diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-14 19:43:34 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-06-14 19:43:34 +0000 |
| commit | 2ef19b3a7bf4d9c0905be3a2869546003eec57dd (patch) | |
| tree | 7149269242dd9a01b6d82edfa954ad828987b9b7 | |
| parent | 7a612f8db0c03ba748a174c97e9bc2cf902d8b10 (diff) | |
| download | hercules-2ef19b3a7bf4d9c0905be3a2869546003eec57dd.tar.gz hercules-2ef19b3a7bf4d9c0905be3a2869546003eec57dd.tar.bz2 hercules-2ef19b3a7bf4d9c0905be3a2869546003eec57dd.tar.xz hercules-2ef19b3a7bf4d9c0905be3a2869546003eec57dd.zip | |
Follow up r16297 fixed bug with the cart not going visually-off after it was removed.
Follow up r16296 fixed algorithm issue
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16298 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/pc.c | 3 | ||||
| -rw-r--r-- | src/map/status.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index fa83ced99..9dd2b9a41 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7237,10 +7237,11 @@ int pc_setcart(struct map_session_data *sd,int type) { clif_cartlist(sd); 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); break; } + clif_status_load_notick(&sd->bl, SI_ON_PUSH_CART, type != 0 ? 2 : 0, type, 0, 0); + if(pc_checkskill(sd, MC_PUSHCART) < 10) status_calc_pc(sd,0); //Recalc speed penalty. #else diff --git a/src/map/status.c b/src/map/status.c index 9dd12abbd..09e574ee2 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -3372,8 +3372,8 @@ void status_calc_state( struct block_list *bl, struct status_change *sc, enum sc || (sc->data[SC_BASILICA] && sc->data[SC_BASILICA]->val4 == bl->id) // Basilica caster cannot move || (sc->data[SC_GRAVITATION] && sc->data[SC_GRAVITATION]->val3 == BCT_SELF) || (sc->data[SC_CLOAKING] && //Need wall at level 1-2 - sc->data[SC_CLOAKING]->val1 < 3 && !(sc->data[SC_CLOAKING]->val4&1) - || (sc->data[SC_CRYSTALIZE] && bl->type != BL_MOB)) + sc->data[SC_CLOAKING]->val1 < 3 && !(sc->data[SC_CLOAKING]->val4&1)) + || (sc->data[SC_CRYSTALIZE] && bl->type != BL_MOB) ) { sc->cant.move += ( start ? 1 : -1 ); } |