summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-23 23:15:40 +0000
committershennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-23 23:15:40 +0000
commiteb3c92c2cc583e236fa8ede64eaa6f6ae506c665 (patch)
tree7c228b1451c88de5440c6ad1b967100e1fd81d52
parentf9bb6cca7f02a7b80d39f1f163d4fccfd096b315 (diff)
downloadhercules-eb3c92c2cc583e236fa8ede64eaa6f6ae506c665.tar.gz
hercules-eb3c92c2cc583e236fa8ede64eaa6f6ae506c665.tar.bz2
hercules-eb3c92c2cc583e236fa8ede64eaa6f6ae506c665.tar.xz
hercules-eb3c92c2cc583e236fa8ede64eaa6f6ae506c665.zip
Hello and welcome to BUG TRACKER NIGHT!
The first dish of the night, bugreport:6018 has been fixed. new carts are now removed properly. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16330 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/pc.c3
-rw-r--r--src/map/status.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/map/pc.c b/src/map/pc.c
index 9dd2b9a41..a37c061b2 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -7237,11 +7237,10 @@ 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 d7e9fd35e..fcbe2afd9 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -854,7 +854,8 @@ void initChangeTables(void) {
StatusIconChangeTable[SC_PETROLOGY] = SI_PETROLOGY;
StatusIconChangeTable[SC_CURSED_SOIL] = SI_CURSED_SOIL;
StatusIconChangeTable[SC_UPHEAVAL] = SI_UPHEAVAL;
-
+ StatusIconChangeTable[SC_PUSH_CART] = SI_ON_PUSH_CART;
+
//Other SC which are not necessarily associated to skills.
StatusChangeFlagTable[SC_ASPDPOTION0] = SCB_ASPD;
StatusChangeFlagTable[SC_ASPDPOTION1] = SCB_ASPD;