Fix save and load menu when no save games available

ArnoAnsems · Apr 26, 2021 · ef63693 · ef63693
1 parent 22427eb
commit ef63693
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/Catacomb3D/Catacomb3DMenu.cpp b/src/Catacomb3D/Catacomb3DMenu.cpp
@@ -215,8 +215,8 @@ Catacomb3DMenu::Catacomb3DMenu(
             elementListRestoreGame->AddChild(new GuiElementSaveSlotStaticCat3D(playerInput, savedGame, { GuiActionLoadGame, savedGameIndex }, m_renderableText, m_flashIcon));
             savedGameIndex++;
         }
-        guiPageLoadGame->AddChild(elementListRestoreGame, 80, 60);
     }
+    guiPageLoadGame->AddChild(elementListRestoreGame, 80, 60);
 
     // Save game menu
     GuiPage* guiPageSaveGame = new GuiPage(playerInput);
@@ -239,8 +239,8 @@ Catacomb3DMenu::Catacomb3DMenu(
             elementListSaveGame->AddChild(new GuiElementSaveSlotStaticCat3D(playerInput, savedGame, { GuiActionSaveGame, savedGameIndex }, m_renderableText, m_flashIcon));
             savedGameIndex++;
         }
-        guiPageSaveGame->AddChild(elementListSaveGame, 80, 60);
     }
+    guiPageSaveGame->AddChild(elementListSaveGame, 80, 60);
 
     // Sound menu
     GuiPage* guiPageSound = new GuiPage(playerInput);

diff --git a/src/Engine/ExtraMenu.cpp b/src/Engine/ExtraMenu.cpp
@@ -184,8 +184,8 @@ ExtraMenu::ExtraMenu(
             elementListLoadGame->AddChild(new GuiElementButton(playerInput, savedGame, { GuiActionLoadGame, savedGameIndex }, m_renderableText));
             savedGameIndex++;
         }
-        pageLoadGame->AddChild(elementListLoadGame, 60, 30);
     }
+    pageLoadGame->AddChild(elementListLoadGame, 60, 30);
 
     GuiElementStaticText* pageLabelLoadGame = new GuiElementStaticText(playerInput, "Load Game", EgaBrightYellow, m_renderableText);
     pageLoadGame->AddChild(pageLabelLoadGame, 160, 12);
@@ -207,8 +207,8 @@ ExtraMenu::ExtraMenu(
             elementListSaveGame->AddChild(new GuiElementButton(playerInput, savedGame, { GuiActionSaveGame, savedGameIndex }, m_renderableText));
             savedGameIndex++;
         }
-        pageSaveGame->AddChild(elementListSaveGame, 60, 30);
     }
+    pageSaveGame->AddChild(elementListSaveGame, 60, 30);
 
     GuiElementStaticText* pageLabelSaveGame = new GuiElementStaticText(playerInput, "Save Game", EgaBrightYellow, m_renderableText);
     pageSaveGame->AddChild(pageLabelSaveGame, 160, 12);

diff --git a/src/Engine/GuiElementList.cpp b/src/Engine/GuiElementList.cpp
@@ -42,6 +42,11 @@ GuiElementList::~GuiElementList()
 
 const GuiEvent& GuiElementList::ProcessInput()
 {
+    if (m_elements.empty())
+    {
+        return GetEvent();
+    }
+
     GuiElementBase* element = m_elements.at(m_elementSelected);
     const GuiEvent& guiEvent = element->ProcessInput();
     bool makeBrowseSound = false;