diff options
| author | mekolat <mekolat@users.noreply.github.com> | 2015-10-30 17:17:54 -0400 |
|---|---|---|
| committer | mekolat <mekolat@users.noreply.github.com> | 2016-04-15 11:47:21 -0400 |
| commit | 502b3b714f0f636dac80bd600e174a173bd7028e (patch) | |
| tree | 7681b27b8f7a34c953a117fc3895a1acb3884be0 /src/map/script-call.cpp | |
| parent | 836b7c95f1528183fd90c5493d638d708c1a2adc (diff) | |
| download | tmwa-502b3b714f0f636dac80bd600e174a173bd7028e.tar.gz tmwa-502b3b714f0f636dac80bd600e174a173bd7028e.tar.bz2 tmwa-502b3b714f0f636dac80bd600e174a173bd7028e.tar.xz tmwa-502b3b714f0f636dac80bd600e174a173bd7028e.zip | |
add new builtins for npc commands
add requestitem builtin
add requestlang builtin
add camera builtin
send a force-close on close when no npc dialog
add clear builtin
Diffstat (limited to 'src/map/script-call.cpp')
| -rw-r--r-- | src/map/script-call.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/map/script-call.cpp b/src/map/script-call.cpp index a669b59..fbb9b97 100644 --- a/src/map/script-call.cpp +++ b/src/map/script-call.cpp @@ -882,20 +882,25 @@ void run_script_main(ScriptState *st, Borrowed<const ScriptBuffer> rootscript) abort(); } } + dumb_ptr<map_session_data> sd = map_id2sd(st->rid); switch (st->state) { case ScriptEndState::STOP: + if (sd && sd->npc_id == st->oid) + sd->state.npc_dialog_mes = 0; break; case ScriptEndState::END: - { - dumb_ptr<map_session_data> sd = map_id2sd(st->rid); st->scriptp.code = None; st->scriptp.pos = -1; if (sd && sd->npc_id == st->oid) + { + sd->state.npc_dialog_mes = 0; npc_event_dequeue(sd); - } + } break; case ScriptEndState::RERUNLINE: + if (sd && sd->npc_id == st->oid) + sd->state.npc_dialog_mes = 0; st->scriptp.pos = rerun_pos; break; } |