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

Pass paint session to fence_paint

This commit is contained in:
Ted John 2017-09-02 22:41:36 +01:00
parent 00cde34b39
commit 1f6f83163a
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/openrct2/paint/map_element/fence.c
View File

@ -130,9 +130,9 @@ static void fence_paint_wall(uint32 frameNum, const rct_scenery_entry * sceneryE
* @param height (dx)
* @param map_element (esi)
*/
void fence_paint(uint8 direction, sint32 height, rct_map_element * map_element)
void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element * map_element)
{
gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_WALL;
session->InteractionType = VIEWPORT_INTERACTION_ITEM_WALL;
rct_scenery_entry * sceneryEntry = get_wall_entry(map_element->properties.wall.type);
if (sceneryEntry == NULL || sceneryEntry == (rct_scenery_entry *)-1) {
@ -170,7 +170,7 @@ void fence_paint(uint8 direction, sint32 height, rct_map_element * map_element)
}
if (map_element->flags & MAP_ELEMENT_FLAG_GHOST) {
gPaintSession.InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
dword_141F710 = construction_markers[gConfigGeneral.construction_marker_colour];
}

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

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

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

@ -101,7 +101,7 @@ void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_m
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);
void scenery_paint(uint8 direction, sint32 height, rct_map_element* mapElement);
void fence_paint(uint8 direction, sint32 height, rct_map_element* mapElement);
void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_map_element* mapElement);
void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement);
void track_paint(uint8 direction, sint32 height, rct_map_element *mapElement);

2
test/testpaint/compat.c
View File

@ -85,7 +85,7 @@ void banner_paint(paint_session * session, uint8 direction, int height, rct_map_
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) { }
void scenery_paint(uint8 direction, int height, rct_map_element *mapElement) { }
void fence_paint(uint8 direction, int height, rct_map_element *mapElement) { }
void fence_paint(paint_session * session, uint8 direction, int height, rct_map_element *mapElement) { }
void scenery_multiple_paint(paint_session * session, uint8 direction, uint16 height, rct_map_element *mapElement) { }
rct_ride *get_ride(int index) {