From 7d25480a4df8d7a76a365b56ce141010cda6a6d5 Mon Sep 17 00:00:00 2001
From: Tulio Leao <tupaschoal@gmail.com>
Date: Sun, 7 Jun 2020 21:45:12 -0300
Subject: [PATCH] Rename Peep::time_to_sitdown to TimeToSitdown

---
 src/openrct2/GameStateSnapshots.cpp | 2 +-
 src/openrct2/peep/Guest.cpp         | 6 +++---
 src/openrct2/peep/Peep.h            | 2 +-
 src/openrct2/rct2/S6Exporter.cpp    | 2 +-
 src/openrct2/rct2/S6Importer.cpp    | 2 +-
 test/tests/S6ImportExportTests.cpp  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/openrct2/GameStateSnapshots.cpp b/src/openrct2/GameStateSnapshots.cpp
index f65347c35a..38d662c948 100644
--- a/src/openrct2/GameStateSnapshots.cpp
+++ b/src/openrct2/GameStateSnapshots.cpp
@@ -253,7 +253,7 @@ struct GameStateSnapshots final : public IGameStateSnapshots
         COMPARE_FIELD(Peep, current_ride);
         COMPARE_FIELD(Peep, current_ride_station);
         COMPARE_FIELD(Peep, current_train);
-        COMPARE_FIELD(Peep, time_to_sitdown);
+        COMPARE_FIELD(Peep, TimeToSitdown);
         COMPARE_FIELD(Peep, SpecialSprite);
         COMPARE_FIELD(Peep, ActionSpriteType);
         COMPARE_FIELD(Peep, NextActionSpriteType);
diff --git a/src/openrct2/peep/Guest.cpp b/src/openrct2/peep/Guest.cpp
index f9f1a6f14a..c5909adc9b 100644
--- a/src/openrct2/peep/Guest.cpp
+++ b/src/openrct2/peep/Guest.cpp
@@ -1197,8 +1197,8 @@ void Guest::TryGetUpFromSitting()
     if (HasFood())
         return;
 
-    time_to_sitdown--;
-    if (time_to_sitdown)
+    TimeToSitdown--;
+    if (TimeToSitdown)
         return;
 
     SetState(PEEP_STATE_WALKING);
@@ -1239,7 +1239,7 @@ void Guest::UpdateSitting()
         sub_state = PEEP_SITTING_SAT_DOWN;
 
         // Sets time to sit on seat
-        time_to_sitdown = (129 - energy) * 16 + 50;
+        TimeToSitdown = (129 - energy) * 16 + 50;
     }
     else if (sub_state == PEEP_SITTING_SAT_DOWN)
     {
diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h
index 8170ac1aaa..b2f00f3da4 100644
--- a/src/openrct2/peep/Peep.h
+++ b/src/openrct2/peep/Peep.h
@@ -645,7 +645,7 @@ struct Peep : SpriteBase
             uint8_t current_car;
             uint8_t current_seat;
         };
-        uint16_t time_to_sitdown;
+        uint16_t TimeToSitdown;
         struct
         {
             uint8_t TimeToStand;
diff --git a/src/openrct2/rct2/S6Exporter.cpp b/src/openrct2/rct2/S6Exporter.cpp
index 339a7aaa34..eea7cbed78 100644
--- a/src/openrct2/rct2/S6Exporter.cpp
+++ b/src/openrct2/rct2/S6Exporter.cpp
@@ -1175,7 +1175,7 @@ void S6Exporter::ExportSpritePeep(RCT2SpritePeep* dst, const Peep* src)
     dst->current_ride = src->current_ride;
     dst->current_ride_station = src->current_ride_station;
     dst->current_train = src->current_train;
-    dst->time_to_sitdown = src->time_to_sitdown;
+    dst->time_to_sitdown = src->TimeToSitdown;
     dst->special_sprite = src->SpecialSprite;
     dst->action_sprite_type = static_cast<uint8_t>(src->ActionSpriteType);
     dst->next_action_sprite_type = static_cast<uint8_t>(src->NextActionSpriteType);
diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp
index f3e62df6c5..4c6ff6417d 100644
--- a/src/openrct2/rct2/S6Importer.cpp
+++ b/src/openrct2/rct2/S6Importer.cpp
@@ -1440,7 +1440,7 @@ public:
         dst->current_ride = src->current_ride;
         dst->current_ride_station = src->current_ride_station;
         dst->current_train = src->current_train;
-        dst->time_to_sitdown = src->time_to_sitdown;
+        dst->TimeToSitdown = src->time_to_sitdown;
         dst->SpecialSprite = src->special_sprite;
         dst->ActionSpriteType = static_cast<PeepActionSpriteType>(src->action_sprite_type);
         dst->NextActionSpriteType = static_cast<PeepActionSpriteType>(src->next_action_sprite_type);
diff --git a/test/tests/S6ImportExportTests.cpp b/test/tests/S6ImportExportTests.cpp
index 53a3f38c6d..fbd3f099eb 100644
--- a/test/tests/S6ImportExportTests.cpp
+++ b/test/tests/S6ImportExportTests.cpp
@@ -197,7 +197,7 @@ static void CompareSpriteDataPeep(const Peep& left, const Peep& right)
     COMPARE_FIELD(current_ride);
     COMPARE_FIELD(current_ride_station);
     COMPARE_FIELD(current_train);
-    COMPARE_FIELD(time_to_sitdown);
+    COMPARE_FIELD(TimeToSitdown);
     COMPARE_FIELD(SpecialSprite);
     COMPARE_FIELD(ActionSpriteType);
     COMPARE_FIELD(NextActionSpriteType);