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

More occurrences of shop_item

Browse Source
This commit is contained in:
Gymnasiast
2016-05-02 22:32:33 +02:00
parent b37d4804ce
commit 6c7f685b08
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ride/ride.c
View File

@@ -355,7 +355,7 @@ money32 ride_calculate_income_per_hour(rct_ride *ride)
priceMinusCost = ride->price;
currentShopItem = entry->shop_item;
if (currentShopItem != 255) {
if (currentShopItem != SHOP_ITEM_NONE) {
priceMinusCost -= get_shop_item_cost(currentShopItem);
}
@@ -363,11 +363,11 @@ money32 ride_calculate_income_per_hour(rct_ride *ride)
RCT2_GLOBAL(0x0097D7CB + (ride->type * 4), uint8) :
entry->shop_item_secondary;
if (currentShopItem != 255) {
if (currentShopItem != SHOP_ITEM_NONE) {
priceMinusCost += ride->price_secondary;
priceMinusCost -= get_shop_item_cost(currentShopItem);
if (entry->shop_item != 255)
if (entry->shop_item != SHOP_ITEM_NONE)
priceMinusCost /= 2;
}
@@ -6001,14 +6001,14 @@ foundRideEntry:
ride->price = RideData4[ride->type].price;
ride->price_secondary = RideData4[ride->type].price_secondary;
if (rideEntry->shop_item == 255) {
if (rideEntry->shop_item == SHOP_ITEM_NONE) {
if (!(gParkFlags & PARK_FLAGS_PARK_FREE_ENTRY)) {
ride->price = 0;
}
} else {
ride->price = DefaultShopItemPrice[rideEntry->shop_item];
}
if (rideEntry->shop_item_secondary != 255) {
if (rideEntry->shop_item_secondary != SHOP_ITEM_NONE) {
ride->price_secondary = DefaultShopItemPrice[rideEntry->shop_item_secondary];
}
@@ -6025,7 +6025,7 @@ foundRideEntry:
}
}
if (rideEntry->shop_item != 255) {
if (rideEntry->shop_item != SHOP_ITEM_NONE) {
if (shop_item_has_common_price(rideEntry->shop_item)) {
money32 price = shop_item_get_common_price(ride, rideEntry->shop_item);
if (price != MONEY32_UNDEFINED) {
@@ -6034,7 +6034,7 @@ foundRideEntry:
}
}
if (rideEntry->shop_item_secondary != 255) {
if (rideEntry->shop_item_secondary != SHOP_ITEM_NONE) {
if (shop_item_has_common_price(rideEntry->shop_item_secondary)) {
money32 price = shop_item_get_common_price(ride, rideEntry->shop_item_secondary);
if (price != MONEY32_UNDEFINED) {
@@ -6542,10 +6542,10 @@ void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *es
}
if (!secondary_price) {
shop_item = 0x1F;
shop_item = SHOP_ITEM_ADMISSION;
if (ride->type != RIDE_TYPE_TOILETS) {
shop_item = rideEntry->shop_item;
if (shop_item == 0xFF) {
if (shop_item == SHOP_ITEM_NONE) {
ride->price = price;
window_invalidate_by_class(WC_RIDE);
return;
@@ -6560,7 +6560,7 @@ void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *es
}
else {
shop_item = rideEntry->shop_item_secondary;
if (shop_item == 0xFF) {
if (shop_item == SHOP_ITEM_NONE) {
shop_item = RCT2_GLOBAL(0x0097D7CB + (ride->type * 4), uint8);
if ((ride->lifecycle_flags & RIDE_LIFECYCLE_ON_RIDE_PHOTO) == 0) {
ride->price_secondary = price;
@@ -6584,7 +6584,7 @@ void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *es
rideEntry = get_ride_entry(ride->subtype);
if (ride->type != RIDE_TYPE_TOILETS || shop_item != 0x1F) {
if (ride->type != RIDE_TYPE_TOILETS || shop_item != SHOP_ITEM_ADMISSION) {
if (rideEntry->shop_item == shop_item) {
ride->price = price;
window_invalidate_by_number(WC_RIDE, rideId);
@@ -6596,8 +6596,8 @@ void game_command_set_ride_price(int *eax, int *ebx, int *ecx, int *edx, int *es
}
// If the shop item is the same or an on-ride photo
if (rideEntry->shop_item_secondary == shop_item ||
(rideEntry->shop_item_secondary == 0xFF &&
(shop_item == 0x3 || shop_item == 0x20 || shop_item == 0x21 || shop_item == 0x22))) {
(rideEntry->shop_item_secondary == SHOP_ITEM_NONE &&
(shop_item == SHOP_ITEM_PHOTO || shop_item == SHOP_ITEM_PHOTO2 || shop_item == SHOP_ITEM_PHOTO3 || shop_item == SHOP_ITEM_PHOTO4))) {
ride->price_secondary = price;
window_invalidate_by_number(WC_RIDE, rideId);