mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00
Code Issues Releases Wiki Activity

Move wall colour functions over to the struct methods

Browse Source
This commit is contained in:
Michael Steenbeek
2018-09-17 14:22:17 +02:00
parent 533e937926
commit dcabdeb805
7 changed files with 21 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/ride/TrackDesignSave.cpp
View File

@@ -359,10 +359,10 @@ static void track_design_save_add_wall(int32_t x, int32_t y, rct_tile_element* t
uint8_t flags = 0;
flags |= tileElement->type & 3;
flags |= wall_get_tertiary_colour(tileElement) << 2;
flags |= tileElement->AsWall()->GetTertiaryColour() << 2;
uint8_t secondaryColour = wall_get_secondary_colour(tileElement);
uint8_t primaryColour = wall_get_primary_colour(tileElement);
uint8_t secondaryColour = tileElement->AsWall()->GetSecondaryColour();
uint8_t primaryColour = tileElement->AsWall()->GetPrimaryColour();
track_design_save_push_tile_element(x, y, tileElement);
track_design_save_push_tile_element_desc(entry, x, y, tileElement->base_height, flags, primaryColour, secondaryColour);
@@ -547,7 +547,7 @@ static void track_design_save_remove_wall(int32_t x, int32_t y, rct_tile_element
uint8_t flags = 0;
flags |= tileElement->type & 3;
flags |= wall_get_tertiary_colour(tileElement) << 2;
flags |= tileElement->AsWall()->GetTertiaryColour() << 2;
track_design_save_pop_tile_element(x, y, tileElement);
track_design_save_pop_tile_element_desc(entry, x, y, tileElement->base_height, flags);