diff options
| author | Jesusaves <cpntb1@ymail.com> | 2018-12-31 19:09:49 -0200 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2018-12-31 19:09:49 -0200 |
| commit | 2f16d8b8c34257733180058c82415d395ea27474 (patch) | |
| tree | 09a7e0b77ba01cfade269593ee88c02122fd5976 /npc/functions/main.txt | |
| parent | f4ac215d94dc2c5eb58675f79e0be87932f78cc3 (diff) | |
| parent | 28fdcc18ff9c80fea20414482ecc7c74fd0bf9cf (diff) | |
| download | serverdata-jesusalva/GuidedTour.tar.gz serverdata-jesusalva/GuidedTour.tar.bz2 serverdata-jesusalva/GuidedTour.tar.xz serverdata-jesusalva/GuidedTour.zip | |
Merge branch 'master' into jesusalva/GuidedTourjesusalva/GuidedTour
Diffstat (limited to 'npc/functions/main.txt')
| -rw-r--r-- | npc/functions/main.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/functions/main.txt b/npc/functions/main.txt index 97c34702..b620be0c 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -183,9 +183,9 @@ function script npctalkonce { set(getvariableofnpc(.talk_lock, strnpcinfo(NPC_NAME_UNIQUE)), gettimetick(2) + getarg(1, 1)); break; default: - if (gettimetick(2) <= @NPC_TALK_LOCK[getnpcid(0)]) + if (gettimetick(2) <= @NPC_TALK_LOCK[getnpcid()]) return false; - @NPC_TALK_LOCK[getnpcid(0)] = gettimetick(2) + getarg(1, 1); + @NPC_TALK_LOCK[getnpcid()] = gettimetick(2) + getarg(1, 1); } // talk mechanism |