From 084bfe0d48a47360aa17aa28e67ba208f8c7c7f9 Mon Sep 17 00:00:00 2001
From: Gymnasiast <m.o.steenbeek@gmail.com>
Date: Wed, 14 Apr 2021 15:03:09 +0200
Subject: [PATCH] Remove global from PlaceParkEntranceAction

---
 src/openrct2-ui/windows/Map.cpp                  | 2 +-
 src/openrct2/actions/GameActionCompat.cpp        | 2 +-
 src/openrct2/actions/PlaceParkEntranceAction.cpp | 5 +++--
 src/openrct2/actions/PlaceParkEntranceAction.h   | 3 ++-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/openrct2-ui/windows/Map.cpp b/src/openrct2-ui/windows/Map.cpp
index b57e916f5b..6f23ee8883 100644
--- a/src/openrct2-ui/windows/Map.cpp
+++ b/src/openrct2-ui/windows/Map.cpp
@@ -1327,7 +1327,7 @@ static void window_map_place_park_entrance_tool_down(const ScreenCoordsXY& scree
     CoordsXYZD parkEntrancePosition = place_park_entrance_get_map_position(screenCoords);
     if (!parkEntrancePosition.isNull())
     {
-        auto gameAction = PlaceParkEntranceAction(parkEntrancePosition);
+        auto gameAction = PlaceParkEntranceAction(parkEntrancePosition, gFootpathSelectedId);
         auto result = GameActions::Execute(&gameAction);
         if (result->Error == GameActions::Status::Ok)
         {
diff --git a/src/openrct2/actions/GameActionCompat.cpp b/src/openrct2/actions/GameActionCompat.cpp
index 00c45e2090..15c9cc46e2 100644
--- a/src/openrct2/actions/GameActionCompat.cpp
+++ b/src/openrct2/actions/GameActionCompat.cpp
@@ -33,7 +33,7 @@ money32 park_entrance_place_ghost(const CoordsXYZD& entranceLoc)
 {
     park_entrance_remove_ghost();
 
-    auto gameAction = PlaceParkEntranceAction(entranceLoc);
+    auto gameAction = PlaceParkEntranceAction(entranceLoc, gFootpathSelectedId);
     gameAction.SetFlags(GAME_COMMAND_FLAG_GHOST);
 
     auto result = GameActions::Execute(&gameAction);
diff --git a/src/openrct2/actions/PlaceParkEntranceAction.cpp b/src/openrct2/actions/PlaceParkEntranceAction.cpp
index 661a69e1b9..f2b55f58da 100644
--- a/src/openrct2/actions/PlaceParkEntranceAction.cpp
+++ b/src/openrct2/actions/PlaceParkEntranceAction.cpp
@@ -21,8 +21,9 @@
 #include "../world/Sprite.h"
 #include "../world/Surface.h"
 
-PlaceParkEntranceAction::PlaceParkEntranceAction(const CoordsXYZD& location)
+PlaceParkEntranceAction::PlaceParkEntranceAction(const CoordsXYZD& location, ObjectEntryIndex pathType)
     : _loc(location)
+    , _pathType(pathType)
 {
 }
 
@@ -146,7 +147,7 @@ GameActions::Result::Ptr PlaceParkEntranceAction::Execute() const
         entranceElement->SetDirection(_loc.direction);
         entranceElement->SetSequenceIndex(index);
         entranceElement->SetEntranceType(ENTRANCE_TYPE_PARK_ENTRANCE);
-        entranceElement->SetPathType(gFootpathSelectedId);
+        entranceElement->SetPathType(_pathType);
 
         if (!entranceElement->IsGhost())
         {
diff --git a/src/openrct2/actions/PlaceParkEntranceAction.h b/src/openrct2/actions/PlaceParkEntranceAction.h
index 2514d3ae1a..5c251c2bc5 100644
--- a/src/openrct2/actions/PlaceParkEntranceAction.h
+++ b/src/openrct2/actions/PlaceParkEntranceAction.h
@@ -15,10 +15,11 @@ DEFINE_GAME_ACTION(PlaceParkEntranceAction, GameCommand::PlaceParkEntrance, Game
 {
 private:
     CoordsXYZD _loc;
+    ObjectEntryIndex _pathType;
 
 public:
     PlaceParkEntranceAction() = default;
-    PlaceParkEntranceAction(const CoordsXYZD& location);
+    PlaceParkEntranceAction(const CoordsXYZD& location, ObjectEntryIndex pathType);
 
     uint16_t GetActionFlags() const override;