summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-30 14:27:02 +0000
committerInkfish <Inkfish@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-06-30 14:27:02 +0000
commit9463bf2e1b9afd636b9b7a69b5511817d3c66337 (patch)
tree7406b8e375f6ac330ccd37620778d518146fbab5
parent62ba3401df75d514b91aa7e1b2f818609950f735 (diff)
downloadhercules-9463bf2e1b9afd636b9b7a69b5511817d3c66337.tar.gz
hercules-9463bf2e1b9afd636b9b7a69b5511817d3c66337.tar.bz2
hercules-9463bf2e1b9afd636b9b7a69b5511817d3c66337.tar.xz
hercules-9463bf2e1b9afd636b9b7a69b5511817d3c66337.zip
Fixed when dynamic_mobs is active, reloading script right after the last player having left a map leads to permanet mobs not spawning on that map.(bugreport:2736)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13921 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--src/map/npc.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index ce1579a15..544019286 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+09/06/30
+ * Fixed when dynamic_mobs is active, reloading script right after the last player having left a map leads to permanet mobs not spawning on that map. [Inkfish]
09/06/29
* Fixed attack not counted as connect when dodged and got damage from skill bonus like Weaponry Research. [Inkfish]
09/06/28
diff --git a/src/map/npc.c b/src/map/npc.c
index 0d6c9a9a9..05a58f92f 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -3147,6 +3147,11 @@ int npc_reload(void)
aFree(map[m].moblist[i]);
map[m].moblist[i] = NULL;
}
+ if( map[m].mob_delete_timer != INVALID_TIMER )
+ { // Mobs were removed anyway,so delete the timer [Inkfish]
+ delete_timer(map[m].mob_delete_timer, map_removemobs_timer);
+ map[m].mob_delete_timer = INVALID_TIMER;
+ }
}
}
if (map[m].npc_num > 0)