From f6a0fcc255dc4945cd032050c5ef7afca981b785 Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Sat, 31 Jan 2015 11:46:56 +0000 Subject: [PATCH 1/3] Fix secondary price loss per item --- src/windows/ride.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/windows/ride.c b/src/windows/ride.c index c5fd0f9447..0bcf193f41 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -5540,9 +5540,9 @@ static void window_ride_income_paint() profit = ride->price_secondary; stringId = STR_PROFIT_PER_ITEM_SOLD; - profit -= primaryItem < 32 ? - RCT2_GLOBAL(0x00982164 + (primaryItem * 8), uint16) : - RCT2_GLOBAL(0x00982144 + (primaryItem * 8), uint16); + profit -= secondaryItem < 32 ? + RCT2_GLOBAL(0x00982164 + (secondaryItem * 8), uint16) : + RCT2_GLOBAL(0x00982144 + (secondaryItem * 8), uint16); if (profit < 0) { profit *= -1; stringId = STR_LOSS_PER_ITEM_SOLD; From 9367ec8d05c08c584c7b1143b249266a766169fd Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Sat, 31 Jan 2015 12:24:11 +0000 Subject: [PATCH 2/3] Fix price throughout park not always working --- src/windows/ride.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/windows/ride.c b/src/windows/ride.c index 0bcf193f41..da1e980a28 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -5466,7 +5466,7 @@ static void window_ride_income_invalidate() w->pressed_widgets |= (1 << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK); } else { secondaryItem -= 32; - if (RCT2_GLOBAL(0x0135884C, uint32) & (1 << secondaryItem)) + if (RCT2_GLOBAL(0x0135934C, uint32) & (1 << secondaryItem)) w->pressed_widgets |= (1 << WIDX_SECONDARY_PRICE_SAME_THROUGHOUT_PARK); } From 25914fd8e2ee2cab70f3ab55fa2f9d501fa7f983 Mon Sep 17 00:00:00 2001 From: Duncan Frost Date: Sat, 31 Jan 2015 12:50:05 +0000 Subject: [PATCH 3/3] Fix #732. Sprites were moved to invalid coordinates when closing rides with no exits. --- src/ride/ride.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ride/ride.c b/src/ride/ride.c index d055aceff9..aa1c246b39 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -685,7 +685,7 @@ static void ride_remove_peeps(int rideIndex) if (peep->next_var_29 & 4) z += 8; z++; - sprite_move(exitX, exitY, exitZ, (rct_sprite*)peep); + sprite_move(x, y, z, (rct_sprite*)peep); } else { sprite_move(exitX, exitY, exitZ, (rct_sprite*)peep); peep->sprite_direction = exitDirection;