AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

Refactor ResId into CAssetId

Browse Source
This commit is contained in:
Phillip Stephens
2017-08-12 22:26:14 -07:00
parent e0efcc0e5c
commit 870e8c80ee
176 changed files with 800 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CWorldTransManager.cpp
View File

@@ -383,8 +383,8 @@ void CWorldTransManager::TouchModels()
}
void CWorldTransManager::EnableTransition(const CAnimRes& samusRes,
ResId platRes, const zeus::CVector3f& platScale,
ResId bgRes, const zeus::CVector3f& bgScale, bool goingUp)
CAssetId platRes, const zeus::CVector3f& platScale,
CAssetId bgRes, const zeus::CVector3f& bgScale, bool goingUp)
{
x44_25_stopSoon = false;
x44_26_goingUp = goingUp;
@@ -394,7 +394,7 @@ void CWorldTransManager::EnableTransition(const CAnimRes& samusRes,
x8_textData.reset();
x20_random.SetSeed(99);
ResId beamModelId = g_tweakPlayerRes->GetBeamCineModel(
CAssetId beamModelId = g_tweakPlayerRes->GetBeamCineModel(
DataSpec::ITweakPlayerRes::EBeamId(g_GameState->GetPlayerState()->GetCurrentBeam()));
x4_modelData->x14c_beamModel = g_SimplePool->GetObj(SObjectTag{FOURCC('CMDL'), beamModelId});
@@ -428,7 +428,7 @@ void CWorldTransManager::EnableTransition(const CAnimRes& samusRes,
TouchModels();
}
void CWorldTransManager::EnableTransition(ResId fontId, ResId stringId, u32 strIdx, bool fadeWhite,
void CWorldTransManager::EnableTransition(CAssetId fontId, CAssetId stringId, u32 strIdx, bool fadeWhite,
float chFadeTime, float chFadeRate, float textStartTime)
{
x40_strIdx = strIdx;