From 7f9ff121b11c2bd797bc36e73831da13360b149b Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 20 Apr 2020 23:41:02 +0100 Subject: [PATCH] Fix rebase --- src/openrct2-ui/scripting/CustomWindow.cpp | 3 ++- src/openrct2-ui/windows/TopToolbar.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/openrct2-ui/scripting/CustomWindow.cpp b/src/openrct2-ui/scripting/CustomWindow.cpp index 6fd917491b..377f00ad88 100644 --- a/src/openrct2-ui/scripting/CustomWindow.cpp +++ b/src/openrct2-ui/scripting/CustomWindow.cpp @@ -414,7 +414,8 @@ namespace OpenRCT2::Ui::Windows { gDropdownItemsFormat[i] = selectedIndex == (int32_t)i ? STR_OPTIONS_DROPDOWN_ITEM_SELECTED : STR_OPTIONS_DROPDOWN_ITEM; - set_format_arg_on((uint8_t*)&gDropdownItemsArgs[i], 0, const char*, items[i].c_str()); + auto sz = items[i].c_str(); + std::memcpy(&gDropdownItemsArgs[i], &sz, sizeof(const char*)); } window_dropdown_show_text_custom_width( w->windowPos.x + widget->left, w->windowPos.y + widget->top, widget->bottom - widget->top + 1, diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index e67a515a7c..72b61eb4dd 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -3296,7 +3296,8 @@ static void top_toolbar_init_map_menu(rct_window* w, rct_widget* widget) for (const auto& item : customMenuItems) { gDropdownItemsFormat[i] = STR_STRING; - set_format_arg_on((uint8_t*)&gDropdownItemsArgs[i], 0, const char*, item.Text.c_str()); + auto sz = item.Text.c_str(); + std::memcpy(&gDropdownItemsArgs[i], &sz, sizeof(const char*)); i++; } }