From 2d2face52adb12eb854494c162268f7a34f4dbb2 Mon Sep 17 00:00:00 2001
From: IntelOrca <ted@brambles.org>
Date: Fri, 19 Sep 2014 22:17:14 +0100
Subject: [PATCH] fix merge problems

---
 src/ride.c    | 4 ++--
 src/vehicle.c | 4 ++--
 src/vehicle.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ride.c b/src/ride.c
index 44b85156d6..995c9e5bbc 100644
--- a/src/ride.c
+++ b/src/ride.c
@@ -600,10 +600,10 @@ void ride_init_vehicle_speed(rct_ride *ride)
 	int ecx = -1;
 	while (1) {
 		ecx++;
-		if (ecx >= ride->var_0C8) {
+		if (ecx >= ride->num_vehicles) {
 			break;
 		}
-		rct_vehicle *vehicle = &g_sprite_list[ride->train_car_map[ecx]].vehicle;
+		rct_vehicle *vehicle = &g_sprite_list[ride->vehicles[ecx]].vehicle;
 		vehicle->var_48 &= (1 << 6);
 		uint8 r = scenario_rand();
 		r = 0xC;
diff --git a/src/vehicle.c b/src/vehicle.c
index 6cd47e648a..5c802c1c93 100644
--- a/src/vehicle.c
+++ b/src/vehicle.c
@@ -89,7 +89,7 @@ void sub_6BB9FF(rct_vehicle* vehicle)
 								v18 = 64;
 							}
 							i->var_4 = (sint16)(((v15.both / v18) - 0x8000) >> 4);
-							sint32 v19 = vehicle->var_28;
+							sint32 v19 = vehicle->velocity;
 
 							int testaddr = (vehicle->var_31 * 0x65);
 							testaddr += (int)RCT2_ADDRESS(0x009ACFA4, rct_ride_type*)[vehicle->var_D6];
@@ -138,7 +138,7 @@ int sub_6BC2F3(rct_vehicle* vehicle)
 	do {
 		result += vehicle_temp->var_46;
 	} while (vehicle_temp->next_vehicle_on_train != (uint16)-1 && (vehicle_temp = GET_VEHICLE(vehicle_temp->next_vehicle_on_train)));
-	sint32 v4 = vehicle->var_28;
+	sint32 v4 = vehicle->velocity;
 	if (v4 < 0) {
 		v4 = -v4;
 	}
diff --git a/src/vehicle.h b/src/vehicle.h
index a5a48a9740..668f16a350 100644
--- a/src/vehicle.h
+++ b/src/vehicle.h
@@ -48,7 +48,7 @@ typedef struct {
 	rct_widthheight view;			// 0x1A
 	uint16 var_1E;
 	uint8 pad_20[0x08];
-	sint32 velocity;
+	sint32 velocity;				// 0x28
 	uint8 pad_2C[0x04];
 	uint8 ride;						// 0x30
 	uint8 var_31;