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

COmegaPirate: MSVC runtime fix for skeleton asset IDs

Browse Source
This commit is contained in:
Luke Street
2020-05-31 22:05:48 -04:00
parent ab01cb5f1a
commit 8d2d5ef5d5
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Runtime/World/ScriptLoader.cpp
View File

@@ -3659,11 +3659,14 @@ CEntity* ScriptLoader::LoadOmegaPirate(CStateManager& mgr, CInputStream& in, int
return nullptr;
}
const CAssetId skeletonModelId{in};
const CAssetId skeletonSkinRulesId{in};
const CAssetId skeletonLayoutInfoId{in};
CModelData mData(CAnimRes(pInfo.GetAnimationParameters().GetACSFile(), pInfo.GetAnimationParameters().GetCharacter(),
actHead.x40_scale, pInfo.GetAnimationParameters().GetInitialAnimation(), true));
return new MP1::COmegaPirate(mgr.AllocateUniqueId(), actHead.x0_name, info, actHead.x10_transform, std::move(mData),
pInfo, actParms, elitePirateData, CAssetId(in), CAssetId(in), CAssetId(in));
pInfo, actParms, elitePirateData, skeletonModelId, skeletonSkinRulesId,
skeletonLayoutInfoId);
}
CEntity* ScriptLoader::LoadPhazonPool(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info) {