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

Rename Peep::window_invalidate_flags to use TitleCase

This commit is contained in:
Tulio Leao 2020-06-08 22:25:54 -03:00
parent 1c566eebcb
commit f732c2f1cd
14 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/openrct2-ui/windows/Guest.cpp
View File

@ -1176,9 +1176,9 @@ void window_guest_overview_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_2);
Peep* peep = GET_PEEP(w->number);
if (peep != nullptr && peep->window_invalidate_flags & PEEP_INVALIDATE_PEEP_ACTION)
if (peep != nullptr && peep->WindowInvalidateFlags & PEEP_INVALIDATE_PEEP_ACTION)
{
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_PEEP_ACTION;
peep->WindowInvalidateFlags &= ~PEEP_INVALIDATE_PEEP_ACTION;
widget_invalidate(w, WIDX_ACTION_LBL);
}
@ -1341,7 +1341,7 @@ void window_guest_stats_update(rct_window* w)
{
w->frame_no++;
Peep* peep = GET_PEEP(w->number);
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_PEEP_STATS;
peep->WindowInvalidateFlags &= ~PEEP_INVALIDATE_PEEP_STATS;
w->Invalidate();
}
@ -1872,9 +1872,9 @@ void window_guest_thoughts_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_5);
auto peep = GET_PEEP(w->number);
if (peep->window_invalidate_flags & PEEP_INVALIDATE_PEEP_THOUGHTS)
if (peep->WindowInvalidateFlags & PEEP_INVALIDATE_PEEP_THOUGHTS)
{
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_PEEP_THOUGHTS;
peep->WindowInvalidateFlags &= ~PEEP_INVALIDATE_PEEP_THOUGHTS;
w->Invalidate();
}
}
@ -1935,9 +1935,9 @@ void window_guest_inventory_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_6);
auto peep = GET_PEEP(w->number);
if (peep->window_invalidate_flags & PEEP_INVALIDATE_PEEP_INVENTORY)
if (peep->WindowInvalidateFlags & PEEP_INVALIDATE_PEEP_INVENTORY)
{
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_PEEP_INVENTORY;
peep->WindowInvalidateFlags &= ~PEEP_INVALIDATE_PEEP_INVENTORY;
w->Invalidate();
}
}

4
src/openrct2-ui/windows/Staff.cpp
View File

@ -740,9 +740,9 @@ void window_staff_stats_update(rct_window* w)
widget_invalidate(w, WIDX_TAB_3);
Peep* peep = GET_PEEP(w->number);
if (peep->window_invalidate_flags & PEEP_INVALIDATE_STAFF_STATS)
if (peep->WindowInvalidateFlags & PEEP_INVALIDATE_STAFF_STATS)
{
peep->window_invalidate_flags &= ~PEEP_INVALIDATE_STAFF_STATS;
peep->WindowInvalidateFlags &= ~PEEP_INVALIDATE_STAFF_STATS;
w->Invalidate();
}
}

2
src/openrct2/GameStateSnapshots.cpp
View File

