diff --git a/src/openrct2/CmdlineSprite.cpp b/src/openrct2/CmdlineSprite.cpp index b80c63b5fb..140015265f 100644 --- a/src/openrct2/CmdlineSprite.cpp +++ b/src/openrct2/CmdlineSprite.cpp @@ -608,7 +608,7 @@ int32_t cmdline_for_sprite(const char** argv, int32_t argc) } json_t* path = json_object_get(sprite_description, "path"); - if (!path || !json_is_string(path)) + if (!json_is_string(path)) { fprintf(stderr, "Error: no path provided for sprite %lu\n", (unsigned long)i); json_decref(sprite_list); diff --git a/src/openrct2/actions/WallPlaceAction.hpp b/src/openrct2/actions/WallPlaceAction.hpp index 55a9d2a14a..0141a0bbd2 100644 --- a/src/openrct2/actions/WallPlaceAction.hpp +++ b/src/openrct2/actions/WallPlaceAction.hpp @@ -55,9 +55,9 @@ private: int32_t _wallType{ -1 }; CoordsXYZ _loc; Direction _edge{ INVALID_DIRECTION }; - int32_t _primaryColour{ 0 }; - int32_t _secondaryColour{ 0 }; - int32_t _tertiaryColour{ 0 }; + int32_t _primaryColour{ COLOUR_BLACK }; + int32_t _secondaryColour{ COLOUR_BLACK }; + int32_t _tertiaryColour{ COLOUR_BLACK }; BannerIndex _bannerId{ BANNER_INDEX_NULL }; public: diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 920f71242e..51ec38afeb 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -1356,7 +1356,7 @@ void Network::BeginServerLog() else { logMessage[0] = '\0'; - assert(0 && "Uninitialized mode"); + Guard::Assert(false, "Unknown network mode!"); } AppendServerLog(logMessage); } @@ -1384,7 +1384,7 @@ void Network::CloseServerLog() else { logMessage[0] = '\0'; - assert(0 && "Uninitialized mode"); + Guard::Assert(false, "Unknown network mode!"); } AppendServerLog(logMessage); _server_log_fs.close();