From 24f1e9e8b1865f47475d32214bcaa039a79a5df2 Mon Sep 17 00:00:00 2001 From: skotlex Date: Sun, 8 Apr 2007 16:05:20 +0000 Subject: - Updated some Guild WoE rules to behave as explained here: http://www.eathena.ws/board/index.php?showtopic=146581 - Removed the nosave mapflags from the Guild Castles, as per the previously linked topic. - Added some missing map_freeblock_lock calls to castend_pos and castend_id functions to prevent (rather unlikely) dangling pointer crashes. - Improved the debug message when the npc_scriptcont npc IDs don't match. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10187 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/skill.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/map/skill.c') diff --git a/src/map/skill.c b/src/map/skill.c index 0bd3f288e..0cf04bbe6 100644 --- a/src/map/skill.c +++ b/src/map/skill.c @@ -5720,6 +5720,8 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) if(battle_config.skill_log && battle_config.skill_log&src->type) ShowInfo("Type %d, ID %d skill castend id [id =%d, lv=%d, target ID %d)\n", src->type, src->id, ud->skillid, ud->skilllv, target->id); + + map_freeblock_lock(); if (skill_get_casttype(ud->skillid) == CAST_NODAMAGE) skill_castend_nodamage_id(src,target,ud->skillid,ud->skilllv,tick,0); else @@ -5734,6 +5736,7 @@ int skill_castend_id (int tid, unsigned int tick, int id, int data) else ud->skillid = 0; //mobs can't clear this one as it is used for skill condition 'afterskill' ud->skilllv = ud->skilltarget = 0; } + map_freeblock_unlock(); return 1; } while(0); //Skill failed. @@ -5875,6 +5878,8 @@ int skill_castend_pos (int tid, unsigned int tick, int id, int data) unit_stop_walking(src,1); ud->canact_tick = tick + skill_delayfix(src, ud->skillid, ud->skilllv); unit_set_walkdelay(src, tick, battle_config.default_skill_delay+skill_get_walkdelay(ud->skillid, ud->skilllv), 1); + + map_freeblock_lock(); skill_castend_pos2(src,ud->skillx,ud->skilly,ud->skillid,ud->skilllv,tick,0); if (ud->skilltimer == -1) { @@ -5882,6 +5887,7 @@ int skill_castend_pos (int tid, unsigned int tick, int id, int data) else ud->skillid = 0; //Non mobs can't clear this one as it is used for skill condition 'afterskill' ud->skilllv = ud->skillx = ud->skilly = 0; } + map_freeblock_unlock(); return 1; } while(0); -- cgit v1.2.3-60-g2f50