1.change outs pressanykey -> vmsg

2.secrete chess


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

5 files changed, 21 insertions, 42 deletions

diff --git a/mbbsd/announce.c b/mbbsd/announce.c
index a7cd016f..dba8c1d7 100644
--- a/mbbsd/announce.c
+++ b/mbbsd/announce.c
@@ -962,11 +962,9 @@ a_menu(char *maintitle, char *path, int lastlevel)
 		a_forward(path, &me.header[me.now - me.page], ch /* == 'U' */ );
 		/* By CharlieL */
 	    } else
-		outmsg("無法轉寄此項目");
+		vmsg("無法轉寄此項目");
 
 	    me.page = 9999;
-	    refresh();
-	    sleep(1);
 	    break;
 
 #ifdef BLOG
diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index dd631f1a..a064cecb 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -550,8 +550,7 @@ do_general(int isbid)
 	    && !((cuser->uflag2 & FOREIGN) && strcmp(bp->brdname, "PttForeign") == 0)
 #endif
 	) {
-	outmsg("對不起，您目前無法在此發表文章！");
-	pressanykey();
+	vmsg("對不起，您目前無法在此發表文章！");
 	return READ_REDRAW;
     }
 #ifdef NO_WATER_POST
@@ -559,8 +558,7 @@ do_general(int isbid)
     /* 三分鐘內最多發表五篇文章 */
     if (currutmp->lastact - last_post_time < 60 * 3) {
 	if (water_counts >= 5) {
-	    outmsg("對不起，您的文章太水囉，待會再post吧！小秘訣:可用'X'推薦文章");
-	    pressanykey();
+	    vmsg("對不起，您的文章太水囉，待會再post吧！可用'X'推薦文章");
 	    return READ_REDRAW;
 	}
     } else {
@@ -1778,9 +1776,7 @@ del_range(int ent, fileheader_t *fhdr, char *direct)
 
     /* rocker.011018: 串接模式下還是不允許刪除比較好 */
     if (currmode & MODE_SELECT) {
-	outmsg("請先回到正常模式後再進行刪除...");
-	refresh();
-	/* safe_sleep(1); */
+	vmsg("請先回到正常模式後再進行刪除...");
 	return FULLUPDATE;
     }
 
@@ -1788,17 +1784,13 @@ del_range(int ent, fileheader_t *fhdr, char *direct)
 	getdata(1, 0, "[設定刪除範圍] 起點：", num1, 6, DOECHO);
 	inum1 = atoi(num1);
 	if (inum1 <= 0) {
-	    outmsg("起點有誤");
-	    refresh();
-	    /* safe_sleep(1); */
+	    vmsg("起點有誤");
 	    return FULLUPDATE;
 	}
 	getdata(1, 28, "終點：", num2, 6, DOECHO);
 	inum2 = atoi(num2);
 	if (inum2 < inum1) {
-	    outmsg("終點有誤");
-	    refresh();
-	    /* safe_sleep(1); */
+	    vmsg("終點有誤");
 	    return FULLUPDATE;
 	}
 	getdata(1, 48, msg_sure_ny, num1, 3, LCECHO);
diff --git a/mbbsd/chc.c b/mbbsd/chc.c
index 249b2d98..0ef06fad 100644
--- a/mbbsd/chc.c
+++ b/mbbsd/chc.c
@@ -34,8 +34,10 @@ static const char *num_str[10] = {
 
 static const char *chess_str[2][8] = {
     /* 0     1     2     3     4     5     6     7 */
-    {"  ", "將", "士", "象", "車", "馬", "包", "卒"},
-    {"  ", "帥", "仕", "相", "車", "傌", "炮", "兵"}
+  //  {"  ", "將", "士", "象", "車", "馬", "包", "卒"},
+  //  {"  ", "帥", "仕", "相", "車", "傌", "炮", "兵"}
+    {"  ", "扁", "蓮", "游", "蘇", "長", "輝", "警"},
+    {"  ", "連", "宋", "王", "邱", "馬", "茜", "民"}
 };
 
 static const char *chess_brd[BRD_ROW * 2 - 1] = {
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 23a5a305..308c833a 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1197,8 +1197,7 @@ int make_connection_to_somebody(userinfo_t *uin, int timeout){
 		add_io(0, 0);
 		close(sock);
 		currutmp->sockactive = currutmp->destuid = 0;
-		outmsg("人家在忙啦");
-		pressanykey();
+		vmsg("人家在忙啦");
 		unlockutmpmode();
 		return -1;
 	    } else {
@@ -1214,9 +1213,7 @@ int make_connection_to_somebody(userinfo_t *uin, int timeout){
 #ifdef linux
 		    add_io(sock, 20);	/* added 4 linux... achen */
 #endif
-		    outmsg(msg_usr_left);
-		    refresh();
-		    pressanykey();
+		    vmsg(msg_usr_left);
 		    unlockutmpmode();
 		    return -1;
 		}
@@ -1283,7 +1280,7 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
     } else {
 	showplans(uin->userid);
 	getdata(2, 0, "要和他(她) (T)談天(F)下五子棋(P)鬥寵物"
-		"(C)下象棋(D)下暗棋(N)沒事找錯人了?[N] ", genbuf, 4, LCECHO);
+		"(C)下總統棋(D)下暗棋(N)沒事找錯人了?[N] ", genbuf, 4, LCECHO);
 	switch (*genbuf) {
 	case 'y':
 	case 't':
@@ -1308,11 +1305,8 @@ my_talk(userinfo_t * uin, int fri_stat, char defact)
 	    if (!cuser->mychicken.name[0] || !xuser.mychicken.name[0])
 		error = 2;
 	    if (error) {
-		outmsg(error == 2 ? "並非兩人都養寵物" :
+		vmsg(error == 2 ? "並非兩人都養寵物" :
 		       "有一方的寵物正在使用中");
-		bell();
-		refresh();
-		sleep(1);
 		return;
 	    }
 	    uin->sig = SIG_PK;
diff --git a/mbbsd/vote.c b/mbbsd/vote.c
index 305b9613..b133ae3c 100644
--- a/mbbsd/vote.c
+++ b/mbbsd/vote.c
@@ -714,9 +714,7 @@ vote_maintain(char *bname)
     setbfile(buf, bname, STR_new_desc);
     aborted = vedit(buf, NA, NULL);
     if (aborted == -1) {
-	clear();
-	outs("取消此次投票");
-	pressanykey();
+	vmsg("取消此次投票");
 	return FULLUPDATE;
     }
     aborted = 0;
@@ -876,18 +874,15 @@ user_vote_one(char *bname, int ind)
 	setbfile(buf, bname, FN_CANVOTE);
 	if (!belong(buf, cuser->userid)) {
 	    fclose(cfp);
-	    outs("\n\n對不起! 這是私人投票..你並沒有受邀唷!");
-	    pressanykey();
+	    vmsg("\n\n對不起! 這是私人投票..你並沒有受邀唷!");
 	    return FULLUPDATE;
 	} else {
-	    outs("\n\n恭喜你受邀此次私人投票....<按任意鍵檢視此次受邀名單>");
-	    pressanykey();
+	    vmsg("\n\n恭喜你受邀此次私人投票.   <檢視此次受邀名單>");
 	    more(buf, YEA);
 	}
     }
     if (vote_flag(bname, ind, '\0')) {
-	outs("\n\n此次投票，你已投過了！");
-	pressanykey();
+	vmsg("\n\n此次投票，你已投過了！");
 	return FULLUPDATE;
     }
     setutmpmode(VOTING);
@@ -1079,13 +1074,11 @@ user_vote(char *bname)
     clrtobot();
 
     if (fhp->bvote == 2 || fhp->bvote == 0) {
-	outs("\n\n目前並沒有任何投票舉行。");
-	pressanykey();
+	vmsg("\n\n目前並沒有任何投票舉行。");
 	return FULLUPDATE;
     }
     if (!HAS_PERM(PERM_LOGINOK)) {
-	outs("\n對不起! 您未滿二十歲, 還沒有投票權喔!");
-	pressanykey();
+	vmsg("\n對不起! 您未滿二十歲, 還沒有投票權喔!");
 	return FULLUPDATE;
     }
     strlcpy(STR_new_control, STR_bv_control, sizeof(STR_new_control));
@@ -1159,7 +1152,7 @@ vote_results(char *bname)
 
     setbfile(buf, bname, STR_bv_results);
     if (more(buf, YEA) == -1)
-	outs("\n目前沒有任何投票的結果。");
+	vmsg("\n目前沒有任何投票的結果。");
     return FULLUPDATE;
 }