mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up enabledPieces usage

This commit is contained in:
Gymnasiast 2017-07-18 14:06:18 +02:00 committed by Michael Steenbeek
parent 7a4e7e17a1
commit 6dddd5b76c
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/ride.h
View File

@ -130,13 +130,7 @@ typedef struct rct_ride_entry {
sint8 intensity_multipler; // 0x1B3
sint8 nausea_multipler; // 0x1B4
uint8 max_height; // 0x1B5
union {
uint64 enabledTrackPieces; // 0x1B6
struct {
uint32 enabledTrackPiecesA; // 0x1B6
uint32 enabledTrackPiecesB; // 0x1BA
};
};
uint64 enabledTrackPieces; // 0x1B6
uint8 category[2]; // 0x1BE
uint8 shop_item; // 0x1C0
uint8 shop_item_secondary; // 0x1C1

2
src/openrct2/windows/ride.c
View File

@ -3376,7 +3376,7 @@ static void window_ride_operating_invalidate(rct_window *w)
);
// Lift hill speed
if ((rideEntry->enabledTrackPiecesA & (1UL << TRACK_LIFT_HILL)) &&
if ((rideEntry->enabledTrackPieces & (1ULL << TRACK_LIFT_HILL)) &&
track_piece_is_available_for_ride_type(ride->type, TRACK_LIFT_HILL)) {
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WWT_24;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED].type = WWT_SPINNER;