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

Rename Peep::vandalism_seen to VandalismSeen

Browse Source
This commit is contained in:
Tulio Leao
2020-05-30 19:22:28 -03:00
parent fd71b1b009
commit fc1ba40dc8
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2/GameStateSnapshots.cpp
View File

@@ -301,7 +301,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, no_of_food);
COMPARE_FIELD(Peep, no_of_drinks);
COMPARE_FIELD(Peep, no_of_souvenirs);
COMPARE_FIELD(Peep, vandalism_seen);
COMPARE_FIELD(Peep, VandalismSeen);
COMPARE_FIELD(Peep, VoucherType);
COMPARE_FIELD(Peep, VoucherArguments);
COMPARE_FIELD(Peep, SurroundingsThoughtTimeout);

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

@@ -1763,7 +1763,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->guest_heading_to_ride_id = RIDE_ID_NULL;
peep->litter_count = 0;
peep->disgusting_count = 0;
peep->vandalism_seen = 0;
peep->VandalismSeen = 0;
peep->paid_to_enter = 0;
peep->paid_on_rides = 0;
peep->paid_on_food = 0;
@@ -2659,9 +2659,9 @@ static void peep_footpath_move_forward(Peep* peep, int16_t x, int16_t y, TileEle
return;
}
uint8_t vandalThoughtTimeout = (peep->vandalism_seen & 0xC0) >> 6;
uint8_t vandalThoughtTimeout = (peep->VandalismSeen & 0xC0) >> 6;
// Advance the vandalised tiles by 1
uint8_t vandalisedTiles = (peep->vandalism_seen * 2) & 0x3F;
uint8_t vandalisedTiles = (peep->VandalismSeen * 2) & 0x3F;
if (vandalism)
{
@@ -2684,7 +2684,7 @@ static void peep_footpath_move_forward(Peep* peep, int16_t x, int16_t y, TileEle
vandalThoughtTimeout--;
}
peep->vandalism_seen = (vandalThoughtTimeout << 6) | vandalisedTiles;
peep->VandalismSeen = (vandalThoughtTimeout << 6) | vandalisedTiles;
uint16_t crowded = 0;
uint8_t litter_count = 0;
uint8_t sick_count = 0;

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

@@ -735,7 +735,7 @@ struct Peep : SpriteBase
uint8_t no_of_food;
uint8_t no_of_drinks;
uint8_t no_of_souvenirs;
uint8_t vandalism_seen; // 0xC0 vandalism thought timeout, 0x3F vandalism tiles seen
uint8_t VandalismSeen; // 0xC0 vandalism thought timeout, 0x3F vandalism tiles seen
uint8_t VoucherType;
uint8_t VoucherArguments; // ride_id or string_offset_id
uint8_t SurroundingsThoughtTimeout;

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

@@ -1424,7 +1424,7 @@ private:
dst->var_37 = src->var_37;
dst->time_to_consume = src->time_to_consume;
dst->step_progress = src->step_progress;
dst->vandalism_seen = src->vandalism_seen;
dst->VandalismSeen = src->vandalism_seen;
dst->type = static_cast<PeepType>(src->type);

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

@@ -1228,7 +1228,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->no_of_food = src->no_of_food;
dst->no_of_drinks = src->no_of_drinks;
dst->no_of_souvenirs = src->no_of_souvenirs;
dst->vandalism_seen = src->vandalism_seen;
dst->vandalism_seen = src->VandalismSeen;
dst->voucher_type = src->VoucherType;
dst->voucher_arguments = src->VoucherArguments;
dst->surroundings_thought_timeout = src->SurroundingsThoughtTimeout;

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

@@ -1493,7 +1493,7 @@ public:
dst->no_of_food = src->no_of_food;
dst->no_of_drinks = src->no_of_drinks;
dst->no_of_souvenirs = src->no_of_souvenirs;
dst->vandalism_seen = src->vandalism_seen;
dst->VandalismSeen = src->vandalism_seen;
dst->VoucherType = src->voucher_type;
dst->VoucherArguments = src->voucher_arguments;
dst->SurroundingsThoughtTimeout = src->surroundings_thought_timeout;

2
test/tests/S6ImportExportTests.cpp
View File

@@ -254,7 +254,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
COMPARE_FIELD(no_of_food);
COMPARE_FIELD(no_of_drinks);
COMPARE_FIELD(no_of_souvenirs);
COMPARE_FIELD(vandalism_seen);
COMPARE_FIELD(VandalismSeen);
COMPARE_FIELD(VoucherType);
COMPARE_FIELD(VoucherArguments);
COMPARE_FIELD(SurroundingsThoughtTimeout);