summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlwms <lwms@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2002-05-10 20:36:00 +0800
committerlwms <lwms@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2002-05-10 20:36:00 +0800
commit71f183618cb4749da44fa29b4c7f255486975a30 (patch)
tree38e81b7cb76f689f073b2bf0d16fc3b58bfd1771
parenta63aa9c6fb00730975c910a7d6bee0c0fb1f8ddc (diff)
downloadpttbbs-71f183618cb4749da44fa29b4c7f255486975a30.tar
pttbbs-71f183618cb4749da44fa29b4c7f255486975a30.tar.gz
pttbbs-71f183618cb4749da44fa29b4c7f255486975a30.tar.bz2
pttbbs-71f183618cb4749da44fa29b4c7f255486975a30.tar.lz
pttbbs-71f183618cb4749da44fa29b4c7f255486975a30.tar.xz
pttbbs-71f183618cb4749da44fa29b4c7f255486975a30.tar.zst
pttbbs-71f183618cb4749da44fa29b4c7f255486975a30.zip
*** empty log message ***
git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@157 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/cal.c5
-rw-r--r--mbbsd/talk.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/mbbsd/cal.c b/mbbsd/cal.c
index 69bab70e..78204dc9 100644
--- a/mbbsd/cal.c
+++ b/mbbsd/cal.c
@@ -1,4 +1,4 @@
-/* $Id: cal.c,v 1.9 2002/05/10 02:11:12 lwms Exp $ */
+/* $Id: cal.c,v 1.10 2002/05/10 12:36:00 lwms Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -395,8 +395,7 @@ int p_give() {
tax = give_tax(money);
if ( money - tax <= 0 ) return 0; /* 繳完稅就沒錢給了 */
deumoney(searchuser(id), money - tax);
- demoney(-(money - tax ));
- vice(tax, "贈與稅");
+ demoney(-money);
now = time(NULL);
sprintf(genbuf,"%s\t給%s\t%d\t%s", cuser.userid, id, money - tax,
ctime(&now));
diff --git a/mbbsd/talk.c b/mbbsd/talk.c
index 0c82bc2f..21b60a08 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1,4 +1,4 @@
-/* $Id: talk.c,v 1.28 2002/05/07 08:15:16 lwms Exp $ */
+/* $Id: talk.c,v 1.29 2002/05/10 12:36:00 lwms Exp $ */
#include <stdio.h>
#include <string.h>
#include <errno.h>
@@ -2101,9 +2101,8 @@ static void pickup_user(void)
outs("\033[41m 現金不足~~\033[m");
else{
deumoney(uentp->uid, ch - give_tax(ch));
- vice(give_tax(ch), "贈與稅");
sprintf(genbuf, "\033[44m 嗯..還剩下 %d 錢.."
- "\033[m", demoney(-1*(ch - give_tax(ch))));
+ "\033[m", demoney(-ch));
outs(genbuf);
sprintf(genbuf, "%s\t給%s\t%d\t%s", cuser.userid,
uentp->userid, ch,