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

Rename entrance flags to base_image_id

Browse Source
This commit is contained in:
Marijn van der Werf
2016-05-18 23:00:26 +02:00
parent 7c30f89a75
commit 1bf9dc26f9
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/paint/map_element/entrance.c
View File

@@ -46,7 +46,7 @@ void ride_entrance_exit_paint(uint8 direction, int height, rct_map_element* map_
uint8 colour_1, colour_2;
uint32 transparant_image_id = 0, image_id = 0;
if (style->flags & (1 << 30)) {
if (style->base_image_id & 0x40000000) {
colour_1 = ride->track_colour_main[0] + 0x70;
transparant_image_id = (colour_1 << 19) | 0x40000000;
}

2
src/ride/ride_data.h
View File

@@ -32,7 +32,7 @@ typedef struct rct_ride_entrance_definition {
uint16 height;
uint16 scrolling_mode;
rct_string_id string_id;
uint32 flags;
uint32 base_image_id;
uint16 colour_use_flags;
} rct_ride_entrance_definition;

2
src/ride/track_paint.c
View File

@@ -215,7 +215,7 @@ bool track_paint_util_draw_station_covers(enum edge edge, bool hasFence, const r
}
uint32 imageId;
uint32 baseImageId = entranceStyle->flags;
uint32 baseImageId = entranceStyle->base_image_id;
int imageOffset;
rct_xyz16 offset, bounds, boundsOffset;

2
src/windows/ride.c
View File

@@ -4316,7 +4316,7 @@ static void window_ride_colour_paint(rct_window *w, rct_drawpixelinfo *dpi)
const rct_ride_entrance_definition *entranceStyle = &RideEntranceDefinitions[ride->entrance_style];
terniaryColour = 0;
if (entranceStyle->flags & 0x40000000) {
if (entranceStyle->base_image_id & 0x40000000) {
terniaryColour = 0x40000000 | ((trackColour.main + 112) << 19);
}