From 896428c129124d64f8479380881f1b1bd4568847 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 15 Sep 2012 20:18:41 +0200
Subject: [PATCH] enableRestMenu & enableLevelupMenu

---
 apps/openmw/mwbase/windowmanager.hpp    |  3 +++
 apps/openmw/mwgui/windowmanagerimp.cpp  |  1 +
 apps/openmw/mwgui/windowmanagerimp.hpp  |  5 +++++
 apps/openmw/mwinput/inputmanagerimp.cpp |  7 +++++--
 apps/openmw/mwscript/guiextensions.cpp  | 16 +++++++++++-----
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwbase/windowmanager.hpp b/apps/openmw/mwbase/windowmanager.hpp
index 6e4c10625..0fd78225a 100644
--- a/apps/openmw/mwbase/windowmanager.hpp
+++ b/apps/openmw/mwbase/windowmanager.hpp
@@ -219,6 +219,9 @@ namespace MWBase
 
             virtual void setLoadingProgress (const std::string& stage, int depth, int current, int total) = 0;
             virtual void loadingDone() = 0;
+
+            virtual void enableRest() = 0;
+            virtual bool getRestEnabled() = 0;
     };
 }
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 8f7c0d17a..0241cc734 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -85,6 +85,7 @@ WindowManager::WindowManager(
   , mGarbageDialogs()
   , mShown(GW_ALL)
   , mAllowed(newGame ? GW_None : GW_ALL)
+  , mRestAllowed(newGame ? false : true)
   , mShowFPSLevel(fpsLevel)
   , mFPS(0.0f)
   , mTriangleCount(0)
diff --git a/apps/openmw/mwgui/windowmanagerimp.hpp b/apps/openmw/mwgui/windowmanagerimp.hpp
index 131029ed4..a02aa17b5 100644
--- a/apps/openmw/mwgui/windowmanagerimp.hpp
+++ b/apps/openmw/mwgui/windowmanagerimp.hpp
@@ -200,6 +200,9 @@ namespace MWGui
     virtual void setLoadingProgress (const std::string& stage, int depth, int current, int total);
     virtual void loadingDone();
 
+    virtual void enableRest() { mRestAllowed = true; }
+    virtual bool getRestEnabled() { return mRestAllowed; }
+
   private:
     OEngine::GUI::MyGUIManager *mGuiManager;
     HUD *mHud;
@@ -260,6 +263,8 @@ namespace MWGui
        allow() and disableAll().
      */
     GuiWindow mAllowed;
+    // is the rest window allowed?
+    bool mRestAllowed;
 
     void updateVisible(); // Update visibility of all windows based on mode, shown and allowed settings
 
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index 724dccd8e..c3e131440 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -548,8 +548,11 @@ namespace MWInput
 
     void InputManager::rest()
     {
-        if (!mWindows.isGuiMode ())
-            mWindows.pushGuiMode (MWGui::GM_Rest);
+        if (!mWindows.getRestEnabled () || mWindows.isGuiMode ())
+            return;
+
+        /// \todo check if resting is currently allowed (enemies nearby?)
+        mWindows.pushGuiMode (MWGui::GM_Rest);
     }
 
     void InputManager::screenshot()
diff --git a/apps/openmw/mwscript/guiextensions.cpp b/apps/openmw/mwscript/guiextensions.cpp
index d740e5feb..7f3b9777b 100644
--- a/apps/openmw/mwscript/guiextensions.cpp
+++ b/apps/openmw/mwscript/guiextensions.cpp
@@ -30,6 +30,16 @@ namespace MWScript
                 }
         };
 
+        class OpEnableRest : public Interpreter::Opcode0
+        {
+            public:
+
+                virtual void execute (Interpreter::Runtime& runtime)
+                {
+                    MWBase::Environment::get().getWindowManager()->enableRest();
+                }
+        };
+
         class OpShowDialogue : public Interpreter::Opcode0
         {
                 MWGui::GuiMode mDialogue;
@@ -146,12 +156,8 @@ opcodeEnableStatsReviewMenu);
             interpreter.installSegment5 (opcodeEnableStatsMenu,
                 new OpEnableWindow (MWGui::GW_Stats));
 
-            /* Not done yet. Enabling rest mode is not really a gui
-               issue, it's a gameplay issue.
-
             interpreter.installSegment5 (opcodeEnableRest,
-                new OpEnableDialogue (MWGui::GM_Rest));
-            */
+                new OpEnableRest ());
 
             interpreter.installSegment5 (opcodeShowRestMenu,
                 new OpShowDialogue (MWGui::GM_Rest));