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

Fix import of more vehicles, fix some colours

This commit is contained in:
Gymnasiast 2017-01-12 22:03:23 +01:00 committed by Ted John
parent cc4576b72a
commit 54c4f0f1f3
2 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/openrct2/rct1.h
View File

@ -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 {

24
src/openrct2/rct1/tables.cpp
View File

@ -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,