From d85abed850f8de77802fde7da04da4353672382f Mon Sep 17 00:00:00 2001 From: shennetsind Date: Thu, 15 Nov 2012 00:54:26 +0000 Subject: Fixed bugreport:6772 cart display will now update/save properly if you change to a cart of lower level; fixed 2 compiling warnings. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16926 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/pc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/map/pc.c b/src/map/pc.c index b54b88ae2..6b757d20c 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -3621,7 +3621,7 @@ int pc_paycash(struct map_session_data *sd, int price, int points) { char output[128]; int cash; - nullpo_retv(sd); + nullpo_retr(sd,-1); points = cap_value(points,-MAX_ZENY,MAX_ZENY); //prevent command UB if( price < 0 || points < 0 ) @@ -3658,7 +3658,7 @@ int pc_paycash(struct map_session_data *sd, int price, int points) int pc_getcash(struct map_session_data *sd, int cash, int points) { char output[128]; - nullpo_retv(sd); + nullpo_retr(sd,-1); cash = cap_value(cash,-MAX_ZENY,MAX_ZENY); //prevent command UB points = cap_value(points,-MAX_ZENY,MAX_ZENY); //prevent command UB @@ -7485,6 +7485,8 @@ int pc_setcart(struct map_session_data *sd,int type) { clif_updatestatus(sd, SP_CARTINFO); sc_start(&sd->bl, SC_PUSH_CART, 100, type, 0); clif_status_load_notick(&sd->bl, SI_ON_PUSH_CART, 2 , type, 0, 0); + if( sd->sc.data[SC_PUSH_CART] )/* forcefully update */ + sd->sc.data[SC_PUSH_CART]->val1 = type; break; } -- cgit v1.2.3-70-g09d2