From 36a55220bb41463b63308ea5b2c781bdfa453e9f Mon Sep 17 00:00:00 2001
From: scw <scw@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Mon, 17 May 2004 07:11:44 +0000
Subject: menu alignment. Help in userlist. Introducing ^P.

git-svn-id: http://opensvn.csie.org/pttbbs/branches/scw.angel@1997 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/menu.c | 10 +++++-----
 mbbsd/talk.c |  6 +++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 3db2800b..dd53655c 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -348,8 +348,8 @@ static commands_t talklist[] = {
     {t_chat, PERM_CHAT,     "CChat          找家茶坊喫茶去"},
     {t_display, 0,          "DDisplay       顯示上幾次熱訊"},
 #ifdef PLAY_ANGEL
-    {t_switchangel, PERM_ANGEL, "SSwitch Be Angl 切換是否擔任小天使"},
-    {t_changeangel, PERM_BASIC, "UAChange Angel  更換小天使"},
+    {t_switchangel, PERM_ANGEL, "SSwitchBeAngel 切換是否擔任小天使"},
+    {t_changeangel, PERM_BASIC, "UAChange Angel 更換小天使"},
 #endif
     {NULL, 0, NULL}
 };
@@ -380,7 +380,7 @@ static commands_t namelist[] = {
 static commands_t userlist[] = {
     {u_info, PERM_LOGINOK,          "IInfo          設定個人資料與密碼"},
     {calendar, PERM_LOGINOK,          "CCalendar      個人行事曆"},
-    {u_editcalendar, PERM_LOGINOK,    "CDEditCalendar  編輯個人行事曆"},
+    {u_editcalendar, PERM_LOGINOK,    "CDEditCalendar 編輯個人行事曆"},
     {u_loginview, PERM_LOGINOK,     "LLogin View    選擇進站畫面"},
     {u_ansi, 0, "AANSI          切換 ANSI \033[36m彩\033[35m色\033[37m/"
      "\033[30;47m黑\033[1;37m白\033[m模示"},
@@ -391,9 +391,9 @@ static commands_t userlist[] = {
     {u_editplan, PERM_LOGINOK,      "QQueryEdit     編輯名片檔"},
     {u_editsig, PERM_LOGINOK,       "SSignature     編輯簽名檔"},
 #if HAVE_FREECLOAK
-    {u_cloak, PERM_LOGINOK,           "KKCloak         隱身術"},
+    {u_cloak, PERM_LOGINOK,           "KKCloak        隱身術"},
 #else
-    {u_cloak, PERM_CLOAK,           "KKCloak         隱身術"},
+    {u_cloak, PERM_CLOAK,           "KKCloak        隱身術"},
 #endif
     {u_register, PERM_BASIC,        "RRegister      填寫《註冊申請單》"},
     {u_list, PERM_SYSOP,            "UUsers         列出註冊名單"},
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 96181b4f..af14b57f 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1502,7 +1502,11 @@ t_showhelp()
 	outs("(Y)             顯示正在看什麼板\n");
 #endif
     }
+#ifdef PLAY_ANGEL
+    pressanykey_or_callangel();
+#else
     pressanykey();
+#endif
 }
 
 /*
@@ -2833,7 +2837,7 @@ NoAngelFound(const char* msg){
     move(b_lines, 0);
     outs(msg);
     if (currutmp->mode != EDITING)
-	outs("，請先在新手板上尋找答案或發問");
+	outs("，請先在新手板上尋找答案或按 Ctrl-P 發問");
     refresh();
     sleep(1);
     if (currutmp->mode != EDITING){
-- 
cgit v1.2.3