summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-16 18:59:00 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-08-16 18:59:00 +0000
commit0a5636b284ab252741a1c7fee9674c9f2c9f74d6 (patch)
tree6835ec9b5c0cefc57ccf0749130a487fb26f1c40
parent6efed405193d1dd7dc1f517ff4e3366eeef477e3 (diff)
downloadhercules-0a5636b284ab252741a1c7fee9674c9f2c9f74d6.tar.gz
hercules-0a5636b284ab252741a1c7fee9674c9f2c9f74d6.tar.bz2
hercules-0a5636b284ab252741a1c7fee9674c9f2c9f74d6.tar.xz
hercules-0a5636b284ab252741a1c7fee9674c9f2c9f74d6.zip
Fixed eAthena's wrong interpretation of the respawn times
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11027 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/npc.c4
2 files changed, 5 insertions, 0 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 0de25c013..90b268543 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ 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.
2007/08/16
+ * Fixed eAthena's wrong interpretation of the respawn times [Playtester]
* Added icons for NPC_CRITICALWOUND and NPC_SLOWCAST [Playtester]
* Fixed npc chatrooms not being deleted on npc unload/reload (crash)
* Modified chat code a bit for more clarity [ultramage]
diff --git a/src/map/npc.c b/src/map/npc.c
index 2b3de118f..090a2adc2 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2377,6 +2377,10 @@ int npc_parse_mob(char* w1, char* w2, char* w3, char* w4)
return 1;
}
+ //Fix for previously wrong interpretation of the delays
+ mob.delay2 = mob.delay1;
+ mob.delay1 = 0;
+
mob.num = (unsigned short)num;
mob.class_ = (short) class_;
mob.x = (unsigned short)x;