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

Fix variable name type conflict

Browse Source
This commit is contained in:
ζeh Matt
2022-02-12 18:15:19 +02:00
parent f22142d2cf
commit 004cf02c26
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/interface/Window.h
View File

@@ -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;
};

2
src/openrct2/management/Marketing.h
View File

@@ -50,7 +50,7 @@ struct MarketingCampaign
uint8_t Flags{};
union
{
RideId RideId{};
::RideId RideId{};
ShopItemIndex ShopItemType;
};
};

4
src/openrct2/ride/RideAudio.cpp
View File

@@ -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{};