From 53c5519cb3c2f0941dce05a9aa88a2a77ea725f0 Mon Sep 17 00:00:00 2001 From: ZehMatt Date: Mon, 9 Aug 2021 22:22:01 +0300 Subject: [PATCH] Fix missing include and guard functions with network macro --- .../scripting/bindings/game/ScCheats.hpp | 2 +- .../bindings/network/ScPlayerGroup.cpp | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/openrct2/scripting/bindings/game/ScCheats.hpp b/src/openrct2/scripting/bindings/game/ScCheats.hpp index 740a13c085..6c56554417 100644 --- a/src/openrct2/scripting/bindings/game/ScCheats.hpp +++ b/src/openrct2/scripting/bindings/game/ScCheats.hpp @@ -12,8 +12,8 @@ #ifdef ENABLE_SCRIPTING # include "../../../Cheats.h" +# include "../../Duktape.hpp" # include "../../ScriptEngine.h" -# include "Duktape.hpp" namespace OpenRCT2::Scripting { diff --git a/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp b/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp index 0839bebe50..697712f5ba 100644 --- a/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp +++ b/src/openrct2/scripting/bindings/network/ScPlayerGroup.cpp @@ -50,6 +50,7 @@ namespace OpenRCT2::Scripting # endif } +# ifndef DISABLE_NETWORK static std::string TransformPermissionKeyToJS(const std::string& s) { auto result = s.substr(sizeof("PERMISSION_") - 1); @@ -60,6 +61,17 @@ namespace OpenRCT2::Scripting return result; } + static std::string TransformPermissionKeyToInternal(const std::string& s) + { + auto result = "PERMISSION_" + s; + for (auto& c : result) + { + c = std::toupper(c); + } + return result; + } +# endif + std::vector ScPlayerGroup::permissions_get() const { # ifndef DISABLE_NETWORK @@ -84,16 +96,6 @@ namespace OpenRCT2::Scripting # endif } - static std::string TransformPermissionKeyToInternal(const std::string& s) - { - auto result = "PERMISSION_" + s; - for (auto& c : result) - { - c = std::toupper(c); - } - return result; - } - void ScPlayerGroup::permissions_set(std::vector value) { # ifndef DISABLE_NETWORK