diff --git a/src/openrct2-ui/windows/LoadSave.cpp b/src/openrct2-ui/windows/LoadSave.cpp index c0b0a5bc7c..8e98422ef5 100644 --- a/src/openrct2-ui/windows/LoadSave.cpp +++ b/src/openrct2-ui/windows/LoadSave.cpp @@ -717,7 +717,7 @@ static void window_loadsave_paint(rct_window* w, rct_drawpixelinfo* dpi) // Draw path text auto ft = Formatter::Common(); - ft.Add(Platform::StrDecompToPrecomp(buffer)); + ft.Add(Platform::StrDecompToPrecomp(buffer)); gfx_draw_string_left_clipped( dpi, STR_STRING, gCommonFormatArgs, COLOUR_BLACK, { w->windowPos.x + 4, w->windowPos.y + 20 }, w->width - 8); diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index 9c40675c00..af100a5bf4 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -1835,7 +1835,7 @@ static void window_options_invalidate(rct_window* w) size_t activeAvailableThemeIndex = theme_manager_get_active_available_theme_index(); const utf8* activeThemeName = theme_manager_get_available_theme_name(activeAvailableThemeIndex); auto ft = Formatter::Common(); - ft.Add(reinterpret_cast(activeThemeName)); + ft.Add(activeThemeName); break; } @@ -1844,7 +1844,7 @@ static void window_options_invalidate(rct_window* w) { const utf8* name = title_sequence_manager_get_name(title_get_config_sequence()); auto ft = Formatter::Common(); - ft.Add(reinterpret_cast(name)); + ft.Add(name); // The real name setting of clients is fixed to that of the server // and the server cannot change the setting during gameplay to prevent desyncs @@ -2078,7 +2078,7 @@ static void window_options_paint(rct_window* w, rct_drawpixelinfo* dpi) + ScreenCoordsXY{ w->widgets[WIDX_AUTOSAVE_AMOUNT].left + 1, w->widgets[WIDX_AUTOSAVE_AMOUNT].top + 1 }); auto ft = Formatter::Common(); - ft.Add(Platform::StrDecompToPrecomp(gConfigGeneral.rct1_path)); + ft.Add(Platform::StrDecompToPrecomp(gConfigGeneral.rct1_path)); rct_widget pathWidget = window_options_advanced_widgets[WIDX_PATH_TO_RCT1_BUTTON]; @@ -2128,7 +2128,7 @@ static void window_options_tooltip(rct_window* w, rct_widgetindex widgetIndex, r else { auto ft = Formatter::Common(); - ft.Add(reinterpret_cast(gConfigGeneral.rct1_path)); + ft.Add(gConfigGeneral.rct1_path); } } } diff --git a/src/openrct2-ui/windows/TitleCommandEditor.cpp b/src/openrct2-ui/windows/TitleCommandEditor.cpp index bf249b4ca7..b6d09c9457 100644 --- a/src/openrct2-ui/windows/TitleCommandEditor.cpp +++ b/src/openrct2-ui/windows/TitleCommandEditor.cpp @@ -774,7 +774,7 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo* if (command.SpriteIndex != SPRITE_INDEX_NULL) { window_draw_viewport(dpi, w); - Formatter::Common().Add(reinterpret_cast(command.SpriteName)); + Formatter::Common().Add(command.SpriteName); } else { @@ -801,7 +801,7 @@ static void window_title_command_editor_paint(rct_window* w, rct_drawpixelinfo* } else { - Formatter::Common().Add(reinterpret_cast(_sequence->Saves[command.SaveIndex])); + Formatter::Common().Add(_sequence->Saves[command.SaveIndex]); gfx_draw_string_left_clipped( dpi, STR_STRING, gCommonFormatArgs, w->colours[1], { w->windowPos.x + w->widgets[WIDX_INPUT].left + 1, w->windowPos.y + w->widgets[WIDX_INPUT].top }, diff --git a/src/openrct2-ui/windows/TitleEditor.cpp b/src/openrct2-ui/windows/TitleEditor.cpp index 80034060fe..83eea6538b 100644 --- a/src/openrct2-ui/windows/TitleEditor.cpp +++ b/src/openrct2-ui/windows/TitleEditor.cpp @@ -996,7 +996,7 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe } else { - ft.Add(reinterpret_cast(command->SpriteName)); + ft.Add(command->SpriteName); } break; case TITLE_SCRIPT_WAIT: diff --git a/src/openrct2/platform/Platform.Android.cpp b/src/openrct2/platform/Platform.Android.cpp index 7dfac9b621..c0dedd9039 100644 --- a/src/openrct2/platform/Platform.Android.cpp +++ b/src/openrct2/platform/Platform.Android.cpp @@ -45,9 +45,9 @@ namespace Platform return std::string(); } - uintptr_t StrDecompToPrecomp(utf8* input) + utf8* StrDecompToPrecomp(utf8* input) { - return reinterpret_cast(input); + return input; } bool HandleSpecialCommandLineArgument(const char* argument) diff --git a/src/openrct2/platform/Platform.Linux.cpp b/src/openrct2/platform/Platform.Linux.cpp index 2ca7fa1afd..623496300a 100644 --- a/src/openrct2/platform/Platform.Linux.cpp +++ b/src/openrct2/platform/Platform.Linux.cpp @@ -150,9 +150,9 @@ namespace Platform return exePath; } - uintptr_t StrDecompToPrecomp(utf8* input) + utf8* StrDecompToPrecomp(utf8* input) { - return reinterpret_cast(input); + return input; } bool HandleSpecialCommandLineArgument(const char* argument) diff --git a/src/openrct2/platform/Platform.Win32.cpp b/src/openrct2/platform/Platform.Win32.cpp index e847ea9ce2..3acae295c4 100644 --- a/src/openrct2/platform/Platform.Win32.cpp +++ b/src/openrct2/platform/Platform.Win32.cpp @@ -346,9 +346,9 @@ namespace Platform return String::ToUtf8(wExePath.get()); } - uintptr_t StrDecompToPrecomp(utf8* input) + utf8* StrDecompToPrecomp(utf8* input) { - return reinterpret_cast(input); + return input; } void SetUpFileAssociations() diff --git a/src/openrct2/platform/Platform.macOS.mm b/src/openrct2/platform/Platform.macOS.mm index 1f3d2fbbd4..9f303ef172 100644 --- a/src/openrct2/platform/Platform.macOS.mm +++ b/src/openrct2/platform/Platform.macOS.mm @@ -104,7 +104,7 @@ namespace Platform } } - uintptr_t StrDecompToPrecomp(utf8* input) + utf8* StrDecompToPrecomp(utf8* input) { @autoreleasepool { @@ -114,8 +114,7 @@ namespace Platform } NSString* inputDecomp = [NSString stringWithUTF8String:input]; - return reinterpret_cast( - strdup([inputDecomp.precomposedStringWithCanonicalMapping cStringUsingEncoding:NSUTF8StringEncoding])); + return strdup([inputDecomp.precomposedStringWithCanonicalMapping cStringUsingEncoding:NSUTF8StringEncoding]); } } diff --git a/src/openrct2/platform/Platform2.h b/src/openrct2/platform/Platform2.h index fb5f565f5e..2c7f94693d 100644 --- a/src/openrct2/platform/Platform2.h +++ b/src/openrct2/platform/Platform2.h @@ -56,5 +56,5 @@ namespace Platform bool IsRunningInWine(); bool IsColourTerminalSupported(); bool HandleSpecialCommandLineArgument(const char* argument); - uintptr_t StrDecompToPrecomp(utf8* input); + utf8* StrDecompToPrecomp(utf8* input); } // namespace Platform