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

Start naming EMaterialTypes values

Browse Source
This commit is contained in:
Phillip Stephens
2016-12-29 13:38:59 -08:00
parent b3cae0d4d5
commit af1e22a62d
35 changed files with 173 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Runtime/World/ScriptLoader.cpp
View File

@@ -385,9 +385,9 @@ CEntity* ScriptLoader::LoadActor(CStateManager& mgr, CInputStream& in, int propC
CActorParameters actParms = LoadActorParameters(in);
bool b1 = in.readBool();
bool b2 = in.readBool();
bool b3 = in.readBool();
bool b4 = in.readBool();
bool snow = in.readBool();
bool grass = in.readBool();
bool metalGrating = in.readBool();
bool b5 = in.readBool();
u32 w2 = in.readUint32Big();
float f3 = in.readFloatBig();
@@ -403,14 +403,14 @@ CEntity* ScriptLoader::LoadActor(CStateManager& mgr, CInputStream& in, int propC
zeus::CAABox aabb = GetCollisionBox(mgr, info.GetAreaId(), collisionExtent, centroid);
CMaterialList list;
if (b2)
list.Add(EMaterialTypes::Eleven);
if (snow) // Bool 2
list.Add(EMaterialTypes::Snow);
if (b3)
list.Add(EMaterialTypes::Three);
if (grass) // Bool 3
list.Add(EMaterialTypes::Grass);
if (b4)
list.Add(EMaterialTypes::Six);
if (metalGrating) // Bool 4
list.Add(EMaterialTypes::MetalGrating);
bool generateExtent = false;
if (collisionExtent.x < 0.f || collisionExtent.y < 0.f || collisionExtent.z < 0.f)