From 6e592b3fbc459867f9966c3cdefbc363a26ec895 Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Tue, 4 Dec 2007 18:22:55 +0000
Subject: - general refine and improvement, fixing messages

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3630 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/brc.c  |  2 ++
 mbbsd/menu.c |  5 +++--
 mbbsd/user.c | 27 +++++++++++++++------------
 3 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'mbbsd')

diff --git a/mbbsd/brc.c b/mbbsd/brc.c
index dcfd89eb..be242367 100644
--- a/mbbsd/brc.c
+++ b/mbbsd/brc.c
@@ -16,6 +16,8 @@
 
 #define BRC_BLOCKSIZE   1024
 
+// Note: BRC v3 should already support MAX_BOARD > 65535,
+// but not widely tested yet.
 #if MAX_BOARD > 65535 || BRC_MAXSIZE > 65535
 #error Max number of boards or BRC_MAXSIZE cannot fit in unsigned short, \
 please rewrite brc.c
diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index ac31b010..deb83c2f 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -402,9 +402,10 @@ static const commands_t maillist[] = {
     {m_new, PERM_READMAIL,      "RNew           閱\讀新進郵件"},
     {m_read, PERM_READMAIL,     "RRead          多功\能讀信選單"},
     {m_send, PERM_LOGINOK,      "RSend          站內寄信"},
-    {x_love, PERM_LOGINOK,      "PPaper         " ANSI_COLOR(1;32) "情書產生器" ANSI_RESET " "},
+    {x_love, PERM_LOGINOK,      "PPaper         情書產生器"},
     {mail_list, PERM_LOGINOK,   "RMail List     群組寄信"},
-    {setforward, PERM_LOGINOK, "FForward       " ANSI_COLOR(32) "設定信箱自動轉寄" ANSI_RESET},
+    {setforward, PERM_LOGINOK,  "FForward       " ANSI_COLOR(1;32) 
+				"設定信箱自動轉寄" ANSI_RESET},
     {m_sysop, 0,                "YYes, sir!     諂媚站長"},
     {m_internet, PERM_INTERNET, "RInternet      寄信到 Internet"},
     {mail_mbox, PERM_INTERNET,  "RZip UserHome  把所有私人資料打包回去"},
diff --git a/mbbsd/user.c b/mbbsd/user.c
index f89d1d82..35cc0aab 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -359,13 +359,12 @@ void Customize(void)
 	0,
     };
 
-    showtitle("個人化設定", "個人化設定");
-
     while ( !done ) {
 	int i = 0, ia = 0, ic = 0; /* general uflags */
 	int iax = 0; /* extended flags */
 
 	clear();
+	showtitle("個人化設定", "個人化設定");
 	move(2, 0);
 	outs("您目前的個人化設定: ");
 	move(4, 0);
@@ -373,19 +372,23 @@ void Customize(void)
 	/* print uflag options */
 	for (i = 0; masks1[i]; i++, ia++)
 	{
-	    prints("%c. %-40s%10s\n",
-		    'a' + ia,
-		    desc1[i],
-		    (cuser.uflag & masks1[i]) ? "是" : "否");
+	    clrtoeol();
+	    prints( ANSI_COLOR(1;36) "%c" ANSI_RESET
+		    ". %-40s%s\n",
+		    'a' + ia, desc1[i],
+		    (cuser.uflag & masks1[i]) ? 
+		    ANSI_COLOR(1;36) "是" ANSI_RESET : "否");
 	}
 	ic = i;
 	/* print uflag2 options */
 	for (i = 0; masks2[i]; i++, ia++)
 	{
-	    prints("%c. %-40s%10s\n",
-		    'a' + ia,
-		    desc2[i],
-		    (cuser.uflag2 & masks2[i]) ? "是" : "否");
+	    clrtoeol();
+	    prints( ANSI_COLOR(1;36) "%c" ANSI_RESET
+		    ". %-40s%s" ANSI_RESET "\n",
+		    'a' + ia, desc2[i],
+		    (cuser.uflag2 & masks2[i]) ? 
+		    ANSI_COLOR(1;36) "是" ANSI_RESET : "否");
 	}
 	/* extended stuff */
 	{
@@ -393,13 +396,13 @@ void Customize(void)
 	    const static char *wm[] = 
 		{"一般", "進階", "未來", ""};
 
-	    prints("%c. %-40s%10s\n",
+	    prints("%c. %-40s%s\n",
 		    '1' + iax++,
 		    "水球模式",
 		    wm[(cuser.uflag2 & WATER_MASK)]);
 	    memcpy(mindbuf, &currutmp->mind, 4);
 	    mindbuf[4] = 0;
-	    prints("%c. %-40s%10s\n",
+	    prints("%c. %-40s%s\n",
 		    '1' + iax++,
 		    "目前的心情",
 		    mindbuf);
-- 
cgit v1.2.3