diff --git a/src/openrct2/GameState.cpp b/src/openrct2/GameState.cpp index 1dc2419f1b..a1200faa3c 100644 --- a/src/openrct2/GameState.cpp +++ b/src/openrct2/GameState.cpp @@ -369,7 +369,6 @@ void GameState::UpdateLogic() NetworkFlush(); gameState.CurrentTicks++; - gSavedAge++; #ifdef ENABLE_SCRIPTING auto& hookEngine = GetContext()->GetScriptEngine().GetHookEngine(); diff --git a/src/openrct2/entity/EntityRegistry.cpp b/src/openrct2/entity/EntityRegistry.cpp index db5152d5db..9737faef72 100644 --- a/src/openrct2/entity/EntityRegistry.cpp +++ b/src/openrct2/entity/EntityRegistry.cpp @@ -171,8 +171,6 @@ const std::list& GetEntityList(const EntityType id) */ void ResetAllEntities() { - gSavedAge = 0; - // Free all associated Entity pointers prior to zeroing memory for (int32_t i = 0; i < MAX_ENTITIES; ++i) { diff --git a/src/openrct2/rct2/RCT2.h b/src/openrct2/rct2/RCT2.h index 3c4b586a18..e52f9bd3d1 100644 --- a/src/openrct2/rct2/RCT2.h +++ b/src/openrct2/rct2/RCT2.h @@ -988,7 +988,7 @@ namespace RCT2 char CustomStrings[Limits::MaxUserStrings][Limits::MaxUserStringLength]; uint32_t GameTicks1; Ride Rides[Limits::MaxRidesInPark]; - uint16_t SavedAge; + uint16_t SavedAge; // unused int16_t SavedViewX; int16_t SavedViewY; uint8_t SavedViewZoom; diff --git a/src/openrct2/rct2/S6Importer.cpp b/src/openrct2/rct2/S6Importer.cpp index 954ece5a05..15bfd90af5 100644 --- a/src/openrct2/rct2/S6Importer.cpp +++ b/src/openrct2/rct2/S6Importer.cpp @@ -440,7 +440,6 @@ namespace RCT2 ImportRides(); - gSavedAge = _s6.SavedAge; gSavedView = ScreenCoordsXY{ _s6.SavedViewX, _s6.SavedViewY }; gSavedViewZoom = ZoomLevel{ static_cast(_s6.SavedViewZoom) }; gSavedViewRotation = _s6.SavedViewRotation; diff --git a/src/openrct2/scenario/Scenario.cpp b/src/openrct2/scenario/Scenario.cpp index 459fa121af..40f60c9478 100644 --- a/src/openrct2/scenario/Scenario.cpp +++ b/src/openrct2/scenario/Scenario.cpp @@ -69,7 +69,6 @@ const StringId ScenarioCategoryStringIds[SCENARIO_CATEGORY_COUNT] = { std::string gScenarioSavePath; bool gFirstTimeSaving = true; -uint16_t gSavedAge; uint32_t gLastAutoSaveUpdate = 0; bool gAllowEarlyCompletionInNetworkPlay; diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index 774140a8cd..fe6c61fe95 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -162,7 +162,6 @@ extern bool gAllowEarlyCompletionInNetworkPlay; extern std::string gScenarioSavePath; extern bool gFirstTimeSaving; -extern uint16_t gSavedAge; extern uint32_t gLastAutoSaveUpdate; extern std::string gScenarioFileName; diff --git a/src/openrct2/title/TitleScreen.cpp b/src/openrct2/title/TitleScreen.cpp index dea6c2c51d..42192b387d 100644 --- a/src/openrct2/title/TitleScreen.cpp +++ b/src/openrct2/title/TitleScreen.cpp @@ -184,8 +184,6 @@ void TitleScreen::Tick() ContextUpdateMapTooltip(); WindowDispatchUpdateAll(); - gSavedAge++; - ContextHandleInput(); gInUpdateCode = false;