Archive/TombEngine
0
0
Fork 0
mirror of https://github.com/TombEngine/TombEngine.git synced 2025-05-02 17:57:59 +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

12
TR5Main/Objects/Generic/Object/burning_torch.cpp
View file

@ -108,7 +108,7 @@ namespace TEN::Entities::Generic
if (Lara.leftArm.frameNumber == 27)
{
Lara.litTorch = false;
Lara.Flare.FlareControlLeft = false;
Lara.Flare.ControlLeft = false;
Lara.leftArm.lock = false;
Lara.gunType = Lara.lastGunType;
Lara.requestGunType = WEAPON_NONE;
@ -128,7 +128,7 @@ namespace TEN::Entities::Generic
if (Lara.leftArm.frameNumber == 41)
{
Lara.litTorch = false;
Lara.Flare.FlareControlLeft = false;
Lara.Flare.ControlLeft = false;
Lara.leftArm.lock = false;
Lara.lastGunType = WEAPON_NONE;
Lara.gunType = WEAPON_NONE;
@ -145,7 +145,7 @@ namespace TEN::Entities::Generic
{
Lara.leftArm.lock = false;
Lara.leftArm.frameNumber = 0;
Lara.Flare.FlareControlLeft = true;
Lara.Flare.ControlLeft = true;
Lara.litTorch = LaraItem->ItemFlags[3] & 1;
Lara.leftArm.animNumber = Objects[ID_LARA_TORCH_ANIM].animIndex;
}
@ -154,7 +154,7 @@ namespace TEN::Entities::Generic
break;
}
if (Lara.Flare.FlareControlLeft)
if (Lara.Flare.ControlLeft)
Lara.gunStatus = LG_READY;
Lara.leftArm.frameBase = g_Level.Anims[Lara.leftArm.animNumber].framePtr;
@ -185,7 +185,7 @@ namespace TEN::Entities::Generic
Lara.requestGunType = WEAPON_TORCH;
Lara.gunType = WEAPON_TORCH;
Lara.Flare.FlareControlLeft = true;
Lara.Flare.ControlLeft = true;
Lara.leftArm.animNumber = Objects[ID_LARA_TORCH_ANIM].animIndex;
Lara.gunStatus = LG_READY;
Lara.leftArm.lock = false;
@ -349,7 +349,7 @@ namespace TEN::Entities::Generic
}
l->ActiveState = LS_MISC_CONTROL;
l->FrameNumber = g_Level.Anims[l->AnimNumber].frameBase;
Lara.Flare.FlareControlLeft = false;
Lara.Flare.ControlLeft = false;
Lara.leftArm.lock = true;
Lara.interactedItem = itemNumber;
}