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

Remove unnecessary conditions in step tests; reset torso and head rotation before perorming a crawl vault

Browse source
This commit is contained in:
Sezz 2021-12-02 23:45:19 +11:00
parent 03b0ea7027
commit ab42c8627b
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Settings.lua
View file

@ -22,5 +22,5 @@ anims.crawlspaceSwandive = true;
anims.monkeyReverse = true;
anims.monkeyAutoJump = false;
anims.oscillateHang = true;
anims.pose = true;
anims.pose = false;
SetAnimations(anims);

11
TR5Main/Game/Lara/lara_helpers.cpp
View file

@ -67,6 +67,15 @@ void DoLaraStep(ITEM_INFO* item, COLL_INFO* coll)
void DoLaraCrawlVault(ITEM_INFO* item, COLL_INFO* coll)
{
LaraInfo*& info = item->data;
info->torsoXrot = 0;
info->torsoYrot = 0;
info->torsoZrot = 0;
info->headXrot = 0;
info->headYrot = 0;
info->headZrot = 0;
if (TestLaraCrawlExitDownStep(item, coll))
{
if (TrInput & IN_DUCK && TestLaraCrawlDownStep(item, coll))
@ -90,14 +99,12 @@ void DoLaraCrawlVault(ITEM_INFO* item, COLL_INFO* coll)
if (TestLaraCrawlUpStep(item, coll))
{
item->goalAnimState = LS_STEP_UP;
return;
}
if (TestLaraCrawlDownStep(item, coll))
{
item->goalAnimState = LS_STEP_DOWN;
return;
}
}

15
TR5Main/Game/Lara/lara_tests.cpp
View file

@ -1538,10 +1538,6 @@ bool TestLaraStepUp(ITEM_INFO* item, COLL_INFO* coll)
if (coll->Middle.Floor < -(STEP_SIZE / 2) && // Lower floor bound.
coll->Middle.Floor >= -STEPUP_HEIGHT && // Upper floor bound.
coll->Middle.Floor != NO_HEIGHT &&
item->currentAnimState != LS_WALK_BACK &&
item->currentAnimState != LS_RUN_BACK &&
item->currentAnimState != LS_SPRINT_DIVE &&
item->currentAnimState != LS_SPLAT &&
item->currentAnimState != LS_CRAWL_IDLE && // Crawl step up handled differently.
item->currentAnimState != LS_CRAWL_FORWARD)
{
@ -1556,13 +1552,7 @@ bool TestLaraStepDown(ITEM_INFO* item, COLL_INFO* coll)
if (coll->Middle.Floor > (STEP_SIZE / 2) && // Upper floor bound.
coll->Middle.Floor <= STEPUP_HEIGHT && // Lower floor bound.
coll->Middle.Floor != NO_HEIGHT &&
item->currentAnimState != LS_RUN_FORWARD && // No step down anim exists for these states.
item->currentAnimState != LS_SPRINT &&
item->currentAnimState != LS_WADE_FORWARD &&
item->currentAnimState != LS_RUN_BACK &&
item->currentAnimState != LS_SPRINT_DIVE &&
item->currentAnimState != LS_SPLAT &&
item->currentAnimState != LS_CRAWL_IDLE && // Crawl step down handled differently.
item->currentAnimState != LS_CRAWL_IDLE && // Crawl step down handled differently.
item->currentAnimState != LS_CRAWL_FORWARD)
{
return true;
@ -1621,8 +1611,9 @@ bool TestLaraRunForward(ITEM_INFO* item, COLL_INFO* coll)
auto y = item->pos.yPos - coll->Setup.Height;
auto probe = GetCollisionResult(item, item->pos.yRot, coll->Setup.Radius * sqrt(2) + 4, 0);
// Hack to ensure Lara can run off diagonal ledges + . coll->Front.Floor often holds the wrong height because of quadrant-dependent wall pushing. @Sezz 2021.11.06
// BUG: This interferes with the one-step stand-to-crouch vault where the ceiling is lower than Lara's height.
if ((probe.Position.Ceiling - y) < 0) // Hack to ensure Lara can run off diagonal ledges. coll->Front.Floor often holds the wrong height because of quadrant-dependent wall pushing. @Sezz 2021.11.06
if ((probe.Position.Ceiling - y) < 0)
return true;
return false;