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

objects: Do not change Controller on Enter for Alive non-C4D_Livings 

Previously, only C4D_Livings that were Alive did not get their
Controller changed. There is no need for the Category check, the
Alive check is sufficient.
Günther Brammer 2011-01-02 19:52:29 +01:00
parent 74135b4350
commit 3c7f17c1aa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/object/C4Object.cpp
View File

@ -1505,7 +1505,7 @@ bool C4Object::Enter(C4Object *pTarget, bool fCalls, bool fCopyMotion, bool *pfR
}
// Assume that the new container controls this object, if it cannot control itself (i.e.: Alive)
// So it can be traced back who caused the damage, if a projectile hits its target
if (!(Alive && (Category & C4D_Living)))
if (!Alive)
Controller = pTarget->Controller;
// Misc updates
// motion must be copied immediately, so the position will be correct when OCF is set, and