mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-04 13:42:55 +01:00
Code Issues Releases Wiki Activity

Pass paint session to entrance_paint

Browse Source
This commit is contained in:
Ted John
2017-09-02 22:43:45 +01:00
parent 1f6f83163a
commit 8456639b47
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/openrct2/paint/map_element/entrance.c
View File

@@ -32,7 +32,7 @@ static uint32 _unk9E32BC;
*
* rct2: 0x0066508C, 0x00665540
*/
static void ride_entrance_exit_paint(uint8 direction, sint32 height, rct_map_element* map_element)
static void ride_entrance_exit_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element)
{
uint8 is_exit = map_element->properties.entrance.type == ENTRANCE_TYPE_RIDE_EXIT;
@@ -81,11 +81,11 @@ static void ride_entrance_exit_paint(uint8 direction, sint32 height, rct_map_ele
colour_2 = ride->track_colour_additional[0];
image_id = (colour_1 << 19) | (colour_2 << 24) | IMAGE_TYPE_REMAP | IMAGE_TYPE_REMAP_2_PLUS;
gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_RIDE;
session->InteractionType = VIEWPORT_INTERACTION_ITEM_RIDE;
_unk9E32BC = 0;
if (map_element->flags & MAP_ELEMENT_FLAG_GHOST){
gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
image_id = construction_markers[gConfigGeneral.construction_marker_colour];
_unk9E32BC = image_id;
if (transparant_image_id)
@@ -185,7 +185,7 @@ static void ride_entrance_exit_paint(uint8 direction, sint32 height, rct_map_ele
*
* rct2: 0x006658ED
*/
static void park_entrance_paint(uint8 direction, sint32 height, rct_map_element* map_element){
static void park_entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element){
if (gTrackDesignSaveMode)
return;
@@ -195,11 +195,11 @@ static void park_entrance_paint(uint8 direction, sint32 height, rct_map_element*
}
#endif
gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_PARK;
session->InteractionType = VIEWPORT_INTERACTION_ITEM_PARK;
_unk9E32BC = 0;
uint32 image_id, ghost_id = 0;
if (map_element->flags & MAP_ELEMENT_FLAG_GHOST){
gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
ghost_id = construction_markers[gConfigGeneral.construction_marker_colour];
_unk9E32BC = ghost_id;
}
@@ -277,10 +277,10 @@ static void park_entrance_paint(uint8 direction, sint32 height, rct_map_element*
*
* rct2: 0x00664FD4
*/
void entrance_paint(uint8 direction, sint32 height, rct_map_element* map_element){
gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_LABEL;
void entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element){
session->InteractionType = VIEWPORT_INTERACTION_ITEM_LABEL;
rct_drawpixelinfo* dpi = gPaintSession.Unk140E9A8;
rct_drawpixelinfo* dpi = session->Unk140E9A8;
if (gCurrentViewportFlags & VIEWPORT_FLAG_PATH_HEIGHTS &&
dpi->zoom_level == 0){
@@ -298,10 +298,10 @@ void entrance_paint(uint8 direction, sint32 height, rct_map_element* map_element
switch (map_element->properties.entrance.type){
case ENTRANCE_TYPE_RIDE_ENTRANCE:
case ENTRANCE_TYPE_RIDE_EXIT:
ride_entrance_exit_paint(direction, height, map_element);
ride_entrance_exit_paint(session, direction, height, map_element);
break;
case ENTRANCE_TYPE_PARK_ENTRANCE:
park_entrance_paint(direction, height, map_element);
park_entrance_paint(session, direction, height, map_element);
break;
}
}

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

@@ -259,7 +259,7 @@ static void sub_68B3FB(paint_session * session, sint32 x, sint32 y)
scenery_paint(direction, height, map_element);
break;
case MAP_ELEMENT_TYPE_ENTRANCE:
entrance_paint(direction, height, map_element);
entrance_paint(session, direction, height, map_element);
break;
case MAP_ELEMENT_TYPE_WALL:
fence_paint(session, direction, height, map_element);

2
src/openrct2/paint/map_element/map_element.h
View File

@@ -96,7 +96,7 @@ uint16 paint_util_rotate_segments(uint16 segments, uint8 rotation);
void map_element_paint_setup(paint_session * session, sint32 x, sint32 y);
void entrance_paint(uint8 direction, sint32 height, rct_map_element* map_element);
void entrance_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element);
void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* map_element);
void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement);
void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement);

2
test/testpaint/compat.c
View File

@@ -80,7 +80,7 @@ rct_xy16 gMapSelectPositionB;
rct_xyz16 gMapSelectArrowPosition;
uint8 gMapSelectArrowDirection;
void entrance_paint(uint8 direction, int height, rct_map_element *map_element) { }
void entrance_paint(paint_session * session, uint8 direction, int height, rct_map_element *map_element) { }
void banner_paint(paint_session * session, uint8 direction, int height, rct_map_element *map_element) { }
void surface_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { }
void path_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { }