From 4c2ce0f89299a4da864b66fc18442c0590fd312c Mon Sep 17 00:00:00 2001
From: Simon J <mwnciau@gmail.com>
Date: Tue, 18 Aug 2020 13:26:03 +0100
Subject: [PATCH] Remove duplicate TRACK_ELEMENT_LOCATION_IS_UNDERGROUND flag
 (#12714)

Renamed all instances to ELEMENT_IS_UNDERGROUND

Co-authored-by: Simon Jarrett <simonjjarrett@gmail.com>
---
 src/openrct2-ui/windows/RideConstruction.cpp | 2 +-
 src/openrct2/actions/TrackPlaceAction.hpp    | 4 ++--
 src/openrct2/ride/Track.h                    | 5 -----
 src/openrct2/windows/_legacy.cpp             | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/openrct2-ui/windows/RideConstruction.cpp b/src/openrct2-ui/windows/RideConstruction.cpp
index 0a4760b798..0237f45b29 100644
--- a/src/openrct2-ui/windows/RideConstruction.cpp
+++ b/src/openrct2-ui/windows/RideConstruction.cpp
@@ -1845,7 +1845,7 @@ static void window_ride_construction_construct(rct_window* w)
     }
 
     auto tpar = dynamic_cast<TrackPlaceActionResult*>(res.get());
-    if (tpar != nullptr && tpar->GroundFlags & TRACK_ELEMENT_LOCATION_IS_UNDERGROUND)
+    if (tpar != nullptr && tpar->GroundFlags & ELEMENT_IS_UNDERGROUND)
     {
         viewport_set_visibility(1);
     }
diff --git a/src/openrct2/actions/TrackPlaceAction.hpp b/src/openrct2/actions/TrackPlaceAction.hpp
index 439483c6af..93f5f75449 100644
--- a/src/openrct2/actions/TrackPlaceAction.hpp
+++ b/src/openrct2/actions/TrackPlaceAction.hpp
@@ -281,7 +281,7 @@ public:
             {
                 if (FlatTrackFlags[_trackType] & TRACK_ELEM_FLAG_ONLY_ABOVE_GROUND)
                 {
-                    if (res->GroundFlags & TRACK_ELEMENT_LOCATION_IS_UNDERGROUND)
+                    if (res->GroundFlags & ELEMENT_IS_UNDERGROUND)
                     {
                         return std::make_unique<TrackPlaceActionResult>(
                             GA_ERROR::DISALLOWED, STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND);
@@ -292,7 +292,7 @@ public:
             {
                 if (TrackFlags[_trackType] & TRACK_ELEM_FLAG_ONLY_ABOVE_GROUND)
                 {
-                    if (res->GroundFlags & TRACK_ELEMENT_LOCATION_IS_UNDERGROUND)
+                    if (res->GroundFlags & ELEMENT_IS_UNDERGROUND)
                     {
                         return std::make_unique<TrackPlaceActionResult>(
                             GA_ERROR::DISALLOWED, STR_CAN_ONLY_BUILD_THIS_ABOVE_GROUND);
diff --git a/src/openrct2/ride/Track.h b/src/openrct2/ride/Track.h
index 603e0bd143..7a6ded31a0 100644
--- a/src/openrct2/ride/Track.h
+++ b/src/openrct2/ride/Track.h
@@ -528,11 +528,6 @@ enum
     TRACK_SEQUENCE_FLAG_DISALLOW_DOORS = (1 << 6),   // 0x40
 };
 
-enum
-{
-    TRACK_ELEMENT_LOCATION_IS_UNDERGROUND = 2,
-};
-
 enum
 {
     GC_SET_MAZE_TRACK_BUILD = 0,
diff --git a/src/openrct2/windows/_legacy.cpp b/src/openrct2/windows/_legacy.cpp
index 34f938b6df..8ca81f5d85 100644
--- a/src/openrct2/windows/_legacy.cpp
+++ b/src/openrct2/windows/_legacy.cpp
@@ -104,7 +104,7 @@ money32 place_provisional_track_piece(
 
         _unkF440C5 = { trackPos.x, trackPos.y, trackPos.z + z_begin, static_cast<Direction>(trackDirection) };
         _currentTrackSelectionFlags |= TRACK_SELECTION_FLAG_TRACK;
-        viewport_set_visibility((tpar->GroundFlags & TRACK_ELEMENT_LOCATION_IS_UNDERGROUND) ? 1 : 3);
+        viewport_set_visibility((tpar->GroundFlags & ELEMENT_IS_UNDERGROUND) ? 1 : 3);
         if (_currentTrackSlopeEnd != 0)
             viewport_set_visibility(2);