From ab859094455fd375d0cb42523b13cf8367315be1 Mon Sep 17 00:00:00 2001 From: sketchyphoenix Date: Wed, 18 Jun 2008 10:39:20 +0000 Subject: Fixed cash shop not using points to make up the cash difference when purchasing an item. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12853 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'src/map/pc.c') diff --git a/src/map/pc.c b/src/map/pc.c index 643863ea6..2b2ef3a83 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -2816,21 +2816,10 @@ void pc_paycash(struct map_session_data *sd, int price, int points) int cash = price - points; nullpo_retv(sd); - if( cash > 0 ) - { - pc_setaccountreg(sd,"#CASHPOINTS",sd->cashPoints - cash); - - sprintf(output, "Used %d cash points. %d points remaining.", cash, sd->cashPoints); - clif_disp_onlyself(sd, output, strlen(output)); - } - - if( points > 0 ) - { - pc_setaccountreg(sd,"#KAFRAPOINTS",sd->kafraPoints - points); - - sprintf(output, "Used %d kafra points. %d points remaining.", points, sd->kafraPoints); - clif_disp_onlyself(sd, output, strlen(output)); - } + pc_setaccountreg(sd,"#CASHPOINTS",sd->cashPoints - cash); + pc_setaccountreg(sd,"#KAFRAPOINTS",sd->kafraPoints - points); + sprintf(output, "Used %d kafra points and %d cash points. %d kafra and %d cash points remaining.", points, cash, sd->kafraPoints, sd->cashPoints); + clif_disp_onlyself(sd, output, strlen(output)); } void pc_getcash(struct map_session_data *sd, int cash, int points) -- cgit v1.2.3-70-g09d2