* looks like we've fixed ANSI in getdata(), so let's unlock all colourful prompts

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

5 files changed, 2 insertions, 36 deletions

diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c
index 6d3bb323..507b6be2 100644
--- a/pttbbs/mbbsd/bbs.c
+++ b/pttbbs/mbbsd/bbs.c
@@ -545,9 +545,8 @@ readdoent(int num, fileheader_t * ent)
     } // if(!iscorpse)
     else {
 	// quick display
-#ifdef USE_PFTERM
+	SOLVE_ANSI_CACHE();
 	outs(ANSI_COLOR(1;30));
-#endif
 	prints("%7d    ", num);
 	prints("%-6.5s", ent->date);
 	prints("%-13.12s", ent->owner);
@@ -1262,11 +1261,7 @@ do_generalboardreply(/*const*/ fileheader_t * fhdr)
     if (!CheckPostRestriction(currbid))
     {
 	getdata(b_lines - 1, 0,	
-#ifdef USE_PFTERM
 		ANSI_COLOR(1;31) "▲ 無法回應至看板。 " ANSI_RESET
-#else
-		"▲ 無法回應至看板。 "
-#endif
 		"改回應至 (M)作者信箱 (Q)取消？[Q] ",
 		genbuf, sizeof(genbuf), LCECHO);
 	switch (genbuf[0]) {
@@ -2721,12 +2716,8 @@ recommend(int ent, fileheader_t * fhdr, const char *direct)
 
 #else // !OLDRECOMMEND
     maxlength -= strlen(myid);
-# ifdef    USE_PFTERM
     sprintf(buf, "%s%s%s %s:", 
 	    ctype_attr[type], ctype[type], ANSI_RESET, myid);
-# else  // !USE_PFTERM
-    sprintf(buf, "%s %s:", ctype[type], myid);
-# endif // !USE_PFTERM
 #endif // !OLDRECOMMEND
 
     move(b_lines, 0);
@@ -2739,11 +2730,7 @@ recommend(int ent, fileheader_t * fhdr, const char *direct)
     {
 	char ans[2];
 	sprintf(buf+strlen(buf), 
-#ifdef USE_PFTERM
 		ANSI_REVERSE "%-*s" ANSI_RESET " 確定[y/N]:", 
-#else
-		"%-*s 確定[y/N]:", 
-#endif
 		maxlength, msg);
 	move(b_lines, 0);
 	clrtoeol();
diff --git a/pttbbs/mbbsd/gamble.c b/pttbbs/mbbsd/gamble.c
index a3d59236..c43d4030 100644
--- a/pttbbs/mbbsd/gamble.c
+++ b/pttbbs/mbbsd/gamble.c
@@ -258,12 +258,8 @@ openticket(int bid)
     do {
 	do {
 	    getdata(20, 0,
-#ifdef USE_PFTERM
 		ANSI_COLOR(1) "選擇中獎的號碼(0:不開獎 99:取消退錢)" 
 		ANSI_RESET ":"
-#else
-		"選擇中獎的號碼(0:不開獎 99:取消退錢):"
-#endif
 		    , buf, 3, LCECHO);
 	    bet = atoi(buf);
 	    move(0, 0);
@@ -274,11 +270,7 @@ openticket(int bid)
 	    return 0;
 	}
 	getdata(21, 0, 
-#ifdef USE_PFTERM
 		ANSI_COLOR(1) "再次確認輸入號碼" ANSI_RESET ":"
-#else
-		"再次確認輸入號碼:"
-#endif
 		, buf, 3, LCECHO);
     } while (bet != atoi(buf));
 
diff --git a/pttbbs/mbbsd/ordersong.c b/pttbbs/mbbsd/ordersong.c
index 11918729..eb50d7fa 100644
--- a/pttbbs/mbbsd/ordersong.c
+++ b/pttbbs/mbbsd/ordersong.c
@@ -47,13 +47,9 @@ do_order_song(void)
 	     "若有上述違規情形，站方將保留決定是否公開播放的權利\n"
 	     "如不同意請按 (3) 離開。" ANSI_RESET "\n");
 	getdata(18, 0, 
-#ifdef USE_PFTERM
 		"請選擇 " ANSI_COLOR(1) "1)" ANSI_RESET " 開始點歌、"
 		ANSI_COLOR(1) "2)" ANSI_RESET " 看歌本、"
 		"或是 " ANSI_COLOR(1) "3)" ANSI_RESET " 離開: ",
-#else
-		"請選擇 1)開始點歌 2)看歌本 3)離開: ",
-#endif
 		ans, sizeof(ans), DOECHO);
 
 	if (ans[0] == '1')
diff --git a/pttbbs/mbbsd/register.c b/pttbbs/mbbsd/register.c
index e8826ff0..bee85fec 100644
--- a/pttbbs/mbbsd/register.c
+++ b/pttbbs/mbbsd/register.c
@@ -535,11 +535,7 @@ getfield(int line, const char *info, const char *notes_fn, const char *desc, cha
     }
     move(line, 0); prints("  原先設定：%-30.30s (%s)", buf, info);
     snprintf(prompt, sizeof(prompt), 
-#ifdef USE_PFTERM
 	    ANSI_COLOR(1) ">>%s" ANSI_RESET "：", 
-#else
-	    ">>%s：", 
-#endif
 	    desc);
     if (getdata_str(line + 1, 0, prompt, genbuf, len, DOECHO, buf))
 	strcpy(buf, genbuf);
diff --git a/pttbbs/mbbsd/talk.c b/pttbbs/mbbsd/talk.c
index 0ae35200..1f28eae5 100644
--- a/pttbbs/mbbsd/talk.c
+++ b/pttbbs/mbbsd/talk.c
@@ -604,13 +604,8 @@ water_scr(const water_t * tw, int which, char type)
 	move(0, strlen(tw->userid) + 6);
     } else {
 
-#ifndef USE_PFTERM
-	// workaround poor terminal, made by in2.
-	move(8 + which, 28);
-	outs("123456789012345678901234567890");
-#endif // !USE_PFTERM
-
 	move(8 + which, 28);
+	SOLVE_ANSI_CACHE();
 	prints(ANSI_COLOR(1;37;44) "  %c %-13s　" ANSI_COLOR(0) "",
 	       tw->uin ? ' ' : 'x',
 	       tw->userid);