Parcourir la source

Reverted one of the changes in dynamic mobs that may be causing the spawning problems.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12512 54d463be-8e91-2dee-dedb-b68131a5f0ec
Kevin il y a 17 ans
Parent
commit
d826519faf
2 fichiers modifiés avec 3 ajouts et 1 suppressions
  1. 2 0
      Changelog-Trunk.txt
  2. 1 1
      src/map/npc.c

+ 2 - 0
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.

+ 1 - 1
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;