From cf4007f34bf5feee7903506e1a569f60aec5b795 Mon Sep 17 00:00:00 2001 From: mekolat Date: Thu, 21 Apr 2016 10:46:15 -0400 Subject: make `get` return -1 when getting a param fails --- src/map/script-fun.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp index beabef3..13a635d 100644 --- a/src/map/script-fun.cpp +++ b/src/map/script-fun.cpp @@ -3813,7 +3813,10 @@ void builtin_get(ScriptState *st) } if (bl == nullptr) + { + push_int(st->stack, -1); return; + } int var = pc_readparam(bl, reg.sp()); push_int(st->stack, var); return; @@ -3869,9 +3872,8 @@ void builtin_get(ScriptState *st) if (!bl) { - PRINTF("builtin_get: no block list attached %s!\n"_fmt, conv_str(st, &AARG(1))); if (postfix == '$') - push_str(st->stack, conv_str(st, &AARG(1))); + push_str(st->stack, ""_s); else push_int(st->stack, 0); return; -- cgit v1.2.3-70-g09d2