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

change enabledTrackPieces to 64 bit integer in ride type struct

This commit is contained in:
IntelOrca 2015-06-24 16:43:09 +01:00
parent 196b6b2086
commit 474d300578
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/object.c
View File

@ -428,8 +428,7 @@ int paint_ride_entry(int flags, int ebx, int ecx, int edx, rct_drawpixelinfo* dp
ride_type->description = object_get_localised_text(&chunk, ecx, ebx, 1);
if(gConfigInterface.select_by_track_type) {
ride_type->enabledTrackPieces=0xFFFFFFFF;
ride_type->enabledTrackPiecesAdditional=0xFFFFFFFF;
ride_type->enabledTrackPieces = 0xFFFFFFFFFFFFFFFF;
bool remove_flag=true;
for(int j=0;j<3;j++)

9
src/ride/ride.h
View File

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

2
src/windows/ride.c
View File

@ -3085,7 +3085,7 @@ static void window_ride_operating_invalidate()
w->pressed_widgets &= ~0x44700000;
// Lift hill speed
if ((rideEntry->enabledTrackPieces & RCT2_ADDRESS(0x01357444, uint32)[ride->type]) & 8) {
if ((rideEntry->enabledTrackPiecesA & RCT2_ADDRESS(0x01357444, uint32)[ride->type]) & 8) {
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_LABEL].type = WWT_24;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED].type = WWT_SPINNER;
window_ride_operating_widgets[WIDX_LIFT_HILL_SPEED_INCREASE].type = WWT_DROPDOWN_BUTTON;