diff options
| author | Kevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-07 00:06:47 +0000 |
|---|---|---|
| committer | Kevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-04-07 00:06:47 +0000 |
| commit | 8df84b5a68a786687c4ed9804c16ee1eaecb62f5 (patch) | |
| tree | 4a9011c28159f3cb6601c0194e9195df68356725 | |
| parent | 9e5dbdaaacce246ec2963073beadc8a05b90e0c1 (diff) | |
| download | hercules-8df84b5a68a786687c4ed9804c16ee1eaecb62f5.tar.gz hercules-8df84b5a68a786687c4ed9804c16ee1eaecb62f5.tar.bz2 hercules-8df84b5a68a786687c4ed9804c16ee1eaecb62f5.tar.xz hercules-8df84b5a68a786687c4ed9804c16ee1eaecb62f5.zip | |
Reverted one of the changes in dynamic mobs that may be causing the spawning problems.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12512 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index f0f0fca1a..72f27d33e 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. 2008/04/06 + * Reverted one of the changes in dynamic mobs that may + - be causing the spawning problems. (r12512) [Kevin] * Equip speed buffs no longer stack with speed consumables. (r12509) [Kevin] - (Speed potion not included). * Sprint, Fusion, and Increase AGI now stack independently. diff --git a/src/map/npc.c b/src/map/npc.c index 51c95cee0..98a03d2cd 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2334,7 +2334,7 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c data = (struct spawn_data*)aMalloc(sizeof(struct spawn_data)); memcpy(data, &mob, sizeof(struct spawn_data)); - if( !battle_config.dynamic_mobs ) { + if( !battle_config.dynamic_mobs || data->delay1 || data->delay2 ) { data->state.dynamic = false; npc_parse_mob2(data); npc_delay_mob += data->num; |