From 0a92e74ced3e65b2d1fe3a4cd6affa718e48e217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 3 Dec 2017 23:45:43 +0100 Subject: [PATCH 1/2] Minor fixes --- src/openrct2/Context.cpp | 2 +- src/openrct2/ParkImporter.cpp | 16 ++++----------- src/openrct2/actions/GameAction.cpp | 3 +-- src/openrct2/cmdline/CommandLine.cpp | 6 +----- src/openrct2/cmdline/RootCommands.cpp | 1 + src/openrct2/cmdline/UriHandler.cpp | 2 +- src/openrct2/core/File.cpp | 2 +- src/openrct2/core/FileScanner.cpp | 8 ++++---- src/openrct2/core/Guard.cpp | 2 ++ src/openrct2/drawing/ScrollingText.cpp | 2 +- src/openrct2/drawing/TTFSDLPort.cpp | 4 ++-- src/openrct2/drawing/Text.h | 4 ++-- src/openrct2/drawing/X8DrawingEngine.cpp | 4 +--- src/openrct2/interface/Theme.cpp | 8 ++++---- src/openrct2/management/NewsItem.cpp | 7 +------ src/openrct2/network/Network.cpp | 4 ++-- src/openrct2/network/NetworkConnection.h | 2 +- src/openrct2/network/NetworkGroup.cpp | 3 +-- src/openrct2/network/NetworkGroup.h | 2 +- src/openrct2/network/NetworkPacket.cpp | 6 ++++-- src/openrct2/network/TcpSocket.cpp | 14 +++++++------ src/openrct2/network/network.h | 2 +- src/openrct2/object/Object.h | 2 +- src/openrct2/object/StringTable.cpp | 2 +- src/openrct2/peep/Staff.cpp | 2 +- src/openrct2/rct1/S4Importer.cpp | 22 ++++++++++----------- src/openrct2/rct2/S6Exporter.h | 2 +- src/openrct2/ride/Track.cpp | 12 ++--------- src/openrct2/ride/TrackDesignRepository.cpp | 4 ++-- src/openrct2/ride/Vehicle.cpp | 21 ++++++-------------- 30 files changed, 70 insertions(+), 101 deletions(-) diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index c49da24781..019992eaf4 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -437,7 +437,7 @@ namespace OpenRCT2 bool LoadParkFromStream(IStream * stream, const std::string &path, bool loadTitleScreenFirstOnFail) final override { - ClassifiedFileInfo info; + ClassifiedFileInfo info{}; if (TryClassifyFile(stream, &info)) { if (info.Type == FILE_TYPE::SAVED_GAME || diff --git a/src/openrct2/ParkImporter.cpp b/src/openrct2/ParkImporter.cpp index f03058454c..00fdae8c09 100644 --- a/src/openrct2/ParkImporter.cpp +++ b/src/openrct2/ParkImporter.cpp @@ -117,22 +117,14 @@ namespace ParkImporter bool ExtensionIsRCT1(const std::string &extension) { - if (String::Equals(extension, ".sc4", true) || - String::Equals(extension, ".sv4", true)) - { - return true; - } - return false; + return String::Equals(extension, ".sc4", true) || + String::Equals(extension, ".sv4", true); } bool ExtensionIsScenario(const std::string &extension) { - if (String::Equals(extension, ".sc4", true) || - String::Equals(extension, ".sc6", true)) - { - return true; - } - return false; + return String::Equals(extension, ".sc4", true) || + String::Equals(extension, ".sc6", true); } } diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 7c31595c1b..5d9727fc0c 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -28,8 +28,7 @@ #include "GameAction.h" GameActionResult::GameActionResult() -{ -} += default; GameActionResult::GameActionResult(GA_ERROR error, rct_string_id message) { diff --git a/src/openrct2/cmdline/CommandLine.cpp b/src/openrct2/cmdline/CommandLine.cpp index b569e65296..98d05185b0 100644 --- a/src/openrct2/cmdline/CommandLine.cpp +++ b/src/openrct2/cmdline/CommandLine.cpp @@ -463,11 +463,7 @@ namespace CommandLine } else if (shortOption[1] != '\0') { - if (!ParseOptionValue(option, &shortOption[1])) - { - return false; - } - return true; + return ParseOptionValue(option, &shortOption[1]); } } diff --git a/src/openrct2/cmdline/RootCommands.cpp b/src/openrct2/cmdline/RootCommands.cpp index 37e246fdb3..87a2025ec5 100644 --- a/src/openrct2/cmdline/RootCommands.cpp +++ b/src/openrct2/cmdline/RootCommands.cpp @@ -23,6 +23,7 @@ #include "../platform/platform.h" #include "../localisation/Language.h" #include "../core/Console.hpp" +#include "../core/Guard.hpp" #include "../core/Memory.hpp" #include "../core/Path.hpp" #include "../core/String.hpp" diff --git a/src/openrct2/cmdline/UriHandler.cpp b/src/openrct2/cmdline/UriHandler.cpp index 4a790d17e8..56fe9b536c 100644 --- a/src/openrct2/cmdline/UriHandler.cpp +++ b/src/openrct2/cmdline/UriHandler.cpp @@ -47,7 +47,7 @@ static exitcode_t HandleUri(const std::string &uri) { exitcode_t result = EXITCODE_CONTINUE; auto args = String::Split(uri, "/"); - if (args.size() > 0) + if (!args.empty()) { #ifndef DISABLE_NETWORK std::string arg = args[0]; diff --git a/src/openrct2/core/File.cpp b/src/openrct2/core/File.cpp index 398e5e6440..3822f7df7c 100644 --- a/src/openrct2/core/File.cpp +++ b/src/openrct2/core/File.cpp @@ -135,7 +135,7 @@ namespace File } free(pathW); #else - struct stat statInfo; + struct stat statInfo{}; if (stat(path.c_str(), &statInfo) == 0) { lastModified = statInfo.st_mtime; diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index 9c32069859..af4dc59024 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -66,7 +66,7 @@ private: { std::string Path; std::vector Listing; - sint32 Index; + sint32 Index{}; }; // Options @@ -75,7 +75,7 @@ private: bool _recurse; // State - bool _started; + bool _started{}; std::stack _directoryStack; // Current @@ -132,7 +132,7 @@ public: PushState(_rootPath); } - while (_directoryStack.size() != 0) + while (!_directoryStack.empty()) { DirectoryState * state = &_directoryStack.top(); state->Index++; @@ -337,7 +337,7 @@ private: String::Set(path, pathSize, directory); Path::Append(path, pathSize, node->d_name); - struct stat statInfo; + struct stat statInfo{}; sint32 statRes = stat(path, &statInfo); if (statRes != -1) { diff --git a/src/openrct2/core/Guard.cpp b/src/openrct2/core/Guard.cpp index 65e4d6c034..2516324fce 100644 --- a/src/openrct2/core/Guard.cpp +++ b/src/openrct2/core/Guard.cpp @@ -15,6 +15,8 @@ #pragma endregion #include +#include +#include #include #include "../common.h" diff --git a/src/openrct2/drawing/ScrollingText.cpp b/src/openrct2/drawing/ScrollingText.cpp index d8c1ceb417..15a226b346 100644 --- a/src/openrct2/drawing/ScrollingText.cpp +++ b/src/openrct2/drawing/ScrollingText.cpp @@ -154,7 +154,7 @@ static void scrolling_text_format(utf8 *dst, size_t size, rct_draw_scroll_text * extern bool TempForScrollText; -#define SCROLL_POS(x, y) ((y * 64) + x) +#define SCROLL_POS(x, y) (((y) * 64) + (x)) // clang-format off static constexpr const sint16 _scrollpos0[] = { diff --git a/src/openrct2/drawing/TTFSDLPort.cpp b/src/openrct2/drawing/TTFSDLPort.cpp index 3d56cadaa3..f03b29db8c 100644 --- a/src/openrct2/drawing/TTFSDLPort.cpp +++ b/src/openrct2/drawing/TTFSDLPort.cpp @@ -66,8 +66,8 @@ in the result FT_Bitmap after the FT_Render_Glyph() call. */ #define NUM_GRAYS 256 /* Handy routines for converting from fixed point */ -#define FT_FLOOR(X) ((X & -64) / 64) -#define FT_CEIL(X) (((X + 63) & -64) / 64) +#define FT_FLOOR(X) (((X) & -64) / 64) +#define FT_CEIL(X) ((((X) + 63) & -64) / 64) #define CACHED_METRICS 0x10 #define CACHED_BITMAP 0x01 diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index 863e4abdb1..eebe59a744 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -39,8 +39,8 @@ class StaticLayout { private: utf8string _buffer; - TextPaint _paint; - sint32 _lineCount; + TextPaint _paint{}; + sint32 _lineCount{}; sint32 _lineHeight; sint32 _maxWidth; diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index 3fc5d77361..c8bb9fdac9 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -471,9 +471,7 @@ X8DrawingContext::X8DrawingContext(X8DrawingEngine * engine) } X8DrawingContext::~X8DrawingContext() -{ - -} += default; IDrawingEngine * X8DrawingContext::GetEngine() { diff --git a/src/openrct2/interface/Theme.cpp b/src/openrct2/interface/Theme.cpp index 99b257c087..fbc15371f2 100644 --- a/src/openrct2/interface/Theme.cpp +++ b/src/openrct2/interface/Theme.cpp @@ -304,7 +304,7 @@ UIThemeWindowEntry UIThemeWindowEntry::FromJson(const WindowThemeDesc * wtDesc, uint8 numColours = (uint8)json_array_size(jsonColours); numColours = Math::Min(numColours, wtDesc->NumColours); - UIThemeWindowEntry result; + UIThemeWindowEntry result { }; result.WindowClass = wtDesc->WindowClass; result.Theme = wtDesc->DefaultTheme; @@ -524,7 +524,7 @@ namespace ThemeManager NumPredefinedThemes = 0; for (auto predefinedTheme : PredefinedThemes) { - AvailableTheme theme; + AvailableTheme theme {}; theme.Name = predefinedTheme.Theme->Name; outThemes->push_back(std::move(theme)); @@ -538,7 +538,7 @@ namespace ThemeManager auto fileInfo = scanner->GetFileInfo(); auto name = Path::GetFileNameWithoutExtension(std::string(fileInfo->Name)); - AvailableTheme theme; + AvailableTheme theme {}; theme.Name = name; theme.Path = GetThemeFileName(theme.Name); outThemes->push_back(std::move(theme)); @@ -747,7 +747,7 @@ uint8 theme_get_colour(rct_windowclass wc, uint8 index) void theme_set_colour(rct_windowclass wc, uint8 index, colour_t colour) { - UIThemeWindowEntry entry; + UIThemeWindowEntry entry { }; entry.WindowClass = wc; auto currentEntry = (UIThemeWindowEntry *)ThemeManager::CurrentTheme->GetEntry(wc); diff --git a/src/openrct2/management/NewsItem.cpp b/src/openrct2/management/NewsItem.cpp index 3fd33ab03a..f646dd6bee 100644 --- a/src/openrct2/management/NewsItem.cpp +++ b/src/openrct2/management/NewsItem.cpp @@ -123,12 +123,7 @@ static bool news_item_is_current_old() remove_time = 256; } - if (news_item_get(0)->Ticks >= remove_time) - { - return true; - } - - return false; + return news_item_get(0)->Ticks >= remove_time; } /** diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 35802c7ac2..24b45dd650 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -668,7 +668,7 @@ bool Network::CheckSRAND(uint32 tick, uint32 srand0) server_srand0_tick = 0; // Check that the server and client sprite hashes match const char *client_sprite_hash = sprite_checksum(); - const bool sprites_mismatch = server_sprite_hash[0] != '\0' && strcmp(client_sprite_hash, server_sprite_hash); + const bool sprites_mismatch = server_sprite_hash[0] != '\0' && strcmp(client_sprite_hash, server_sprite_hash) != 0; // Check PRNG values and sprite hashes, if exist if ((srand0 != server_srand0) || sprites_mismatch) { #ifdef DEBUG_DESYNC @@ -1956,7 +1956,7 @@ void Network::Server_Handle_AUTH(NetworkConnection& connection, NetworkPacket& p connection.AuthStatus = NETWORK_AUTH_BADNAME; } else if (!passwordless) { - if ((!password || strlen(password) == 0) && _password.size() > 0) { + if ((!password || strlen(password) == 0) && !_password.empty()) { connection.AuthStatus = NETWORK_AUTH_REQUIREPASSWORD; } else if (password && _password != password) { diff --git a/src/openrct2/network/NetworkConnection.h b/src/openrct2/network/NetworkConnection.h index a798acd1b5..283c35fdc3 100644 --- a/src/openrct2/network/NetworkConnection.h +++ b/src/openrct2/network/NetworkConnection.h @@ -58,7 +58,7 @@ public: private: std::list> _outboundPackets; - uint32 _lastPacketTime; + uint32 _lastPacketTime{}; utf8 * _lastDisconnectReason = nullptr; bool SendPacket(NetworkPacket &packet); diff --git a/src/openrct2/network/NetworkGroup.cpp b/src/openrct2/network/NetworkGroup.cpp index 65d907488c..556c75ddec 100644 --- a/src/openrct2/network/NetworkGroup.cpp +++ b/src/openrct2/network/NetworkGroup.cpp @@ -26,8 +26,7 @@ NetworkGroup::NetworkGroup() } NetworkGroup::~NetworkGroup() -{ -} += default; NetworkGroup NetworkGroup::FromJson(const json_t * json) { diff --git a/src/openrct2/network/NetworkGroup.h b/src/openrct2/network/NetworkGroup.h index 79d38ef634..6359951995 100644 --- a/src/openrct2/network/NetworkGroup.h +++ b/src/openrct2/network/NetworkGroup.h @@ -25,7 +25,7 @@ class NetworkGroup final { public: - std::array ActionsAllowed; + std::array ActionsAllowed{}; uint8 Id = 0; static NetworkGroup FromJson(const json_t * json); diff --git a/src/openrct2/network/NetworkPacket.cpp b/src/openrct2/network/NetworkPacket.cpp index 87afdc6601..704027e348 100644 --- a/src/openrct2/network/NetworkPacket.cpp +++ b/src/openrct2/network/NetworkPacket.cpp @@ -19,14 +19,16 @@ #include "NetworkTypes.h" #include "NetworkPacket.h" +#include + std::unique_ptr NetworkPacket::Allocate() { - return std::unique_ptr(new NetworkPacket); // change to make_unique in c++14 + return std::make_unique(); // change to make_unique in c++14 } std::unique_ptr NetworkPacket::Duplicate(NetworkPacket &packet) { - return std::unique_ptr(new NetworkPacket(packet)); // change to make_unique in c++14 + return std::make_unique(packet); // change to make_unique in c++14 } uint8 * NetworkPacket::GetData() diff --git a/src/openrct2/network/TcpSocket.cpp b/src/openrct2/network/TcpSocket.cpp index 48cab68929..d9aa60b694 100644 --- a/src/openrct2/network/TcpSocket.cpp +++ b/src/openrct2/network/TcpSocket.cpp @@ -24,6 +24,9 @@ #include // clang-format off +// MSVC: include here otherwise PI gets defined twice +#include + #ifdef _WIN32 // winsock2 must be included before windows.h #include @@ -91,8 +94,7 @@ private: public: TcpSocket() - { - } + = default; ~TcpSocket() override { @@ -125,7 +127,7 @@ public: throw std::runtime_error("Socket not closed."); } - sockaddr_storage ss; + sockaddr_storage ss { }; sint32 ss_len; if (!ResolveAddress(address, port, &ss, &ss_len)) { @@ -185,7 +187,7 @@ public: { throw std::runtime_error("Socket not listening."); } - struct sockaddr_storage client_addr; + struct sockaddr_storage client_addr { }; socklen_t client_len = sizeof(struct sockaddr_storage); ITcpSocket * tcpSocket = nullptr; @@ -238,7 +240,7 @@ public: // Resolve address _status = SOCKET_STATUS_RESOLVING; - sockaddr_storage ss; + sockaddr_storage ss { }; sint32 ss_len; if (!ResolveAddress(address, port, &ss, &ss_len)) { @@ -290,7 +292,7 @@ public: #pragma warning(disable : 4548) // expression before comma has no effect; expected expression with side-effect FD_SET(_socket, &writeFD); #pragma warning(pop) - timeval timeout; + timeval timeout { }; timeout.tv_sec = 0; timeout.tv_usec = 0; if (select((sint32)(_socket + 1), nullptr, &writeFD, nullptr, &timeout) > 0) diff --git a/src/openrct2/network/network.h b/src/openrct2/network/network.h index 271df19d1c..6933c2c558 100644 --- a/src/openrct2/network/network.h +++ b/src/openrct2/network/network.h @@ -242,7 +242,7 @@ private: uint32 server_tick = 0; uint32 server_srand0 = 0; uint32 server_srand0_tick = 0; - char server_sprite_hash[EVP_MAX_MD_SIZE + 1]; + char server_sprite_hash[EVP_MAX_MD_SIZE + 1]{}; uint8 player_id = 0; std::list> client_connection_list; std::multiset game_command_queue; diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index 43c78a6c16..2faa152772 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -136,7 +136,7 @@ class Object { private: char * _identifier; - rct_object_entry _objectEntry; + rct_object_entry _objectEntry{}; StringTable _stringTable; ImageTable _imageTable; diff --git a/src/openrct2/object/StringTable.cpp b/src/openrct2/object/StringTable.cpp index cc1a5568b5..1ce714a676 100644 --- a/src/openrct2/object/StringTable.cpp +++ b/src/openrct2/object/StringTable.cpp @@ -63,7 +63,7 @@ void StringTable::Read(IReadObjectContext * context, IStream * stream, uint8 id) (rct2LanguageId <= RCT2_LANGUAGE_ID_PORTUGUESE) ? RCT2ToOpenRCT2LanguageId[rct2LanguageId] : LANGUAGE_UNDEFINED; - StringTableEntry entry; + StringTableEntry entry { }; entry.Id = id; entry.LanguageId = languageId; diff --git a/src/openrct2/peep/Staff.cpp b/src/openrct2/peep/Staff.cpp index 0435c62e63..7b118b19e0 100644 --- a/src/openrct2/peep/Staff.cpp +++ b/src/openrct2/peep/Staff.cpp @@ -2047,7 +2047,7 @@ void rct_peep::UpdateAnswering() { return; } - + if (current_ride != rideEntranceExitElement->properties.entrance.ride_index) return; diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index d07ab0f40f..f0bb7de52a 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -122,18 +122,18 @@ private: EntryList _waterEntry; // Lookup tables for converting from RCT1 hard coded types to the new dynamic object entries - uint8 _rideTypeToRideEntryMap[RCT1_RIDE_TYPE_COUNT]; - uint8 _vehicleTypeToRideEntryMap[RCT1_VEHICLE_TYPE_COUNT]; - uint8 _smallSceneryTypeToEntryMap[256]; - uint8 _largeSceneryTypeToEntryMap[256]; - uint8 _wallTypeToEntryMap[256]; - uint8 _pathTypeToEntryMap[24]; - uint8 _pathAdditionTypeToEntryMap[16]; - uint8 _sceneryThemeTypeToEntryMap[24]; + uint8 _rideTypeToRideEntryMap[RCT1_RIDE_TYPE_COUNT]{}; + uint8 _vehicleTypeToRideEntryMap[RCT1_VEHICLE_TYPE_COUNT]{}; + uint8 _smallSceneryTypeToEntryMap[256]{}; + uint8 _largeSceneryTypeToEntryMap[256]{}; + uint8 _wallTypeToEntryMap[256]{}; + uint8 _pathTypeToEntryMap[24]{}; + uint8 _pathAdditionTypeToEntryMap[16]{}; + uint8 _sceneryThemeTypeToEntryMap[24]{}; // Research - uint8 _researchRideEntryUsed[MAX_RIDE_OBJECTS]; - uint8 _researchRideTypeUsed[RCT1_RIDE_TYPE_COUNT]; + uint8 _researchRideEntryUsed[MAX_RIDE_OBJECTS]{}; + uint8 _researchRideTypeUsed[RCT1_RIDE_TYPE_COUNT]{}; // Scenario repository - used for determining scenario name IScenarioRepository * _scenarioRepository = GetScenarioRepository(); @@ -206,7 +206,7 @@ public: CreateAvailableObjectMappings(); auto missingObjects = GetInvalidObjects(); - if (missingObjects.size() > 0) + if (!missingObjects.empty()) { return ParkLoadResult::CreateMissingObjects(missingObjects); } diff --git a/src/openrct2/rct2/S6Exporter.h b/src/openrct2/rct2/S6Exporter.h index 67bb972c42..5aff66384f 100644 --- a/src/openrct2/rct2/S6Exporter.h +++ b/src/openrct2/rct2/S6Exporter.h @@ -44,7 +44,7 @@ public: void ExportRide(rct2_ride * dst, const Ride * src); private: - rct_s6_data _s6; + rct_s6_data _s6{}; void Save(IStream * stream, bool isScenario); static uint32 GetLoanHash(money32 initialCash, money32 bankLoan, uint32 maxBankLoan); diff --git a/src/openrct2/ride/Track.cpp b/src/openrct2/ride/Track.cpp index 787dd5ebcc..c31807439a 100644 --- a/src/openrct2/ride/Track.cpp +++ b/src/openrct2/ride/Track.cpp @@ -2279,22 +2279,14 @@ bool track_element_is_covered(sint32 trackElementType) bool track_element_is_booster(uint8 rideType, uint8 trackType) { // Boosters share their ID with the Spinning Control track. - if (rideType != RIDE_TYPE_STEEL_WILD_MOUSE && trackType == TRACK_ELEM_BOOSTER) - { - return true; - } - return false; + return rideType != RIDE_TYPE_STEEL_WILD_MOUSE && trackType == TRACK_ELEM_BOOSTER; } bool track_element_has_speed_setting(uint8 trackType) { // This does not check if the element is really a Spinning Control track instead of a booster, // but this does not cause problems. - if (trackType == TRACK_ELEM_BRAKES || trackType == TRACK_ELEM_BOOSTER) - { - return true; - } - return false; + return trackType == TRACK_ELEM_BRAKES || trackType == TRACK_ELEM_BOOSTER; } uint8 track_element_get_seat_rotation(const rct_tile_element * tileElement) diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index 66e59538c3..89395064ce 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -54,7 +54,7 @@ std::string GetNameFromTrackPath(const std::string &path) { std::string name = Path::GetFileNameWithoutExtension(path); //The track name should be the file name until the first instance of a dot - name = name.substr(0, name.find_first_of(".")); + name = name.substr(0, name.find_first_of('.')); return name; } @@ -149,7 +149,7 @@ public: Guard::ArgumentNotNull(env); } - ~TrackDesignRepository() = default; + ~TrackDesignRepository() override = default; size_t GetCount() const override { diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index 480487092c..fde3745b79 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -90,7 +90,7 @@ static void vehicle_kill_all_passengers(rct_vehicle * vehicle); static bool vehicle_can_depart_synchronised(rct_vehicle * vehicle); #define NO_SCREAM 254 -#define VEHICLE_INVALID_ID -1 +#define VEHICLE_INVALID_ID (-1) #define VEHICLE_MAX_SPIN_SPEED 1536 #define VEHICLE_MAX_SPIN_SPEED_FOR_STOPPING 700 @@ -1832,7 +1832,7 @@ static void vehicle_update_measurements(rct_vehicle * vehicle) rct_tile_element * tile_element = map_get_surface_element_at({x, y}); // If vehicle above ground. - if (tile_element->base_height * 8 <= z) + if (tile_element->base_height * 8 <= z) { // Set tile_element to first element. Since elements aren't always ordered by base height, // we must start at the first element and iterate through each tile element. @@ -1866,7 +1866,7 @@ static void vehicle_update_measurements(rct_vehicle * vehicle) cover_found = true; break; } - // Iterate through each tile_element. + // Iterate through each tile_element. } while (!tile_element_is_last_for_tile(tile_element++)); if (cover_found == false) @@ -3163,11 +3163,7 @@ static bool vehicle_next_tower_element_is_top(rct_vehicle * vehicle) return true; } - if (track_element_get_type(tileElement + 2) == TRACK_ELEM_TOWER_SECTION) - { - return false; - } - return true; + return track_element_get_type(tileElement + 2) != TRACK_ELEM_TOWER_SECTION; } /** @@ -7511,12 +7507,7 @@ static bool loc_6DB38B(rct_vehicle * vehicle, rct_tile_element * tileElement) sint32 trackType = track_element_get_type(tileElement); sint32 vangleStart = TrackDefinitions[trackType].vangle_start; - if (vangleStart != _vehicleVAngleEndF64E36 || bankStart != _vehicleBankEndF64E37) - { - return false; - } - - return true; + return !(vangleStart != _vehicleVAngleEndF64E36 || bankStart != _vehicleBankEndF64E37); } static void loc_6DB481(rct_vehicle * vehicle) @@ -9521,7 +9512,7 @@ static void vehicle_update_track_motion_powered_ride_acceleration(rct_vehicle * uint16 trackType = vehicle->track_direction >> 2; if (trackType == TRACK_ELEM_LEFT_QUARTER_TURN_1_TILE) - { + { speedModifier = (vehicle->var_CD == 5) ? HALF_SPEED : THREE_QUARTER_SPEED; } else if (trackType == TRACK_ELEM_RIGHT_QUARTER_TURN_1_TILE) From f9dd98123437ef19dd30329d9bafb64c4b43236c Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Sat, 12 May 2018 15:13:48 +0200 Subject: [PATCH 2/2] Further fixes - Use `= 0` for initializing types - Add default values to some structs, instead of zero-initializing their instances with `{}` - Use `std::make_unique` in Network.cpp - Remove trivial constructors and destructors - Improve readability of expression in Vehicle.cpp --- src/openrct2/Context.cpp | 2 +- src/openrct2/FileClassifier.h | 4 ++-- src/openrct2/actions/GameAction.cpp | 3 --- src/openrct2/actions/GameAction.h | 2 +- src/openrct2/core/FileScanner.cpp | 4 ++-- src/openrct2/drawing/Text.h | 12 ++++++------ src/openrct2/drawing/X8DrawingEngine.cpp | 3 --- src/openrct2/drawing/X8DrawingEngine.h | 1 - src/openrct2/network/Network.cpp | 12 ++++++------ src/openrct2/network/NetworkConnection.h | 2 +- src/openrct2/network/NetworkGroup.cpp | 3 --- src/openrct2/network/NetworkGroup.h | 1 - src/openrct2/network/NetworkPacket.cpp | 4 ++-- src/openrct2/network/TcpSocket.cpp | 3 +-- src/openrct2/ride/TrackDesignRepository.cpp | 2 -- src/openrct2/ride/Vehicle.cpp | 2 +- 16 files changed, 23 insertions(+), 37 deletions(-) diff --git a/src/openrct2/Context.cpp b/src/openrct2/Context.cpp index 019992eaf4..c49da24781 100644 --- a/src/openrct2/Context.cpp +++ b/src/openrct2/Context.cpp @@ -437,7 +437,7 @@ namespace OpenRCT2 bool LoadParkFromStream(IStream * stream, const std::string &path, bool loadTitleScreenFirstOnFail) final override { - ClassifiedFileInfo info{}; + ClassifiedFileInfo info; if (TryClassifyFile(stream, &info)) { if (info.Type == FILE_TYPE::SAVED_GAME || diff --git a/src/openrct2/FileClassifier.h b/src/openrct2/FileClassifier.h index b7b9b4aab5..b73ce00162 100644 --- a/src/openrct2/FileClassifier.h +++ b/src/openrct2/FileClassifier.h @@ -45,8 +45,8 @@ enum class FILE_TYPE struct ClassifiedFileInfo { - FILE_TYPE Type; - uint32 Version; + FILE_TYPE Type = FILE_TYPE::UNDEFINED; + uint32 Version = 0; }; #define FILE_TYPE_S4_CUTOFF 2 diff --git a/src/openrct2/actions/GameAction.cpp b/src/openrct2/actions/GameAction.cpp index 5d9727fc0c..234b2dd9db 100644 --- a/src/openrct2/actions/GameAction.cpp +++ b/src/openrct2/actions/GameAction.cpp @@ -27,9 +27,6 @@ #include "../world/Park.h" #include "GameAction.h" -GameActionResult::GameActionResult() -= default; - GameActionResult::GameActionResult(GA_ERROR error, rct_string_id message) { Error = error; diff --git a/src/openrct2/actions/GameAction.h b/src/openrct2/actions/GameAction.h index 4e14f9d717..746b123888 100644 --- a/src/openrct2/actions/GameAction.h +++ b/src/openrct2/actions/GameAction.h @@ -81,7 +81,7 @@ public: money32 Cost = 0; uint16 ExpenditureType = 0; - GameActionResult(); + GameActionResult() = default; GameActionResult(GA_ERROR error, rct_string_id message); GameActionResult(GA_ERROR error, rct_string_id title, rct_string_id message); GameActionResult(GA_ERROR error, rct_string_id title, rct_string_id message, uint8 * args); diff --git a/src/openrct2/core/FileScanner.cpp b/src/openrct2/core/FileScanner.cpp index af4dc59024..edb56ae0b3 100644 --- a/src/openrct2/core/FileScanner.cpp +++ b/src/openrct2/core/FileScanner.cpp @@ -66,7 +66,7 @@ private: { std::string Path; std::vector Listing; - sint32 Index{}; + sint32 Index = 0; }; // Options @@ -75,7 +75,7 @@ private: bool _recurse; // State - bool _started{}; + bool _started = false; std::stack _directoryStack; // Current diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index eebe59a744..041b93422b 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -29,18 +29,18 @@ enum class TextAlignment struct TextPaint { - uint8 Colour; - sint16 SpriteBase; - bool UnderlineText; - TextAlignment Alignment; + uint8 Colour = 0; + sint16 SpriteBase = 0; + bool UnderlineText = false; + TextAlignment Alignment = TextAlignment::LEFT; }; class StaticLayout { private: utf8string _buffer; - TextPaint _paint{}; - sint32 _lineCount{}; + TextPaint _paint; + sint32 _lineCount = 0; sint32 _lineHeight; sint32 _maxWidth; diff --git a/src/openrct2/drawing/X8DrawingEngine.cpp b/src/openrct2/drawing/X8DrawingEngine.cpp index c8bb9fdac9..4c679a70aa 100644 --- a/src/openrct2/drawing/X8DrawingEngine.cpp +++ b/src/openrct2/drawing/X8DrawingEngine.cpp @@ -470,9 +470,6 @@ X8DrawingContext::X8DrawingContext(X8DrawingEngine * engine) _engine = engine; } -X8DrawingContext::~X8DrawingContext() -= default; - IDrawingEngine * X8DrawingContext::GetEngine() { return _engine; diff --git a/src/openrct2/drawing/X8DrawingEngine.h b/src/openrct2/drawing/X8DrawingEngine.h index 2d6dd6d6a0..97a8df6fd2 100644 --- a/src/openrct2/drawing/X8DrawingEngine.h +++ b/src/openrct2/drawing/X8DrawingEngine.h @@ -134,7 +134,6 @@ namespace OpenRCT2 public: explicit X8DrawingContext(X8DrawingEngine * engine); - ~X8DrawingContext() override; IDrawingEngine * GetEngine() override; diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 24b45dd650..1c2ff584df 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -764,7 +764,7 @@ NetworkGroup* Network::AddGroup() } } if (newid != -1) { - std::unique_ptr group(new NetworkGroup); // change to make_unique in c++14 + auto group = std::make_unique(); group->Id = newid; group->SetName("Group #" + std::to_string(newid)); addedgroup = group.get(); @@ -845,17 +845,17 @@ void Network::SaveGroups() void Network::SetupDefaultGroups() { - std::unique_ptr admin(new NetworkGroup()); // change to make_unique in c++14 + auto admin = std::make_unique(); admin->SetName("Admin"); admin->ActionsAllowed.fill(0xFF); admin->Id = 0; group_list.push_back(std::move(admin)); - std::unique_ptr spectator(new NetworkGroup()); // change to make_unique in c++14 + auto spectator = std::make_unique(); spectator->SetName("Spectator"); spectator->ToggleActionPermission(0); // Chat spectator->Id = 1; group_list.push_back(std::move(spectator)); - std::unique_ptr user(new NetworkGroup()); // change to make_unique in c++14 + auto user = std::make_unique(); user->SetName("User"); user->ActionsAllowed.fill(0xFF); user->ToggleActionPermission(15); // Kick Player @@ -896,7 +896,7 @@ void Network::LoadGroups() for (size_t i = 0; i < groupCount; i++) { json_t * jsonGroup = json_array_get(json_groups, i); - std::unique_ptr newgroup(new NetworkGroup(NetworkGroup::FromJson(jsonGroup))); // change to make_unique in c++14 + auto newgroup = std::make_unique(NetworkGroup::FromJson(jsonGroup)); group_list.push_back(std::move(newgroup)); } json_t * jsonDefaultGroup = json_object_get(json, "default_group"); @@ -2475,7 +2475,7 @@ void Network::Client_Handle_GROUPLIST(NetworkConnection& connection, NetworkPack for (uint32 i = 0; i < size; i++) { NetworkGroup group; group.Read(packet); - std::unique_ptr newgroup(new NetworkGroup(group)); // change to make_unique in c++14 + auto newgroup = std::make_unique(group); group_list.push_back(std::move(newgroup)); } } diff --git a/src/openrct2/network/NetworkConnection.h b/src/openrct2/network/NetworkConnection.h index 283c35fdc3..323beec22e 100644 --- a/src/openrct2/network/NetworkConnection.h +++ b/src/openrct2/network/NetworkConnection.h @@ -58,7 +58,7 @@ public: private: std::list> _outboundPackets; - uint32 _lastPacketTime{}; + uint32 _lastPacketTime = 0; utf8 * _lastDisconnectReason = nullptr; bool SendPacket(NetworkPacket &packet); diff --git a/src/openrct2/network/NetworkGroup.cpp b/src/openrct2/network/NetworkGroup.cpp index 556c75ddec..15896ecd53 100644 --- a/src/openrct2/network/NetworkGroup.cpp +++ b/src/openrct2/network/NetworkGroup.cpp @@ -25,9 +25,6 @@ NetworkGroup::NetworkGroup() ActionsAllowed = { 0 }; } -NetworkGroup::~NetworkGroup() -= default; - NetworkGroup NetworkGroup::FromJson(const json_t * json) { NetworkGroup group; diff --git a/src/openrct2/network/NetworkGroup.h b/src/openrct2/network/NetworkGroup.h index 6359951995..ad519b6053 100644 --- a/src/openrct2/network/NetworkGroup.h +++ b/src/openrct2/network/NetworkGroup.h @@ -31,7 +31,6 @@ public: static NetworkGroup FromJson(const json_t * json); NetworkGroup(); - ~NetworkGroup(); const std::string & GetName() const; void SetName(std::string name); diff --git a/src/openrct2/network/NetworkPacket.cpp b/src/openrct2/network/NetworkPacket.cpp index 704027e348..7476408b56 100644 --- a/src/openrct2/network/NetworkPacket.cpp +++ b/src/openrct2/network/NetworkPacket.cpp @@ -23,12 +23,12 @@ std::unique_ptr NetworkPacket::Allocate() { - return std::make_unique(); // change to make_unique in c++14 + return std::make_unique(); } std::unique_ptr NetworkPacket::Duplicate(NetworkPacket &packet) { - return std::make_unique(packet); // change to make_unique in c++14 + return std::make_unique(packet); } uint8 * NetworkPacket::GetData() diff --git a/src/openrct2/network/TcpSocket.cpp b/src/openrct2/network/TcpSocket.cpp index d9aa60b694..32e7a75eb1 100644 --- a/src/openrct2/network/TcpSocket.cpp +++ b/src/openrct2/network/TcpSocket.cpp @@ -93,8 +93,7 @@ private: std::string _error; public: - TcpSocket() - = default; + TcpSocket() = default; ~TcpSocket() override { diff --git a/src/openrct2/ride/TrackDesignRepository.cpp b/src/openrct2/ride/TrackDesignRepository.cpp index 89395064ce..b092e44867 100644 --- a/src/openrct2/ride/TrackDesignRepository.cpp +++ b/src/openrct2/ride/TrackDesignRepository.cpp @@ -149,8 +149,6 @@ public: Guard::ArgumentNotNull(env); } - ~TrackDesignRepository() override = default; - size_t GetCount() const override { return _items.size(); diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index fde3745b79..9f8fce6597 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -7507,7 +7507,7 @@ static bool loc_6DB38B(rct_vehicle * vehicle, rct_tile_element * tileElement) sint32 trackType = track_element_get_type(tileElement); sint32 vangleStart = TrackDefinitions[trackType].vangle_start; - return !(vangleStart != _vehicleVAngleEndF64E36 || bankStart != _vehicleBankEndF64E37); + return vangleStart == _vehicleVAngleEndF64E36 && bankStart == _vehicleBankEndF64E37; } static void loc_6DB481(rct_vehicle * vehicle)