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

Fix SolidMasks not moving objects if the top left of the landscape was solid 

A missing fixed conversion let the shape check happen at or around position 1/1 instead of at the actual object position.

Also removed a redundant contact check.
stable-5.3
Sven Eberhardt 2012-12-31 15:55:32 +01:00 committed by Nicolas Hake
parent 57b8e5c17d
commit 4864b2252f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/landscape/C4SolidMask.cpp
View File

@ -192,7 +192,7 @@ void C4SolidMask::Put(bool fCauseInstability, C4TargetRect *pClipRect, bool fRes
{
C4Object *pObj = ppAttachingObjects[i];
if (pObj->IsMoveableBySolidMask(pForObject->GetPlane()))
if (!pObj->Shape.ContactCheck(pObj->GetFixedX()+dx, pObj->GetFixedY()+dy))
if (!pObj->Shape.ContactCheck(fixtoi(pObj->GetFixedX()+dx), fixtoi(pObj->GetFixedY()+dy)))
if (pObj->iLastAttachMovementFrame != Game.FrameCounter)
{
pObj->iLastAttachMovementFrame = Game.FrameCounter;
@ -295,8 +295,7 @@ void C4SolidMask::Remove(bool fBackupAttachment)
int iVtx = 0;
for (; iVtx < pObj->Shape.VtxNum; ++iVtx)
if (pObj->Shape.GetVertexContact(iVtx, pObj->Action.t_attach | CNAT_Bottom, pObj->GetX(), pObj->GetY(), DensityProvider(pForObject, *this)))
if (pObj->Shape.GetVertexContact(iVtx, pObj->Action.t_attach | CNAT_Bottom, pObj->GetX(), pObj->GetY(), DensityProvider(pForObject, *this)))
break;
break;
if (iVtx == pObj->Shape.VtxNum) continue; // no contact
// contact: Add object to list
if (iAttachingObjectsCapacity == iAttachingObjectsCount)