summaryrefslogtreecommitdiffstats
path: root/src/core/Frontend.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-12-29 13:03:59 +0100
committerSergeanur <s.anureev@yandex.ua>2020-12-29 13:03:59 +0100
commit2bc843fdcd8a1e02eff94ccbb264f02c9c8a1d4c (patch)
tree38f6eb7c0957136f4bf5cbe3a6261edc8bb03244 /src/core/Frontend.cpp
parentReorder CEntity functions into their original order (diff)
downloadre3-2bc843fdcd8a1e02eff94ccbb264f02c9c8a1d4c.tar
re3-2bc843fdcd8a1e02eff94ccbb264f02c9c8a1d4c.tar.gz
re3-2bc843fdcd8a1e02eff94ccbb264f02c9c8a1d4c.tar.bz2
re3-2bc843fdcd8a1e02eff94ccbb264f02c9c8a1d4c.tar.lz
re3-2bc843fdcd8a1e02eff94ccbb264f02c9c8a1d4c.tar.xz
re3-2bc843fdcd8a1e02eff94ccbb264f02c9c8a1d4c.tar.zst
re3-2bc843fdcd8a1e02eff94ccbb264f02c9c8a1d4c.zip
Diffstat (limited to 'src/core/Frontend.cpp')
-rw-r--r--src/core/Frontend.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 04a8fcbe..db5da918 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -4554,6 +4554,7 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
int option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
#ifdef FIX_BUGS
int currScreen = m_nCurrScreen;
+ int currOption = m_nCurrOption;
#endif
switch (option) {
case MENUACTION_CHANGEMENU:
@@ -4831,12 +4832,12 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
ProcessOnOffMenuOptions();
if (!goBack) {
#ifdef FIX_BUGS
- int saveSlot = aScreens[currScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
+ int saveSlot = aScreens[currScreen].m_aEntries[currOption].m_SaveSlot;
+ if (saveSlot >= SAVESLOT_1 && saveSlot <= SAVESLOT_8 && Slots[currOption] != SLOT_OK)
#else
int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
-#endif
-
if (saveSlot >= SAVESLOT_1 && saveSlot <= SAVESLOT_8 && Slots[m_nCurrOption] != SLOT_OK)
+#endif
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
else
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_ENTER_OR_ADJUST, 0);