summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscw <scw@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-05-16 17:43:06 +0800
committerscw <scw@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2004-05-16 17:43:06 +0800
commit3d0fa7c79b4d5d08868f32f44052392d03638074 (patch)
tree76269870dd6e88e61b21ad23fbe613dc9853adfa
parent62b898b733dd7b8acfaefc287c513668a007f232 (diff)
downloadpttbbs-3d0fa7c79b4d5d08868f32f44052392d03638074.tar
pttbbs-3d0fa7c79b4d5d08868f32f44052392d03638074.tar.gz
pttbbs-3d0fa7c79b4d5d08868f32f44052392d03638074.tar.bz2
pttbbs-3d0fa7c79b4d5d08868f32f44052392d03638074.tar.lz
pttbbs-3d0fa7c79b4d5d08868f32f44052392d03638074.tar.xz
pttbbs-3d0fa7c79b4d5d08868f32f44052392d03638074.tar.zst
pttbbs-3d0fa7c79b4d5d08868f32f44052392d03638074.zip
Fix error for compiling without defining PLAY_ANGEL.
git-svn-id: http://opensvn.csie.org/pttbbs/branches/scw.angel@1994 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--include/proto.h2
-rw-r--r--mbbsd/io.c7
-rw-r--r--mbbsd/menu.c4
-rw-r--r--mbbsd/stuff.c6
4 files changed, 14 insertions, 5 deletions
diff --git a/include/proto.h b/include/proto.h
index 90f093fb..c4d401f0 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -578,9 +578,11 @@ int isvisible_uid(int tuid);
int friend_stat(userinfo_t *me, userinfo_t * ui);
int call_in(userinfo_t *uentp, int fri_stat);
int make_connection_to_somebody(userinfo_t *uin, int timeout);
+#ifdef PLAY_ANGEL
int t_changeangel(void);
void CallAngel(void);
int t_switchangel(void);
+#endif
/* tmpjack */
int reg_barbq(void);
diff --git a/mbbsd/io.c b/mbbsd/io.c
index 22de008f..bfba9c2d 100644
--- a/mbbsd/io.c
+++ b/mbbsd/io.c
@@ -322,8 +322,7 @@ igetch()
}
}
return ch;
- //case '\n': /* Ptt把 \n拿掉 */
- // continue;
+
case Ctrl('T'):
if (WATERMODE(WATER_ORIG) || WATERMODE(WATER_NEW)) {
if (watermode > 0) {
@@ -371,8 +370,10 @@ igetch()
}
return ch;
- case Ctrl('J'):
+ case Ctrl('J'): /* Ptt 把 \n 拿掉 */
+#ifdef PLAY_ANGEL
CallAngel();
+#endif
continue;
case IAC:
diff --git a/mbbsd/menu.c b/mbbsd/menu.c
index d77492ff..bafff3fb 100644
--- a/mbbsd/menu.c
+++ b/mbbsd/menu.c
@@ -410,9 +410,9 @@ static commands_t userlist[] = {
{u_editplan, PERM_LOGINOK, "QQueryEdit 編輯名片檔"},
{u_editsig, PERM_LOGINOK, "SSignature 編輯簽名檔"},
#if HAVE_FREECLOAK
- {u_cloak, PERM_LOGINOK, "KCloak 隱身術"},
+ {u_cloak, PERM_LOGINOK, "CCloak 隱身術"},
#else
- {u_cloak, PERM_CLOAK, "KCloak 隱身術"},
+ {u_cloak, PERM_CLOAK, "CCloak 隱身術"},
#endif
{u_register, PERM_BASIC, "RRegister 填寫《註冊申請單》"},
{u_list, PERM_SYSOP, "UUsers 列出註冊名單"},
diff --git a/mbbsd/stuff.c b/mbbsd/stuff.c
index 1debf67b..7ce5e720 100644
--- a/mbbsd/stuff.c
+++ b/mbbsd/stuff.c
@@ -422,6 +422,7 @@ pressanykey()
refresh();
}
+#ifdef PLAY_ANGEL
void
pressanykey_or_callangel(){
int ch;
@@ -444,6 +445,7 @@ pressanykey_or_callangel(){
clrtoeol();
refresh();
}
+#endif
int
vmsg(const char *fmt,...)
@@ -629,7 +631,11 @@ show_help(char *helptext[])
else
prints(" %s\n", str);
}
+#ifdef PLAY_ANGEL
pressanykey_or_callangel();
+#else
+ pressanykey();
+#endif
}
#endif // _BBS_UTIL_C_