diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/npc.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 1ca40ef66..77399ed8c 100644 --- a/Changelog-Trunk.txt +++ b/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.
2006/04/02
+ * Fixed npc_gettimerevent_tick returning the difference since the last
+ triggered label instead of total elapsed time for the npc-timer. [Skotlex]
* Added a missing memset on ers_alloc'ing mob loot which was making data
from looted items fill in normal drop info (in other words, you could get
normal loots that were named after players, for example) [Skotlex]
diff --git a/src/map/npc.c b/src/map/npc.c index b5dd3f42a..d58f4ec66 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -756,10 +756,10 @@ int npc_gettimerevent_tick(struct npc_data *nd) //If within a timer, set the tick value to the time passed since the beginning of the timer.
if (sd) {
if(sd->npc_timer_id != -1)
- tick = DIFF_TICK(gettick(), nd->u.scr.timertick);
+ tick += DIFF_TICK(gettick(), nd->u.scr.timertick);
} else {
if(nd->u.scr.timerid!=-1)
- tick = DIFF_TICK(gettick(), nd->u.scr.timertick);
+ tick += DIFF_TICK(gettick(), nd->u.scr.timertick);
}
return tick;
|