diff --git a/TR5Main/Game/Lara/lara_basic.cpp b/TR5Main/Game/Lara/lara_basic.cpp index 356f9b430..de2f7f4f2 100644 --- a/TR5Main/Game/Lara/lara_basic.cpp +++ b/TR5Main/Game/Lara/lara_basic.cpp @@ -316,7 +316,7 @@ void lara_col_run(ITEM_INFO* item, COLL_INFO* coll) { item->pos.zRot = 0; - if (coll->splat || TestWall(item, 256, 0, -640)) + if (coll->hitTallBounds || TestWall(item, 256, 0, -640)) { item->goalAnimState = LS_SPLAT; 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; - if (coll->splat || TestWall(item, 256, 0, -640)) + if (coll->hitTallBounds || TestWall(item, 256, 0, -640)) { item->goalAnimState = LS_SPLAT; if (GetChange(item, &g_Level.Anims[item->animNumber])) diff --git a/TR5Main/Game/collide.cpp b/TR5Main/Game/collide.cpp index 661111b10..009083df5 100644 --- a/TR5Main/Game/collide.cpp +++ b/TR5Main/Game/collide.cpp @@ -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 if (item == LaraItem && coll->collType == CT_FRONT) - coll->splat = (YMin <= inYMin + LARA_HEADROOM); + coll->hitTallBounds = (YMin <= inYMin + LARA_HEADROOM); return true; } @@ -2714,7 +2714,7 @@ void DoObjectCollision(ITEM_INFO* l, COLL_INFO* coll) // previously LaraBaddieCo l->hitStatus = false; coll->hitStatic = false; - coll->splat = false; + coll->hitTallBounds = false; if (l == LaraItem) Lara.hitDirection = -1; diff --git a/TR5Main/Game/collide.h b/TR5Main/Game/collide.h index 767e931a8..1e4d2755a 100644 --- a/TR5Main/Game/collide.h +++ b/TR5Main/Game/collide.h @@ -61,7 +61,7 @@ struct COLL_INFO signed char tiltX; signed char tiltZ; bool hitStatic; - bool splat; + bool hitTallBounds; bool slopesAreWalls; bool slopesArePits; bool lavaIsPit;