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

Fix #4113: Free rides: Income and profit calculated using old price

Browse Source
This commit is contained in:
Ted John
2016-08-21 13:49:29 +01:00
parent 3f1a95cbee
commit 9b77bb35ae
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ride/ride.c
View File

@@ -383,26 +383,22 @@ money16 get_shop_hot_value(int shopItem)
*/
static money32 ride_calculate_income_per_hour(rct_ride *ride)
{
rct_ride_entry *entry;
money32 customersPerHour, priceMinusCost;
int currentShopItem;
// Get entry by ride to provide better reporting
entry = get_ride_entry_by_ride(ride);
rct_ride_entry *entry = get_ride_entry_by_ride(ride);
if (entry == NULL) {
return 0;
}
customersPerHour = ride_customers_per_hour(ride);
priceMinusCost = ride->price;
money32 customersPerHour = ride_customers_per_hour(ride);
money32 priceMinusCost = ride_get_price(ride);
currentShopItem = entry->shop_item;
int currentShopItem = entry->shop_item;
if (currentShopItem != SHOP_ITEM_NONE) {
priceMinusCost -= get_shop_item_cost(currentShopItem);
}
currentShopItem = ride->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO ?
RidePhotoItems[ride->type] :
entry->shop_item_secondary;
RidePhotoItems[ride->type] :
entry->shop_item_secondary;
if (currentShopItem != SHOP_ITEM_NONE) {
priceMinusCost += ride->price_secondary;