mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-20 05:23:04 +01:00
Code Issues Releases Wiki Activity

Rename Peep::surrounding_thought_timeout > SurroundingsThoughtTimeout

Browse Source
This commit is contained in:
Tulio Leao
2020-05-13 23:28:16 -03:00
parent 32c8e5614f
commit c17aa095d5
8 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

@@ -304,7 +304,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
COMPARE_FIELD(Peep, vandalism_seen);
COMPARE_FIELD(Peep, voucher_type);
COMPARE_FIELD(Peep, voucher_arguments);
COMPARE_FIELD(Peep, surroundings_thought_timeout);
COMPARE_FIELD(Peep, SurroundingsThoughtTimeout);
COMPARE_FIELD(Peep, Angriness);
COMPARE_FIELD(Peep, TimeLost);
COMPARE_FIELD(Peep, DaysInQueue);

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

@@ -755,10 +755,10 @@ void Guest::Tick128UpdateGuest(int32_t index)
if (state == PEEP_STATE_WALKING || state == PEEP_STATE_SITTING)
{
surroundings_thought_timeout++;
if (surroundings_thought_timeout >= 18)
SurroundingsThoughtTimeout++;
if (SurroundingsThoughtTimeout >= 18)
{
surroundings_thought_timeout = 0;
SurroundingsThoughtTimeout = 0;
if (x != LOCATION_NULL)
{
PeepThoughtType thought_type = peep_assess_surroundings(x & 0xFFE0, y & 0xFFE0, z);

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

@@ -1772,7 +1772,7 @@ Peep* Peep::Generate(const CoordsXYZ& coords)
peep->no_of_food = 0;
peep->no_of_drinks = 0;
peep->no_of_souvenirs = 0;
peep->surroundings_thought_timeout = 0;
peep->SurroundingsThoughtTimeout = 0;
peep->Angriness = 0;
peep->TimeLost = 0;

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

@@ -738,7 +738,7 @@ struct Peep : SpriteBase
uint8_t vandalism_seen; // 0xC0 vandalism thought timeout, 0x3F vandalism tiles seen
uint8_t voucher_type;
uint8_t voucher_arguments; // ride_id or string_offset_id
uint8_t surroundings_thought_timeout;
uint8_t SurroundingsThoughtTimeout;
uint8_t Angriness;
uint8_t TimeLost; // the time the peep has been lost when it reaches 254 generates the lost thought
uint8_t DaysInQueue;

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

@@ -1497,7 +1497,7 @@ private:
dst->voucher_arguments = src->voucher_arguments;
dst->voucher_type = src->voucher_type;
dst->surroundings_thought_timeout = src->surroundings_thought_timeout;
dst->SurroundingsThoughtTimeout = src->surroundings_thought_timeout;
dst->Angriness = src->angriness;
dst->TimeLost = src->time_lost;

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

@@ -1231,7 +1231,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
dst->vandalism_seen = src->vandalism_seen;
dst->voucher_type = src->voucher_type;
dst->voucher_arguments = src->voucher_arguments;
dst->surroundings_thought_timeout = src->surroundings_thought_timeout;
dst->surroundings_thought_timeout = src->SurroundingsThoughtTimeout;
dst->angriness = src->Angriness;
dst->time_lost = src->TimeLost;
dst->days_in_queue = src->DaysInQueue;

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

@@ -1496,7 +1496,7 @@ public:
dst->vandalism_seen = src->vandalism_seen;
dst->voucher_type = src->voucher_type;
dst->voucher_arguments = src->voucher_arguments;
dst->surroundings_thought_timeout = src->surroundings_thought_timeout;
dst->SurroundingsThoughtTimeout = src->surroundings_thought_timeout;
dst->Angriness = src->angriness;
dst->TimeLost = src->time_lost;
dst->DaysInQueue = src->days_in_queue;