From 0c3794d24d6a2e44a00d33fa316417b2f06618ce Mon Sep 17 00:00:00 2001 From: phobos2077 Date: Tue, 23 May 2023 21:21:02 +0200 Subject: [PATCH] Fix ruined stack in rm_mult_objs_from_inven - Also fixed incorrect opcode name in error message in inven_cmd --- src/interpreter_extra.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/interpreter_extra.cc b/src/interpreter_extra.cc index 12f32220..b2d32951 100644 --- a/src/interpreter_extra.cc +++ b/src/interpreter_extra.cc @@ -3098,8 +3098,7 @@ static void _op_inven_cmds(Program* program) break; } } else { - // FIXME: Should be inven_cmds. - scriptPredefinedError(program, "anim", SCRIPT_ERROR_OBJECT_IS_NULL); + scriptPredefinedError(program, "inven_cmds", SCRIPT_ERROR_OBJECT_IS_NULL); } programStackPushPointer(program, item); @@ -3657,7 +3656,8 @@ static void opRemoveMultipleObjectsFromInventory(Program* program) Object* owner = static_cast(programStackPopPointer(program)); if (owner == NULL || item == NULL) { - // FIXME: Ruined stack. + scriptPredefinedError(program, "rm_mult_objs_from_inven", SCRIPT_ERROR_OBJECT_IS_NULL); + programStackPushInteger(program, 0); return; }