mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Peep::ItemFlags merging (#13511)

Browse Source 
* Merge standard and extra item flags for peeps

* Update replays
This commit is contained in:
Duncan
2020-12-09 09:21:23 +00:00
committed by GitHub
parent c12e1634fc
commit 9cbdae2ef1
11 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/tests/S6ImportExportTests.cpp
View File

@@ -191,7 +191,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
{
COMPARE_FIELD(RideTypesBeenOn[i]);
}
COMPARE_FIELD(ItemExtraFlags);
COMPARE_FIELD(ItemFlags);
COMPARE_FIELD(Photo2RideRef);
COMPARE_FIELD(Photo3RideRef);
COMPARE_FIELD(Photo4RideRef);
@@ -267,7 +267,6 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(HatColour);
COMPARE_FIELD(FavouriteRide);
COMPARE_FIELD(FavouriteRideRating);
COMPARE_FIELD(ItemStandardFlags);
}
static void CompareSpriteDataVehicle(const Vehicle& left, const Vehicle& right)