PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-10 15:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add ~CStateManager

Browse Source
This commit is contained in:
Henrique Gemignani Passos Lima
2022-11-15 01:08:47 +02:00
parent 23371108b3
commit 7dc8252b27
12 changed files with 89 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/MetroidPrime/CStateManager.cpp Normal file
View File

@@ -0,0 +1,50 @@
#include "MetroidPrime/CStateManager.hpp"
#include "MetroidPrime/CEnvFxManager.hpp"
#include "MetroidPrime/CMapWorldInfo.hpp"
#include "MetroidPrime/CRipple.hpp"
#include "MetroidPrime/CRumbleManager.hpp"
#include "MetroidPrime/CScriptMailbox.hpp"
#include "MetroidPrime/CStateManagerContainer.hpp"
#include "MetroidPrime/CWorld.hpp"
#include "MetroidPrime/Player/CPlayer.hpp"
#include "MetroidPrime/Player/CPlayerState.hpp"
#include "MetroidPrime/Player/CWorldLayerState.hpp"
#include "MetroidPrime/Player/CWorldTransManager.hpp"
#include "MetroidPrime/ScriptObjects/CScriptMazeNode.hpp"
#include "Collision/CCollisionPrimitive.hpp"
#include "Kyoto/Graphics/CLight.hpp"
// CStateManager::CStateManager();
CStateManager::~CStateManager() {
CMemory::OffsetFakeStatics(
-(x808_objectLists.size() * sizeof(CObjectList) + 0x11c)); // TODO what is this 11c?
x88c_rumbleManager->HardStopAll();
x880_envFxManager->Cleanup();
x900_random = &x8fc_random;
CObjectList& list = *x808_objectLists[0];
ClearGraveyard();
for (int i = 0; i != kMaxObjects; ++i) {
CEntity* ent = list[i];
if (ent && ent->GetUniqueId() != x84c_player->GetUniqueId()) {
ent->AcceptScriptMsg(kSM_Deleted, kInvalidUniqueId, *this);
RemoveObject(ent->GetUniqueId());
delete ent;
}
}
ClearGraveyard();
x84c_player->AcceptScriptMsg(kSM_Deleted, kInvalidUniqueId, *this);
RemoveObject(x84c_player->GetUniqueId());
delete x84c_player;
x84c_player = nullptr;
CCollisionPrimitive::Uninitialize();
CMemory::SetOutOfMemoryCallback(nullptr, nullptr);
}
void CStateManager::RemoveObject(TUniqueId id) {}
void CStateManager::ClearGraveyard() {}

2
src/MetroidPrime/ScriptObjects/CScriptSpecialFunction.cpp
View File

@@ -448,7 +448,7 @@ void CScriptSpecialFunction::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId
if (msg == kSM_Decrement || msg == kSM_Increment) {
if (x1bc_areaSaveId != -1 && x1c0_layerIdx != -1) {
TAreaId aId = mgr.GetWorld()->GetAreaIdForSaveId(x1bc_areaSaveId);
rstl::rc_ptr< CScriptLayerManager > worldLayerState(NULL);
rstl::rc_ptr< CWorldLayerState > worldLayerState(NULL);
if (aId != kInvalidAreaId) {
// worldLayerState = mgr.WorldLayerState();