summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlwms <lwms@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2002-05-06 17:17:02 +0800
committerlwms <lwms@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>2002-05-06 17:17:02 +0800
commit3dc250a6fa7dfdbc8cb4f839c193e02d0f7968f6 (patch)
treeffdbd197c0bbd2044a8f6cae98c245167bdee28e
parent094f77cf0e97ce1a64bffb6dfa933927e5fd901f (diff)
downloadpttbbs-3dc250a6fa7dfdbc8cb4f839c193e02d0f7968f6.tar
pttbbs-3dc250a6fa7dfdbc8cb4f839c193e02d0f7968f6.tar.gz
pttbbs-3dc250a6fa7dfdbc8cb4f839c193e02d0f7968f6.tar.bz2
pttbbs-3dc250a6fa7dfdbc8cb4f839c193e02d0f7968f6.tar.lz
pttbbs-3dc250a6fa7dfdbc8cb4f839c193e02d0f7968f6.tar.xz
pttbbs-3dc250a6fa7dfdbc8cb4f839c193e02d0f7968f6.tar.zst
pttbbs-3dc250a6fa7dfdbc8cb4f839c193e02d0f7968f6.zip
*** empty log message ***
git-svn-id: http://opensvn.csie.org/pttbbs/pttbbs/trunk/pttbbs@147 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
-rw-r--r--mbbsd/cal.c4
-rw-r--r--mbbsd/talk.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/mbbsd/cal.c b/mbbsd/cal.c
index 6853ec64..1e939641 100644
--- a/mbbsd/cal.c
+++ b/mbbsd/cal.c
@@ -1,4 +1,4 @@
-/* $Id: cal.c,v 1.7 2002/05/03 01:25:11 lwms Exp $ */
+/* $Id: cal.c,v 1.8 2002/05/06 09:17:02 lwms Exp $ */
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -393,7 +393,7 @@ int p_give() {
tax = give_tax(money);
if ( money - tax <= 0 ) return 0; /* 繳完稅就沒錢給了 */
deumoney(searchuser(id), money - tax);
- demoney(-money);
+ demoney(-(money - tax ));
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 ddedb827..80e66b0c 100644
--- a/mbbsd/talk.c
+++ b/mbbsd/talk.c
@@ -1,4 +1,4 @@
-/* $Id: talk.c,v 1.26 2002/05/02 06:41:46 lwms Exp $ */
+/* $Id: talk.c,v 1.27 2002/05/06 09:17:02 lwms Exp $ */
#include <stdio.h>
#include <string.h>
#include <errno.h>
@@ -2094,7 +2094,7 @@ static void pickup_user(void)
if (getdata(b_lines - 1, 0, "[銀行轉帳]:", genbuf, 7,
LCECHO)){
clrtoeol();
- if ((ch = atoi(genbuf)) <= 0 || ch == give_tax(ch) )
+ if ((ch = atoi(genbuf)) <= 0 || ch <= give_tax(ch) )
break;
reload_money();
if (ch > cuser.money)
@@ -2102,7 +2102,7 @@ static void pickup_user(void)
else{
deumoney(uentp->uid, ch - give_tax(ch));
sprintf(genbuf, "\033[44m 嗯..還剩下 %d 錢.."
- "\033[m", demoney(-1*ch));
+ "\033[m", demoney(-1*(ch - give_tax(ch))));
outs(genbuf);
sprintf(genbuf, "%s\t給%s\t%d\t%s", cuser.userid,
uentp->userid, ch,