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

Commenting out more diagonal floor checks, this time for jumping upward or forward to grab ledges

Browse source
This commit is contained in:
wolfcheese 2021-05-30 23:50:32 -04:00
parent e58250eaca
commit f81a54edae
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1027,11 +1027,11 @@ void lara_col_reach(ITEM_INFO* item, COLL_INFO* coll)
if (!(!edgeCatch || edgeCatch < 0 && !LaraTestHangOnClimbWall(item, coll))) if (!(!edgeCatch || edgeCatch < 0 && !LaraTestHangOnClimbWall(item, coll)))
{ {
angle = item->pos.yRot; angle = item->pos.yRot;
if (coll->midSplitFloor && coll->frontSplitFloor == coll->midSplitFloor) /*if (coll->midSplitFloor && coll->frontSplitFloor == coll->midSplitFloor)
{ {
result = SnapToDiagonal(angle, 35); result = SnapToDiagonal(angle, 35);
} }
else else*/
{ {
result = SnapToQuadrant(angle, 35); result = SnapToQuadrant(angle, 35);
} }
@ -1117,13 +1117,13 @@ void lara_col_reach(ITEM_INFO* item, COLL_INFO* coll)
{ {
item->pos.yPos += coll->frontFloor - bounds->Y1; item->pos.yPos += coll->frontFloor - bounds->Y1;
if (coll->midSplitFloor) /*if (coll->midSplitFloor)
{ {
Vector2 v = GetDiagonalIntersect(item->pos.xPos, item->pos.zPos, coll->midSplitFloor, LARA_RAD, angle); Vector2 v = GetDiagonalIntersect(item->pos.xPos, item->pos.zPos, coll->midSplitFloor, LARA_RAD, angle);
item->pos.xPos = v.x; item->pos.xPos = v.x;
item->pos.zPos = v.y; item->pos.zPos = v.y;
} }
else else*/
{ {
Vector2 v = GetOrthogonalIntersect(item->pos.xPos, item->pos.zPos, LARA_RAD, angle); Vector2 v = GetOrthogonalIntersect(item->pos.xPos, item->pos.zPos, LARA_RAD, angle);
item->pos.xPos = v.x; item->pos.xPos = v.x;
@ -1661,11 +1661,11 @@ void lara_col_upjump(ITEM_INFO* item, COLL_INFO* coll)
short angle = item->pos.yRot; short angle = item->pos.yRot;
bool result; bool result;
if (coll->midSplitFloor && coll->frontSplitFloor == coll->midSplitFloor) /*if (coll->midSplitFloor && coll->frontSplitFloor == coll->midSplitFloor)
{ {
result = SnapToDiagonal(angle, 35); result = SnapToDiagonal(angle, 35);
} }
else else*/
{ {
result = SnapToQuadrant(angle, 35); result = SnapToQuadrant(angle, 35);
} }
@ -1706,13 +1706,13 @@ void lara_col_upjump(ITEM_INFO* item, COLL_INFO* coll)
else else
item->pos.yPos += coll->frontFloor - bounds->Y1; item->pos.yPos += coll->frontFloor - bounds->Y1;
if (coll->midSplitFloor) /*if (coll->midSplitFloor)
{ {
Vector2 v = GetDiagonalIntersect(item->pos.xPos, item->pos.zPos, coll->midSplitFloor, LARA_RAD, item->pos.yRot); Vector2 v = GetDiagonalIntersect(item->pos.xPos, item->pos.zPos, coll->midSplitFloor, LARA_RAD, item->pos.yRot);
item->pos.xPos = v.x; item->pos.xPos = v.x;
item->pos.zPos = v.y; item->pos.zPos = v.y;
} }
else else*/
{ {
Vector2 v = GetOrthogonalIntersect(item->pos.xPos, item->pos.zPos, LARA_RAD, item->pos.yRot); Vector2 v = GetOrthogonalIntersect(item->pos.xPos, item->pos.zPos, LARA_RAD, item->pos.yRot);
item->pos.xPos = v.x; item->pos.xPos = v.x;