From ca6687180056b8f89d7f16827dc22eeacce5f211 Mon Sep 17 00:00:00 2001 From: markzd Date: Thu, 20 Dec 2012 17:32:49 +0000 Subject: * Follow up: r16011 1. Fixed a behavior which didn't unlock target when it was out of range. (bugrepor:7022) 2. Removed a redundant variable assignment. * Follow up: r17029 1. Fixed @clearcart which was not deleting and updating the client properly. - Special thanks to clydelion, on the fixes. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17033 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/atcommand.c | 6 ++++++ src/map/mob.c | 1 + src/map/unit.c | 1 - 3 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/map/atcommand.c b/src/map/atcommand.c index e003274b3..2a57c0ccb 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -5321,6 +5321,7 @@ ACMD_FUNC(cleargstorage) ACMD_FUNC(clearcart) { + int i; nullpo_retr(-1, sd); if (pc_iscarton(sd) == 0) { @@ -5332,7 +5333,12 @@ ACMD_FUNC(clearcart) return -1; } + for( i = 0; i < MAX_CART; i++ ) + if(sd->status.cart[i].nameid > 0) + pc_cart_delitem(sd, i, sd->status.cart[i].amount, 1, LOG_TYPE_OTHER); + clif_clearcart(fd); + clif_updatestatus(sd,SP_CARTINFO); clif_displaymessage(fd, msg_txt(1397)); // Your cart was cleaned. return 0; diff --git a/src/map/mob.c b/src/map/mob.c index 6da9d5e57..ade39b847 100644 --- a/src/map/mob.c +++ b/src/map/mob.c @@ -1321,6 +1321,7 @@ int mob_unlocktarget(struct mob_data *md, unsigned int tick) } if (md->target_id) { md->target_id=0; + md->ud.target_to = 0; unit_set_target(&md->ud, 0); } return 0; diff --git a/src/map/unit.c b/src/map/unit.c index e3a371b74..91b9f9edd 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -293,7 +293,6 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr_t data else { //Stopped walking. Update to_x and to_y to current location [Skotlex] ud->to_x = bl->x; ud->to_y = bl->y; - ud->target_to = 0; } return 0; } -- cgit v1.2.3-60-g2f50