AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 20:57:01 +00:00
Code Issues Projects Releases Wiki Activity

Finish initial CCredits implementation, merge EFlowStates with EClientFlowStates

Browse Source
This commit is contained in:
Phillip Stephens
2021-06-03 16:47:04 -07:00
parent 665dc5fd51
commit 99d363d5df
12 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/World/CWorld.cpp
View File

@@ -193,9 +193,7 @@ int CDummyWorld::IGetAreaCount() const { return x18_areas.size(); }
const std::optional<CWorldLayers>& CDummyWorld::GetWorldLayers() const { return m_worldLayers; }
CWorld::CWorld(IObjectStore& objStore, IFactory& resFactory, CAssetId mlvlId)
: x8_mlvlId(mlvlId)
, x60_objectStore(objStore)
, x64_resFactory(resFactory) {
: x8_mlvlId(mlvlId), x60_objectStore(objStore), x64_resFactory(resFactory) {
SObjectTag tag{FOURCC('MLVL'), mlvlId};
x44_bufSz = resFactory.ResourceSize(tag);
x40_loadBuf.reset(new u8[x44_bufSz]);
@@ -204,7 +202,8 @@ CWorld::CWorld(IObjectStore& objStore, IFactory& resFactory, CAssetId mlvlId)
CWorld::~CWorld() {
StopSounds();
if (g_GameState->GetWorldTransitionManager()->IsTransitionEnabled() && g_Main->GetFlowState() == EFlowState::None)
if (g_GameState->GetWorldTransitionManager()->IsTransitionEnabled() &&
g_Main->GetFlowState() == EClientFlowStates::None)
CStreamAudioManager::StopOneShot();
else
CStreamAudioManager::StopAll();