mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #12238 from frutiemax/Fix12223

Browse Source 
Close #12223: Assert that Formatter::Add() only receives desired types
This commit is contained in:
Michael Steenbeek
2020-07-14 00:05:37 +02:00
committed by GitHub
parent 821dc60a7d 5f4e1ba344
commit 1034aadb72
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/TitleEditor.cpp
View File

@@ -996,7 +996,7 @@ static void window_title_editor_scrollpaint_commands(rct_window* w, rct_drawpixe
}
else
{
ft.Add<uint8_t*>(command->SpriteName);
ft.Add<utf8*>(command->SpriteName);
}
break;
case TITLE_SCRIPT_WAIT:

16
src/openrct2/localisation/Localisation.h
View File

@@ -131,6 +131,22 @@ public:
{
static_assert(sizeof(TSpecified) <= sizeof(uintptr_t), "Type too large");
static_assert(sizeof(TDeduced) <= sizeof(uintptr_t), "Type too large");
// clang-format off
static_assert(
std::is_same_v<TSpecified, char*> ||
std::is_same_v<TSpecified, const char*> ||
std::is_same_v<TSpecified, int16_t> ||
std::is_same_v<TSpecified, int32_t> ||
std::is_same_v<TSpecified, money32> ||
std::is_same_v<TSpecified, rct_string_id> ||
std::is_same_v<TSpecified, uint16_t> ||
std::is_same_v<TSpecified, uint32_t> ||
std::is_same_v<TSpecified, utf8*> ||
std::is_same_v<TSpecified, const utf8*>
);
// clang-format on
uintptr_t convertedValue;
if constexpr (std::is_integral_v<TSpecified>)
{