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

Close #6024: Closing object selection now advances to next step

Browse Source 
In the scenario editor and track designer X button in object selector
will now close the object selector window and advance to the next stage
instead of closing the scenario editor and track editor entirely and
returning to the main menu.

Co-authored-by: Gymnasiast <m.o.steenbeek@gmail.com>
This commit is contained in:
WantDiscussion
2020-04-25 01:19:06 +10:00
committed by GitHub
parent 295a98028e
commit 37e9270c00
5 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -20,6 +20,7 @@
#include "object/ObjectManager.h"
#include "object/ObjectRepository.h"
#include "ride/RideData.h"
#include "scenario/Scenario.h"
#include "windows/Intent.h"
#include "world/Footpath.h"
#include "world/LargeScenery.h"
@@ -375,6 +376,24 @@ void reset_selected_object_count_and_size()
}
}
void finish_object_selection()
{
if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER)
{
set_every_ride_type_invented();
set_every_ride_entry_invented();
gS6Info.editor_step = EDITOR_STEP_ROLLERCOASTER_DESIGNER;
gfx_invalidate_screen();
}
else
{
set_all_scenery_items_invented();
scenery_set_default_placement_configuration();
gS6Info.editor_step = EDITOR_STEP_LANDSCAPE_EDITOR;
gfx_invalidate_screen();
}
}
/**
* Master objects are objects that are not
* optional / required dependants of an