From 004cf02c26a0c2490baacd3db1ceb7e4d66c21a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=CE=B6eh=20Matt?= <5415177+ZehMatt@users.noreply.github.com>
Date: Sat, 12 Feb 2022 18:15:19 +0200
Subject: [PATCH] Fix variable name type conflict

---
 src/openrct2/interface/Window.h     | 4 ++--
 src/openrct2/management/Marketing.h | 2 +-
 src/openrct2/ride/RideAudio.cpp     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/openrct2/interface/Window.h b/src/openrct2/interface/Window.h
index 2ec963dad9..f4c0049b4a 100644
--- a/src/openrct2/interface/Window.h
+++ b/src/openrct2/interface/Window.h
@@ -269,8 +269,8 @@ struct campaign_variables
     int16_t no_weeks; // 0x482
     union
     {
-        RideId RideId;               // 0x484
-        ObjectEntryIndex ShopItemId; // 0x484
+        ::RideId RideId;
+        ObjectEntryIndex ShopItemId;
     };
     uint32_t pad_486;
 };
diff --git a/src/openrct2/management/Marketing.h b/src/openrct2/management/Marketing.h
index 0ea501010f..42962b9307 100644
--- a/src/openrct2/management/Marketing.h
+++ b/src/openrct2/management/Marketing.h
@@ -50,7 +50,7 @@ struct MarketingCampaign
     uint8_t Flags{};
     union
     {
-        RideId RideId{};
+        ::RideId RideId{};
         ShopItemIndex ShopItemType;
     };
 };
diff --git a/src/openrct2/ride/RideAudio.cpp b/src/openrct2/ride/RideAudio.cpp
index fa2af9bb85..46e5fdf9d8 100644
--- a/src/openrct2/ride/RideAudio.cpp
+++ b/src/openrct2/ride/RideAudio.cpp
@@ -35,7 +35,7 @@ namespace OpenRCT2::RideAudio
      */
     struct ViewportRideMusicInstance
     {
-        RideId RideId;
+        ::RideId RideId;
         uint8_t TrackIndex{};
 
         size_t Offset{};
@@ -49,7 +49,7 @@ namespace OpenRCT2::RideAudio
      */
     struct RideMusicChannel
     {
-        RideId RideId{};
+        ::RideId RideId{};
         uint8_t TrackIndex{};
 
         size_t Offset{};