summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-18 21:22:29 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-12-18 21:22:29 +0000
commitb01e1cda28ba47b513cc6dc888dc9b9da0c058d0 (patch)
tree9b9cb328775812cab0f78e763760ccae302e73be /src
parentfc936e5ced9af544cde112c1abc7374526088890 (diff)
downloadhercules-b01e1cda28ba47b513cc6dc888dc9b9da0c058d0.tar.gz
hercules-b01e1cda28ba47b513cc6dc888dc9b9da0c058d0.tar.bz2
hercules-b01e1cda28ba47b513cc6dc888dc9b9da0c058d0.tar.xz
hercules-b01e1cda28ba47b513cc6dc888dc9b9da0c058d0.zip
* Updated respawn time interpretation according to latest kRO update
- this first time is the "min respawn time" - the second time is the "variance" which is added to the "min respawn time" git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11946 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/npc.c9
1 files changed, 5 insertions, 4 deletions
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_;