Rename Peep::favourite_ride to FavouriteRide

This commit is contained in:
Tulio Leao 2020-05-13 23:06:40 -03:00
parent 7a6de648fe
commit 3b632fcf95
12 changed files with 16 additions and 16 deletions

View File

@ -1698,9 +1698,9 @@ void window_guest_rides_paint(rct_window* w, rct_drawpixelinfo* dpi)
y = w->windowPos.y + window_guest_rides_widgets[WIDX_PAGE_BACKGROUND].bottom - 12;
set_format_arg(0, rct_string_id, STR_PEEP_FAVOURITE_RIDE_NOT_AVAILABLE);
if (peep->favourite_ride != RIDE_ID_NULL)
if (peep->FavouriteRide != RIDE_ID_NULL)
{
auto ride = get_ride(peep->favourite_ride);
auto ride = get_ride(peep->FavouriteRide);
if (ride != nullptr)
{
ride->FormatNameTo(gCommonFormatArgs);

View File

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

View File

@ -218,9 +218,9 @@ private:
{
peep->guest_heading_to_ride_id = RIDE_ID_NULL;
}
if (peep->favourite_ride == _rideIndex)
if (peep->FavouriteRide == _rideIndex)
{
peep->favourite_ride = RIDE_ID_NULL;
peep->FavouriteRide = RIDE_ID_NULL;
}
for (int32_t i = 0; i < PEEP_MAX_THOUGHTS; i++)

View File

@ -173,7 +173,7 @@ private:
newPeep->paid_on_rides = 0;
newPeep->paid_on_food = 0;
newPeep->paid_on_souvenirs = 0;
newPeep->favourite_ride = RIDE_ID_NULL;
newPeep->FavouriteRide = RIDE_ID_NULL;
newPeep->staff_orders = _staffOrders;
uint16_t idSearchSpriteIndex;

View File

@ -1787,7 +1787,7 @@ void Guest::OnExitRide(ride_id_t rideIndex)
if (peep_flags & PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE)
{
peep_flags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
favourite_ride = rideIndex;
FavouriteRide = rideIndex;
// TODO fix this flag name or add another one
window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS;
}

View File

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

View File

@ -745,7 +745,7 @@ struct Peep : SpriteBase
uint8_t balloon_colour;
uint8_t umbrella_colour;
uint8_t hat_colour;
uint8_t favourite_ride;
uint8_t FavouriteRide;
uint8_t FavouriteRideRating;
uint32_t ItemStandardFlags;

View File

@ -1542,12 +1542,12 @@ private:
// Set it to N/A if the save comes from the original or AA.
if (_gameVersion == FILE_VERSION_RCT1_LL)
{
dst->favourite_ride = src->favourite_ride;
dst->FavouriteRide = src->favourite_ride;
dst->FavouriteRideRating = src->favourite_ride_rating;
}
else
{
dst->favourite_ride = RIDE_ID_NULL;
dst->FavouriteRide = RIDE_ID_NULL;
dst->FavouriteRideRating = 0;
}

View File

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

View File

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

View File

@ -324,9 +324,9 @@ void ride_update_favourited_stat()
FOR_ALL_GUESTS (spriteIndex, peep)
{
if (peep->favourite_ride != RIDE_ID_NULL)
if (peep->FavouriteRide != RIDE_ID_NULL)
{
auto ride = get_ride(peep->favourite_ride);
auto ride = get_ride(peep->FavouriteRide);
if (ride != nullptr)
{
ride->guests_favourite++;

View File

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