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

More LaraInfo cleanup; update savegame schema

Browse source
This commit is contained in:
Sezz 2022-02-10 01:38:32 +11:00
parent a63563913b
commit 5bba1df285
76 changed files with 1940 additions and 2150 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TR5Main/Objects/Generic/Object/objects.cpp
View file

@ -111,7 +111,7 @@ void TightRopeCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll)
|| l->AnimNumber != LA_STAND_IDLE
|| l->Status == ITEM_INVISIBLE
|| Lara.gunStatus)
&& (!Lara.isMoving || Lara.interactedItem !=itemNum))
&& (!Lara.Control.IsMoving || Lara.interactedItem !=itemNum))
{
#ifdef NEW_TIGHTROPE
if(l->ActiveState == LS_TIGHTROPE_FORWARD &&
@ -148,7 +148,7 @@ void TightRopeCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll)
l->ActiveState = LS_TIGHTROPE_ENTER;
l->AnimNumber = LA_TIGHTROPE_START;
l->FrameNumber = g_Level.Anims[l->AnimNumber].frameBase;
Lara.isMoving = false;
Lara.Control.IsMoving = false;
ResetLaraFlex(l);
#ifdef NEW_TIGHTROPE
Lara.tightrope.balance = 0;
@ -171,8 +171,8 @@ void TightRopeCollision(short itemNum, ITEM_INFO* l, COLL_INFO* coll)
}
else
{
if (Lara.isMoving && Lara.interactedItem == itemNum)
Lara.isMoving = false;
if (Lara.Control.IsMoving && Lara.interactedItem == itemNum)
Lara.Control.IsMoving = false;
item->Position.yRot += -ANGLE(180);
}
}