From c67962577af449d7325981ed3356ec6e1198e54a Mon Sep 17 00:00:00 2001 From: Ted John Date: Fri, 24 Apr 2020 15:58:01 +0100 Subject: [PATCH] Rename __ENABLE_SCRIPTING__ to ENABLE_SCRIPTING --- CMakeLists.txt | 2 +- OpenRCT2.xcodeproj/project.pbxproj | 12 ++++++------ openrct2.common.props | 2 +- src/openrct2-ui/UiContext.cpp | 2 +- src/openrct2-ui/scripting/CustomMenu.cpp | 2 +- src/openrct2-ui/scripting/CustomMenu.h | 2 +- src/openrct2-ui/scripting/CustomWindow.cpp | 2 +- src/openrct2-ui/scripting/CustomWindow.h | 2 +- src/openrct2-ui/scripting/ScUi.hpp | 2 +- src/openrct2-ui/scripting/ScViewport.hpp | 2 +- src/openrct2-ui/scripting/ScWidget.hpp | 2 +- src/openrct2-ui/scripting/ScWindow.hpp | 2 +- src/openrct2-ui/scripting/UiExtensions.cpp | 2 +- src/openrct2-ui/scripting/UiExtensions.h | 2 +- src/openrct2-ui/windows/TopToolbar.cpp | 4 ++-- src/openrct2/Context.cpp | 8 ++++---- src/openrct2/Context.h | 2 +- src/openrct2/Game.cpp | 4 ++-- src/openrct2/GameState.cpp | 4 ++-- src/openrct2/actions/CustomAction.hpp | 2 +- src/openrct2/actions/GameAction.cpp | 4 ++-- src/openrct2/actions/GameActionRegistration.cpp | 2 +- src/openrct2/interface/StdInOutConsole.cpp | 4 ++-- src/openrct2/network/Network.cpp | 6 +++--- src/openrct2/scripting/Duktape.hpp | 2 +- src/openrct2/scripting/HookEngine.cpp | 2 +- src/openrct2/scripting/HookEngine.h | 2 +- src/openrct2/scripting/Plugin.cpp | 2 +- src/openrct2/scripting/Plugin.h | 2 +- src/openrct2/scripting/ScConfiguration.hpp | 2 +- src/openrct2/scripting/ScConsole.hpp | 2 +- src/openrct2/scripting/ScContext.hpp | 2 +- src/openrct2/scripting/ScDate.hpp | 2 +- src/openrct2/scripting/ScDisposable.hpp | 2 +- src/openrct2/scripting/ScEntity.hpp | 2 +- src/openrct2/scripting/ScMap.hpp | 2 +- src/openrct2/scripting/ScNetwork.hpp | 2 +- src/openrct2/scripting/ScObject.hpp | 2 +- src/openrct2/scripting/ScPark.hpp | 2 +- src/openrct2/scripting/ScRide.hpp | 2 +- src/openrct2/scripting/ScTile.hpp | 2 +- src/openrct2/scripting/ScriptEngine.cpp | 2 +- src/openrct2/scripting/ScriptEngine.h | 2 +- 43 files changed, 58 insertions(+), 58 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f0a901263..c66dced475 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,7 @@ if (ENABLE_LIGHTFX) add_definitions(-D__ENABLE_LIGHTFX__) endif () if (ENABLE_SCRIPTING) - add_definitions(-D__ENABLE_SCRIPTING__) + add_definitions(-DENABLE_SCRIPTING) endif () if (NOT DISABLE_DISCORD_RPC) diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index d6cbe34616..1e79ff4859 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -4619,7 +4619,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", __ENABLE_LIGHTFX__, - __ENABLE_SCRIPTING__, + ENABLE_SCRIPTING, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -4665,7 +4665,7 @@ GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", __ENABLE_LIGHTFX__, - __ENABLE_SCRIPTING__, + ENABLE_SCRIPTING, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -4712,7 +4712,7 @@ "DEBUG=1", "$(inherited)", __ENABLE_LIGHTFX__, - __ENABLE_SCRIPTING__, + ENABLE_SCRIPTING, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -4755,7 +4755,7 @@ OPENGL_NO_LINK, "OPENRCT2_BUILD_INFO_HEADER=\"\\\"$(DERIVED_FILE_DIR)/gitversion.h\\\"\"", __ENABLE_LIGHTFX__, - __ENABLE_SCRIPTING__, + ENABLE_SCRIPTING, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_UNINITIALIZED_AUTOS = YES; @@ -4796,7 +4796,7 @@ "DEBUG=1", "$(inherited)", __ENABLE_LIGHTFX__, - __ENABLE_SCRIPTING__, + ENABLE_SCRIPTING, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; HEADER_SEARCH_PATHS = ( @@ -4831,7 +4831,7 @@ OPENGL_NO_LINK, "OPENRCT2_BUILD_INFO_HEADER=\"\\\"$(DERIVED_FILE_DIR)/gitversion.h\\\"\"", __ENABLE_LIGHTFX__, - __ENABLE_SCRIPTING__, + ENABLE_SCRIPTING, ); GCC_WARN_64_TO_32_BIT_CONVERSION = NO; HEADER_SEARCH_PATHS = ( diff --git a/openrct2.common.props b/openrct2.common.props index 49b68916f3..93aca8cd87 100644 --- a/openrct2.common.props +++ b/openrct2.common.props @@ -54,7 +54,7 @@ C4555: expression has no effect; expected expression with side-effect --> __AVX2__;__SSE4_1__;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;NOMINMAX;%(PreprocessorDefinitions) - __ENABLE_SCRIPTING__;%(PreprocessorDefinitions) + ENABLE_SCRIPTING;%(PreprocessorDefinitions) MultiThreaded MultiThreadedDLL true diff --git a/src/openrct2-ui/UiContext.cpp b/src/openrct2-ui/UiContext.cpp index 78d8b9ee75..f29217d915 100644 --- a/src/openrct2-ui/UiContext.cpp +++ b/src/openrct2-ui/UiContext.cpp @@ -120,7 +120,7 @@ public: void Initialise() override { -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING auto& scriptEngine = GetContext()->GetScriptEngine(); UiScriptExtensions::Extend(scriptEngine); #endif diff --git a/src/openrct2-ui/scripting/CustomMenu.cpp b/src/openrct2-ui/scripting/CustomMenu.cpp index eca0ad34db..a2d7ef47b4 100644 --- a/src/openrct2-ui/scripting/CustomMenu.cpp +++ b/src/openrct2-ui/scripting/CustomMenu.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "CustomMenu.h" diff --git a/src/openrct2-ui/scripting/CustomMenu.h b/src/openrct2-ui/scripting/CustomMenu.h index fa639752af..6d41982e21 100644 --- a/src/openrct2-ui/scripting/CustomMenu.h +++ b/src/openrct2-ui/scripting/CustomMenu.h @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include # include diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index d0053058af..74039ea776 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../interface/Dropdown.h" # include "ScUi.hpp" diff --git a/src/openrct2-ui/scripting/CustomWindow.h b/src/openrct2-ui/scripting/CustomWindow.h index 25db69e806..5877673780 100644 --- a/src/openrct2-ui/scripting/CustomWindow.h +++ b/src/openrct2-ui/scripting/CustomWindow.h @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../interface/Window.h" diff --git a/src/openrct2-ui/scripting/ScUi.hpp b/src/openrct2-ui/scripting/ScUi.hpp index e00a898939..1377acaa9e 100644 --- a/src/openrct2-ui/scripting/ScUi.hpp +++ b/src/openrct2-ui/scripting/ScUi.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "CustomMenu.h" # include "ScViewport.hpp" diff --git a/src/openrct2-ui/scripting/ScViewport.hpp b/src/openrct2-ui/scripting/ScViewport.hpp index e33d7c00a9..100c6ab670 100644 --- a/src/openrct2-ui/scripting/ScViewport.hpp +++ b/src/openrct2-ui/scripting/ScViewport.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../interface/Window.h" diff --git a/src/openrct2-ui/scripting/ScWidget.hpp b/src/openrct2-ui/scripting/ScWidget.hpp index fc362c15bf..e28f2ff9c0 100644 --- a/src/openrct2-ui/scripting/ScWidget.hpp +++ b/src/openrct2-ui/scripting/ScWidget.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../interface/Widget.h" # include "../interface/Window.h" diff --git a/src/openrct2-ui/scripting/ScWindow.hpp b/src/openrct2-ui/scripting/ScWindow.hpp index 5561e5ad1e..e885072e32 100644 --- a/src/openrct2-ui/scripting/ScWindow.hpp +++ b/src/openrct2-ui/scripting/ScWindow.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "ScWidget.hpp" diff --git a/src/openrct2-ui/scripting/UiExtensions.cpp b/src/openrct2-ui/scripting/UiExtensions.cpp index 93b95901b7..de973d5ef7 100644 --- a/src/openrct2-ui/scripting/UiExtensions.cpp +++ b/src/openrct2-ui/scripting/UiExtensions.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "UiExtensions.h" diff --git a/src/openrct2-ui/scripting/UiExtensions.h b/src/openrct2-ui/scripting/UiExtensions.h index 7d29bcd41d..0f97ea7b06 100644 --- a/src/openrct2-ui/scripting/UiExtensions.h +++ b/src/openrct2-ui/scripting/UiExtensions.h @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING namespace OpenRCT2::Scripting { diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 72b61eb4dd..e2e7a67589 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -3288,7 +3288,7 @@ static void top_toolbar_init_map_menu(rct_window* w, rct_widget* widget) gDropdownItemsFormat[i++] = STR_MAPGEN_WINDOW_TITLE; } -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING const auto& customMenuItems = OpenRCT2::Scripting::CustomMenuItems; if (!customMenuItems.empty()) { @@ -3334,7 +3334,7 @@ static void top_toolbar_map_menu_dropdown(int16_t dropdownIndex) } else { -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING const auto& customMenuItems = OpenRCT2::Scripting::CustomMenuItems; auto customIndex = static_cast(dropdownIndex - customStartIndex); if (customMenuItems.size() > customIndex) diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 0a04bea93b..3b0d1a71b8 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -103,7 +103,7 @@ namespace OpenRCT2 std::unique_ptr _discordService; #endif StdInOutConsole _stdInOutConsole; -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING ScriptEngine _scriptEngine; #endif @@ -140,7 +140,7 @@ namespace OpenRCT2 , _audioContext(audioContext) , _uiContext(uiContext) , _localisationService(std::make_unique(env)) -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING , _scriptEngine(_stdInOutConsole, *env) #endif , _painter(std::make_unique(uiContext)) @@ -185,7 +185,7 @@ namespace OpenRCT2 return _uiContext; } -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING Scripting::ScriptEngine& GetScriptEngine() override { return _scriptEngine; @@ -1032,7 +1032,7 @@ namespace OpenRCT2 Twitch::Update(); chat_update(); -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING _scriptEngine.Update(); #endif _stdInOutConsole.ProcessEvalQueue(); diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index 0ec9465f13..19098f747f 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -114,7 +114,7 @@ namespace OpenRCT2 virtual Localisation::LocalisationService& GetLocalisationService() abstract; virtual IObjectManager& GetObjectManager() abstract; virtual IObjectRepository& GetObjectRepository() abstract; -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING virtual Scripting::ScriptEngine& GetScriptEngine() abstract; #endif virtual ITrackDesignRepository* GetTrackDesignRepository() abstract; diff --git a/src/openrct2/Game.cpp b/src/openrct2/Game.cpp index a3f0b1cfba..0047162ffc 100644 --- a/src/openrct2/Game.cpp +++ b/src/openrct2/Game.cpp @@ -592,14 +592,14 @@ void game_load_init() void game_load_scripts() { -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING GetContext()->GetScriptEngine().LoadPlugins(); #endif } void game_unload_scripts() { -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING GetContext()->GetScriptEngine().UnloadPlugins(); #endif } diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index 4e9de175a2..4e6543d460 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -269,7 +269,7 @@ void GameState::UpdateLogic() } } -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING auto& hookEngine = GetContext()->GetScriptEngine().GetHookEngine(); hookEngine.Call(HOOK_TYPE::INTERVAL_TICK, true); @@ -279,7 +279,7 @@ void GameState::UpdateLogic() date_update(); _date = Date(gDateMonthsElapsed, gDateMonthTicks); -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING if (day != _date.GetDay()) { hookEngine.Call(HOOK_TYPE::INTERVAL_DAY, true); diff --git a/src/openrct2/actions/CustomAction.hpp b/src/openrct2/actions/CustomAction.hpp index e220598159..3419061a72 100644 --- a/src/openrct2/actions/CustomAction.hpp +++ b/src/openrct2/actions/CustomAction.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../Context.h" # include "../scripting/ScriptEngine.h" diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 4c82e56f93..04226031a2 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -400,7 +400,7 @@ namespace GameActions } GameActionResult::Ptr result = QueryInternal(action, topLevel); -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING if (result->Error == GA_ERROR::OK && ((network_get_mode() == NETWORK_MODE_NONE) || (flags & GAME_COMMAND_FLAG_NETWORKED))) { @@ -444,7 +444,7 @@ namespace GameActions // Execute the action, changing the game state result = action->Execute(); -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING if (result->Error == GA_ERROR::OK) { auto& scriptEngine = GetContext()->GetScriptEngine(); diff --git a/src/openrct2/actions/GameActionRegistration.cpp b/src/openrct2/actions/GameActionRegistration.cpp index 8f2638cd8d..0d5ce2f7e5 100644 --- a/src/openrct2/actions/GameActionRegistration.cpp +++ b/src/openrct2/actions/GameActionRegistration.cpp @@ -172,7 +172,7 @@ namespace GameActions Register(); Register(); Register(); -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING Register(); #endif } diff --git a/src/openrct2/interface/StdInOutConsole.cpp b/src/openrct2/interface/StdInOutConsole.cpp index 92ed0970c1..ae60a1e033 100644 --- a/src/openrct2/interface/StdInOutConsole.cpp +++ b/src/openrct2/interface/StdInOutConsole.cpp @@ -56,7 +56,7 @@ void StdInOutConsole::Start() std::future StdInOutConsole::Eval(const std::string& s) { -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING auto& scriptEngine = GetContext()->GetScriptEngine(); return scriptEngine.Eval(s); #else @@ -71,7 +71,7 @@ std::future StdInOutConsole::Eval(const std::string& s) void StdInOutConsole::ProcessEvalQueue() { -#ifndef __ENABLE_SCRIPTING__ +#ifndef ENABLE_SCRIPTING while (_evalQueue.size() > 0) { auto item = std::move(_evalQueue.front()); diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 3ed563b753..f38fbf4597 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -1474,7 +1474,7 @@ void Network::Server_Send_SCRIPTS(NetworkConnection& connection) const { std::unique_ptr packet(NetworkPacket::Allocate()); *packet << static_cast(NETWORK_COMMAND_SCRIPTS); -# ifdef __ENABLE_SCRIPTING__ +# ifdef ENABLE_SCRIPTING using namespace OpenRCT2::Scripting; auto& scriptEngine = GetContext()->GetScriptEngine(); @@ -2445,7 +2445,7 @@ void Network::Client_Handle_SCRIPTS(NetworkConnection& connection, NetworkPacket uint32_t numScripts{}; packet >> numScripts; -# ifdef __ENABLE_SCRIPTING__ +# ifdef ENABLE_SCRIPTING auto& scriptEngine = GetContext()->GetScriptEngine(); for (uint32_t i = 0; i < numScripts; i++) { @@ -2888,7 +2888,7 @@ void Network::Client_Handle_CHAT([[maybe_unused]] NetworkConnection& connection, static bool ProcessChatMessagePluginHooks(const NetworkPlayer& player, std::string& text) { -# ifdef __ENABLE_SCRIPTING__ +# ifdef ENABLE_SCRIPTING auto& hookEngine = GetContext()->GetScriptEngine().GetHookEngine(); if (hookEngine.HasSubscriptions(OpenRCT2::Scripting::HOOK_TYPE::NETWORK_CHAT)) { diff --git a/src/openrct2/scripting/Duktape.hpp b/src/openrct2/scripting/Duktape.hpp index 6d0874d818..6091b0a2ca 100644 --- a/src/openrct2/scripting/Duktape.hpp +++ b/src/openrct2/scripting/Duktape.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include # include diff --git a/src/openrct2/scripting/HookEngine.cpp b/src/openrct2/scripting/HookEngine.cpp index 5211ca6154..20010f4dc7 100644 --- a/src/openrct2/scripting/HookEngine.cpp +++ b/src/openrct2/scripting/HookEngine.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "HookEngine.h" diff --git a/src/openrct2/scripting/HookEngine.h b/src/openrct2/scripting/HookEngine.h index 8179c38fb7..8971ad9d60 100644 --- a/src/openrct2/scripting/HookEngine.h +++ b/src/openrct2/scripting/HookEngine.h @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../common.h" # include "Duktape.hpp" diff --git a/src/openrct2/scripting/Plugin.cpp b/src/openrct2/scripting/Plugin.cpp index f0d2e5832f..548539486c 100644 --- a/src/openrct2/scripting/Plugin.cpp +++ b/src/openrct2/scripting/Plugin.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "Plugin.h" diff --git a/src/openrct2/scripting/Plugin.h b/src/openrct2/scripting/Plugin.h index 3c70d911d1..fdf61aa3dc 100644 --- a/src/openrct2/scripting/Plugin.h +++ b/src/openrct2/scripting/Plugin.h @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "Duktape.hpp" diff --git a/src/openrct2/scripting/ScConfiguration.hpp b/src/openrct2/scripting/ScConfiguration.hpp index e3d8e6a1d4..15ca10d16d 100644 --- a/src/openrct2/scripting/ScConfiguration.hpp +++ b/src/openrct2/scripting/ScConfiguration.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../Context.h" # include "../config/Config.h" diff --git a/src/openrct2/scripting/ScConsole.hpp b/src/openrct2/scripting/ScConsole.hpp index 19edf7cb5d..0b8e90e6aa 100644 --- a/src/openrct2/scripting/ScConsole.hpp +++ b/src/openrct2/scripting/ScConsole.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../interface/InteractiveConsole.h" # include "Duktape.hpp" diff --git a/src/openrct2/scripting/ScContext.hpp b/src/openrct2/scripting/ScContext.hpp index 8c3dcf5be2..2ca39eef1a 100644 --- a/src/openrct2/scripting/ScContext.hpp +++ b/src/openrct2/scripting/ScContext.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../actions/CustomAction.hpp" # include "../actions/ParkSetNameAction.hpp" diff --git a/src/openrct2/scripting/ScDate.hpp b/src/openrct2/scripting/ScDate.hpp index 25ad7c441e..9ce0b49220 100644 --- a/src/openrct2/scripting/ScDate.hpp +++ b/src/openrct2/scripting/ScDate.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../Context.h" # include "../Date.h" diff --git a/src/openrct2/scripting/ScDisposable.hpp b/src/openrct2/scripting/ScDisposable.hpp index 4bd43a0e7b..3b57e83ceb 100644 --- a/src/openrct2/scripting/ScDisposable.hpp +++ b/src/openrct2/scripting/ScDisposable.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "Duktape.hpp" diff --git a/src/openrct2/scripting/ScEntity.hpp b/src/openrct2/scripting/ScEntity.hpp index 44b567c908..b386ed4b99 100644 --- a/src/openrct2/scripting/ScEntity.hpp +++ b/src/openrct2/scripting/ScEntity.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../common.h" # include "../world/Sprite.h" diff --git a/src/openrct2/scripting/ScMap.hpp b/src/openrct2/scripting/ScMap.hpp index b109c67cb6..df1c2d00e4 100644 --- a/src/openrct2/scripting/ScMap.hpp +++ b/src/openrct2/scripting/ScMap.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../common.h" # include "../ride/Ride.h" diff --git a/src/openrct2/scripting/ScNetwork.hpp b/src/openrct2/scripting/ScNetwork.hpp index adb778e857..25215c17f1 100644 --- a/src/openrct2/scripting/ScNetwork.hpp +++ b/src/openrct2/scripting/ScNetwork.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../actions/NetworkModifyGroupAction.hpp" # include "../actions/PlayerKickAction.hpp" diff --git a/src/openrct2/scripting/ScObject.hpp b/src/openrct2/scripting/ScObject.hpp index b3124edfed..c5cd7db835 100644 --- a/src/openrct2/scripting/ScObject.hpp +++ b/src/openrct2/scripting/ScObject.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../Context.h" # include "../common.h" diff --git a/src/openrct2/scripting/ScPark.hpp b/src/openrct2/scripting/ScPark.hpp index 2226421b73..9476df9596 100644 --- a/src/openrct2/scripting/ScPark.hpp +++ b/src/openrct2/scripting/ScPark.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../Context.h" # include "../common.h" diff --git a/src/openrct2/scripting/ScRide.hpp b/src/openrct2/scripting/ScRide.hpp index eb46929ef3..35dde8054e 100644 --- a/src/openrct2/scripting/ScRide.hpp +++ b/src/openrct2/scripting/ScRide.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../common.h" # include "../ride/Ride.h" diff --git a/src/openrct2/scripting/ScTile.hpp b/src/openrct2/scripting/ScTile.hpp index e00584a955..df9530b815 100644 --- a/src/openrct2/scripting/ScTile.hpp +++ b/src/openrct2/scripting/ScTile.hpp @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../Context.h" # include "../common.h" diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index 84f997bdd4..889db5a430 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -7,7 +7,7 @@ * OpenRCT2 is licensed under the GNU General Public License version 3. *****************************************************************************/ -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "ScriptEngine.h" diff --git a/src/openrct2/scripting/ScriptEngine.h b/src/openrct2/scripting/ScriptEngine.h index 8257dd769b..23e18756ad 100644 --- a/src/openrct2/scripting/ScriptEngine.h +++ b/src/openrct2/scripting/ScriptEngine.h @@ -9,7 +9,7 @@ #pragma once -#ifdef __ENABLE_SCRIPTING__ +#ifdef ENABLE_SCRIPTING # include "../common.h" # include "../core/FileWatcher.h"