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

More particle bug fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-05-13 13:27:47 -10:00
parent faf0ac7d27
commit 9130b9459a
10 changed files with 148 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/World/ScriptLoader.cpp
View File

@@ -1863,7 +1863,7 @@ CEntity* ScriptLoader::LoadPlayerActor(CStateManager& mgr, CInputStream& in, int
bool solid = in.readBool();
bool active = in.readBool();
u32 flags = LoadParameterFlags(in);
bool w1 = in.readUint32Big() - 1;
CPlayerState::EBeamId beam = CPlayerState::EBeamId(in.readUint32Big() - 1);
FourCC fcc = g_ResFactory->GetResourceTypeById(animParms.GetACSFile());
if (!fcc || fcc != SBIG('ANCS'))
@@ -1884,7 +1884,7 @@ CEntity* ScriptLoader::LoadPlayerActor(CStateManager& mgr, CInputStream& in, int
CAnimRes(animParms.GetACSFile(), animParms.GetCharacter(), aHead.x40_scale,
animParms.GetInitialAnimation(), loop),
CModelData::CModelDataNull(), aabox, true, list, mass, zMomentum, hInfo, dVuln,
actParms, loop, active, flags, w1);
actParms, loop, active, flags, beam);
}
CEntity* ScriptLoader::LoadFlaahgra(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info)