@ -240,7 +240,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, time_to_consume);
COMPARE_FIELD(Peep, intensity);
COMPARE_FIELD(Peep, nausea_tolerance);
COMPARE_FIELD(Peep, window_invalidate_flags);
COMPARE_FIELD(Peep, WindowInvalidateFlags);
COMPARE_FIELD(Peep, PaidOnDrink);
for (int i = 0; i < 16; i++)
{

2
src/openrct2/actions/StaffHireNewAction.hpp
View File

@ -159,7 +159,7 @@ private:
else
{
newPeep->sprite_identifier = 1;
newPeep->window_invalidate_flags = 0;
newPeep->WindowInvalidateFlags = 0;
newPeep->Action = PEEP_ACTION_NONE_2;
newPeep->SpecialSprite = 0;
newPeep->ActionSpriteImageOffset = 0;

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

@ -1092,7 +1092,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
ItemStandardFlags |= (1 << discard_container);
}
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
}
else
@ -1110,7 +1110,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
ItemStandardFlags |= (1 << discard_container);
}
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
}
}
@ -1141,7 +1141,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
if (newEnergy != energy)
{
energy = newEnergy;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_2;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_2;
}
uint8_t newHappiness = happiness;
@ -1162,7 +1162,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
if (newHappiness != happiness)
{
happiness = newHappiness;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_2;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_2;
}
uint8_t newNausea = nausea;
@ -1183,7 +1183,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
if (newNausea != nausea)
{
nausea = newNausea;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_2;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_2;
}
}
@ -1681,7 +1681,7 @@ loc_69B221:
if (shopItem == SHOP_ITEM_PHOTO4)
Photo4RideRef = ride->id;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
if (PeepFlags & PEEP_FLAGS_TRACKING)
{
@ -1726,7 +1726,7 @@ loc_69B221:
if (hasVoucher)
{
ItemStandardFlags &= ~PEEP_ITEM_VOUCHER;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
}
else if (!(gParkFlags & PARK_FLAGS_NO_MONEY))
{
@ -1788,11 +1788,11 @@ void Guest::OnExitRide(ride_id_t rideIndex)
PeepFlags &= ~PEEP_FLAGS_RIDE_SHOULD_BE_MARKED_AS_FAVOURITE;
FavouriteRide = rideIndex;
// TODO fix this flag name or add another one
window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS;
WindowInvalidateFlags |= PEEP_INVALIDATE_STAFF_STATS;
}
happiness = happiness_target;
nausea = nausea_target;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_STATS;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_STATS;
if (PeepFlags & PEEP_FLAGS_LEAVING_PARK)
PeepFlags &= ~(PEEP_FLAGS_PARK_ENTRANCE_CHOSEN);
@ -1802,7 +1802,7 @@ void Guest::OnExitRide(ride_id_t rideIndex)
GuestHeadingToRideId = rideIndex;
GuestIsLostCountdown = 200;
peep_reset_pathfind_goal(this);
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_ACTION;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_ACTION;
}
if (peep_should_preferred_intensity_increase(this))
@ -1865,7 +1865,7 @@ void Guest::PickRideToGoOn()
GuestHeadingToRideId = ride->id;
GuestIsLostCountdown = 200;
peep_reset_pathfind_goal(this);
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_ACTION;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_ACTION;
// Make peep look at their map if they have one
if (ItemStandardFlags & PEEP_ITEM_MAP)
@ -2436,7 +2436,7 @@ static void peep_tried_to_enter_full_queue(Peep* peep, Ride* ride)
static void peep_reset_ride_heading(Peep* peep)
{
peep->GuestHeadingToRideId = RIDE_ID_NULL;
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_ACTION;
peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_ACTION;
}
static void peep_ride_is_too_intense(Guest* peep, Ride* ride, bool peepAtRide)
@ -3243,7 +3243,7 @@ template<typename T> static void peep_head_for_nearest_ride(Guest* peep, bool co
peep->GuestHeadingToRideId = closestRide->id;
peep->GuestIsLostCountdown = 200;
peep_reset_pathfind_goal(peep);
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_ACTION;
peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_ACTION;
peep->TimeLost = 0;
}
}
@ -3311,7 +3311,7 @@ void Guest::StopPurchaseThought(uint8_t ride_type)
Thoughts[PEEP_MAX_THOUGHTS - 1].type = PEEP_THOUGHT_TYPE_NONE;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_THOUGHTS;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_THOUGHTS;
i--;
}
}
@ -3860,7 +3860,7 @@ void Guest::UpdateRideFreeVehicleEnterRide(Ride* ride)
&& (VoucherArguments == CurrentRide))
{
ItemStandardFlags &= ~PEEP_ITEM_VOUCHER;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
}
else
{
@ -5350,7 +5350,7 @@ void Guest::UpdateWalking()
litterType = item_extra_litter[pos_extr];
}
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
int32_t litterX = x + (scenario_rand() & 0x7) - 3;
@ -5917,7 +5917,7 @@ void Guest::UpdateUsingBin()
if ((scenario_rand() & 7) == 0)
space_left_in_bin--;
ItemStandardFlags &= ~(1 << cur_container);
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
continue;
}
@ -5928,7 +5928,7 @@ void Guest::UpdateUsingBin()
litter_create(litterX, litterY, z, scenario_rand() & 3, litterType);
ItemStandardFlags &= ~(1 << cur_container);
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
}
@ -5950,7 +5950,7 @@ void Guest::UpdateUsingBin()
if ((scenario_rand() & 7) == 0)
space_left_in_bin--;
ItemExtraFlags &= ~(1 << cur_container);
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
continue;
@ -5962,7 +5962,7 @@ void Guest::UpdateUsingBin()
litter_create(litterX, litterY, z, scenario_rand() & 3, litterType);
ItemExtraFlags &= ~(1 << cur_container);
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
UpdateSpriteType();
}
@ -6856,7 +6856,7 @@ void Guest::UpdateSpriteType()
create_balloon(x, y, z + 9, BalloonColour, isBalloonPopped);
}
ItemStandardFlags &= ~PEEP_ITEM_BALLOON;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
}
if (climate_is_raining() && (ItemStandardFlags & PEEP_ITEM_UMBRELLA) && x != LOCATION_NULL)

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

