Add ~CStateManager

include/Collision/CCollisionPrimitive.hpp

@@ -25,6 +25,8 @@ public:
   virtual ~CCollisionPrimitive();
   virtual CRayCastResult CastRayInternal(const CInternalRayCastStructure&) const = 0;
 
+  static void Uninitialize();
+
 private:
   uint x4_;
   CMaterialList x8_material;

include/MetroidPrime/CEnvFxManager.hpp

@@ -41,6 +41,7 @@ public:
   static void Initialize();
   void SetFxDensity(int, float);
   void SetSplashRate(float f) { xb54_baseSplashRate = f; }
+  void Cleanup();
 
 private:
   CAABox x0_particleBounds;

include/MetroidPrime/CFluidPlaneManager.hpp

@@ -8,6 +8,8 @@
 
 #include "rstl/reserved_vector.hpp"
 
+class CScriptWater;
+
 class CFluidPlaneManager {
 public:
   // TODO

include/MetroidPrime/CMapWorldInfo.hpp

@@ -0,0 +1,8 @@
+#ifndef _CMAPWORLDINFO
+#define _CMAPWORLDINFO
+
+class CMapWorldInfo {
+
+};
+
+#endif // _CMAPWORLDINFO

include/MetroidPrime/CRumbleManager.hpp

@@ -17,6 +17,7 @@ public:
   short Rumble(CStateManager&, ERumbleFxId, float, ERumblePriority);
 
   void StopRumble(short id);
+  void HardStopAll() { x0_rumbleGenerator.HardStopAll(); } 
   void Update(float dt);
 
 private:

include/MetroidPrime/CStateManager.hpp

@@ -49,7 +49,7 @@ class CEntity;
 class CMazeState;
 class CRayCastResult;
 class CMaterialFilter;
-class CScriptLayerManager;
+class CWorldLayerState;
 class CLight;
 class CDamageInfo;
 class CTexture;
@@ -100,6 +100,9 @@ public:
     kCFS_Max,
   };
 
+  CStateManager();
+  ~CStateManager();
+
   bool RenderLast(const TUniqueId&);
   void ResetEscapeSequenceTimer(float);
   void SendScriptMsg(TUniqueId uid, TEditorId target, EScriptObjectMessage msg,
@@ -167,6 +170,8 @@ public:
 
   CObjectList& ObjectListById(EGameObjectList id) { return *x808_objectLists[id]; }
   const CObjectList& GetObjectListById(EGameObjectList id) const { return *x808_objectLists[id]; }
+  
+  void RemoveObject(TUniqueId);
 
   const CFinalInput& GetFinalInput() const { return xb54_finalInput; }
 
@@ -276,7 +281,7 @@ private:
   rstl::rc_ptr< CScriptMailbox > x8bc_mailbox;
   rstl::rc_ptr< CMapWorldInfo > x8c0_mapWorldInfo;
   rstl::rc_ptr< CWorldTransManager > x8c4_worldTransManager;
-  rstl::rc_ptr< CScriptLayerManager > x8c8_worldLayerState;
+  rstl::rc_ptr< CWorldLayerState > x8c8_worldLayerState;
 
   TAreaId x8cc_nextAreaId;
   TAreaId x8d0_prevAreaId;
@@ -330,6 +335,8 @@ private:
   bool xf94_28_inSaveUI : 1;
   bool xf94_29_cinematicPause : 1;
   bool xf94_30_fullThreat : 1;
+
+  void ClearGraveyard();
 };
 CHECK_SIZEOF(CStateManager, 0xf98)