Merge pull request #1193 from MiroslavR/disabled_player

ESS-import: player is no longer disabled

apps/essimporter/importercontext.hpp

@@ -69,6 +69,7 @@ namespace ESSImport
             mPlayer.mHasMark = 0;
             mPlayer.mCurrentCrimeId = 0; // TODO
             mPlayer.mObject.blank();
+            mPlayer.mObject.mEnabled = true;
             mPlayer.mObject.mRef.mRefID = "player"; // REFR.mRefID would be PlayerSaveGame
 
             mGlobalMapState.mBounds.mMinX = 0;

apps/openmw/mwworld/player.cpp

@@ -328,6 +328,12 @@ namespace MWWorld
                 throw std::runtime_error ("invalid player state record (object state)");
             }
 
+            if (!player.mObject.mEnabled)
+            {
+                std::cerr << "Savegame attempted to disable the player." << std::endl;
+                player.mObject.mEnabled = true;
+            }
+
             mPlayer.load (player.mObject);
 
             for (int i=0; i<ESM::Attribute::Length; ++i)