@ -660,7 +660,7 @@ std::optional<CoordsXY> Peep::UpdateAction(int16_t& xy_distance)
else
nausea -= 30;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_2;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_2;
// Create sick at location
litter_create(x, y, z, sprite_direction, (sprite_index & 1) ? LITTER_TYPE_SICK_ALT : LITTER_TYPE_SICK);
@ -1067,7 +1067,7 @@ static void peep_update_thoughts(Peep* peep)
// When thought is older than ~6900 ticks remove it
if (++peep->Thoughts[i].freshness >= 28)
{
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_THOUGHTS;
peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_THOUGHTS;
// Clear top thought, push others up
if (i < PEEP_MAX_THOUGHTS - 2)
@ -1090,7 +1090,7 @@ static void peep_update_thoughts(Peep* peep)
if (add_fresh && fresh_thought != -1)
{
peep->Thoughts[fresh_thought].freshness = 1;
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_THOUGHTS;
peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_THOUGHTS;
}
}
@ -1601,7 +1601,7 @@ void Peep::InsertNewThought(PeepThoughtType thoughtType, uint8_t thoughtArgument
Thoughts[0].freshness = 0;
Thoughts[0].fresh_timeout = 0;
window_invalidate_flags |= PEEP_INVALIDATE_PEEP_THOUGHTS;
WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_THOUGHTS;
}
/**
@ -1640,7 +1640,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->type = PEEP_TYPE_GUEST;
peep->PreviousRide = RIDE_ID_NULL;
peep->Thoughts->type = PEEP_THOUGHT_TYPE_NONE;
peep->window_invalidate_flags = 0;
peep->WindowInvalidateFlags = 0;
uint8_t intensityHighest = (scenario_rand() & 0x7) + 3;
uint8_t intensityLowest = std::min(intensityHighest, static_cast<uint8_t>(7)) - 3;
@ -2597,13 +2597,13 @@ static void peep_interact_with_entrance(Peep* peep, int16_t x, int16_t y, TileEl
{
entranceFee /= 2;
peep->ItemStandardFlags &= ~PEEP_ITEM_VOUCHER;
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
}
else if (peep->VoucherType == VOUCHER_TYPE_PARK_ENTRY_FREE)
{
entranceFee = 0;
peep->ItemStandardFlags &= ~PEEP_ITEM_VOUCHER;
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
}
}
if (entranceFee > peep->CashInPocket)
@ -3389,7 +3389,7 @@ static void peep_release_balloon(Guest* peep, int16_t spawn_height)
if (peep->sprite_type == PEEP_SPRITE_TYPE_BALLOON && peep->x != LOCATION_NULL)
{
create_balloon(peep->x, peep->y, spawn_height, peep->BalloonColour, false);
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_INVENTORY;
peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_INVENTORY;
peep->UpdateSpriteType();
}
}

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

@ -513,7 +513,7 @@ enum PeepSpriteType : uint8_t
PEEP_SPRITE_TYPE_INVALID = 255
};
// Flags used by peep->window_invalidate_flags
// Flags used by peep->WindowInvalidateFlags
enum PeepInvalidate
{
PEEP_INVALIDATE_PEEP_THOUGHTS = 1,
@ -628,7 +628,7 @@ struct Peep : SpriteBase
uint8_t time_to_consume;
IntensityRange intensity;
uint8_t nausea_tolerance;
uint8_t window_invalidate_flags;
uint8_t WindowInvalidateFlags;
money16 PaidOnDrink;
uint8_t RideTypesBeenOn[16];
uint32_t ItemExtraFlags;

12
src/openrct2/peep/Staff.cpp
View File

@ -1232,7 +1232,7 @@ void Staff::UpdateMowing()
map_invalidate_tile_zoom0({ NextLoc, surfaceElement->GetBaseZ(), surfaceElement->GetBaseZ() + 16 });
}
StaffLawnsMown++;
window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS;
WindowInvalidateFlags |= PEEP_INVALIDATE_STAFF_STATS;
}
}
@ -1292,7 +1292,7 @@ void Staff::UpdateWatering()
tile_element->AsSmallScenery()->SetAge(0);
map_invalidate_tile_zoom0({ actionLoc, tile_element->GetBaseZ(), tile_element->GetClearanceZ() });
StaffGardensWatered++;
window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS;
WindowInvalidateFlags |= PEEP_INVALIDATE_STAFF_STATS;
} while (!(tile_element++)->IsLastForTile());
StateReset();
@ -1376,7 +1376,7 @@ void Staff::UpdateEmptyingBin()
map_invalidate_tile_zoom0({ NextLoc, tile_element->GetBaseZ(), tile_element->GetClearanceZ() });
StaffBinsEmptied++;
window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS;
WindowInvalidateFlags |= PEEP_INVALIDATE_STAFF_STATS;
}
}
@ -1395,7 +1395,7 @@ void Staff::UpdateSweeping()
// Remove sick at this location
litter_remove_at(x, y, z);
StaffLitterSwept++;
window_invalidate_flags |= PEEP_INVALIDATE_STAFF_STATS;
WindowInvalidateFlags |= PEEP_INVALIDATE_STAFF_STATS;
}
if (auto loc = UpdateAction())
{
@ -2621,13 +2621,13 @@ bool Staff::UpdateFixingFinishFixOrInspect(bool firstRun, int32_t steps, Ride* r
UpdateRideInspected(CurrentRide);
StaffRidesInspected++;
window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME | RIDE_INVALIDATE_RIDE_LIST;
WindowInvalidateFlags |= RIDE_INVALIDATE_RIDE_INCOME | RIDE_INVALIDATE_RIDE_LIST;
return true;
}
StaffRidesFixed++;
window_invalidate_flags |= RIDE_INVALIDATE_RIDE_INCOME | RIDE_INVALIDATE_RIDE_LIST;
WindowInvalidateFlags |= RIDE_INVALIDATE_RIDE_INCOME | RIDE_INVALIDATE_RIDE_LIST;
sprite_direction = PeepDirection << 3;
Action = PEEP_ACTION_STAFF_ANSWER_CALL_2;

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

@ -1464,7 +1464,7 @@ private:
dst->intensity = static_cast<IntensityRange>(src->intensity);
dst->nausea_tolerance = src->nausea_tolerance;
dst->window_invalidate_flags = 0;
dst->WindowInvalidateFlags = 0;
dst->CurrentRide = src->current_ride;
dst->CurrentRideStation = src->current_ride_station;

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

@ -1162,7 +1162,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->time_to_consume = src->time_to_consume;
dst->intensity = static_cast<uint8_t>(src->intensity);
dst->nausea_tolerance = src->nausea_tolerance;
dst->window_invalidate_flags = src->window_invalidate_flags;
dst->window_invalidate_flags = src->WindowInvalidateFlags;
dst->paid_on_drink = src->PaidOnDrink;
for (size_t i = 0; i < std::size(src->RideTypesBeenOn); i++)
{

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

@ -1427,7 +1427,7 @@ public:
dst->time_to_consume = src->time_to_consume;
dst->intensity = static_cast<IntensityRange>(src->intensity);
dst->nausea_tolerance = src->nausea_tolerance;
dst->window_invalidate_flags = src->window_invalidate_flags;
dst->WindowInvalidateFlags = src->window_invalidate_flags;
dst->PaidOnDrink = src->paid_on_drink;
for (size_t i = 0; i < std::size(src->ride_types_been_on); i++)
{

2
src/openrct2/ride/Ride.cpp
View File

@ -1132,7 +1132,7 @@ void ride_remove_peeps(Ride* ride)
peep->happiness = std::min(peep->happiness, peep->happiness_target) / 2;
peep->happiness_target = peep->happiness;
peep->window_invalidate_flags |= PEEP_INVALIDATE_PEEP_STATS;
peep->WindowInvalidateFlags |= PEEP_INVALIDATE_PEEP_STATS;
}
}

2
src/openrct2/world/Sprite.cpp
View File

@ -296,7 +296,7 @@ rct_sprite_checksum sprite_checksum()
// We set this to 0 because as soon the client selects a guest the window will remove the
// invalidation flags causing the sprite checksum to be different than on server, the flag does not affect
// game state.
copy.peep.window_invalidate_flags = 0;
copy.peep.WindowInvalidateFlags = 0;
}
_spriteHashAlg->Update(&copy, sizeof(copy));

2
test/tests/S6ImportExportTests.cpp
View File

@ -184,7 +184,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(time_to_consume);
COMPARE_FIELD(intensity);
COMPARE_FIELD(nausea_tolerance);
COMPARE_FIELD(window_invalidate_flags);
COMPARE_FIELD(WindowInvalidateFlags);
COMPARE_FIELD(PaidOnDrink);
for (int i = 0; i < PEEP_MAX_THOUGHTS; i++)
{