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

Turn construction marker into a define

Browse Source
This commit is contained in:
Michael Steenbeek
2017-12-04 10:12:42 +01:00
parent 1ef73997b5
commit 273edee634
10 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/openrct2/paint/Paint.cpp
View File

@@ -28,9 +28,6 @@
// Global for paint clipping height
uint8 gClipHeight = 128; // Default to middle value
// Global for (white) construction marker mask.
uint32 const gConstructionMarker = COLOUR_DARK_GREEN << 19 | COLOUR_GREY << 24 | IMAGE_TYPE_REMAP;
paint_session gPaintSession;
static bool _paintSessionInUse;

4
src/openrct2/paint/paint.h
View File

@@ -210,8 +210,8 @@ extern "C" {
// Global for paint clipping height.
extern uint8 gClipHeight;
/** rct2: 0x00993CC4 */
extern const uint32 gConstructionMarker;
/** rct2: 0x00993CC4. The white ghost that indicates not-yet-built elements. */
#define CONSTRUCTION_MARKER (COLOUR_DARK_GREEN << 19 | COLOUR_GREY << 24 | IMAGE_TYPE_REMAP);
extern bool gShowDirtyVisuals;
extern bool gPaintBoundingBoxes;

2
src/openrct2/paint/tile_element/banner.c
View File

@@ -65,7 +65,7 @@ void banner_paint(paint_session * session, uint8 direction, sint32 height, rct_t
if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST) // if being placed
{
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
image_id |= gConstructionMarker;
image_id |= CONSTRUCTION_MARKER;
}
else{
image_id |=

4
src/openrct2/paint/tile_element/entrance.c
View File

@@ -86,7 +86,7 @@ static void ride_entrance_exit_paint(paint_session * session, uint8 direction, s
if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST){
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
image_id = gConstructionMarker;
image_id = CONSTRUCTION_MARKER;
_unk9E32BC = image_id;
if (transparant_image_id)
transparant_image_id = image_id;
@@ -200,7 +200,7 @@ static void park_entrance_paint(paint_session * session, uint8 direction, sint32
uint32 image_id, ghost_id = 0;
if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST){
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
ghost_id = gConstructionMarker;
ghost_id = CONSTRUCTION_MARKER;
_unk9E32BC = ghost_id;
}

2
src/openrct2/paint/tile_element/fence.c
View File

@@ -173,7 +173,7 @@ void fence_paint(paint_session * session, uint8 direction, sint32 height, rct_ti
if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST) {
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
dword_141F710 = gConstructionMarker;
dword_141F710 = CONSTRUCTION_MARKER;
}
// Save tile_element

2
src/openrct2/paint/tile_element/large_scenery.c
View File

@@ -208,7 +208,7 @@ void large_scenery_paint(paint_session * session, uint8 direction, uint16 height
}
if (tileElement->flags & TILE_ELEMENT_FLAG_GHOST) {
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
sequenceNum = gConstructionMarker;
sequenceNum = CONSTRUCTION_MARKER;
image_id &= 0x7FFFF;
dword_F4387C = sequenceNum;
image_id |= dword_F4387C;

4
src/openrct2/paint/tile_element/path.c
View File

@@ -686,12 +686,12 @@ void path_paint(paint_session * session, uint8 direction, uint16 height, rct_til
}
if (footpath_element_path_scenery_is_ghost(tile_element)) {
sceneryImageFlags = gConstructionMarker;
sceneryImageFlags = CONSTRUCTION_MARKER;
}
if (tile_element->flags & TILE_ELEMENT_FLAG_GHOST) {
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
imageFlags = gConstructionMarker;
imageFlags = CONSTRUCTION_MARKER;
}
sint16 x = session->MapPosition.x, y = session->MapPosition.y;

2
src/openrct2/paint/tile_element/scenery.c
View File

@@ -60,7 +60,7 @@ void scenery_paint(paint_session * session, uint8 direction, sint32 height, rct_
}
if (tileElement->flags & TILE_ELEMENT_FLAG_GHOST) {
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
baseImageid = gConstructionMarker;
baseImageid = CONSTRUCTION_MARKER;
}
uint32 dword_F64EB0 = baseImageid;

2
src/openrct2/ride/track_paint.c
View File

@@ -1779,7 +1779,7 @@ void track_paint(paint_session * session, uint8 direction, sint32 height, rct_ti
session->TrackColours[SCHEME_3] = 0x21600000;
}
if (tileElement->flags & TILE_ELEMENT_FLAG_GHOST) {
uint32 ghost_id = gConstructionMarker;
uint32 ghost_id = CONSTRUCTION_MARKER;
session->InteractionType = VIEWPORT_INTERACTION_ITEM_NONE;
session->TrackColours[SCHEME_TRACK] = ghost_id;
session->TrackColours[SCHEME_SUPPORTS] = ghost_id;