Fix: [OpenRCT2#23297] Peeps disappear when closing the game.

distribution/changelog.txt

@@ -2,6 +2,7 @@
 ------------------------------------------------------------------------
 - Improved: [#23260] Add diagonal (block) brakes to LSM Launched Roller Coaster.
 - Fix: [#23286] Currency formatted incorrectly in the in game console.
+- Fix: [#23297] Peeps disappear when closing the game.
 
 0.4.17 (2024-12-08)
 ------------------------------------------------------------------------

src/openrct2/Game.cpp

@@ -689,7 +689,7 @@ void GameLoadOrQuitNoSavePrompt()
         }
         default:
             GameUnloadScripts();
-            ResetAllEntities();
+            FreeAllEntities();
             OpenRCT2Finish();
             break;
     }

src/openrct2/entity/EntityRegistry.cpp

@@ -159,12 +159,10 @@ const std::list<EntityId>& GetEntityList(const EntityType id)
 }
 
 /**
- *
- *  rct2: 0x0069EB13
+ * Frees any dynamically attached memory for all entities
  */
-void ResetAllEntities()
+void FreeAllEntities()
 {
-    // Free all associated Entity pointers prior to zeroing memory
     for (int32_t i = 0; i < MAX_ENTITIES; ++i)
     {
         auto* spr = GetEntity(EntityId::FromUnderlying(i));
@@ -174,6 +172,15 @@ void ResetAllEntities()
         }
         FreeEntity(*spr);
     }
+}
+
+/**
+ *
+ *  rct2: 0x0069EB13
+ */
+void ResetAllEntities()
+{
+    FreeAllEntities();
 
     auto& gameState = GetGameState();
     std::fill(std::begin(gameState.Entities), std::end(gameState.Entities), Entity_t());

src/openrct2/entity/EntityRegistry.h

@@ -64,6 +64,7 @@ T* CreateEntityAt(const EntityId index)
     return static_cast<T*>(CreateEntityAt(index, T::cEntityType));
 }
 
+void FreeAllEntities();
 void ResetAllEntities();
 void ResetEntitySpatialIndices();
 void UpdateAllMiscEntities();