From 921d281ff7320d0560077af7d88b6dc935db5a81 Mon Sep 17 00:00:00 2001
From: ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Thu, 24 Jun 2004 16:43:39 +0000
Subject: don't merge money

git-svn-id: http://opensvn.csie.org/pttbbs/branches/Ptt.merge@2083 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/merge.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mbbsd')

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;
-- 
cgit v1.2.3