Display angel usage when calling angel

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3395 63ad8ddf-47c3-0310-b6dd-a9e9d9715204

3 files changed, 33 insertions, 4 deletions

diff --git a/mbbsd/admin.c b/mbbsd/admin.c
index c75c8ef0..5b094b59 100644
--- a/mbbsd/admin.c
+++ b/mbbsd/admin.c
@@ -684,7 +684,7 @@ x_file(void)
     /* Ptt */
     outs("³]©w (1)¨­¥÷½T»{«H (4)postª`·N¨Æ¶µ (5)¿ù»~µn¤J°T®§ (6)µù¥U½d¨Ò (7)³q¹L½T»{³qª¾\n");
     outs("     (8)email post³qª¾ (9)¨t²Î¥\\¯àºëÆF (A)¯ù¼Ó (B)¯¸ªø¦W³æ (C)email³q¹L½T»{\n");
-    outs("     (D)·s¨Ï¥ÎªÌ»Ýª¾ (E)¨­¥÷½T»{¤èªk (F)Åwªïµe­± (G)¶i¯¸µe­±"
+    outs("     (D)·s¨Ï¥ÎªÌ»Ýª¾ (E)¨­¥÷½T»{¤èªk (F)Åwªïµe­± (G)¶i¯¸µe­± "
 #ifdef MULTI_WELCOME_LOGIN
 	 "(X)§R°£¶i¯¸µe­±"
 #endif
@@ -692,7 +692,7 @@ x_file(void)
     outs("     (H)¬ÝªO´Á­­ (I)¬G¶m (J)¥X¯¸µe­± (K)¥Í¤é¥d (L)¸`¤é (M)¥~Äy¨Ï¥ÎªÌ»{ÃÒ³qª¾\n");
     outs("     (N)¥~Äy¨Ï¥ÎªÌ¹L´Áĵ§i³qª¾ (O)¬ÝªO¦Cªí help (P)¤å³¹¦Cªí help\n");
 #ifdef PLAY_ANGEL
-    outs(" (Y)¤p¤Ñ¨Ï»{ÃÒ³qª¾\n");
+    outs("     (R)¤p¤Ñ¨Ï»{ÃÒ³qª¾ (S)¤p¤Ñ¨Ï¥\\¯à»¡©ú\n");
 #endif
     getdata(b_lines - 1, 0, "[Q]¨ú®ø[1-9 A-P]¡H", ans, sizeof(ans), LCECHO);
 
@@ -803,9 +803,13 @@ x_file(void)
 	break;
 
 #ifdef PLAY_ANGEL
-    case 'y':
+    case 'r':
 	fpath = "etc/angel_notify";
 	break;
+
+    case 's':
+	fpath = "etc/angel_usage";
+	break;
 #endif
 
     default:
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 43feb4b2..11b1abfb 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -3426,8 +3426,8 @@ AngelNotOnline(){
 
 static void
 TalkToAngel(){
-    userinfo_t* uent;
     static int AngelPermChecked = 0;
+    userinfo_t* uent;
     userec_t xuser;
 
     if (strcmp(cuser.myangel, "-") == 0){
@@ -3453,6 +3453,8 @@ TalkToAngel(){
 	return;
     }
 
+    more("etc/angel_usage", NA);
+
     /* ³o¬q¸Ü©Î³\¥i¥H¦b¤p¤Ñ¨Ï¦^µª°ÝÃD®É show ¥X¨Ó
     move(b_lines - 1, 0);
     outs("²{¦b§Aªºid¨ü¨ì«O±K¡A¦^µª§A°ÝÃDªº¤p¤Ñ¨Ï¨Ã¤£ª¾¹D§A¬O½Ö       \n"
diff --git a/sample/etc/angel_usage b/sample/etc/angel_usage
new file mode 100644
index 00000000..36ac9da5
--- /dev/null
+++ b/sample/etc/angel_usage
@@ -0,0 +1,23 @@
+
+  ùÝùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùùß
+  ùø                                                                        ùø
+  ùø  ¡·¤p¤Ñ¨Ï¬O¥Î¨Ó¸Ñµªbbs¨Ï¥Î¤Wªº°ÝÃD¡A¤£¤@©w·|¸ò¤p¥D¤H²á¤Ñ¡C             ùø
+  ùø                                                                        ùø
+  ùø  ¡ó¤p¤Ñ¨Ï¬O¯u¤H¡A¦ý¬O¥L³Q¤j¤Ñ¨Ï­­¨î¤£¯à¬ªº|id¡B©Ê§Oµ¥¨p¤H¸ê°T¡C        ùø
+  ùø                                                                        ùø
+  ùø  ¡¸¨C­Ó¤ë29¤é©I¥s¤p¤Ñ¨Ï¨ÃÂIºq¥i¥H±o¨ìP¹ô«B¡C                        ­È ùø
+  ùø                                                                     ¤é ùø
+  ùø  ¡µ¤p¥D¤H°Ý°ÝÃD§ä¤£¨ì¤p¤Ñ¨Ï½Ð¨ì·s¤âª©(PttNewhand)¡A                 ¥Í ùø
+  ùø    ·Q¯d¨¥µ¹¤p¤Ñ¨Ï½Ð¨ì³\Ä@ª©(AngelPray)    ¢d¢f¢«        ¢ª¢g¢d      ¡G ùø
+  ùø                                         ¢¨¢i¢«            ¢ª¢i ¢© ¦N¼Ú ùø
+  ùø                                         ¢i¢i¢c¢e¢f¢g¢g¢f¢e¢d¢i¢i¢o¦Ì¢Ù ùø
+  ùø    ¢i||¢i          ¢d¢d   ¢d¢d          ¢ª¢i¢i            ¢n¢i¢i¢«©g»Å ùø
+¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e¢e ¢«¢ª¢«             ¢ª¢«¢©¢e¢e¢e¢e¢e
+                                      ¢¨¢h¢©            »Å            ¢¨¢i¢©
+                                       ¢¨¢i¢i                          ¢i¢i¢©
+                                     ¢¨¢i¢i¢i        ¢i      ¢i¢i      ¢ª¢i¢i¢©
+                                       ¢i¢i¢«     ¡´           ¡´      ¢m¢i¢i
+  «Ü¥¿«Ü¥¿ªº¥¿¤Ó¤p¯ô                   ¢«  ¢m     ¢d¢d¢c¢c¢c¢c¢d¢d ¢A      ¢ª
+  «Ü³J«Ü³Jªº¼u¯]¨T¤ô                    ¡¹ùùùùùß¡Y  ¢ª       ¢«    ¢B  ¢«
+                      ´£¿ô±z          ¡¸ùùùùùùùáùùùùùùùùùùùùùùùùùùùùùùùù
+                   £rccfg & s75287      ¡¹ùùùùùå   ¢f¢e¢d¢c¢c¢d¢e¢f