From c46fffb99342eee4d4eeec4e8a4707a294f0b3b7 Mon Sep 17 00:00:00 2001
From: in2 <in2@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Thu, 15 Jan 2004 17:37:12 +0000
Subject: add some comments for ofo water mode. set nkwbd default to 5, 5

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@1484 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/talk.c | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'mbbsd/talk.c')

diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index f44b69b9..4af0fa92 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -105,7 +105,16 @@ modestring(userinfo_t * uentp, int simple)
 		     "回應 %s", getuserid(uentp->destuid));
 	else
 	    snprintf(modestr, sizeof(modestr), "回應呼叫");
-    } else if (!mode && *uentp->chatid == 2)
+    } 
+    else if (!mode && *uentp->chatid == 3)
+	snprintf(modestr, sizeof(modestr), "水球準備中");
+    else if (
+#ifdef NOKILLWATERBALL
+	     uentp->msgcount > 0
+#else
+	     (!mode) && *uentp->chatid == 2
+#endif
+	     )
 	if (uentp->msgcount < 10) {
 	    char           *cnum[10] =
 	    {"", "一", "兩", "三", "四", "五", "六", "七",
@@ -114,8 +123,6 @@ modestring(userinfo_t * uentp, int simple)
 		     "中%s顆水球", cnum[(int)(uentp->msgcount)]);
 	} else
 	    snprintf(modestr, sizeof(modestr), "不行了 @_@");
-    else if (!mode && *uentp->chatid == 3)
-	snprintf(modestr, sizeof(modestr), "水球準備中");
     else if (!mode)
 	return (uentp->destuid == 6) ? uentp->chatid :
 	    IdleTypeTable[(0 <= uentp->destuid && uentp->destuid < 6) ?
@@ -540,9 +547,11 @@ my_write2(void)
     currstat = currstat0;
     currutmp->chatid[0] = c0;
     currutmp->mode = mode0;
-    if (wmofo == 1)
+    if (wmofo == RECVINREPLYING){
+	wmofo = NOTREPLYING;
 	write_request(0);
-    wmofo = -1;
+    }
+    wmofo = NOTREPLYING;
 }
 
 /*
-- 
cgit v1.2.3