From 54c4f0f1f35ee9c4864068d08067307f96589212 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Thu, 12 Jan 2017 22:03:23 +0100
Subject: [PATCH] Fix import of more vehicles, fix some colours

---
 src/openrct2/rct1.h          | 11 +++++++++++
 src/openrct2/rct1/tables.cpp | 24 ++++++++++++------------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/openrct2/rct1.h b/src/openrct2/rct1.h
index 38769ee144..b1c056350b 100644
--- a/src/openrct2/rct1.h
+++ b/src/openrct2/rct1.h
@@ -1135,11 +1135,22 @@ enum {
 	MINE_TRAIN_CARRIAGE = 36,
 	CORKSCREW_RC_FRONT = 38,
 	CORKSCREW_RC_CARRIAGE = 39,
+	GHOST_TRAIN_CAR = 63,
 	TWISTER_RC_SPOILER = 64,
 	TWISTER_RC_CARRIAGE = 65,
+	GHOST_TRAIN_INVISIBLE = 66,
+	ARTICULATED_RC_FRONT = 67,
+	ARTICULATED_RC_CARRIAGE = 68,
+	MINIATURE_RAILWAY_CARRIAGE_COVERED = 71,
 	STANDUP_TWISTER_RC_CARRIAGE = 72,
+	REVERSER_RC_CAR = 79,
+	REVERSER_RC_BOGIE = 80,
 	HYPERCOASTER_FRONT = 96,
 	HYPERCOASTER_CARRIAGE = 97,
+	INVERTED_4_ACROSS_CARRIAGE = 98,
+	WATER_COASTER_BOAT = 99,
+	WATER_COATER_INVISIBLE = 101,
+	RIVER_RAFT = 103,
 };
 
 enum {
diff --git a/src/openrct2/rct1/tables.cpp b/src/openrct2/rct1/tables.cpp
index 9ea48dc384..f1ddd1375c 100644
--- a/src/openrct2/rct1/tables.cpp
+++ b/src/openrct2/rct1/tables.cpp
@@ -320,7 +320,7 @@ namespace RCT1
             { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_WOODEN_SIDE_FRICTION_CARS,
             { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_VINTAGE_CARS,
             { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_STEAM_TRAIN_COVERED_CARS,
-            { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_STAND_UP_STEEL_TWISTER_ROLLER_COASTER_TRAIN,
+            { COPY_COLOUR_1, COLOUR_BLACK, COPY_COLOUR_2 }, // RCT1_VEHICLE_TYPE_STAND_UP_STEEL_TWISTER_ROLLER_COASTER_TRAIN,
             { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_FLOORLESS_STEEL_TWISTER_ROLLER_COASTER_TRAIN,
             { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_STEEL_MOUSE_CARS,
             { COPY_COLOUR_1, COPY_COLOUR_2, COLOUR_BLACK }, // RCT1_VEHICLE_TYPE_CHAIRLIFT_CARS_ALTERNATIVE,
@@ -480,15 +480,15 @@ namespace RCT1
             0,
             0,
             0,
-            0,
+            0, // GHOST_TRAIN_CAR
             1, // TWISTER_RC_SPOILER
             0, // TWISTER_RC_CARRIAGE
+            1, // GHOST_TRAIN_INVISIBLE
+            0, // ARTICULATED_RC_FRONT
+            1, // ARTICULATED_RC_CARRIAGE
             0,
             0,
-            0,
-            0,
-            0,
-            0,
+            2, // MINIATURE_RAILWAY_CARRIAGE_COVERED
             0, // STANDUP_TWISTER_RC_CARRIAGE
             0,
             0,
@@ -496,8 +496,8 @@ namespace RCT1
             0,
             0,
             0,
-            0,
-            0,
+            0, // REVERSER_RC_CAR
+            2, // REVERSER_RC_BOGIE
             0,
             0,
             0,
@@ -515,12 +515,12 @@ namespace RCT1
             0,
             0, // HYPERCOASTER_FRONT
             1, // HYPERCOASTER_CARRIAGE
+            0, // INVERTED_4_ACROSS_CARRIAGE
+            0, // WATER_COASTER_BOAT
             0,
+            1, // WATER_COASTER_INVISIBLE
             0,
-            0,
-            0,
-            0,
-            0,
+            0, // RIVER_RAFT
             0,
             0,
             0,