From eef9df504a4f3c9a6254421ec5f2363861d40dc6 Mon Sep 17 00:00:00 2001
From: mckibbenta <mckibbenta@gmail.com>
Date: Thu, 29 Aug 2013 20:25:36 -0400
Subject: [PATCH] fiddlings

---
 apps/openmw/mwmechanics/actors.cpp      | 2 +-
 apps/openmw/mwscript/miscextensions.cpp | 3 +--
 apps/openmw/mwworld/worldimp.cpp        | 9 +++++++--
 apps/openmw/mwworld/worldimp.hpp        | 2 ++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index b8d0a8745..a6db0a909 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -272,7 +272,7 @@ namespace MWMechanics
 
                 // workaround: always keep player alive for now
                 // \todo remove workaround, once player death can be handled
-                if(iter->first.getRefData().getHandle()=="player")
+                if(iter->first.getRefData().getHandle()=="player" && false)
                 {
                     MWMechanics::DynamicStat<float> stat(stats.getHealth());
 
diff --git a/apps/openmw/mwscript/miscextensions.cpp b/apps/openmw/mwscript/miscextensions.cpp
index c53cafa17..a8d8a5f2b 100644
--- a/apps/openmw/mwscript/miscextensions.cpp
+++ b/apps/openmw/mwscript/miscextensions.cpp
@@ -726,8 +726,7 @@ namespace MWScript
 
                     bool enabled = MWBase::Environment::get().getWorld()->toggleGodMode();
 
-                    // context.report (enabled ? "God Mode -> On" : "God Mode -> Off");
-                    context.report("Unimplemented");
+                    context.report (enabled ? "God Mode -> On" : "God Mode -> Off");
                 }
         };
 
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5c08af612..a6489fc30 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -170,7 +170,7 @@ namespace MWWorld
       mSky (true), mCells (mStore, mEsm),
       mActivationDistanceOverride (mActivationDistanceOverride),
       mFallback(fallbackMap), mPlayIntro(0), mTeleportEnabled(true),
-      mFacedDistance(FLT_MAX)
+      mFacedDistance(FLT_MAX), mGodMode(false)
     {
         mPhysics = new PhysicsSystem(renderer);
         mPhysEngine = mPhysics->getEngine();
@@ -1945,7 +1945,12 @@ namespace MWWorld
 
     bool World::toggleGodMode()
     {
-        return false;
+        if (mGodMode)
+            mGodMode = false;
+        else
+            mGodMode = true;
+
+        return mGodMode;
     }
 
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 30ffcda40..5e6fe50f9 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -68,6 +68,8 @@ namespace MWWorld
 
             OEngine::Physic::PhysicEngine* mPhysEngine;
 
+            bool mGodMode;
+
             // not implemented
             World (const World&);
             World& operator= (const World&);