From 474d300578e20ba72e5cfb8f9cd7c3485a39827c Mon Sep 17 00:00:00 2001
From: IntelOrca <ted@brambles.org>
Date: Wed, 24 Jun 2015 16:43:09 +0100
Subject: [PATCH] change enabledTrackPieces to 64 bit integer in ride type
 struct

---
 src/object.c       | 3 +--
 src/ride/ride.h    | 9 +++++++--
 src/windows/ride.c | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/object.c b/src/object.c
index 74f41deaf3..040ce1b51a 100644
--- a/src/object.c
+++ b/src/object.c
@@ -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++)
diff --git a/src/ride/ride.h b/src/ride/ride.h
index ebf54167e7..923a4e540c 100644
--- a/src/ride/ride.h
+++ b/src/ride/ride.h
@@ -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
diff --git a/src/windows/ride.c b/src/windows/ride.c
index 042966f4f4..a5dfed63fe 100644
--- a/src/windows/ride.c
+++ b/src/windows/ride.c
@@ -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;