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

Remove rest of FOR_ALL_RIDES instances

Browse Source
This commit is contained in:
Ted John
2019-08-04 16:00:15 +01:00
parent e23638548a
commit a863c7ae50
18 changed files with 328 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/ride/ShopItem.cpp
View File

@@ -78,30 +78,26 @@ const ShopItemDescriptor ShopItems[SHOP_ITEM_COUNT] = {
money32 shop_item_get_common_price(Ride* forRide, int32_t shopItem)
{
rct_ride_entry* rideEntry;
Ride* ride;
int32_t i;
FOR_ALL_RIDES (i, ride)
for (const auto& ride : GetRideManager())
{
if (ride != forRide)
if (&ride != forRide)
{
rideEntry = get_ride_entry(ride->subtype);
auto rideEntry = ride.GetRideEntry();
if (rideEntry == nullptr)
{
continue;
}
if (rideEntry->shop_item == shopItem)
{
return ride->price;
return ride.price;
}
if (rideEntry->shop_item_secondary == shopItem)
{
return ride->price_secondary;
return ride.price_secondary;
}
if (shop_item_is_photo(shopItem) && (ride->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO))
if (shop_item_is_photo(shopItem) && (ride.lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO))
{
return ride->price_secondary;
return ride.price_secondary;
}
}
}