summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2005-09-22 19:57:42 +0800
committerpiaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2005-09-22 19:57:42 +0800
commitdd061d2c4c0f3f0a5ff7a20587ef3831157fb49d (patch)
tree9d59d16294fb33c276ce305cd628f705b88ef125
parent71202dcbdd8dc68a7ba663880b649020ac8aa53b (diff)
downloadpttbbs-dd061d2c4c0f3f0a5ff7a20587ef3831157fb49d.tar
pttbbs-dd061d2c4c0f3f0a5ff7a20587ef3831157fb49d.tar.gz
pttbbs-dd061d2c4c0f3f0a5ff7a20587ef3831157fb49d.tar.bz2
pttbbs-dd061d2c4c0f3f0a5ff7a20587ef3831157fb49d.tar.lz
pttbbs-dd061d2c4c0f3f0a5ff7a20587ef3831157fb49d.tar.xz
pttbbs-dd061d2c4c0f3f0a5ff7a20587ef3831157fb49d.tar.zst
pttbbs-dd061d2c4c0f3f0a5ff7a20587ef3831157fb49d.zip
prepare for connect6
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3204 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--include/modes.h5
-rw-r--r--mbbsd/go.c4
-rw-r--r--mbbsd/talk.c6
-rw-r--r--mbbsd/var.c4
4 files changed, 10 insertions, 9 deletions
diff --git a/include/modes.h b/include/modes.h
index d9e110e4..6a4ef66e 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -99,9 +99,10 @@
#define REEDIT 79
#define BLOGGING 80
#define CHESSWATCHING 81
-#define GO 82
+#define UMODE_GO 82
#define DEBUGSLEEPING 83
-#define MODE_MAX 83 /* 所有其他選單動態須在此之前 */
+#define UMODE_CONN6 84
+#define MODE_MAX 85 /* 所有其他選單動態須在此之前 */
/* menu.c 中的模式 */
#define QUIT 0x666 /* Return value to abort recursive functions */
diff --git a/mbbsd/go.c b/mbbsd/go.c
index fe00a63a..4611fb49 100644
--- a/mbbsd/go.c
+++ b/mbbsd/go.c
@@ -896,7 +896,7 @@ gochess(int s, ChessGameMode mode)
if (mode == CHESS_MODE_WATCH)
setutmpmode(CHESSWATCHING);
else
- setutmpmode(GO);
+ setutmpmode(UMODE_GO);
currutmp->sig = SIG_GO;
ChessPlay(info);
@@ -920,7 +920,7 @@ gochess_personal(void)
int
gochess_watch(void)
{
- return ChessWatchGame(&gochess, GO, "圍棋");
+ return ChessWatchGame(&gochess, UMODE_GO, "圍棋");
}
static int
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 503eac7a..b86a471b 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -137,7 +137,7 @@ modestring(const userinfo_t * uentp, int simple)
return word;
else if (uentp->in_chat && mode == CHATING)
snprintf(modestr, sizeof(modestr), "%s (%s)", word, uentp->chatid);
- else if (mode == TALK || mode == M_FIVE || mode == CHC || mode == GO
+ else if (mode == TALK || mode == M_FIVE || mode == CHC || mode == UMODE_GO
|| mode == DARK) {
if (!isvisible_uid(uentp->destuid)) /* Leeym 對方(紫色)隱形 */
snprintf(modestr, sizeof(modestr), "%s 空氣", word);
@@ -1492,10 +1492,10 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
if (ch == EDITING || ch == TALK || ch == CHATING || ch == PAGE ||
ch == MAILALL || ch == MONITOR || ch == M_FIVE || ch == CHC ||
- ch == DARK || ch == GO || ch == CHESSWATCHING ||
+ ch == DARK || ch == UMODE_GO || ch == CHESSWATCHING ||
(!ch && (uin->chatid[0] == 1 || uin->chatid[0] == 3)) ||
uin->lockmode == M_FIVE || uin->lockmode == CHC) {
- if (ch == CHC || ch == M_FIVE || ch == GO || ch == CHESSWATCHING) {
+ if (ch == CHC || ch == M_FIVE || ch == UMODE_GO || ch == CHESSWATCHING) {
sock = make_connection_to_somebody(uin, 20);
if (sock < 0)
vmsg("無法建立連線");
diff --git a/mbbsd/var.c b/mbbsd/var.c
index be986d72..7798143d 100644
--- a/mbbsd/var.c
+++ b/mbbsd/var.c
@@ -268,8 +268,9 @@ char * const ModeTypeTable[MAX_MODES] = {
"重編文章", /* REEDIT */
"部落格", /* BLOGGING */
"看棋", /* CHESSWATCHING */
- "下圍棋", /* GO */
+ "下圍棋", /* UMODE_GO */
"[系統錯誤]", /* DEBUGSLEEPING */
+ "連六棋", /* UMODE_CONN6 */
"", /* for future usage */
"",
"",
@@ -311,7 +312,6 @@ char * const ModeTypeTable[MAX_MODES] = {
"",
"",
"",
- "",
""
};