diff options
| author | ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-06-25 00:43:39 +0800 |
|---|---|---|
| committer | ptt <ptt@63ad8ddf-47c3-0310-b6dd-a9e9d9715204> | 2004-06-25 00:43:39 +0800 |
| commit | 921d281ff7320d0560077af7d88b6dc935db5a81 (patch) | |
| tree | 3af15a3d7de83565d40bc4fab234c3d3ea8ac828 /mbbsd | |
| parent | eebf27bbdd19d7e95a40ef6baeb0796678b34eb7 (diff) | |
| download | pttbbs-921d281ff7320d0560077af7d88b6dc935db5a81.tar pttbbs-921d281ff7320d0560077af7d88b6dc935db5a81.tar.gz pttbbs-921d281ff7320d0560077af7d88b6dc935db5a81.tar.bz2 pttbbs-921d281ff7320d0560077af7d88b6dc935db5a81.tar.lz pttbbs-921d281ff7320d0560077af7d88b6dc935db5a81.tar.xz pttbbs-921d281ff7320d0560077af7d88b6dc935db5a81.tar.zst pttbbs-921d281ff7320d0560077af7d88b6dc935db5a81.zip | |
don't merge money
git-svn-id: http://opensvn.csie.org/pttbbs/branches/Ptt.merge@2083 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
Diffstat (limited to 'mbbsd')
| -rw-r--r-- | mbbsd/merge.c | 2 |
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; |