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

Remove type from SpriteBase (#13735)

Browse Source 
* Move type field into sub structures

* Use type for misc_type

* Use type for l_type

* Rename to SubType

* Rename SpriteGeneric to MiscEntity

* Rename generic to misc

* Add extra nullptr checks for compilers that cant understand

* Make review changes

* Increment network version

* Update replays
This commit is contained in:
Duncan
2021-01-10 15:14:34 +00:00
committed by GitHub
parent d55bff7587
commit d5ada2dca1
33 changed files with 203 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2-ui/windows/TitleCommandEditor.cpp
View File

@@ -657,10 +657,10 @@ static void window_title_command_editor_tool_down(
}
else if (litter != nullptr)
{
if (litter->type < std::size(litterNames))
if (litter->SubType < std::size(litterNames))
{
validSprite = true;
format_string(_command.SpriteName, USER_STRING_MAX_LENGTH, litterNames[litter->type], nullptr);
format_string(_command.SpriteName, USER_STRING_MAX_LENGTH, litterNames[litter->SubType], nullptr);
}
}
else if (balloon != nullptr)