change 'money' to full virtual money name to prevent confusion

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

8 files changed, 26 insertions, 24 deletions

diff --git a/pttbbs/mbbsd/bbs.c b/pttbbs/mbbsd/bbs.c
index 3af50a22..de201cce 100644
--- a/pttbbs/mbbsd/bbs.c
+++ b/pttbbs/mbbsd/bbs.c
@@ -243,14 +243,15 @@ save_violatelaw(void)
     if (cuser.money < (int)cuser.vl_count * 1000) {
 	snprintf(buf, sizeof(buf),
 		 ANSI_COLOR(1;31) "這是你第 %d 次違反本站法規"
-		 "必須繳出 %d 元；但你目前只有 %d 元, 錢不夠啦!!" ANSI_RESET,
-           (int)cuser.vl_count, (int)cuser.vl_count * 1000, cuser.money);
+		 "必須繳出 %d " MONEYNAME "幣；但你目前只有 %d ，數量不足!!"
+                 ANSI_RESET, (int)cuser.vl_count, (int)cuser.vl_count * 1000,
+                 cuser.money);
 	mvouts(22, 0, buf);
 	pressanykey();
 	return 0;
     }
     move(5, 0);
-    prints("這是你第 %d 次違法 必須繳出 %d 元\n\n", 
+    prints("這是你第 %d 次違法 必須繳出 %d " MONEYNAME "幣\n\n", 
 	    cuser.vl_count, cuser.vl_count * 1000);
     outs(ANSI_COLOR(1;37) "你知道嗎? 因為你的違法 "
 	   "已經造成很多人的不便" ANSI_RESET "\n");
@@ -260,7 +261,7 @@ save_violatelaw(void)
 	ok[0] != 'y') 
     {
 	move(15, 0);
-	outs( ANSI_COLOR(1;31) "不想付錢嗎？ 還是不知道要按 y ？\n"
+	outs( ANSI_COLOR(1;31) "不想付嗎？ 還是不知道要按 y ？\n"
 	    "請養成看清楚系統訊息的好習慣。\n"
 	    "等你想通了再來吧!! 我相信你不會知錯不改的~~~" ANSI_RESET);
 	pressanykey();
@@ -274,7 +275,7 @@ save_violatelaw(void)
 	log_filef("log/violation", LOG_CREAT,
 		"%s %s pay-violation error: race-conditionn hack?\n", 
 		Cdate(&now), cuser.userid);
-	vmsg("錢怎麼忽然不夠了？ 試圖欺騙系統被查到將砍帳號！");
+	vmsg(MONEYNAME "幣怎麼忽然不夠了？ 試圖欺騙系統被查到將砍帳號！");
 	return 0; 
     }
 
@@ -1358,7 +1359,7 @@ do_general(int garbage)
                 pay(-money, "%s 看板發文稿酬: %s", currboard, postfile.title); 
 		pwcuIncNumPost();
 		addPost = 1;
-		prints("這是您的第 %d 篇有效文章，獲得稿酬 %d 元\n",
+		prints("這是您的第 %d 篇有效文章，獲得稿酬 %d " MONEYNAME "幣\n",
 			cuser.numposts, money);
 		prints("\n (若之後自行或被板主刪文則此次獲得的有效文章數及稿酬可能會被回收)\n\n");
 	    } else {
@@ -3327,7 +3328,7 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
         if (!not_owned) {
             reload_money();
             if (cuser.money < del_fee) {
-                vmsgf("您身上的金錢不夠，刪除此文要 %d 元", del_fee);
+                vmsgf("您身上的" MONEYNAME "幣不夠，刪除此文要 %d " MONEYNAME "幣", del_fee);
                 return FULLUPDATE;
             }
             // after this, we cannot delay in !not_owned mode otherwise we'll get
@@ -3432,7 +3433,7 @@ del_post(int ent, fileheader_t * fhdr, char *direct)
                 pay(del_fee, "%s 看板 文章自刪清潔費: %s",  
                         currboard, fhdr->title); 
 		sendalert(cuser.userid, ALERT_PWD_PERM);
-		vmsgf("您的文章減為 %d 篇，支付清潔費 %d 元", 
+		vmsgf("您的文章減為 %d 篇，支付清潔費 %d " MONEYNAME "幣", 
 			cuser.numposts, del_fee);
 	    }
 
@@ -3613,7 +3614,7 @@ view_postinfo(int ent, const fileheader_t * fhdr, const char *direct, int crs_ln
 	if(m < 0)
 	    prints("│ 特殊文章，無價格記錄");
 	else
-	    prints("│ 這一篇文章值 %d 元", m);
+	    prints("│ 這一篇文章值 %d " MONEYNAME "幣", m);
 
     }
     prints("\n");
diff --git a/pttbbs/mbbsd/cal.c b/pttbbs/mbbsd/cal.c
index da1fc909..6e5ccbda 100644
--- a/pttbbs/mbbsd/cal.c
+++ b/pttbbs/mbbsd/cal.c
@@ -177,11 +177,11 @@ p_exmail(void)
     reload_money();
     if (cuser.money < n * 1000)
     {
-	vmsg("你的錢不夠。");
+	vmsg("你的" MONEYNAME "幣不夠。");
 	return 0;
     }
 
-    if (vmsgf("你想購買 %d 封信箱 (要花 %d 元), 確定嗎？[y/N] ", 
+    if (vmsgf("你想購買 %d 封信箱 (要花 %d " MONEYNAME "幣), 確定嗎？[y/N] ", 
 		n, n*1000) != 'y')
 	return 0;
 
@@ -215,7 +215,7 @@ mail_redenvelop(const char *from, const char *to, int money, char *fpath)
 	    "標題: 招財進寶\n"
 	    "時間: %s\n"
 	    ANSI_COLOR(1;33) "親愛的 %s ：\n\n" ANSI_RESET
-	    ANSI_COLOR(1;31) "    我包給你一個 %d 元的大紅包喔 ^_^\n\n"
+	    ANSI_COLOR(1;31) "    我包給你一個 %d " MONEYNAME "幣的大紅包喔 ^_^\n\n"
 	    "    禮輕情意重，請笑納...... ^_^" ANSI_RESET "\n"
 #if defined(USE_RECENTPAY) || defined(LOG_RECENTPAY)
             "\n  您可於下列位置找到最近的交易記錄:\n"
@@ -394,7 +394,7 @@ give_money_ui(const char *userid)
 
     m = 0;
     money_buf[0] = 0;
-    mvouts(2, 0, "要給他多少錢呢? "
+    mvouts(2, 0, "要給他多少" MONEYNAME "幣呢? "
            "(可按 TAB 切換輸入稅前/稅後金額, 稅率固定 10%)\n");
     outs(" 請輸入金額: ");  // (3, 0)
     {
@@ -416,7 +416,7 @@ give_money_ui(const char *userid)
 
     reload_money();
     if (cuser.money < m) {
-	vmsg("你沒有那麼多錢喔!");
+	vmsg("你沒有那麼多" MONEYNAME "幣喔!");
 	return -1;
     }
 
diff --git a/pttbbs/mbbsd/chicken.c b/pttbbs/mbbsd/chicken.c
index 99aba620..d84d398d 100644
--- a/pttbbs/mbbsd/chicken.c
+++ b/pttbbs/mbbsd/chicken.c
@@ -194,7 +194,7 @@ new_chicken(void)
     price = egg_price[(int)mychicken.type];
     reload_money();
     if (cuser.money < price) {
-	vmsgf("錢不夠買蛋蛋,蛋蛋要 %d 元", price);
+	vmsgf(MONEYNAME "幣不夠買蛋蛋(要 %d)", price);
 	return 0;
     }
 
diff --git a/pttbbs/mbbsd/gamble.c b/pttbbs/mbbsd/gamble.c
index 93c3fa00..9ae8e09d 100644
--- a/pttbbs/mbbsd/gamble.c
+++ b/pttbbs/mbbsd/gamble.c
@@ -260,7 +260,7 @@ openticket(int bid)
     do {
 	do {
 	    getdata(20, 0,
-		ANSI_COLOR(1) "選擇中獎的號碼(0:不開獎 99:取消退錢)" 
+		ANSI_COLOR(1) "選擇中獎的號碼(0:不開獎 99:取消退費)" 
 		ANSI_RESET ":"
 		    , buf, 3, LCECHO);
 	    bet = atoi(buf);
@@ -334,7 +334,7 @@ openticket(int bid)
 	mail_redenvelop("[賭場抽頭]", cuser.userid, forBM, NULL);
 	money = ticket[bet] ? money * 0.95 / ticket[bet] : 9999999;
     } else {
-	pay(price * 10, "賭盤退錢手續費");
+	pay(price * 10, "賭盤退費手續費");
 	money = price;
     }
     setbfile(outcome, bh->brdname, FN_TICKET_OUTCOME);
@@ -367,7 +367,7 @@ openticket(int bid)
 		    Cdatelite(&now), betname[bet], total * price, money,
 		    total ? (float)ticket[bet] / total : 0);
 	} else
-	    fprintf(fp, "\n\n賭盤取消退錢： %s \n\n", Cdatelite(&now));
+	    fprintf(fp, "\n\n賭盤取消退費： %s \n\n", Cdatelite(&now));
 
     } // XXX somebody may use fp even fp==NULL
     fclose(fp1);
@@ -386,7 +386,7 @@ openticket(int bid)
 			    MONEYNAME "幣\n",
 			    IDLEN, userid, i, betname[mybet], money * i);
 		snprintf(buf, sizeof(buf),
-			 "%s 賭場退錢! $ %d", bh->brdname, money * i);
+			 "%s 賭場退費! $ %d", bh->brdname, money * i);
 	    } else if (mybet == bet) {
 		if (fp)
 		    fprintf(fp, "恭喜 %-*s 買了 %3d 張 %s, 獲得 %5d 枚" 
diff --git a/pttbbs/mbbsd/mbbsd.c b/pttbbs/mbbsd/mbbsd.c
index 564caad3..0693a76a 100644
--- a/pttbbs/mbbsd/mbbsd.c
+++ b/pttbbs/mbbsd/mbbsd.c
@@ -635,7 +635,7 @@ multi_user_check(void)
 	move(b_lines-6, 0); clrtobot();
 	outs("\n" ANSI_COLOR(1) 
 		"注意: 您有其它連線已登入此帳號。\n"
-		" 同時多次登入同個帳號可能導致文章數或金錢異常，\n"
+		" 同時多次登入同個帳號可能導致文章數或" MONEYNAME "幣異常，\n"
 		" 且本站不受理因多重登入造成的損失。" ANSI_RESET);
 
 	getdata(b_lines - 1, 0, "您想刪除其他重複登入的連線嗎？[Y/n] ",
diff --git a/pttbbs/mbbsd/menu.c b/pttbbs/mbbsd/menu.c
index 2f39ebc7..ebc6511f 100644
--- a/pttbbs/mbbsd/menu.c
+++ b/pttbbs/mbbsd/menu.c
@@ -655,7 +655,8 @@ static int u_view_recentpay()
     char fn[PATHLEN];
     clear();
     mvouts(10, 5, "注意: 本記錄尚於測試中，可能會有未記錄到的交易記錄。");
-    mvouts(11, 5, "      此處內容僅供參考，實際金錢異動以站方內部資料為準");
+    mvouts(11, 5, "      此處內容僅供參考，實際" MONEYNAME 
+                        "幣異動以站方內部資料為準");
     pressanykey();
     setuserfile(fn, FN_RECENTPAY);
     return more(fn, YEA);
@@ -835,7 +836,7 @@ static const commands_t xyzlist[] = {
 
 /* Ptt money menu */
 static const commands_t moneylist[] = {
-    {p_give, 0,         "00Give        給其他人錢"},
+    {p_give, 0,         "00Give        給其他人" MONEYNAME "幣"},
     {save_violatelaw, 0,"11ViolateLaw  繳罰單"},
     {p_from, 0,         "22From        暫時修改故鄉"},
     {ordersong,0,       "33OSong       動態點歌機"},
diff --git a/pttbbs/mbbsd/talk.c b/pttbbs/mbbsd/talk.c
index 93ad7a28..f8a97b1e 100644
--- a/pttbbs/mbbsd/talk.c
+++ b/pttbbs/mbbsd/talk.c
@@ -1540,7 +1540,7 @@ static const char
     "  好友廣播",    " b (要在好友列表)",
     "  回顧訊息",    "l",
     "  寄信給他",    "m",
-    "  給錢",	     "g",
+    "  給予" MONEYNAME "幣","g",
     NULL,
 },
 *hlp_talkmisc[] = {
diff --git a/pttbbs/mbbsd/user.c b/pttbbs/mbbsd/user.c
index 2da34e24..9e9d366c 100644
--- a/pttbbs/mbbsd/user.c
+++ b/pttbbs/mbbsd/user.c
@@ -176,7 +176,7 @@ user_display(const userec_t * u, int adminmode)
 	outs("\n");
 
     prints("\t電子信箱: %s\n", u->email);
-    prints("\t銀行帳戶: %d 元\n", u->money);
+    prints("\t銀行帳戶: %d " MONEYNAME "幣\n", u->money);
 #ifdef USE_USER_SEX
     prints("\t性    別: %s\n", sex[u->sex%8]);
 #endif