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

Additional CPlayerGun implementations; downcast macro for tweak pointers

Browse Source
This commit is contained in:
Jack Andersen
2017-08-26 17:02:18 -10:00
parent 86ada63867
commit 1f7e8e1033
38 changed files with 780 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Runtime/World/CWorldTransManager.cpp
View File

@@ -394,8 +394,7 @@ void CWorldTransManager::EnableTransition(const CAnimRes& samusRes,
x8_textData.reset();
x20_random.SetSeed(99);
CAssetId beamModelId = g_tweakPlayerRes->GetBeamCineModel(
DataSpec::ITweakPlayerRes::EBeamId(g_GameState->GetPlayerState()->GetCurrentBeam()));
CAssetId beamModelId = g_tweakPlayerRes->GetBeamCineModel(g_GameState->GetPlayerState()->GetCurrentBeam());
x4_modelData->x14c_beamModel = g_SimplePool->GetObj(SObjectTag{FOURCC('CMDL'), beamModelId});