Merge remote-tracking branch 'greye/rc0-17'openmw-0.17.0

5 files changed, 6 insertions, 16 deletions

diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 5e97b4922b..9c801cbff5 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -254,7 +254,6 @@ namespace MWBase
             virtual bool toggleVanityMode(bool enable, bool force) = 0;
             virtual void allowVanityMode(bool allow) = 0;
             virtual void togglePlayerLooking(bool enable) = 0;
-            virtual bool isVanityEnabled() = 0;
 
             virtual void renderPlayer() = 0;
     };
diff --git a/apps/openmw/mwrender/player.hpp b/apps/openmw/mwrender/player.hpp
index e56abc17d8..8dd313b7fa 100644
--- a/apps/openmw/mwrender/player.hpp
+++ b/apps/openmw/mwrender/player.hpp
@@ -107,10 +107,6 @@ namespace MWRender
         void getSightAngles(float &pitch, float &yaw);
 
         void togglePlayerLooking(bool enable);
-
-        bool isVanityEnabled() {
-            return mVanity.enabled;
-        }
     };
 }
 
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 003a61a391..b6bfcbf974 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -68,10 +68,6 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
         return mPlayer->toggleVanityMode(enable, force);
     }
 
-    bool isVanityEnabled() {
-        return mPlayer->isVanityEnabled();
-    }
-
     void allowVanityMode(bool allow) {
         mPlayer->allowVanityMode(allow);
     }
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index e9e29bdae9..864c1a1eed 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -209,6 +209,8 @@ namespace MWScript
 
         class OpToggleVanityMode : public Interpreter::Opcode0
         {
+            static bool sActivate;
+
         public:
         
             virtual void execute(Interpreter::Runtime &runtime)
@@ -219,16 +221,17 @@ namespace MWScript
                 MWBase::World *world =
                     MWBase::Environment::get().getWorld();
 
-                bool value = !world->isVanityEnabled();
-                if (world->toggleVanityMode(value, true)) {
+                if (world->toggleVanityMode(sActivate, true)) {
                     context.report(
-                        (value) ? "Vanity Mode -> On" : "Vanity Mode -> Off"
+                        (sActivate) ? "Vanity Mode -> On" : "Vanity Mode -> Off"
                     );
+                    sActivate = !sActivate;
                 } else {
                     context.report("Vanity Mode -> No");
                 }
             }
         };
+        bool OpToggleVanityMode::sActivate = true;
 
         const int opcodeXBox = 0x200000c;
         const int opcodeOnActivate = 0x200000d;
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 889741989b..51216e3a5a 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -298,10 +298,6 @@ namespace MWWorld
             }
 
             virtual void renderPlayer();
-
-            virtual bool isVanityEnabled() {
-                return mRendering->isVanityEnabled();
-            }
     };
 }