From b9c6a6862a328cc044793a5c8547ca9e67ec9406 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sat, 26 Sep 2015 01:49:58 +0200
Subject: [PATCH] Don't reset god mode, scripts enabled and sky enabled flags
 when loading a save game

These flags aren't stored in the save file, so it makes no sense to reset them to their default each time a save game is loaded. Instead, reset on "new game".
---
 apps/openmw/mwworld/worldimp.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 3ff7a750a..585786136 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -204,6 +204,10 @@ namespace MWWorld
         mLevitationEnabled = true;
         mTeleportEnabled = true;
 
+        mGodMode = false;
+        mScriptsEnabled = true;
+        mSky = true;
+
         // Rebuild player
         setupPlayer();
 
@@ -297,9 +301,6 @@ namespace MWWorld
 
         mDoorStates.clear();
 
-        mGodMode = false;
-        mScriptsEnabled = true;
-        mSky = true;
         mTeleportEnabled = true;
         mLevitationEnabled = true;