mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Merge pull request #7519 from IntelOrca/refactor/new-object-types-prep

Browse Source 
Refactor code around object types
This commit is contained in:
Aaron van Geffen
2018-05-15 15:10:16 +02:00
committed by GitHub
parent 19442eb6c2 58241d33fc
commit 829ac11bec
14 changed files with 259 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/ride/TrackDesignRepository.cpp
View File

@@ -203,7 +203,7 @@ public:
}
const ObjectRepositoryItem * ori = repo->FindObject(item.ObjectEntry.c_str());
uint8 rideGroupIndex = (ori != nullptr) ? ori->RideGroupIndex : 0;
uint8 rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
const RideGroup * itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex);
if (itemRideGroup != nullptr && itemRideGroup->Equals(rideGroup))
@@ -268,7 +268,7 @@ public:
}
const ObjectRepositoryItem * ori = repo->FindObject(item.ObjectEntry.c_str());
uint8 rideGroupIndex = (ori != nullptr) ? ori->RideGroupIndex : 0;
uint8 rideGroupIndex = (ori != nullptr) ? ori->RideInfo.RideGroupIndex : 0;
const RideGroup * itemRideGroup = RideGroupManager::RideGroupFind(rideType, rideGroupIndex);
if (itemRideGroup != nullptr && itemRideGroup->Equals(rideGroup))