disallow quick-save, while in menu/pause

Author: Try

game/gothic.cpp

@@ -14,7 +14,8 @@
 #include "game/definitions/musicdefinitions.h"
 #include "game/definitions/fightaidefinitions.h"
 #include "game/definitions/particlesdefinitions.h"
-#include "game/serialize.h"
+
+#include "world/objects/npc.h"
 
 #include "utils/fileutil.h"
 #include "utils/inifile.h"
@@ -178,6 +179,13 @@ bool Gothic::isInGame() const {
   return game!=nullptr;
   }
 
+bool Gothic::isInGameAndAlive() const {
+  auto pl = Gothic::inst().player();
+  if(pl==nullptr || pl->isDead())
+    return false;
+  return isInGame();
+  }
+
 const World *Gothic::world() const {
   if(game)
     return game->world();

game/gothic.h

@@ -42,6 +42,7 @@ class Gothic final {
     auto         version() const -> const VersionInfo&;
 
     bool         isInGame() const;
+    bool         isInGameAndAlive() const;
 
     std::string_view defaultWorld()  const;
     std::string_view defaultPlayer() const;

game/mainwindow.cpp

@@ -725,11 +725,14 @@ void MainWindow::onMarvinKey() {
         if(auto camera = Gothic::inst().camera()) {
           camera->setMarvinMode(Camera::M_Freeze);
           }
-        } else {
+        }
+      else if(Gothic::inst().isInGameAndAlive() && !Gothic::inst().isPause()) {
         Gothic::inst().quickSave();
         }
 #else
-      Gothic::inst().quickSave();
+      if(Gothic::inst().isInGameAndAlive() && !Gothic::inst().isPause()) {
+        Gothic::inst().quickSave();
+        }
 #endif
       break;
 

game/ui/gamemenu.cpp

@@ -292,7 +292,7 @@ GameMenu::GameMenu(MenuRoot &owner, KeyCodec& keyCodec, phoenix::vm &vm, std::st
     }
   setPosition(int(infoX*float(w())),int(infoY*float(h())));
 
-  setSelection(isInGameAndAlive() ? menu->default_ingame : menu->default_outgame);
+  setSelection(Gothic::inst().isInGameAndAlive() ? menu->default_ingame : menu->default_outgame);
   updateValues();
   slider = Resources::loadTexture("MENU_SLIDER_POS.TGA");
 
@@ -708,9 +708,9 @@ bool GameMenu::isSelectable(const std::shared_ptr<phoenix::c_menu_item>& item) {
 bool GameMenu::isEnabled(const std::shared_ptr<phoenix::c_menu_item>& item) {
   if(item==nullptr)
     return false;
-  if((item->flags & phoenix::c_menu_item_flags::only_ingame) && !isInGameAndAlive())
+  if((item->flags & phoenix::c_menu_item_flags::only_ingame) && !Gothic::inst().isInGameAndAlive())
     return false;
-  if((item->flags & phoenix::c_menu_item_flags::only_outgame) && isInGameAndAlive())
+  if((item->flags & phoenix::c_menu_item_flags::only_outgame) && Gothic::inst().isInGameAndAlive())
     return false;
   return true;
   }
@@ -988,13 +988,6 @@ void GameMenu::setDefaultKeys(std::string_view preset) {
   keyCodec.setDefaultKeys(preset);
   }
 
-bool GameMenu::isInGameAndAlive() {
-  auto pl = Gothic::inst().player();
-  if(pl==nullptr || pl->isDead())
-    return false;
-  return Gothic::inst().isInGame();
-  }
-
 bool GameMenu::implUpdateSavThumb(GameMenu::Item& sel) {
   const size_t id = saveSlotId(sel);
   if(id==size_t(-1))

game/ui/gamemenu.h

@@ -118,7 +118,6 @@ class GameMenu : public Tempest::Widget {
     void                                  updateVideo();
     void                                  setDefaultKeys(std::string_view preset);
 
-    static bool                           isInGameAndAlive();
     static QuestStat                      toStatus(std::string_view str);
     static bool                           isCompatible(const QuestLog::Quest& q, QuestStat st);
     static int32_t                        numQuests(const QuestLog* q, QuestStat st);