summaryrefslogtreecommitdiff
path: root/src/map/npc.c
diff options
context:
space:
mode:
authorKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-07 00:06:47 +0000
committerKevin <Kevin@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-04-07 00:06:47 +0000
commit8df84b5a68a786687c4ed9804c16ee1eaecb62f5 (patch)
tree4a9011c28159f3cb6601c0194e9195df68356725 /src/map/npc.c
parent9e5dbdaaacce246ec2963073beadc8a05b90e0c1 (diff)
downloadhercules-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
Diffstat (limited to 'src/map/npc.c')
-rw-r--r--src/map/npc.c2
1 files changed, 1 insertions, 1 deletions
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;