diff options
| -rw-r--r-- | src/map/npc.c | 2 | ||||
| -rw-r--r-- | src/map/skill.c | 6 | ||||
| -rw-r--r-- | src/map/status.c | 4 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
4 files changed, 5 insertions, 9 deletions
diff --git a/src/map/npc.c b/src/map/npc.c index c65997d39..ea5e17502 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -1300,7 +1300,7 @@ int npc_unload(struct npc_data* nd) #endif if( nd->bl.subtype == SHOP ) - free(nd->u.shop.shop_item); + aFree(nd->u.shop.shop_item); else if( nd->bl.subtype == SCRIPT ) { diff --git a/src/map/skill.c b/src/map/skill.c index b294af028..5d1e33fc0 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5487,12 +5487,8 @@ int skill_castend_pos (int tid, unsigned int tick, int id, int data) ud->canact_tick = tick; ud->skillid = ud->skilllv = 0; - if(sd) { - clif_skill_fail(sd,ud->skillid,0,0); + if(sd) sd->skillitem = sd->skillitemlv = 0; - } - else if (hd && hd->master) - clif_skill_fail(hd->master, ud->skillid, 0, 0); else if(md) md->skillidx = -1; return 0; diff --git a/src/map/status.c b/src/map/status.c index 706037115..8a04109b3 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -4519,7 +4519,7 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti if (tick_def) { if (battle_config.pc_sc_def_rate != 100) - tick_def = sc_def*battle_config.pc_sc_def_rate/100; + tick_def = tick_def*battle_config.pc_sc_def_rate/100; } } else { @@ -4535,7 +4535,7 @@ int status_get_sc_def(struct block_list *bl, enum sc_type type, int rate, int ti if (tick_def) { if (battle_config.mob_sc_def_rate != 100) - tick_def = sc_def*battle_config.mob_sc_def_rate/100; + tick_def = tick_def*battle_config.mob_sc_def_rate/100; } } diff --git a/src/map/unit.c b/src/map/unit.c index 9a214e2e6..21cdb61fe 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -1816,7 +1816,7 @@ int unit_free(struct block_list *bl, int clrtype) clif_foreachclient(clif_friendslist_toggle_sub, sd->status.account_id, sd->status.char_id, 0); party_send_logout(sd); guild_send_memberinfoshort(sd,0); - pc_cleareventtimer(sd); + pc_cleareventtimer(sd); pc_delspiritball(sd,sd->spiritball,1); if (clrtype >= 0) { chrif_save_scdata(sd); //Save status changes, then clear'em out from memory. [Skotlex] |