From b7b1920a794ce5e20f018ab8f2983164c90f6d59 Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 7 Mar 2020 22:40:45 +0000 Subject: [PATCH] Fix build --- src/openrct2-ui/scripting/CustomWindow.cpp | 4 ++-- src/openrct2/actions/MazePlaceTrackAction.hpp | 6 ++++-- src/openrct2/scripting/HookEngine.cpp | 3 +-- src/openrct2/scripting/HookEngine.h | 3 +-- src/openrct2/scripting/ScObject.hpp | 1 + src/openrct2/scripting/ScTile.hpp | 1 + src/openrct2/scripting/ScriptEngine.cpp | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index dbf8c724ab..6fd917491b 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -412,8 +412,8 @@ namespace OpenRCT2::Ui::Windows const auto numItems = std::min(items.size(), DROPDOWN_ITEMS_MAX_SIZE); for (size_t i = 0; i < numItems; i++) { - gDropdownItemsFormat[i] = selectedIndex == i ? STR_OPTIONS_DROPDOWN_ITEM_SELECTED - : STR_OPTIONS_DROPDOWN_ITEM; + gDropdownItemsFormat[i] = selectedIndex == (int32_t)i ? STR_OPTIONS_DROPDOWN_ITEM_SELECTED + : STR_OPTIONS_DROPDOWN_ITEM; set_format_arg_on((uint8_t*)&gDropdownItemsArgs[i], 0, const char*, items[i].c_str()); } window_dropdown_show_text_custom_width( diff --git a/src/openrct2/actions/MazePlaceTrackAction.hpp b/src/openrct2/actions/MazePlaceTrackAction.hpp index 18c723399a..afcb95b551 100644 --- a/src/openrct2/actions/MazePlaceTrackAction.hpp +++ b/src/openrct2/actions/MazePlaceTrackAction.hpp @@ -93,7 +93,8 @@ public: { _loc.ToTileStart(), baseHeight, clearanceHeight }, &map_place_non_scenery_clear_func, { 0b1111, 0 }, GetFlags(), &clearCost, CREATE_CROSSING_MODE_NONE)) { - return MakeResult(GA_ERROR::NO_CLEARANCE, std::get(res->ErrorTitle), gGameCommandErrorText, gCommonFormatArgs); + return MakeResult( + GA_ERROR::NO_CLEARANCE, std::get(res->ErrorTitle), gGameCommandErrorText, gCommonFormatArgs); } if (gMapGroundFlags & ELEMENT_IS_UNDERWATER) @@ -162,7 +163,8 @@ public: { _loc.ToTileStart(), baseHeight, clearanceHeight }, &map_place_non_scenery_clear_func, { 0b1111, 0 }, GetFlags() | GAME_COMMAND_FLAG_APPLY, &clearCost, CREATE_CROSSING_MODE_NONE)) { - return MakeResult(GA_ERROR::NO_CLEARANCE, std::get(res->ErrorTitle), gGameCommandErrorText, gCommonFormatArgs); + return MakeResult( + GA_ERROR::NO_CLEARANCE, std::get(res->ErrorTitle), gGameCommandErrorText, gCommonFormatArgs); } money32 price = (((RideTrackCosts[ride->type].track_price * TrackPricing[TRACK_ELEM_MAZE]) >> 16)); diff --git a/src/openrct2/scripting/HookEngine.cpp b/src/openrct2/scripting/HookEngine.cpp index 74295ec993..8263a88701 100644 --- a/src/openrct2/scripting/HookEngine.cpp +++ b/src/openrct2/scripting/HookEngine.cpp @@ -30,9 +30,8 @@ HOOK_TYPE OpenRCT2::Scripting::GetHookType(const std::string& name) return (result != LookupTable.end()) ? result->second : HOOK_TYPE::UNDEFINED; } -HookEngine::HookEngine(ScriptEngine& scriptEngine, ScriptExecutionInfo& execInfo) +HookEngine::HookEngine(ScriptEngine& scriptEngine) : _scriptEngine(scriptEngine) - , _execInfo(execInfo) { _hookMap.resize(NUM_HOOK_TYPES); for (size_t i = 0; i < NUM_HOOK_TYPES; i++) diff --git a/src/openrct2/scripting/HookEngine.h b/src/openrct2/scripting/HookEngine.h index 6547215866..8f31ab3907 100644 --- a/src/openrct2/scripting/HookEngine.h +++ b/src/openrct2/scripting/HookEngine.h @@ -72,12 +72,11 @@ namespace OpenRCT2::Scripting { private: ScriptEngine& _scriptEngine; - ScriptExecutionInfo& _execInfo; std::vector _hookMap; uint32_t _nextCookie = 1; public: - HookEngine(ScriptEngine& scriptEngine, ScriptExecutionInfo& execInfo); + HookEngine(ScriptEngine& scriptEngine); HookEngine(const HookEngine&) = delete; uint32_t Subscribe(HOOK_TYPE type, std::shared_ptr owner, const DukValue& function); void Unsubscribe(HOOK_TYPE type, uint32_t cookie); diff --git a/src/openrct2/scripting/ScObject.hpp b/src/openrct2/scripting/ScObject.hpp index ee59e0f303..bd049e767e 100644 --- a/src/openrct2/scripting/ScObject.hpp +++ b/src/openrct2/scripting/ScObject.hpp @@ -11,6 +11,7 @@ #ifdef __ENABLE_SCRIPTING__ +# include "../Context.h" # include "../common.h" # include "../object/ObjectManager.h" # include "../object/RideObject.h" diff --git a/src/openrct2/scripting/ScTile.hpp b/src/openrct2/scripting/ScTile.hpp index 1c0e5aa6df..6adfbb30e3 100644 --- a/src/openrct2/scripting/ScTile.hpp +++ b/src/openrct2/scripting/ScTile.hpp @@ -11,6 +11,7 @@ #ifdef __ENABLE_SCRIPTING__ +# include "../Context.h" # include "../common.h" # include "../world/Footpath.h" # include "../world/Scenery.h" diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index f1b324bde5..5ca0c0b990 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -360,7 +360,7 @@ DukContext::~DukContext() ScriptEngine::ScriptEngine(InteractiveConsole& console, IPlatformEnvironment& env) : _console(console) , _env(env) - , _hookEngine(*this, _execInfo) + , _hookEngine(*this) { }