mind

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

3 files changed, 27 insertions, 28 deletions

diff --git a/include/pttstruct.h b/include/pttstruct.h
index 8570aa22..f7690f43 100644
--- a/include/pttstruct.h
+++ b/include/pttstruct.h
@@ -1,4 +1,4 @@
-/* $Id: pttstruct.h,v 1.22 2002/06/29 13:52:31 ptt Exp $ */
+/* $Id: pttstruct.h,v 1.23 2002/07/04 20:08:09 in2 Exp $ */
 #ifndef INCLUDE_STRUCT_H
 #define INCLUDE_STRUCT_H
 
@@ -72,7 +72,7 @@ typedef struct userec_t {
     unsigned short chc_lose;
     unsigned short chc_tie;
     int mobile;
-    int mind;
+    char mind[4];
     char ident[11];
     unsigned int uflag2;
     time_t recommend;
@@ -245,7 +245,7 @@ typedef struct userinfo_t {
     int mailalert;
     int sex;
     char color;
-    int mind;
+    char mind[4];
 #ifdef MULTI_SERVER
     char    hostid;
 #endif
diff --git a/mbbsd/mbbsd.c b/mbbsd/mbbsd.c
index ae560338..9309668d 100644
--- a/mbbsd/mbbsd.c
+++ b/mbbsd/mbbsd.c
@@ -1,4 +1,4 @@
-/* $Id: mbbsd.c,v 1.37 2002/07/04 19:46:16 in2 Exp $ */
+/* $Id: mbbsd.c,v 1.38 2002/07/04 20:08:11 in2 Exp $ */
 #include "bbs.h"
 
 #define SOCKET_QLEN 4
@@ -168,7 +168,7 @@ u_exit (char *mode)
     
     cuser.invisible = currutmp->invisible;
     cuser.pager = currutmp->pager;
-    cuser.mind  = currutmp->mind; 
+    memcpy(cuser.mind, currutmp->mind, 4);
     setutmpbid(0);
     if (!(HAS_PERM (PERM_SYSOP) && HAS_PERM (PERM_DENYPOST)) &&
 	!currutmp->invisible )
@@ -739,7 +739,7 @@ setup_utmp (int mode)
     uinfo.five_tie = cuser.five_tie;
     uinfo.invisible = cuser.invisible % 2;
     uinfo.pager = cuser.pager%5;
-    uinfo.mind  = cuser.mind; 
+    memcpy(uinfo.mind, cuser.mind, 4);
 #ifdef WHERE
     uinfo.from_alias = where (fromhost);
 #endif
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index f02d3c14..9c8dba8d 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1,4 +1,4 @@
-/* $Id: talk.c,v 1.76 2002/07/02 16:22:00 in2 Exp $ */
+/* $Id: talk.c,v 1.77 2002/07/04 20:08:11 in2 Exp $ */
 #include "bbs.h"
 
 #define QCAST   int (*)(const void *, const void *)
@@ -1603,14 +1603,6 @@ static void pickup(pickup_t *currpickup, int pickup_way, int *page,
 	currpickup[size].ui = 0;
 }
 
-char    *Mind[] = {
-    "   ",
-    "^-^", "^_^", "Q_Q", "@_@", "/_\\", "=_=", "-_-", "-.-", ">_<",
-    "-_+", "!_!", "o_o", "z_Z", "O_O", "O.O", "$_$", "^*^", "O_<",
-    "喜!", "怒!", "哀!", "樂!", ":) ", ":( ", ":~ ", ":q ", ":O ",
-    ":D ", ":p ", ";) ", ":> ", ";> ", ":< ", ":)~", ":D~", ">< ",
-    "^^;", "^^|", "哭;",  NULL
-};
 static void draw_pickup(int drawall, pickup_t *pickup, int pickup_way,
 			int page, int show_mode, int show_uid, int show_board,
 			int show_pid, int real_name,
@@ -1624,6 +1616,7 @@ static void draw_pickup(int drawall, pickup_t *pickup, int pickup_way,
 
     userinfo_t      *uentp;
     int     i, ch, state, friend;
+    char    mind[5];
 #ifdef SHOW_IDLE_TIME
     char    idlestr[32];
     int     idletime;
@@ -1693,6 +1686,13 @@ static void draw_pickup(int drawall, pickup_t *pickup, int pickup_way,
 	    strcpy(idlestr, "      "); 
 #endif
 
+	if( (uentp->userlevel & PERM_VIOLATELAW) )
+	    memcpy(mind, "通緝", 4);
+	else if( uentp->birth )
+	    memcpy(mind, "壽星", 4);
+	else
+	    memcpy(mind, uentp->mind, 4);
+	mind[4] = 0;
 	prints("%5d %c%c%s%-13s%-17.16s\033[m%-17.16s%-13.13s"
 	       "\33[33m%-4.4s\33[m%s\n",
 
@@ -1730,8 +1730,7 @@ static void draw_pickup(int drawall, pickup_t *pickup, int pickup_way,
 	       modestring(uentp, 0),
 	       
 	       /* memo */
-	       ((uentp->userlevel & PERM_VIOLATELAW) ? "通緝" :
-		(uentp->birth ? "壽星" : Mind[uentp->mind])),
+	       mind,
 
 	       /* idle */
 #ifdef SHOW_IDLE_TIME
@@ -2105,17 +2104,17 @@ static void userlist(void)
 		}
 		break;
 
-	    case 'i':
-		move(3,0);
-		clrtobot();
-		for( i = 0 ; Mind[i] != NULL ; ++i ){
-		    move(5 + (i - 1) / 7, ((i - 1) % 7) * 10);
-		    prints("%2d: %s", i, Mind[i]);
-		}
-		getdata(b_lines - 1, 0, "你現在的心情 0:無 q不變 [q]:",
-				genbuf, 3, LCECHO);
-		if( genbuf[0] && genbuf[0] != 'q' && atoi(genbuf) >= 0)
-		    currutmp->mind = atoi(genbuf) % i;
+	    case 'i':{
+		char    mindbuf[5];
+		getdata(b_lines - 1, 0, "現在的心情? ",
+			mindbuf, sizeof(mindbuf), LCECHO);
+		if( strcmp(mindbuf, "通緝") == 0 )
+		    vmsg("不可以把自己設通緝啦!");
+		else if( strcmp(mindbuf, "壽星") == 0 )
+		    vmsg("你不是今天生日欸!");
+		else
+		    memcpy(currutmp->mind, mindbuf, 4);
+	    }
 		redrawall = redraw = 1;
 		break;