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

Initial CScriptPlatform imps, minor cleanup, and RandomStatic GLSL fixes

Browse Source
This commit is contained in:
Phillip Stephens
2017-06-10 22:49:27 -07:00
parent 2d2a3dcf1c
commit 46c70ecf11
7 changed files with 92 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/World/ScriptLoader.cpp
View File

@@ -644,7 +644,7 @@ CEntity* ScriptLoader::LoadPlatform(CStateManager& mgr, CInputStream& in, int pr
zeus::CAABox aabb = GetCollisionBox(mgr, info.GetAreaId(), extent, centroid);
FourCC dclnType = g_ResFactory->GetResourceTypeById(dclnId);
rstl::optional_object<TLockedToken<CCollidableOBBTreeGroup>> dclnToken;
rstl::optional_object<TLockedToken<CCollidableOBBTreeGroupContainer>> dclnToken;
if (dclnType)
{
dclnToken.emplace(g_SimplePool->GetObj({SBIG('DCLN'), dclnId}));