- prepare to remove chicken-pk

- menu string update


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

3 files changed, 34 insertions, 15 deletions

diff --git a/mbbsd/chicken.c b/mbbsd/chicken.c
index 7dd9118f..a9c8b01b 100644
--- a/mbbsd/chicken.c
+++ b/mbbsd/chicken.c
@@ -1,6 +1,9 @@
 /* $Id$ */
 #include "bbs.h"
 
+// TODO pull chicken out of userec.
+// remove chickenpk.
+
 #define NUM_KINDS   15		/* 有多少種動物 */
 
 static const char * const cage[17] = {
@@ -878,6 +881,7 @@ chicken_main(void)
     return 0;
 }
 
+#ifdef USE_CHICKEN_PK
 int
 chickenpk(int fd)
 {
@@ -1020,3 +1024,4 @@ chickenpk(int fd)
     unlockutmpmode();
     return 0;
 }
+#endif // USE_CHICKEN_PK
diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index 267f5126..a4d1e1d8 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -462,8 +462,8 @@ int u_customize()
 
 /* User menu */
 static const commands_t userlist[] = {
+    {u_customize, PERM_LOGINOK,     "UUCustomize    個人化設定"},
     {u_info, PERM_LOGINOK,    	    "IInfo          設定個人資料與密碼"},
-    {u_customize, PERM_LOGINOK,     "IUCustomize    個人化設定"},
     {calendar, PERM_LOGINOK,        "CCalendar      個人行事曆"},
     {u_editcalendar, PERM_LOGINOK,  "CDEditCalendar 編輯個人行事曆"},
     {u_loginview, PERM_LOGINOK,     "LLogin View    選擇進站畫面"},
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index c3ce1494..29532d82 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1555,12 +1555,11 @@ int make_connection_to_somebody(userinfo_t *uin, int timeout){
 void
 my_talk(userinfo_t * uin, int fri_stat, char defact)
 {
-    int             sock, msgsock, error = 0, ch;
+    int             sock, msgsock, ch;
     pid_t           pid;
     char            c;
     char            genbuf[4];
     unsigned char   mode0 = currutmp->mode;
-    userec_t        xuser;
 
     genbuf[0] = defact;
     ch = uin->mode;
@@ -1646,7 +1645,11 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
 		}
 	    }
 	    move(4, 0);
-	    outs("要和他(她) (T)談天(F)下五子棋(P)鬥寵物(C)下象棋(D)下暗棋(G)下圍棋(R)下黑白棋");
+	    outs("要和他(她) (T)談天(F)下五子棋"
+#ifdef USE_CHICKEN_PK
+		    "(P)鬥寵物"
+#endif // USE_CHICKEN_PK
+		    "(C)下象棋(D)下暗棋(G)下圍棋(R)下黑白棋");
 	    getdata(5, 0, "           (N)沒事找錯人了?[N] ", genbuf, 4, LCECHO);
 	}
 
@@ -1672,20 +1675,27 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
 	case 'r':
 	    uin->sig = SIG_REVERSI;
 	    break;
+#ifdef USE_CHICKEN_PK
 	case 'p':
-	    reload_chicken();
-	    getuser(uin->userid, &xuser);
-	    if (uin->lockmode == CHICKEN || currutmp->lockmode == CHICKEN)
-		error = 1;
-	    if (!cuser.mychicken.name[0] || !xuser.mychicken.name[0])
-		error = 2;
-	    if (error) {
-		vmsg(error == 2 ? "並非兩人都養寵物" :
-		       "有一方的寵物正在使用中");
-		return;
+	    {
+		userec_t xuser;
+		int error = 0;
+
+		reload_chicken();
+		getuser(uin->userid, &xuser);
+		if (uin->lockmode == CHICKEN || currutmp->lockmode == CHICKEN)
+		    error = 1;
+		if (!cuser.mychicken.name[0] || !xuser.mychicken.name[0])
+		    error = 2;
+		if (error) {
+		    vmsg(error == 2 ? "並非兩人都養寵物" :
+			    "有一方的寵物正在使用中");
+		    return;
+		}
+		uin->sig = SIG_PK;
 	    }
-	    uin->sig = SIG_PK;
 	    break;
+#endif // USE_CHICKEN_PK
 	default:
 	    return;
 	}
@@ -1741,9 +1751,11 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
 	    case SIG_DARK:
 		main_dark(msgsock, uin);
 		break;
+#ifdef USE_CHICKEN_PK
 	    case SIG_PK:
 		chickenpk(msgsock);
 		break;
+#endif
 	    case SIG_GOMO:
 		gomoku(msgsock, CHESS_MODE_VERSUS);
 		break;
@@ -3250,9 +3262,11 @@ talkreply(void)
 	case SIG_DARK:
 	    main_dark(a, uip);
 	    break;
+#ifdef USE_CHICKEN_PK
 	case SIG_PK:
 	    chickenpk(a);
 	    break;
+#endif // USE_CHICKEN_PK
 	case SIG_GOMO:
 	    gomoku(a, CHESS_MODE_VERSUS);
 	    break;