marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

C4FO: Make sure object has an action before testing its properties (#704)

Nicolas Hake 2012-01-10 16:17:37 +01:00
parent a5db0007c6
commit 0fe9cb41cd
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/script/C4FindObject.cpp
View File

@ -620,12 +620,16 @@ bool C4FindObjectCategory::IsEnsured()
bool C4FindObjectAction::Check(C4Object *pObj)
{
assert(pObj);
if (!pObj->GetAction()) return false;
return SEqual(pObj->GetAction()->GetName(), szAction);
}
bool C4FindObjectActionTarget::Check(C4Object *pObj)
{
assert(index >= 0 && index <= 1);
assert(pObj);
if (!pObj->GetAction()) return false;
if (index == 0)
return pObj->Action.Target == pActionTarget;
else if (index == 1)
@ -636,6 +640,8 @@ bool C4FindObjectActionTarget::Check(C4Object *pObj)
bool C4FindObjectProcedure::Check(C4Object *pObj)
{
assert(pObj);
if (!pObj->GetAction()) return false;
C4Value v;
pObj->GetAction()->GetProperty(P_Procedure, &v);
return v != C4VNull && v.getStr() == procedure;