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

Make ObjectRepositoryItem C++

Browse Source
This commit is contained in:
Ted John
2018-05-14 13:05:59 +01:00
parent f8271e93b0
commit 6f00e6aafe
8 changed files with 67 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/EditorObjectSelectionSession.cpp
View File

@@ -61,7 +61,7 @@ static void setup_track_manager_objects()
{
*selectionFlags |= OBJECT_SELECTION_FLAG_6;
for (auto rideType : item->RideType)
for (auto rideType : item->RideInfo.RideType)
{
if (rideType != RIDE_TYPE_NULL && ride_type_has_flag(rideType, RIDE_TYPE_FLAG_HAS_TRACK))
{
@@ -90,7 +90,7 @@ static void setup_track_designer_objects()
{
*selectionFlags |= OBJECT_SELECTION_FLAG_6;
for (uint8 rideType : item->RideType)
for (uint8 rideType : item->RideInfo.RideType)
{
if (rideType != RIDE_TYPE_NULL)
{
@@ -420,8 +420,9 @@ sint32 window_editor_object_selection_select_object(uint8 bh, sint32 flags, cons
uint8 objectType = object_entry_get_type(&item->ObjectEntry);
if (objectType == OBJECT_TYPE_SCENERY_GROUP && (flags & (1 << 2))) {
for (sint32 j = 0; j < item->NumThemeObjects; j++) {
window_editor_object_selection_select_object(++bh, flags, &item->ThemeObjects[j]);
for (const auto& sgEntry : item->SceneryGroupInfo.Entries)
{
window_editor_object_selection_select_object(++bh, flags, &sgEntry);
}
}
@@ -450,8 +451,10 @@ sint32 window_editor_object_selection_select_object(uint8 bh, sint32 flags, cons
}
if (objectType == OBJECT_TYPE_SCENERY_GROUP && (flags & (1 << 2))) {
for (uint16 j = 0; j < item->NumThemeObjects; j++) {
if (!window_editor_object_selection_select_object(++bh, flags, &item->ThemeObjects[j])) {
for (const auto& sgEntry : item->SceneryGroupInfo.Entries)
{
if (!window_editor_object_selection_select_object(++bh, flags, &sgEntry))
{
_maxObjectsWasHit = true;
}
}