diff --git a/src/openrct2-ui/windows/TileInspector.cpp b/src/openrct2-ui/windows/TileInspector.cpp index d55639020a..e244a6f14f 100644 --- a/src/openrct2-ui/windows/TileInspector.cpp +++ b/src/openrct2-ui/windows/TileInspector.cpp @@ -1754,8 +1754,8 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) ScreenCoordsXY screenCoords(w->windowPos.x, w->windowPos.y); // Draw coordinates - gfx_draw_string(dpi, (char*)"X:", COLOUR_WHITE, screenCoords + ScreenCoordsXY(5, 24)); - gfx_draw_string(dpi, (char*)"Y:", COLOUR_WHITE, screenCoords + ScreenCoordsXY(74, 24)); + gfx_draw_string(dpi, "X:", COLOUR_WHITE, screenCoords + ScreenCoordsXY(5, 24)); + gfx_draw_string(dpi, "Y:", COLOUR_WHITE, screenCoords + ScreenCoordsXY(74, 24)); if (windowTileInspectorTileSelected) { auto tileCoords = TileCoordsXY{ windowTileInspectorToolMap }; @@ -1764,8 +1764,8 @@ static void window_tile_inspector_paint(rct_window* w, rct_drawpixelinfo* dpi) } else { - gfx_draw_string(dpi, (char*)"-", COLOUR_WHITE, screenCoords + ScreenCoordsXY(43 - 7, 24)); - gfx_draw_string(dpi, (char*)"-", COLOUR_WHITE, screenCoords + ScreenCoordsXY(113, 24)); + gfx_draw_string(dpi, "-", COLOUR_WHITE, screenCoords + ScreenCoordsXY(43 - 7, 24)); + gfx_draw_string(dpi, "-", COLOUR_WHITE, screenCoords + ScreenCoordsXY(113, 24)); } if (windowTileInspectorSelectedIndex != -1) diff --git a/src/openrct2/core/Memory.hpp b/src/openrct2/core/Memory.hpp index 5c5955a080..a387acfbf6 100644 --- a/src/openrct2/core/Memory.hpp +++ b/src/openrct2/core/Memory.hpp @@ -75,7 +75,7 @@ namespace Memory template static void Free(T* ptr) { - free((void*)ptr); + free(const_cast(reinterpret_cast(ptr))); } template static void FreeArray(T* ptr, size_t count) diff --git a/src/openrct2/drawing/TTFSDLPort.cpp b/src/openrct2/drawing/TTFSDLPort.cpp index 9b058d93b4..9b4b02b7a0 100644 --- a/src/openrct2/drawing/TTFSDLPort.cpp +++ b/src/openrct2/drawing/TTFSDLPort.cpp @@ -1,6 +1,10 @@ // Adapted from freetype.h in order to avoid C-style casts. #define FT_LOAD_TARGET_ALT(x) (static_cast((x)&15) << 16) +#define FT_IMAGE_TAG(value, _x1, _x2, _x3, _x4) \ + value \ + = ((static_cast(_x1) << 24) | (static_cast(_x2) << 16) \ + | (static_cast(_x3) << 8) | static_cast(_x4)) /** * The following code is from SDL2_ttf (2 Jan 2017). diff --git a/src/openrct2/scripting/ScriptEngine.cpp b/src/openrct2/scripting/ScriptEngine.cpp index 8e9180e389..89c0195c33 100644 --- a/src/openrct2/scripting/ScriptEngine.cpp +++ b/src/openrct2/scripting/ScriptEngine.cpp @@ -369,7 +369,7 @@ ScriptEngine::ScriptEngine(InteractiveConsole& console, IPlatformEnvironment& en void ScriptEngine::Initialise() { - auto ctx = (duk_context*)_context; + auto ctx = static_cast(_context); ScCheats::Register(ctx); ScConfiguration::Register(ctx); ScConsole::Register(ctx); diff --git a/test/tests/ImageImporterTests.cpp b/test/tests/ImageImporterTests.cpp index ce7b9f5485..5c91fa7650 100644 --- a/test/tests/ImageImporterTests.cpp +++ b/test/tests/ImageImporterTests.cpp @@ -29,7 +29,7 @@ public: uint32_t hash = 27; for (size_t i = 0; i < bufferLength; i++) { - hash = (13 * hash) + ((uint8_t*)buffer)[i]; + hash = (13 * hash) + (reinterpret_cast(buffer))[i]; } return hash; } diff --git a/test/tests/IniWriterTest.cpp b/test/tests/IniWriterTest.cpp index acdc46c2af..87e5b1a08b 100644 --- a/test/tests/IniWriterTest.cpp +++ b/test/tests/IniWriterTest.cpp @@ -46,7 +46,7 @@ TEST_F(IniWriterTest, create_one_section) ASSERT_LE(ms.GetPosition(), 13); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); ASSERT_STREQ(ini, "[OpenRCT2]" PLATFORM_NEWLINE); Memory::Free(ini); delete iw; @@ -67,7 +67,7 @@ TEST_F(IniWriterTest, create_multiple_sections) ASSERT_LE(ms.GetPosition(), 55); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); ASSERT_STREQ( ini, "[OpenRCT1]" PLATFORM_NEWLINE PLATFORM_NEWLINE "[OpenRCT2]" PLATFORM_NEWLINE PLATFORM_NEWLINE @@ -88,7 +88,7 @@ TEST_F(IniWriterTest, create_loose_bool_entry) ASSERT_LE(ms.GetPosition(), 17); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); ASSERT_STREQ(ini, "boolval = true" PLATFORM_NEWLINE); Memory::Free(ini); delete iw; @@ -107,7 +107,7 @@ TEST_F(IniWriterTest, create_loose_enum_entry) ASSERT_LE(ms.GetPosition(), 37); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); ASSERT_STREQ(ini, "by_string = stringval" PLATFORM_NEWLINE "int32_t = 0" PLATFORM_NEWLINE); Memory::Free(ini); delete iw; @@ -125,7 +125,7 @@ TEST_F(IniWriterTest, create_loose_float_entry) ASSERT_LE(ms.GetPosition(), 17); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); // This will be non-fatal due to float. EXPECT_STREQ(ini, "one = 1.000000" PLATFORM_NEWLINE); Memory::Free(ini); @@ -148,7 +148,7 @@ TEST_F(IniWriterTest, create_loose_int32_t_entry) ASSERT_LE(ms.GetPosition(), 78); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); ASSERT_STREQ( ini, "one = 1" PLATFORM_NEWLINE "zero = 0" PLATFORM_NEWLINE "minusone = -1" PLATFORM_NEWLINE @@ -169,7 +169,7 @@ TEST_F(IniWriterTest, create_loose_string_entry) ASSERT_LE(ms.GetPosition(), 44); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); ASSERT_STREQ(ini, "path = \"C:'\\\\some/dir\\\\here/\xE7\xA5\x9E\xE9\xB7\xB9\xE6\x9A\xA2\xE9\x81\x8A\"" PLATFORM_NEWLINE); Memory::Free(ini); delete iw; @@ -193,7 +193,7 @@ TEST_F(IniWriterTest, create_multiple_section_with_values) ASSERT_LE(ms.GetPosition(), 108); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); ASSERT_STREQ( ini, "[bool]" PLATFORM_NEWLINE "boolval = true" PLATFORM_NEWLINE PLATFORM_NEWLINE "[int]" PLATFORM_NEWLINE @@ -217,7 +217,7 @@ TEST_F(IniWriterTest, create_duplicate_sections) ASSERT_LE(ms.GetPosition(), 43); // Accommodate for varying-sized newline (Windows) ASSERT_EQ(ms.GetLength(), ms.GetPosition()); ms.SetPosition(0); - const char* ini = (const char*)ms.ReadString(); + const char* ini = reinterpret_cast(ms.ReadString()); ASSERT_STREQ( ini, "[section]" PLATFORM_NEWLINE PLATFORM_NEWLINE "[section]" PLATFORM_NEWLINE PLATFORM_NEWLINE diff --git a/test/tests/RideRatings.cpp b/test/tests/RideRatings.cpp index a43f4e7bad..bdfdc9c869 100644 --- a/test/tests/RideRatings.cpp +++ b/test/tests/RideRatings.cpp @@ -48,8 +48,8 @@ protected: { RatingTuple ratings = ride.ratings; std::string line = String::StdFormat( - "%s: (%d, %d, %d)", RideTypeDescriptors[ride.type].EnumName, (int)ratings.Excitement, (int)ratings.Intensity, - (int)ratings.Nausea); + "%s: (%d, %d, %d)", RideTypeDescriptors[ride.type].EnumName, static_cast(ratings.Excitement), + static_cast(ratings.Intensity), static_cast(ratings.Nausea)); return line; } }; diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp index 4fae5db26e..90e94fed81 100644 --- a/test/tests/S6ImportExportTests.cpp +++ b/test/tests/S6ImportExportTests.cpp @@ -455,7 +455,8 @@ static void CompareStates( { log_warning( "Inconsistent export size! Import Size: %llu bytes, Export Size: %llu bytes", - (unsigned long long)importBuffer.GetLength(), (unsigned long long)exportBuffer.GetLength()); + static_cast(importBuffer.GetLength()), + static_cast(exportBuffer.GetLength())); } for (size_t spriteIdx = 0; spriteIdx < MAX_SPRITES; ++spriteIdx)