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/Game/gui.cpp
View file

@ -1850,7 +1850,7 @@ void GuiController::InitializeInventory()
{
compassNeedleAngle = 4096;
AlterFOV(14560);
Lara.busy = 0;
Lara.Control.IsBusy = 0;
inventoryItemChosen = NO_ITEM;
ClearInputVariables(0);
useItem = 0;
@ -1997,7 +1997,7 @@ void GuiController::UseCurrentItem()
long OldBinocular;
OldBinocular = BinocularRange;
Lara.oldBusy = false;
Lara.Control.OldBusy = false;
BinocularRange = 0;
LaraItem->MeshBits = -1;
invobject = rings[(int)RingTypes::Inventory]->current_object_list[rings[(int)RingTypes::Inventory]->curobjinlist].invitem;
@ -2066,11 +2066,11 @@ void GuiController::UseCurrentItem()
case INV_OBJECT_BINOCULARS:
if (((LaraItem->ActiveState == LS_IDLE && LaraItem->AnimNumber == LA_STAND_IDLE)
|| (Lara.isLow && !(TrInput & IN_CROUCH)))
|| (Lara.Control.IsLow && !(TrInput & IN_CROUCH)))
&& !UseSpotCam
&& !TrackCameraInit)
{
Lara.oldBusy = true;
Lara.Control.OldBusy = true;
BinocularRange = 128;
if (Lara.gunStatus != LG_HANDS_FREE)
@ -3163,7 +3163,7 @@ int GuiController::CallInventory(bool reset_mode)
{
int return_value;
Lara.oldBusy = Lara.busy;
Lara.Control.OldBusy = Lara.Control.IsBusy;
if (TrInput & IN_SELECT)
stop_killing_me_you_dumb_input_system = 1;
@ -3244,7 +3244,7 @@ int GuiController::CallInventory(bool reset_mode)
if (useItem)
UseCurrentItem();
Lara.busy = Lara.oldBusy;
Lara.Control.IsBusy = Lara.Control.OldBusy;
invMode = InventoryMode::None;
ClearInputVariables(0);