AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Additional reference-constructors for TCastToPtr

This commit is contained in:
Jack Andersen 2017-01-15 07:48:42 -10:00
parent e2c671e9b4
commit 7e720266d7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/CStateManager.cpp
View File

@ -529,12 +529,12 @@ bool CStateManager::ApplyLocalDamage(const zeus::CVector3f& vec1, const zeus::CV
float f30 = dt; float f30 = dt;
CPlayer* player = TCastToPtr<CPlayer>(&actor); CPlayer* player = TCastToPtr<CPlayer>(actor);
CAi* ai = TCastToPtr<CAi>(&actor); CAi* ai = TCastToPtr<CAi>(actor);
#if 0 #if 0
CDestroyableRock* dRock = nullptr; CDestroyableRock* dRock = nullptr;
if (!ai) if (!ai)
TCastToPtr<CDestroyableRock>(&actor); TCastToPtr<CDestroyableRock>(actor);
#endif #endif
if (player) if (player)

2
Runtime/World/CScriptCameraPitchVolume.cpp
View File

@ -42,7 +42,7 @@ rstl::optional_object<zeus::CAABox> CScriptCameraPitchVolume::GetTouchBounds() c
void CScriptCameraPitchVolume::Touch(CActor& act, CStateManager& mgr) void CScriptCameraPitchVolume::Touch(CActor& act, CStateManager& mgr)
{ {
CPlayer* pl = TCastToPtr<CPlayer>(&act); CPlayer* pl = TCastToPtr<CPlayer>(act);
if (!pl) if (!pl)
return; return;