mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Use new identifier for default objects

Browse Source
This commit is contained in:
Michael Steenbeek
2020-11-07 20:28:01 +01:00
committed by GitHub
parent 58f099a644
commit d8a7219c86
5 changed files with 90 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2-ui/windows/EditorObjectSelection.cpp
View File

@@ -683,7 +683,7 @@ static void window_editor_object_selection_scroll_mousedown(
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)
{
if (!window_editor_object_selection_select_object(0, 1, listItem->entry))
if (!window_editor_object_selection_select_object(0, INPUT_FLAG_EDITOR_OBJECT_SELECT, listItem->entry))
return;
// Close any other open windows such as options/colour schemes to prevent a crash.
@@ -695,15 +695,16 @@ static void window_editor_object_selection_scroll_mousedown(
return;
}
int32_t ebx = 6;
int32_t flags = INPUT_FLAG_EDITOR_OBJECT_1 | INPUT_FLAG_EDITOR_OBJECT_SELECT_OBJECTS_IN_SCENERY_GROUP;
// If already selected
if (!(object_selection_flags & OBJECT_SELECTION_FLAG_SELECTED))
ebx = 7;
flags |= INPUT_FLAG_EDITOR_OBJECT_SELECT;
_maxObjectsWasHit = false;
if (!window_editor_object_selection_select_object(0, ebx, listItem->entry))
if (!window_editor_object_selection_select_object(0, flags, listItem->entry))
{
rct_string_id error_title = (ebx & 1) ? STR_UNABLE_TO_SELECT_THIS_OBJECT : STR_UNABLE_TO_DE_SELECT_THIS_OBJECT;
rct_string_id error_title = (flags & INPUT_FLAG_EDITOR_OBJECT_SELECT) ? STR_UNABLE_TO_SELECT_THIS_OBJECT
: STR_UNABLE_TO_DE_SELECT_THIS_OBJECT;
context_show_error(error_title, gGameCommandErrorText, {});
return;