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

Merge pull request #328 from MontyTRC89/new_objects_collision

Browse source 
Solid statics collision
This commit is contained in:
MontyTRC 2021-09-08 16:44:01 +02:00 • committed by GitHub
commit 60e81f29d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 432 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TR5Main/Game/Lara/lara_basic.cpp
View file

@ -316,7 +316,7 @@ void lara_col_run(ITEM_INFO* item, COLL_INFO* coll)
{
item->pos.zRot = 0;
if (TestWall(item, 256, 0, -640))
if (coll->splat || TestWall(item, 256, 0, -640))
{
item->goalAnimState = LS_SPLAT;
if (GetChange(item, &g_Level.Anims[item->animNumber]))
@ -1631,7 +1631,6 @@ void lara_col_upjump(ITEM_INFO* item, COLL_INFO* coll)
coll->badPos = NO_BAD_POS;
coll->badNeg = -STEPUP_HEIGHT;
coll->badCeiling = BAD_JUMP_CEILING;
coll->hitCeiling = false;
coll->facing = item->speed < 0 ? Lara.moveAngle + ANGLE(180.0f) : Lara.moveAngle;
GetCollisionInfo(coll, item->pos.xPos, item->pos.yPos, item->pos.zPos, item->roomNumber, 870);
@ -1745,8 +1744,7 @@ void lara_col_upjump(ITEM_INFO* item, COLL_INFO* coll)
if (coll->collType == CT_CLAMP ||
coll->collType == CT_TOP ||
coll->collType == CT_TOP_FRONT ||
coll->hitCeiling)
coll->collType == CT_TOP_FRONT)
item->fallspeed = 1;
if (coll->collType == CT_NONE)
@ -2197,7 +2195,7 @@ void lara_col_dash(ITEM_INFO* item, COLL_INFO* coll)
{
item->pos.zRot = 0;
if (TestWall(item, 256, 0, -640))
if (coll->splat || TestWall(item, 256, 0, -640))
{
item->goalAnimState = LS_SPLAT;
if (GetChange(item, &g_Level.Anims[item->animNumber]))