diff --git a/src/openrct2-ui/interface/Dropdown.h b/src/openrct2-ui/interface/Dropdown.h index c37e396368..1b085c1805 100644 --- a/src/openrct2-ui/interface/Dropdown.h +++ b/src/openrct2-ui/interface/Dropdown.h @@ -156,6 +156,7 @@ namespace OpenRCT2::Dropdown } Item MenuLabel(const utf8* string); + Item PlainMenuLabel(const utf8* string); /** * Like MenuLabel, but shows a tick when selected. diff --git a/src/openrct2-ui/windows/Dropdown.cpp b/src/openrct2-ui/windows/Dropdown.cpp index be6fd1eca2..ef14c24cb4 100644 --- a/src/openrct2-ui/windows/Dropdown.cpp +++ b/src/openrct2-ui/windows/Dropdown.cpp @@ -629,4 +629,9 @@ namespace OpenRCT2::Dropdown { return Item{ STR_OPTIONS_DROPDOWN_ITEM, reinterpret_cast(string) }; } + + Item PlainMenuLabel(const utf8* string) + { + return Item{ STR_STRING, reinterpret_cast(string) }; + } } // namespace OpenRCT2::Dropdown diff --git a/src/openrct2-ui/windows/TitleMenu.cpp b/src/openrct2-ui/windows/TitleMenu.cpp index e17792a176..8bf9f040c7 100644 --- a/src/openrct2-ui/windows/TitleMenu.cpp +++ b/src/openrct2-ui/windows/TitleMenu.cpp @@ -190,16 +190,13 @@ namespace OpenRCT2::Ui::Windows { if (item.Kind == OpenRCT2::Scripting::CustomToolbarMenuItemKind::Toolbox) { - // Add seperator if (!hasCustomItems) { hasCustomItems = true; gDropdown.items[i++] = Dropdown::Separator(); } - gDropdown.items[i].format = STR_STRING; - auto sz = item.Text.c_str(); - std::memcpy(&gDropdown.items[i].args.generic, &sz, sizeof(const char*)); + gDropdown.items[i] = Dropdown::PlainMenuLabel(item.Text.c_str()); i++; } } diff --git a/src/openrct2-ui/windows/TopToolbar.cpp b/src/openrct2-ui/windows/TopToolbar.cpp index 1c8c152b7c..44881b4831 100644 --- a/src/openrct2-ui/windows/TopToolbar.cpp +++ b/src/openrct2-ui/windows/TopToolbar.cpp @@ -1180,9 +1180,7 @@ namespace OpenRCT2::Ui::Windows { if (item.Kind == OpenRCT2::Scripting::CustomToolbarMenuItemKind::Standard) { - gDropdown.items[i].format = STR_STRING; - auto sz = item.Text.c_str(); - std::memcpy(&gDropdown.items[i].args.generic, &sz, sizeof(const char*)); + gDropdown.items[i] = Dropdown::PlainMenuLabel(item.Text.c_str()); i++; } }