summaryrefslogtreecommitdiffstats
path: root/mbbsd
diff options
context:
space:
mode:
Diffstat (limited to 'mbbsd')
-rw-r--r--mbbsd/merge.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mbbsd/merge.c b/mbbsd/merge.c
index a31c5ae7..c65ab438 100644
--- a/mbbsd/merge.c
+++ b/mbbsd/merge.c
@@ -71,6 +71,7 @@ m_fpg()
rename(genbuf,buf);
move(12,0);
clrtobot();
+#ifdef MERGEMONEY
reload_money();
sprintf(buf,
"您的花園幣有 %d 換算成 Ptt 幣為 %d (匯率 155:1), \n"
@@ -78,6 +79,7 @@ m_fpg()
man.money, man.money/155, cuser.money, cuser.money + man.money/155);
demoney(man.money/155);
strcat(msg, buf);
+#endif
i = cuser.exmailbox + man.mailk + man.keepmail;
if (i > 1000) i = 1000;