mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename Peep::favourite_ride_rating to FavouriteRideRating

This commit is contained in:
Tulio Leao 2020-05-13 23:03:58 -03:00
parent 14e0cc5e4a
commit 7a6de648fe
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -312,7 +312,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, umbrella_colour);
COMPARE_FIELD(Peep, hat_colour);
COMPARE_FIELD(Peep, favourite_ride);
COMPARE_FIELD(Peep, favourite_ride_rating);
COMPARE_FIELD(Peep, FavouriteRideRating);
COMPARE_FIELD(Peep, ItemStandardFlags);
}

4
src/openrct2/peep/Guest.cpp
View File

@ -2713,11 +2713,11 @@ static void peep_update_favourite_ride(Peep* peep, Ride* ride)
{
peep->peep_flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
uint8_t peepRideRating = std::clamp((ride->excitement / 4) + peep->happiness, 0, PEEP_MAX_HAPPINESS);
if (peepRideRating >= peep->favourite_ride_rating)
if (peepRideRating >= peep->FavouriteRideRating)
{
if (peep->happiness >= 160 && peep->happiness_target >= 160)
{
peep->favourite_ride_rating = peepRideRating;
peep->FavouriteRideRating = peepRideRating;
peep->peep_flags |= PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
}
}

2
src/openrct2/peep/Peep.cpp
View File

@ -1635,7 +1635,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->action_sprite_type = PEEP_ACTION_SPRITE_TYPE_NONE;
peep->peep_flags = 0;
peep->favourite_ride = RIDE_ID_NULL;
peep->favourite_ride_rating = 0;
peep->FavouriteRideRating = 0;
const rct_sprite_bounds* spriteBounds = g_peep_animation_entries[peep->sprite_type].sprite_bounds;
peep->sprite_width = spriteBounds[peep->action_sprite_type].sprite_width;

2
src/openrct2/peep/Peep.h
View File

@ -746,7 +746,7 @@ struct Peep : SpriteBase
uint8_t umbrella_colour;
uint8_t hat_colour;
uint8_t favourite_ride;
uint8_t favourite_ride_rating;
uint8_t FavouriteRideRating;
uint32_t ItemStandardFlags;
public: // Peep

4
src/openrct2/rct1/S4Importer.cpp
View File

@ -1543,12 +1543,12 @@ private:
if (_gameVersion == FILE_VERSION_RCT1_LL)
{
dst->favourite_ride = src->favourite_ride;
dst->favourite_ride_rating = src->favourite_ride_rating;
dst->FavouriteRideRating = src->favourite_ride_rating;
}
else
{
dst->favourite_ride = RIDE_ID_NULL;
dst->favourite_ride_rating = 0;
dst->FavouriteRideRating = 0;
}
dst->ItemStandardFlags = src->item_standard_flags;

2
src/openrct2/rct2/S6Exporter.cpp
View File

@ -1239,7 +1239,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->umbrella_colour = src->umbrella_colour;
dst->hat_colour = src->hat_colour;
dst->favourite_ride = src->favourite_ride;
dst->favourite_ride_rating = src->favourite_ride_rating;
dst->favourite_ride_rating = src->FavouriteRideRating;
dst->item_standard_flags = src->ItemStandardFlags;
}

2
src/openrct2/rct2/S6Importer.cpp
View File

@ -1504,7 +1504,7 @@ public:
dst->umbrella_colour = src->umbrella_colour;
dst->hat_colour = src->hat_colour;
dst->favourite_ride = src->favourite_ride;
dst->favourite_ride_rating = src->favourite_ride_rating;
dst->FavouriteRideRating = src->favourite_ride_rating;
dst->ItemStandardFlags = src->item_standard_flags;
}

2
test/tests/S6ImportExportTests.cpp
View File

@ -265,7 +265,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(umbrella_colour);
COMPARE_FIELD(hat_colour);
COMPARE_FIELD(favourite_ride);
COMPARE_FIELD(favourite_ride_rating);
COMPARE_FIELD(FavouriteRideRating);
COMPARE_FIELD(ItemStandardFlags);
}