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

Merge branch 'master' of https://github.com/MontyTRC89/TombEngine

Browse source
This commit is contained in:
MontyTRC89 2021-09-08 16:47:31 +02:00
commit 63bd495584
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
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; item->pos.zRot = 0;
if (coll->splat || TestWall(item, 256, 0, -640)) if (coll->hitTallBounds || TestWall(item, 256, 0, -640))
{ {
item->goalAnimState = LS_SPLAT; item->goalAnimState = LS_SPLAT;
if (GetChange(item, &g_Level.Anims[item->animNumber])) if (GetChange(item, &g_Level.Anims[item->animNumber]))
@ -2195,7 +2195,7 @@ void lara_col_dash(ITEM_INFO* item, COLL_INFO* coll)
{ {
item->pos.zRot = 0; item->pos.zRot = 0;
if (coll->splat || TestWall(item, 256, 0, -640)) if (coll->hitTallBounds || TestWall(item, 256, 0, -640))
{ {
item->goalAnimState = LS_SPLAT; item->goalAnimState = LS_SPLAT;
if (GetChange(item, &g_Level.Anims[item->animNumber])) if (GetChange(item, &g_Level.Anims[item->animNumber]))

4
TR5Main/Game/collide.cpp
View file

@ -491,7 +491,7 @@ bool CollideSolidBounds(ITEM_INFO* item, BOUNDING_BOX box, PHD_3DPOS pos, COLL_I
// Set splat state flag if item is Lara and bounds are taller than Lara's headroom // Set splat state flag if item is Lara and bounds are taller than Lara's headroom
if (item == LaraItem && coll->collType == CT_FRONT) if (item == LaraItem && coll->collType == CT_FRONT)
coll->splat = (YMin <= inYMin + LARA_HEADROOM); coll->hitTallBounds = (YMin <= inYMin + LARA_HEADROOM);
return true; return true;
} }
@ -2714,7 +2714,7 @@ void DoObjectCollision(ITEM_INFO* l, COLL_INFO* coll) // previously LaraBaddieCo
l->hitStatus = false; l->hitStatus = false;
coll->hitStatic = false; coll->hitStatic = false;
coll->splat = false; coll->hitTallBounds = false;
if (l == LaraItem) if (l == LaraItem)
Lara.hitDirection = -1; Lara.hitDirection = -1;

2
TR5Main/Game/collide.h
View file

@ -61,7 +61,7 @@ struct COLL_INFO
signed char tiltX; signed char tiltX;
signed char tiltZ; signed char tiltZ;
bool hitStatic; bool hitStatic;
bool splat; bool hitTallBounds;
bool slopesAreWalls; bool slopesAreWalls;
bool slopesArePits; bool slopesArePits;
bool lavaIsPit; bool lavaIsPit;