diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-20 09:10:40 -0700 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-08-20 09:10:40 -0700 |
| commit | 23c0f35ab70cec236e8026529cbdffb730531454 (patch) | |
| tree | 36687eedc6d717401daaefd0e2cd42b2dfe85cf6 /src/map/script.cpp | |
| parent | d3beae7c9699033b000def8aeff8cedfe5525f5f (diff) | |
| download | tmwa-23c0f35ab70cec236e8026529cbdffb730531454.tar.gz tmwa-23c0f35ab70cec236e8026529cbdffb730531454.tar.bz2 tmwa-23c0f35ab70cec236e8026529cbdffb730531454.tar.xz tmwa-23c0f35ab70cec236e8026529cbdffb730531454.zip | |
Refactor npc event timers to have an expired state
This is needed for setnpctimer 0; to work in the ultimate OnTimer#: label.
Diffstat (limited to 'src/map/script.cpp')
| -rw-r--r-- | src/map/script.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/script.cpp b/src/map/script.cpp index 3c95bc1..51b15d4 100644 --- a/src/map/script.cpp +++ b/src/map/script.cpp @@ -2737,7 +2737,7 @@ void builtin_getnpctimer(ScriptState *st) val = npc_gettimerevent_tick(nd).count(); break; case 1: - val = nd->scr.nexttimer != nd->scr.timer_eventv.end(); + val = nd->scr.timer_active; break; case 2: val = nd->scr.timer_eventv.size(); |