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

Fix action target reset on same procedure only.

shapetextures
Sven Eberhardt 2016-01-15 08:14:46 -05:00
parent c8a76ce450
commit cc613c01f4
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/object/C4Object.cpp
View File

@ -2874,10 +2874,12 @@ bool C4Object::SetAction(C4PropList * Act, C4Object *pTarget, C4Object *pTarget2
Action.Time=0;
// reset action data and targets if procedure is changed
if ((Act ? Act->GetPropertyP(P_Procedure) : -1)
!= (LastAction ? LastAction->GetPropertyP(P_Procedure) : -1))
!= (LastAction ? LastAction->GetPropertyP(P_Procedure) : -1))
{
Action.Data = 0;
Action.Target = NULL;
Action.Target2 = NULL;
Action.Target = NULL;
Action.Target2 = NULL;
}
}
// Set new action