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

Implement CScriptDebris; EVNT POI fixes

Browse Source
This commit is contained in:
Jack Andersen
2018-05-15 18:07:38 -10:00
parent 10d36ac1d6
commit 0987866896
14 changed files with 620 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Character/CActorLights.hpp
View File

@@ -92,6 +92,8 @@ public:
bool HasShadowLight() const { return x29c_shadowLightArrIdx != -1; }
s32 GetShadowLightArrIndex() const { return x29c_shadowLightArrIdx; }
s32 GetShadowLightIndex() const { return x2a0_shadowLightIdx; }
u32 GetAreaUpdateFramePeriod() const { return x2a8_areaUpdateFramePeriod; }
void SetAreaUpdateFramePeriod(u32 p) { x2a8_areaUpdateFramePeriod = p; }
};
}

14
Runtime/Character/CPOINode.cpp
View File

@@ -74,9 +74,11 @@ u32 _getPOIList(const CCharAnimTime& time,
{
u32 idx = iterator + ret;
if (idx < capacity)
{
listOut[idx] = T::CopyNodeMinusStartTime(stream[passedCount], curTime);
++ret;
}
++passedCount;
++ret;
if (passedCount < stream.size())
nodeTime = stream[passedCount].GetTime();
}
@@ -97,13 +99,15 @@ u32 _getPOIList(const CCharAnimTime& time,
for (u32 it = iterator ; it < stream.size() ; ++it)
{
CCharAnimTime nodeTime = stream[ret].GetTime();
CCharAnimTime nodeTime = stream[it].GetTime();
if (nodeTime > targetTime)
return ret;
u32 idx = iterator + ret;
if (idx < capacity)
listOut[idx] = T::CopyNodeMinusStartTime(stream[ret], curTime);
++ret;
if (nodeTime >= curTime && idx < capacity)
{
listOut[idx] = T::CopyNodeMinusStartTime(stream[it], curTime);
++ret;
}
}
return ret;