Changed some stuff

diasurgical · Jan 6, 2022 · 83d2350 · 83d2350
1 parent dbe3835
commit 83d2350
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 23 deletions.
diff --git a/Source/control.cpp b/Source/control.cpp
@@ -1002,15 +1002,14 @@ void DrawDeathText(const Surface &out)
 	char gold[64];
 	LightTableIndex = 0;
 
-	//LostGold = Players[MyPlayerId]._pGold / 2;
-	sprintf(gold, _("Death takes its toll of %d Gold"), LostGold);
-
 	DrawString(out, _("You have died"), { { 0, 0 }, { gnScreenWidth, PANEL_TOP } }, UiFlags::FontSize42 | UiFlags::ColorRed | UiFlags::AlignCenter | UiFlags::VerticalCenter, 2);
-	if (!gbIsMultiplayer)
+	if (!gbIsMultiplayer) {
 		DrawString(out, _("Press ESC to load last save."), { { 0, 42 }, { gnScreenWidth, PANEL_TOP } }, UiFlags::FontSize42 | UiFlags::ColorRed | UiFlags::AlignCenter | UiFlags::VerticalCenter, 2);
-	else
+	} else {
 		DrawString(out, _("Press ESC to continue."), { { 0, 42 }, { gnScreenWidth, PANEL_TOP } }, UiFlags::FontSize30 | UiFlags::ColorRed | UiFlags::AlignCenter | UiFlags::VerticalCenter, 2);
-	DrawString(out, gold, { { 0, 84 }, { gnScreenWidth, PANEL_TOP } }, UiFlags::FontSize30 | UiFlags::ColorRed | UiFlags::AlignCenter | UiFlags::VerticalCenter, 2);
+		sprintf(gold, _("Death takes its toll of %d Gold"), LostGold);
+		DrawString(out, gold, { { 0, 84 }, { gnScreenWidth, PANEL_TOP } }, UiFlags::FontSize30 | UiFlags::ColorRed | UiFlags::AlignCenter | UiFlags::VerticalCenter, 2);
+	}
 }
 
 void DrawGoldSplit(const Surface &out, int amount)

diff --git a/Source/gamemenu.cpp b/Source/gamemenu.cpp
@@ -33,21 +33,22 @@ void GamemenuReturnToGame(bool bActivate);
 /** Contains the game menu items of the single player menu. */
 TMenuItem sgSingleMenu[] = {
 	// clang-format off
-    // dwFlags,      pszStr,              fnMenu
-	{ GMENU_ENABLED, N_("Options"),       &GamemenuOptions    },
-	{ GMENU_ENABLED, N_("Save Game"),     &gamemenu_save_game  },
-	{ GMENU_ENABLED, N_("Save and Exit Game"),      &GamemenuSaveAndExit   },
-	{ GMENU_ENABLED, N_("Return to Game"),   &GamemenuReturnToGame  },
-	{ GMENU_ENABLED, nullptr,              nullptr             }
+    // dwFlags,      pszStr,                fnMenu
+	{ GMENU_ENABLED, N_("Options"),         &GamemenuOptions    },
+	{ GMENU_ENABLED, N_("Save Game"),       &gamemenu_save_game  },
+	{ GMENU_ENABLED, N_("Load Game"),       &gamemenu_load_game  },
+	{ GMENU_ENABLED, N_("Exit to Menu"),    &GamemenuNewGame   },
+	{ GMENU_ENABLED, N_("Return to Game"),  &GamemenuReturnToGame  },
+	{ GMENU_ENABLED, nullptr,               nullptr             }
 	// clang-format on
 };
 /** Contains the game menu items of the multi player menu. */
 TMenuItem sgMultiMenu[] = {
 	// clang-format off
     // dwFlags,      pszStr,                fnMenu
 	{ GMENU_ENABLED, N_("Options"),         &GamemenuOptions      },
-	{ GMENU_ENABLED, N_("Save and Exit Game"),      &GamemenuNewGame     },
-	{ GMENU_ENABLED, N_("Return to Game"),   &GamemenuReturnToGame  },
+	{ GMENU_ENABLED, N_("Exit Game"),       &GamemenuNewGame     },
+	{ GMENU_ENABLED, N_("Return to Game"),  &GamemenuReturnToGame  },
 	{ GMENU_ENABLED, nullptr,                nullptr               },
 	// clang-format on
 };
@@ -75,16 +76,11 @@ const char *const SoundToggleNames[] = {
 
 void GamemenuUpdateSingle()
 {
-	//gmenu_enable(&sgSingleMenu[3], gbValidSaveFile);
-
-	//bool enable = Players[MyPlayerId]._pmode != PM_DEATH && !MyPlayerIsDead;
+	gmenu_enable(&sgSingleMenu[2], gbValidSaveFile);
 
-	//gmenu_enable(&sgSingleMenu[0], enable);
-}
+	bool enable = Players[MyPlayerId]._pmode != PM_DEATH && !MyPlayerIsDead;
 
-void GamemenuUpdateMulti()
-{
-	//gmenu_enable(&sgMultiMenu[0], MyPlayerIsDead);
+	gmenu_enable(&sgSingleMenu[0], enable);
 }
 
 void GamemenuPrevious(bool /*bActivate*/)
@@ -396,7 +392,7 @@ void gamemenu_on()
 	if (!gbIsMultiplayer) {
 		gmenu_set_items(sgSingleMenu, GamemenuUpdateSingle);
 	} else {
-		gmenu_set_items(sgMultiMenu, GamemenuUpdateMulti);
+		gmenu_set_items(sgMultiMenu, nullptr);
 	}
 	PressEscKey();
 }