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

Create ShopItemDescriptor

Browse Source
This commit is contained in:
Michael Steenbeek
2019-04-26 20:25:11 +02:00
committed by GitHub
parent 0183fc76db
commit c8df801e66
11 changed files with 105 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,7 +450,7 @@ money32 Ride::CalculateIncomePerHour() const
int32_t currentShopItem = entry->shop_item;
if (currentShopItem != SHOP_ITEM_NONE)
{
priceMinusCost -= get_shop_item_cost(currentShopItem);
priceMinusCost -= ShopItems[currentShopItem].Cost;
}
currentShopItem = (lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO) ? RidePhotoItems[type] : entry->shop_item_secondary;
@@ -458,7 +458,7 @@ money32 Ride::CalculateIncomePerHour() const
if (currentShopItem != SHOP_ITEM_NONE)
{
priceMinusCost += price_secondary;
priceMinusCost -= get_shop_item_cost(currentShopItem);
priceMinusCost -= ShopItems[currentShopItem].Cost;
if (entry->shop_item != SHOP_ITEM_NONE)
priceMinusCost /= 2;