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

Refactor poison effect on Lara; LaraInfo cleanup; general cleanup; update savegame schema

Browse source
This commit is contained in:
Sezz 2022-03-09 17:04:19 +11:00
parent 165dccb2d4
commit 6978cb94f0
83 changed files with 1303 additions and 1147 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,19 +131,19 @@ void TightropeCollision(short itemNumber, ITEM_INFO* laraItem, COLL_INFO* coll)
#ifdef NEW_TIGHTROPE
if (laraItem->ActiveState == LS_TIGHTROPE_WALK &&
laraItem->TargetState != LS_TIGHTROPE_DISMOUNT &&
!laraInfo->Control.TightropeControl.CanDismount)
!laraInfo->Control.Tightrope.CanDismount)
{
if (tightropeItem->Position.yRot == laraItem->Position.yRot)
{
if (abs(tightropeItem->Position.xPos - laraItem->Position.xPos) + abs(tightropeItem->Position.zPos - laraItem->Position.zPos) < 640)
laraInfo->Control.TightropeControl.CanDismount = true;
laraInfo->Control.Tightrope.CanDismount = true;
}
}
#else // !NEW_TIGHTROPE
if (laraItem->ActiveState == LS_TIGHTROPE_WALK &&
laraItem->TargetState != LS_TIGHTROPE_DISMOUNT &&
!laraInfo->Control.TightropeControl.Off)
!laraInfo->Control.Tightrope.Off)
{
if (item->Position.yRot == laraItem->Position.yRot)
{
@ -167,14 +167,14 @@ void TightropeCollision(short itemNumber, ITEM_INFO* laraItem, COLL_INFO* coll)
laraInfo->Control.IsMoving = false;
ResetLaraFlex(laraItem);
#ifdef NEW_TIGHTROPE
laraInfo->Control.TightropeControl.Balance = 0;
laraInfo->Control.TightropeControl.CanDismount = false;
laraInfo->Control.TightropeControl.TightropeItem = itemNumber;
laraInfo->Control.TightropeControl.TimeOnTightrope = 0;
laraInfo->Control.Tightrope.Balance = 0;
laraInfo->Control.Tightrope.CanDismount = false;
laraInfo->Control.Tightrope.TightropeItem = itemNumber;
laraInfo->Control.Tightrope.TimeOnTightrope = 0;
#else // !NEW_TIGHTROPE
laraInfo->Control.TightropeControl.OnCount = 60;
laraInfo->Control.TightropeControl.Off = 0;
laraInfo->Control.TightropeControl.Fall = 0;
laraInfo->Control.Tightrope.OnCount = 60;
laraInfo->Control.Tightrope.Off = 0;
laraInfo->Control.Tightrope.Fall = 0;
#endif
}
else