From b92572d479ac010d9998624c49b27dc96582527a Mon Sep 17 00:00:00 2001 From: florianessl Date: Sat, 1 Feb 2025 20:45:36 +0100 Subject: [PATCH] InspectMapTreeInfo fix: LMU data indexes need to start at 1 --- src/game_interpreter_control_variables.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game_interpreter_control_variables.cpp b/src/game_interpreter_control_variables.cpp index 369222ad90..e8e5c7f860 100644 --- a/src/game_interpreter_control_variables.cpp +++ b/src/game_interpreter_control_variables.cpp @@ -621,8 +621,8 @@ int ControlVariables::InspectMapTreeInfo(InspectMapTreeInfoOp op, int map_id, in case InspectMapTreeInfoOp::Troop_Id: { // TODO: provide a way to conveniently copy values into a range of variables ("ControlVarArrayEx"?) - if (arg1 >= 0 && arg1 < static_cast(map_info.encounters.size())) { - return map_info.encounters[arg1].troop_id; + if (arg1 >= 1 && arg1 <= static_cast(map_info.encounters.size())) { + return map_info.encounters[arg1 - 1].troop_id; } return 0; } @@ -634,7 +634,7 @@ int ControlVariables::InspectMapTreeInfo(InspectMapTreeInfoOp op, int map_id, in case InspectMapTreeInfoOp::Arena_Height: { // TODO: provide a way to conveniently copy values into a range of variables ("ControlVarArrayEx"?) - if (arg1 < 0) { + if (arg1 <= 0) { return 0; } @@ -642,7 +642,7 @@ int ControlVariables::InspectMapTreeInfo(InspectMapTreeInfoOp op, int map_id, in for (unsigned int i = 0; i < lcf::Data::treemap.maps.size(); ++i) { auto& map = lcf::Data::treemap.maps[i]; if (map.parent_map == map_info.ID && map.type == lcf::rpg::TreeMap::MapType_area) { - if (arg1 < cnt_arenas) { + if (arg1 <= cnt_arenas) { cnt_arenas++; continue; }