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

Final CThardusRockProjectile imps, cleanup needed

Browse Source
This commit is contained in:
Phillip Stephens
2020-09-05 14:51:21 -07:00
parent 2c59420177
commit 2ca0cd2bdd
6 changed files with 356 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/ScriptLoader.cpp
View File

@@ -2878,11 +2878,11 @@ CEntity* ScriptLoader::LoadThardusRockProjectile(CStateManager& mgr, CInputStrea
if (!pInfo.GetAnimationParameters().GetACSFile().IsValid())
return nullptr;
std::vector<std::unique_ptr<CModelData>> mDataVec;
std::vector<CStaticRes> mDataVec;
CModelData mData(CAnimRes(pInfo.GetAnimationParameters().GetACSFile(), 0, actorHead.x40_scale,
pInfo.GetAnimationParameters().GetInitialAnimation(), true));
mDataVec.reserve(3);
mDataVec.emplace_back(std::make_unique<CModelData>(CStaticRes(modelId, zeus::skOne3f)));
mDataVec.emplace_back(modelId, zeus::skOne3f);
return new MP1::CThardusRockProjectile(mgr.AllocateUniqueId(), actorHead.x0_name, info, actorHead.x10_transform,
std::move(mData), actParms, pInfo, std::move(mDataVec), stateMachine, f1);
}