From 8637eb6c57da4bf6c43bcf092844a36d3a988574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Thu, 29 Aug 2019 23:03:56 +0200 Subject: [PATCH] Rename some bits to allow unity builds of libopenrct2 (#9944) * Rename some bits to allow unity builds of libopenrct2 Some names are clashing when doing a unity build, renaming them solves the problem. --- src/openrct2-ui/windows/ObjectLoadError.cpp | 4 ++-- src/openrct2/Context.cpp | 4 ++-- src/openrct2/cmdline/ScreenshotCommands.cpp | 24 +++++++++---------- src/openrct2/network/Http.cpp | 4 ++-- src/openrct2/network/Http.h | 4 ++-- .../network/NetworkServerAdvertiser.cpp | 4 ++-- src/openrct2/network/ServerList.cpp | 2 +- src/openrct2/network/Twitch.cpp | 2 +- .../ride/transport/MiniatureRailway.cpp | 4 ++-- 9 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/openrct2-ui/windows/ObjectLoadError.cpp b/src/openrct2-ui/windows/ObjectLoadError.cpp index b3575523ce..fb742d845a 100644 --- a/src/openrct2-ui/windows/ObjectLoadError.cpp +++ b/src/openrct2-ui/windows/ObjectLoadError.cpp @@ -151,7 +151,7 @@ private: void DownloadObject(const rct_object_entry& entry, const std::string name, const std::string url) { - using namespace OpenRCT2::Network; + using namespace OpenRCT2::Networking; try { std::printf("Downloading %s\n", url.c_str()); @@ -190,7 +190,7 @@ private: void NextDownload() { - using namespace OpenRCT2::Network; + using namespace OpenRCT2::Networking; if (!_downloadingObjects || _currentDownloadIndex >= _entries.size()) { diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 2d41b1d7f5..91b368bfac 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -100,7 +100,7 @@ namespace OpenRCT2 #endif StdInOutConsole _stdInOutConsole; #ifndef DISABLE_HTTP - Network::Http::Http _http; + Networking::Http::Http _http; #endif // Game states @@ -721,7 +721,7 @@ namespace OpenRCT2 #ifndef DISABLE_HTTP // Download park and open it using its temporary filename void* data; - size_t dataSize = Network::Http::DownloadPark(gOpenRCT2StartupActionPath, &data); + size_t dataSize = Networking::Http::DownloadPark(gOpenRCT2StartupActionPath, &data); if (dataSize == 0) { title_load(); diff --git a/src/openrct2/cmdline/ScreenshotCommands.cpp b/src/openrct2/cmdline/ScreenshotCommands.cpp index c0e8725ab7..dbe126e027 100644 --- a/src/openrct2/cmdline/ScreenshotCommands.cpp +++ b/src/openrct2/cmdline/ScreenshotCommands.cpp @@ -10,21 +10,21 @@ #include "../interface/Screenshot.h" #include "CommandLine.hpp" -static ScreenshotOptions options; +static ScreenshotOptions _options; // clang-format off static constexpr const CommandLineOptionDefinition ScreenshotOptionsDef[] { - { CMDLINE_TYPE_INTEGER, &options.weather, NAC, "weather", "weather to be used (0 = default, 1 = sunny, ..., 6 = thunder)." }, - { CMDLINE_TYPE_SWITCH, &options.hide_guests, NAC, "no-peeps", "hide peeps" }, - { CMDLINE_TYPE_SWITCH, &options.hide_sprites, NAC, "no-sprites", "hide all sprites (e.g. balloons, vehicles, guests)" }, - { CMDLINE_TYPE_SWITCH, &options.clear_grass, NAC, "clear-grass", "set all grass to be clear of weeds" }, - { CMDLINE_TYPE_SWITCH, &options.mowed_grass, NAC, "mowed-grass", "set all grass to be mowed" }, - { CMDLINE_TYPE_SWITCH, &options.water_plants, NAC, "water-plants", "water plants for the screenshot" }, - { CMDLINE_TYPE_SWITCH, &options.fix_vandalism, NAC, "fix-vandalism", "fix vandalism for the screenshot" }, - { CMDLINE_TYPE_SWITCH, &options.remove_litter, NAC, "remove-litter", "remove litter for the screenshot" }, - { CMDLINE_TYPE_SWITCH, &options.tidy_up_park, NAC, "tidy-up-park", "clear grass, water plants, fix vandalism and remove litter" }, - { CMDLINE_TYPE_SWITCH, &options.transparent, NAC, "transparent", "make the background transparent" }, + { CMDLINE_TYPE_INTEGER, &_options.weather, NAC, "weather", "weather to be used (0 = default, 1 = sunny, ..., 6 = thunder)." }, + { CMDLINE_TYPE_SWITCH, &_options.hide_guests, NAC, "no-peeps", "hide peeps" }, + { CMDLINE_TYPE_SWITCH, &_options.hide_sprites, NAC, "no-sprites", "hide all sprites (e.g. balloons, vehicles, guests)" }, + { CMDLINE_TYPE_SWITCH, &_options.clear_grass, NAC, "clear-grass", "set all grass to be clear of weeds" }, + { CMDLINE_TYPE_SWITCH, &_options.mowed_grass, NAC, "mowed-grass", "set all grass to be mowed" }, + { CMDLINE_TYPE_SWITCH, &_options.water_plants, NAC, "water-plants", "water plants for the screenshot" }, + { CMDLINE_TYPE_SWITCH, &_options.fix_vandalism, NAC, "fix-vandalism", "fix vandalism for the screenshot" }, + { CMDLINE_TYPE_SWITCH, &_options.remove_litter, NAC, "remove-litter", "remove litter for the screenshot" }, + { CMDLINE_TYPE_SWITCH, &_options.tidy_up_park, NAC, "tidy-up-park", "clear grass, water plants, fix vandalism and remove litter" }, + { CMDLINE_TYPE_SWITCH, &_options.transparent, NAC, "transparent", "make the background transparent" }, OptionTableEnd }; @@ -43,7 +43,7 @@ static exitcode_t HandleScreenshot(CommandLineArgEnumerator* argEnumerator) { const char** argv = (const char**)argEnumerator->GetArguments() + argEnumerator->GetIndex(); int32_t argc = argEnumerator->GetCount() - argEnumerator->GetIndex(); - int32_t result = cmdline_for_screenshot(argv, argc, &options); + int32_t result = cmdline_for_screenshot(argv, argc, &_options); if (result < 0) { return EXITCODE_FAIL; diff --git a/src/openrct2/network/Http.cpp b/src/openrct2/network/Http.cpp index 6d8d140752..926f097423 100644 --- a/src/openrct2/network/Http.cpp +++ b/src/openrct2/network/Http.cpp @@ -27,7 +27,7 @@ # define OPENRCT2_USER_AGENT "OpenRCT2/" OPENRCT2_VERSION -namespace OpenRCT2::Network::Http +namespace OpenRCT2::Networking::Http { Http::Http() { @@ -221,6 +221,6 @@ namespace OpenRCT2::Network::Http return dataSize; } -} // namespace OpenRCT2::Network::Http +} // namespace OpenRCT2::Networking::Http #endif diff --git a/src/openrct2/network/Http.h b/src/openrct2/network/Http.h index 399650320e..1d6f08eb8a 100644 --- a/src/openrct2/network/Http.h +++ b/src/openrct2/network/Http.h @@ -17,7 +17,7 @@ # include # include -namespace OpenRCT2::Network::Http +namespace OpenRCT2::Networking::Http { enum class Status { @@ -68,6 +68,6 @@ namespace OpenRCT2::Network::Http */ size_t DownloadPark(const char* url, void** outData); -} // namespace OpenRCT2::Network::Http +} // namespace OpenRCT2::Networking::Http #endif // DISABLE_HTTP diff --git a/src/openrct2/network/NetworkServerAdvertiser.cpp b/src/openrct2/network/NetworkServerAdvertiser.cpp index e712a1a38a..a18865d469 100644 --- a/src/openrct2/network/NetworkServerAdvertiser.cpp +++ b/src/openrct2/network/NetworkServerAdvertiser.cpp @@ -164,7 +164,7 @@ private: void SendRegistration(bool forceIPv4) { - using namespace OpenRCT2::Network; + using namespace OpenRCT2::Networking; _lastAdvertiseTime = platform_get_ticks(); @@ -199,7 +199,7 @@ private: void SendHeartbeat() { - using namespace OpenRCT2::Network; + using namespace OpenRCT2::Networking; Http::Request request; request.url = GetMasterServerUrl(); diff --git a/src/openrct2/network/ServerList.cpp b/src/openrct2/network/ServerList.cpp index d2efbb0fac..7bc8c18e75 100644 --- a/src/openrct2/network/ServerList.cpp +++ b/src/openrct2/network/ServerList.cpp @@ -330,7 +330,7 @@ std::future> ServerList::FetchOnlineServerListAsync # ifdef DISABLE_HTTP return {}; # else - using namespace OpenRCT2::Network; + using namespace OpenRCT2::Networking; auto p = std::make_shared>>(); auto f = p->get_future(); diff --git a/src/openrct2/network/Twitch.cpp b/src/openrct2/network/Twitch.cpp index 71efd1be77..cb6409beb7 100644 --- a/src/openrct2/network/Twitch.cpp +++ b/src/openrct2/network/Twitch.cpp @@ -44,7 +44,7 @@ void twitch_update() # include using namespace OpenRCT2; -using namespace OpenRCT2::Network; +using namespace OpenRCT2::Networking; bool gTwitchEnable = false; diff --git a/src/openrct2/ride/transport/MiniatureRailway.cpp b/src/openrct2/ride/transport/MiniatureRailway.cpp index 7a34f54d73..1c355777bc 100644 --- a/src/openrct2/ride/transport/MiniatureRailway.cpp +++ b/src/openrct2/ride/transport/MiniatureRailway.cpp @@ -1295,9 +1295,9 @@ static void paint_miniature_railway_track_right_quarter_turn_3_tiles( miniature_railway_right_quarter_turn_3_tile_track_floor, nullptr, defaultRightQuarterTurn3TilesBoundLengths, miniature_railway_right_quarter_turn_3_tile_bound_offsets); - static constexpr const int8_t right_quarter_turn_3_tiles_sprite_map[] = { 0, -1, 1, 2 }; + static constexpr const int8_t _right_quarter_turn_3_tiles_sprite_map[] = { 0, -1, 1, 2 }; - int32_t index = right_quarter_turn_3_tiles_sprite_map[trackSequence]; + int32_t index = _right_quarter_turn_3_tiles_sprite_map[trackSequence]; uint32_t imageId = miniature_railway_track_pieces_flat_quarter_turn_3_tiles[direction][index] | session->TrackColours[SCHEME_TRACK];