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

Remove unnecessary offsets

Browse source
This commit is contained in:
Lwmte 2021-10-27 14:32:38 +03:00
parent 3b725736e7
commit 0e152a7235
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,8 +80,6 @@ bool TestLaraVault(ITEM_INFO* item, COLL_INFO* coll)
Lara.NewAnims.CrawlVault3click = 1; Lara.NewAnims.CrawlVault3click = 1;
Lara.NewAnims.MonkeyVault = 1; Lara.NewAnims.MonkeyVault = 1;
float pushOffset = 0.5f;
if (TestValidLedge(item, coll)) if (TestValidLedge(item, coll))
{ {
bool success = false; bool success = false;
@ -116,7 +114,6 @@ bool TestLaraVault(ITEM_INFO* item, COLL_INFO* coll)
item->goalAnimState = LS_STOP; item->goalAnimState = LS_STOP;
item->pos.yPos += coll->Front.Floor + 512; item->pos.yPos += coll->Front.Floor + 512;
Lara.gunStatus = LG_HANDS_BUSY; Lara.gunStatus = LG_HANDS_BUSY;
pushOffset = 0.7f;
success = true; success = true;
} }
else if (Lara.NewAnims.CrawlVault2click && (abs(coll->Front.Ceiling - coll->Front.Floor) < 256)) else if (Lara.NewAnims.CrawlVault2click && (abs(coll->Front.Ceiling - coll->Front.Floor) < 256))
@ -147,7 +144,6 @@ bool TestLaraVault(ITEM_INFO* item, COLL_INFO* coll)
item->goalAnimState = LS_STOP; item->goalAnimState = LS_STOP;
item->pos.yPos += coll->Front.Floor + 768; item->pos.yPos += coll->Front.Floor + 768;
Lara.gunStatus = LG_HANDS_BUSY; Lara.gunStatus = LG_HANDS_BUSY;
pushOffset = 0.7f;
success = true; success = true;
} }
else if (Lara.NewAnims.CrawlVault3click && (abs(coll->Front.Ceiling - coll->Front.Floor) < 256)) else if (Lara.NewAnims.CrawlVault3click && (abs(coll->Front.Ceiling - coll->Front.Floor) < 256))
@ -174,15 +170,11 @@ bool TestLaraVault(ITEM_INFO* item, COLL_INFO* coll)
item->currentAnimState = LS_STOP; item->currentAnimState = LS_STOP;
Lara.calcFallSpeed = -3 - sqrt(-9600 - 12 * coll->Front.Floor); Lara.calcFallSpeed = -3 - sqrt(-9600 - 12 * coll->Front.Floor);
AnimateLara(item); AnimateLara(item);
pushOffset = item->speed ? 0.5f : 0.15f; // While on the run, Lara tends to embed less
success = true; success = true;
} }
if (success) if (success)
{ SnapItemToLedge(item, coll, 0.1f);
ShiftItem(item, coll);
SnapItemToLedge(item, coll, pushOffset);
}
} }
if (TestValidLedgeAngle(coll) && Lara.climbStatus) if (TestValidLedgeAngle(coll) && Lara.climbStatus)