AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix crash in CAutoMapper

This commit is contained in:
Phillip Stephens 2021-03-17 02:55:00 -07:00
parent 0e08cb5461
commit 72b5706400
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Runtime/AutoMapper/CAutoMapper.cpp
View File

@ -217,6 +217,7 @@ bool CAutoMapper::CheckDummyWorldLoad(CStateManager& mgr) {
xa0_curAreaId = aid; xa0_curAreaId = aid;
dummyWorld->IGetMapWorld()->RecalculateWorldSphere(mwInfo, *dummyWorld); dummyWorld->IGetMapWorld()->RecalculateWorldSphere(mwInfo, *dummyWorld);
x24_world = dummyWorld.get();
BeginMapperStateTransition(EAutoMapperState::MapScreen, mgr); BeginMapperStateTransition(EAutoMapperState::MapScreen, mgr);
x32c_loadingDummyWorld = false; x32c_loadingDummyWorld = false;
return true; return true;

2
Runtime/AutoMapper/CAutoMapper.hpp
View File

@ -128,7 +128,7 @@ private:
ELoadPhase x4_loadPhase = ELoadPhase::LoadResources; ELoadPhase x4_loadPhase = ELoadPhase::LoadResources;
TLockedToken<CMapUniverse> x8_mapu; TLockedToken<CMapUniverse> x8_mapu;
std::vector<std::unique_ptr<IWorld>> x14_dummyWorlds; std::vector<std::unique_ptr<IWorld>> x14_dummyWorlds;
CWorld* x24_world; IWorld* x24_world;
TLockedToken<CGuiFrame> x28_frmeMapScreen; // Used to be ptr TLockedToken<CGuiFrame> x28_frmeMapScreen; // Used to be ptr
bool m_frmeInitialized = false; bool m_frmeInitialized = false;
TLockedToken<CModel> x30_miniMapSamus; TLockedToken<CModel> x30_miniMapSamus;