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

Preserve load/save slot selection through inventory menu; exit inv if user saves;

Browse source
This commit is contained in:
Troye 2021-10-13 23:02:24 -05:00
parent b9de4dc794
commit 912ebbc64d
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TR5Main/Game/newinv2.cpp
View file

@ -2844,13 +2844,11 @@ void InventoryClass::handle_inventry_menu()
case MENU_TYPE_LOAD: case MENU_TYPE_LOAD:
//fill_up_savegames_array//or maybe not? //fill_up_savegames_array//or maybe not?
invMode = IM_LOAD; invMode = IM_LOAD;
selected_slot = 0;
break; break;
case MENU_TYPE_SAVE: case MENU_TYPE_SAVE:
//fill_up_savegames_array //fill_up_savegames_array
invMode = IM_SAVE; invMode = IM_SAVE;
selected_slot = 0;
break; break;
case MENU_TYPE_EXAMINE: case MENU_TYPE_EXAMINE:
@ -3554,6 +3552,12 @@ int InventoryClass::S_CallInventory2(bool reset_mode)
if (useItem && !TrInput) if (useItem && !TrInput)
val = 1; val = 1;
if (ExitInvLoop)
{
ExitInvLoop = 0;
val = 1;
}
Camera.numberFrames = g_Renderer.SyncRenderer(); Camera.numberFrames = g_Renderer.SyncRenderer();
if (val) if (val)
@ -3709,7 +3713,7 @@ void InventoryClass::do_save()
{ {
SoundEffect(SFX_TR4_MENU_CHOOSE, 0, SFX_ALWAYS); SoundEffect(SFX_TR4_MENU_CHOOSE, 0, SFX_ALWAYS);
//SaveSelectedSlot(selected_slot); //SaveSelectedSlot(selected_slot);
return; ExitInvLoop = 1; //exit inv if the user has saved
} }
if (goDeselect) if (goDeselect)

5
TR5Main/Game/newinv2.h
View file

@ -496,6 +496,7 @@ private:
int inventoryItemChosen; int inventoryItemChosen;
int enterInventory; int enterInventory;
int lastInvItem; int lastInvItem;
bool ExitInvLoop;
//ammo vars //ammo vars
unsigned short AmountShotGunAmmo1; unsigned short AmountShotGunAmmo1;
@ -535,10 +536,10 @@ private:
//pause //pause
int pause_flag; int pause_flag;
pause_menus pause_menu_to_display = pause_main_menu; pause_menus pause_menu_to_display = pause_main_menu;
short pause_selected_option = 0; short pause_selected_option;
//title //title
short title_selected_option = 0; short title_selected_option;
title_menus title_menu_to_display = title_main_menu; title_menus title_menu_to_display = title_main_menu;
int settings_flag; int settings_flag;