diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-02 18:25:46 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-02 18:25:46 +0000 |
| commit | 3265481434f0dfd9e3e74cc8640803973f05f2c3 (patch) | |
| tree | b274dd360a5ef4574188468e709287eb415f0cfc | |
| parent | 57dff6a693955d56a8b316f78411a4f50e061a0d (diff) | |
| download | hercules-3265481434f0dfd9e3e74cc8640803973f05f2c3.tar.gz hercules-3265481434f0dfd9e3e74cc8640803973f05f2c3.tar.bz2 hercules-3265481434f0dfd9e3e74cc8640803973f05f2c3.tar.xz hercules-3265481434f0dfd9e3e74cc8640803973f05f2c3.zip | |
- Fixed npc_gettimerevent_tick returning the difference since the last triggered label instead of total elapsed time for the npc-timer.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5874 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -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;
|