Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-12 21:47:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix pushable detection without hacks

Browse source
This commit is contained in:
Lwmte 2021-08-17 01:38:22 +03:00
parent b04354e35a
commit 4b3964a6ae
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
TR5Main/Objects/TR5/Object/tr5_pushableblock.cpp
View file

@ -463,12 +463,16 @@ void PushableBlockCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll)
} }
else else
{ {
const short pushableBoundsExtents = 200;
BOUNDING_BOX* bounds = GetBoundsAccurate(item); BOUNDING_BOX* bounds = GetBoundsAccurate(item);
PushableBlockBounds.boundingBox.X1 = (bounds->X1 / 2) - 100; PushableBlockBounds.boundingBox.X1 = bounds->X1 - pushableBoundsExtents;
PushableBlockBounds.boundingBox.X2 = (bounds->X2 / 2) + 100; PushableBlockBounds.boundingBox.X2 = bounds->X2 + pushableBoundsExtents;
PushableBlockBounds.boundingBox.Z1 = bounds->Z1 - 200; PushableBlockBounds.boundingBox.Y1 = bounds->Y1;
PushableBlockBounds.boundingBox.Z2 = 0; PushableBlockBounds.boundingBox.Y2 = bounds->Y2;
PushableBlockBounds.boundingBox.Z1 = bounds->Z1 - pushableBoundsExtents;
PushableBlockBounds.boundingBox.Z2 = bounds->Z2 + pushableBoundsExtents;
short rot = item->pos.yRot; short rot = item->pos.yRot;
item->pos.yRot = (l->pos.yRot + ANGLE(45)) & 0xC000; item->pos.yRot = (l->pos.yRot + ANGLE(45)) & 0xC000;