diff options
| author | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-10-03 12:30:43 +0800 |
|---|---|---|
| committer | piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2009-10-03 12:30:43 +0800 |
| commit | 0d342d6474e385db5ca73f5a636c56177926bf3e (patch) | |
| tree | 7ca06556cee6206be138a7dac3f6a3d08a396dc1 | |
| parent | c099482dac7f90462952c17fd69a62ba8b70eac6 (diff) | |
| download | pttbbs-0d342d6474e385db5ca73f5a636c56177926bf3e.tar pttbbs-0d342d6474e385db5ca73f5a636c56177926bf3e.tar.gz pttbbs-0d342d6474e385db5ca73f5a636c56177926bf3e.tar.bz2 pttbbs-0d342d6474e385db5ca73f5a636c56177926bf3e.tar.lz pttbbs-0d342d6474e385db5ca73f5a636c56177926bf3e.tar.xz pttbbs-0d342d6474e385db5ca73f5a636c56177926bf3e.tar.zst pttbbs-0d342d6474e385db5ca73f5a636c56177926bf3e.zip | |
* remove the FREECLOAK configuration and make it always enabled
* if your own site need such feature, please make it as your local patch.
git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@4900 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
| -rw-r--r-- | include/config.h | 4 | ||||
| -rw-r--r-- | mbbsd/cal.c | 17 | ||||
| -rw-r--r-- | mbbsd/menu.c | 7 | ||||
| -rw-r--r-- | mbbsd/talk.c | 9 | ||||
| -rw-r--r-- | sample/pttbbs.conf | 3 |
5 files changed, 2 insertions, 38 deletions
diff --git a/include/config.h b/include/config.h index 7d63e3dd..5175014f 100644 --- a/include/config.h +++ b/include/config.h @@ -167,10 +167,6 @@ #define FOREIGN_REG_DAY 30 #endif -#ifndef HAVE_FREECLOAK -#define HAVE_FREECLOAK 0 -#endif - #ifndef FORCE_PROCESS_REGISTER_FORM #define FORCE_PROCESS_REGISTER_FORM 0 #endif diff --git a/mbbsd/cal.c b/mbbsd/cal.c index e4d1d492..69c15ce2 100644 --- a/mbbsd/cal.c +++ b/mbbsd/cal.c @@ -89,23 +89,6 @@ inmailbox(int m) } -#if !HAVE_FREECLOAK -/* 花錢選單 */ -int -p_cloak(void) -{ - if (vans(currutmp->invisible ? "確定要現身?[y/N]" : "確定要隱身?[y/N]") != 'y') - return 0; - reload_money(); - if (cuser.money >= 19) { - vice(19, "付費隱身"); - currutmp->invisible %= 2; - vmsg((currutmp->invisible ^= 1) ? MSG_CLOAKED : MSG_UNCLOAK); - } - return 0; -} -#endif - int p_from(void) { diff --git a/mbbsd/menu.c b/mbbsd/menu.c index 7a4160f8..78b0c482 100644 --- a/mbbsd/menu.c +++ b/mbbsd/menu.c @@ -678,11 +678,7 @@ static const commands_t userlist[] = { {u_loginview, PERM_BASIC, "VVLogin View 選擇進站畫面"}, {u_myfiles, PERM_LOGINOK, "MMy Files 【個人檔案】 (名片,簽名檔...)"}, {u_mylogs, PERM_LOGINOK, "LLMy Logs 【個人記錄】 (最近上線...)"}, -#if HAVE_FREECLOAK {u_cloak, PERM_LOGINOK, "KKCloak 隱身術"}, -#else - {u_cloak, PERM_CLOAK, "KKCloak 隱身術"}, -#endif {u_register, MENU_UNREGONLY, "RRegister 填寫《註冊申請單》"}, #ifdef ASSESS {u_cancelbadpost,PERM_LOGINOK, "BBye BadPost 申請刪除劣文"}, @@ -804,9 +800,6 @@ static const commands_t xyzlist[] = { static const commands_t moneylist[] = { {p_give, 0, "00Give 給其他人錢"}, {save_violatelaw, 0,"11ViolateLaw 繳罰單"}, -#if !HAVE_FREECLOAK - {p_cloak, 0, "22Cloak 切換 隱身/現身 $19 /次"}, -#endif {p_from, 0, "33From 暫時修改故鄉 $49 /次"}, {ordersong,0, "44OSong 歐桑動態點歌機 $200 /次"}, {p_exmail, 0, "55Exmail 購買信箱 $1000/封"}, diff --git a/mbbsd/talk.c b/mbbsd/talk.c index 1e27257a..104fb195 100644 --- a/mbbsd/talk.c +++ b/mbbsd/talk.c @@ -2600,13 +2600,8 @@ userlist(void) break; case 'C': -#if !HAVE_FREECLOAK - if (HasUserPerm(PERM_CLOAK)) -#endif - { - currutmp->invisible ^= 1; - redrawall = redraw = 1; - } + currutmp->invisible ^= 1; + redrawall = redraw = 1; break; case ' ': diff --git a/sample/pttbbs.conf b/sample/pttbbs.conf index 8e2b0522..d29b7bbe 100644 --- a/sample/pttbbs.conf +++ b/sample/pttbbs.conf @@ -97,9 +97,6 @@ /* 若定義則啟用修文自動合併系統 */ #define EDITPOST_SMARTMERGE -/* 若定義, 則可以免費隱形 */ -#define HAVE_FREECLOAK 1 - /* 可以設定多重進站畫面 */ #define MULTI_WELCOME_LOGIN |