summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt3
-rw-r--r--src/map/npc.c9
2 files changed, 8 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 2bfd72585..e146ea5e7 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,9 @@ 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/12/18
+ * Updated respawn time interpretation according to latest kRO update [Playtester]
+ - this first time is the "min respawn time"
+ - the second time is the "variance" which is added to the "min respawn time"
* Corrected skill_db reading to properly trim the skill name/descs.
* Added a mobid_db in map.c to handle mob lookups faster. [Skotlex]
2007/12/17
diff --git a/src/map/npc.c b/src/map/npc.c
index 6ddbffe01..3b9acc89c 100644
--- a/src/map/npc.c
+++ b/src/map/npc.c
@@ -2137,7 +2137,7 @@ int npc_parse_mob2(struct spawn_data* mob, int index)
static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const char* start, const char* buffer, const char* filepath)
{
- int level, num, class_, mode, x,y,xs,ys;
+ int level, num, class_, mode, x,y,xs,ys, temp;
char mapname[32];
char mobname[128];
struct spawn_data mob, *data;
@@ -2182,9 +2182,10 @@ static const char* npc_parse_mob(char* w1, char* w2, char* w3, char* w4, const c
return strchr(start,'\n');// skip and continue
}
- //Fix for previously wrong interpretation of the delays
- mob.delay2 = mob.delay1;
- mob.delay1 = 0;
+ //Fixed according to latest kRO update (needs optimization)
+ temp = mob.delay1;
+ mob.delay1 += mob.delay2;
+ mob.delay2 = temp;
mob.num = (unsigned short)num;
mob.class_ = (short) class_;