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

Import Corkscrew train correctly, import colours

This commit is contained in:
Gymnasiast 2017-01-07 00:19:32 +01:00 committed by Ted John
parent f7f744f59b
commit e3d197e856
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/rct1.h
View File

@ -1124,8 +1124,11 @@ enum {
enum {
STEEL_RC_FRONT = 0,
STEEL_RC_CARRIAGE = 1,
WOODEN_RC_TRAIN = 2,
MINE_TRAIN_FRONT = 35,
MINE_TRAIN_CARRIAGE = 36,
CORKSCREW_RC_FRONT = 38,
CORKSCREW_RC_CARRIAGE = 39,
};
#define RCT1_MAX_STATIONS 4

5
src/openrct2/rct1/S4Importer.cpp
View File

@ -918,6 +918,7 @@ private:
for (int i = 0; i < 32; i++)
{
dst->peep[i] = src->peep[i];
dst->peep_tshirt_colours[i] = RCT1::GetColour(src->peep_tshirt_colours[i]);
}
dst->var_CD = src->var_CD;
@ -930,6 +931,10 @@ private:
dst->status = src->status;
dst->sub_state = src->sub_state;
dst->update_flags = src->update_flags;
dst->colours.body_colour = RCT1::GetColour(src->colours.body_colour);
dst->colours.trim_colour = RCT1::GetColour(src->colours.trim_colour);
dst->colours_extended = RCT1::GetColour(src->colours_extended);
sprite_move(src->x, src->y, src->z, (rct_sprite *)dst);
invalidate_sprite_2((rct_sprite *)dst);

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

@ -353,11 +353,11 @@ namespace RCT1
0,
0,
0,
0, //MINE_TRAIN_FRONT
1, //MINE_TRAIN_CARRIAGE
0,
0,
0, // MINE_TRAIN_FRONT
1, // MINE_TRAIN_CARRIAGE
0,
0, // CORKSCREW_RC_FRONT
1, // CORKSCREW_RC_CARRIAGE
0,
0,
0,