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

Update falling_block.cpp

Browse source
This commit is contained in:
Lwmte 2021-09-25 05:15:35 +03:00
parent daeb2f622d
commit 21d93d8a86
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TR5Main/Objects/Generic/Traps/falling_block.cpp
View file

@ -103,15 +103,19 @@ void FallingBlockControl(short itemNumber)
if (item->itemFlags[0] < FALLINGBLOCK_DELAY) if (item->itemFlags[0] < FALLINGBLOCK_DELAY)
item->itemFlags[0] = FALLINGBLOCK_DELAY; item->itemFlags[0] = FALLINGBLOCK_DELAY;
auto bounds = GetBoundsAccurate(item);
auto x = (bounds->X2 - bounds->X1) / 2;
auto z = (bounds->Z2 - bounds->Z1) / 2;
// Convert object to shatter item // Convert object to shatter item
MESH* meshpp = &g_Level.Meshes[Objects[item->objectNumber].meshIndex]; MESH* meshpp = &g_Level.Meshes[Objects[item->objectNumber].meshIndex];
ShatterItem.yRot = item->pos.yRot; ShatterItem.yRot = item->pos.yRot;
ShatterItem.meshp = meshpp; ShatterItem.meshp = meshpp;
ShatterItem.sphere.x = item->pos.xPos; ShatterItem.sphere.x = x + item->pos.xPos;
ShatterItem.sphere.y = item->pos.yPos - STEP_SIZE; // So debris won't spawn below floor ShatterItem.sphere.y = item->pos.yPos - STEP_SIZE; // So debris won't spawn below floor
ShatterItem.sphere.z = item->pos.zPos; ShatterItem.sphere.z = z + item->pos.zPos;
ShatterItem.bit = 0; ShatterItem.bit = 0;
ShatterImpactData.impactDirection = Vector3(0.15f, -(float)item->itemFlags[1] / (float)FALLINGBLOCK_MAX_SPEED, 0); ShatterImpactData.impactDirection = Vector3(0, -(float)item->itemFlags[1] / (float)FALLINGBLOCK_MAX_SPEED, 0);
ShatterImpactData.impactLocation = { (float)ShatterItem.sphere.x, (float)ShatterItem.sphere.y, (float)ShatterItem.sphere.z }; ShatterImpactData.impactLocation = { (float)ShatterItem.sphere.x, (float)ShatterItem.sphere.y, (float)ShatterItem.sphere.z };
ShatterObject(&ShatterItem, nullptr, 0, item->roomNumber, false); ShatterObject(&ShatterItem, nullptr, 0, item->roomNumber, false);