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

Merge pull request #733 from duncanspumpkin/fix_731

Browse Source 
Small Ride Window Fixes
This commit is contained in:
Ted John
2015-01-31 13:26:02 +00:00
parent 3d9235d2bd 25914fd8e2
commit 7a99ea784a
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ride/ride.c
View File

@@ -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;

8
src/windows/ride.c
View File

@@ -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);
}
@@ -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;