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

Attached objects with SolidMask (slave elevator case) can carry objects

stable-5.3
Sven Eberhardt 2012-12-06 20:30:35 +01:00 committed by Nicolas Hake
parent faf0303dd4
commit 486d6a33be
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/object/C4Object.cpp
View File

@ -3943,11 +3943,11 @@ void C4Object::ExecAction()
Exit(GetX(),GetY(),r);
}
// Force position
ForcePosition(Action.Target->fix_x + Action.Target->Shape.VtxX[Action.Data&255]
-Shape.VtxX[Action.Data>>8],
// Move position (so objects on solidmask move)
MovePosition(Action.Target->fix_x + Action.Target->Shape.VtxX[Action.Data&255]
-Shape.VtxX[Action.Data>>8] - fix_x,
Action.Target->fix_y + Action.Target->Shape.VtxY[Action.Data&255]
-Shape.VtxY[Action.Data>>8]);
-Shape.VtxY[Action.Data>>8] - fix_y);
// must zero motion...
xdir=ydir=0;