From 45b43042371dd2ccba7073d446f8281f9e7aab30 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Sun, 21 Sep 2014 13:37:20 +0200
Subject: [PATCH] Store levitation/teleport enabled state in savegames (Fixes
 #1923)

---
 apps/openmw/mwstate/statemanagerimp.cpp |  1 +
 apps/openmw/mwworld/worldimp.cpp        | 41 ++++++++++++++++---------
 components/esm/defs.hpp                 |  1 +
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index aa2d48372..18ebe11ce 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -351,6 +351,7 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
                 case ESM::REC_ACTC:
                 case ESM::REC_PROJ:
                 case ESM::REC_MPRJ:
+                case ESM::REC_ENAB:
 
                     MWBase::Environment::get().getWorld()->readRecord (reader, n.val, contentFileMap);
                     break;
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 425fa20e5..aff24abbd 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -302,7 +302,8 @@ namespace MWWorld
             +mProjectileManager->countSavedGameRecords()
             +1 // player record
             +1 // weather record
-            +1; // actorId counter
+            +1 // actorId counter
+            +1; // levitation/teleport enabled state
     }
 
     void World::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
@@ -325,25 +326,37 @@ namespace MWWorld
         mPlayer->write (writer, progress);
         mWeatherManager->write (writer, progress);
         mProjectileManager->write (writer, progress);
+
+        writer.startRecord(ESM::REC_ENAB);
+        writer.writeHNT("TELE", mTeleportEnabled);
+        writer.writeHNT("LEVT", mLevitationEnabled);
+        writer.endRecord(ESM::REC_ENAB);
+        progress.increaseProgress();
     }
 
     void World::readRecord (ESM::ESMReader& reader, int32_t type,
         const std::map<int, int>& contentFileMap)
     {
-        if (type == ESM::REC_ACTC)
+        switch (type)
         {
-            MWMechanics::CreatureStats::readActorIdCounter(reader);
-            return;
-        }
-
-        if (!mStore.readRecord (reader, type) &&
-            !mGlobalVariables.readRecord (reader, type) &&
-            !mPlayer->readRecord (reader, type) &&
-            !mWeatherManager->readRecord (reader, type) &&
-            !mCells.readRecord (reader, type, contentFileMap) &&
-            !mProjectileManager->readRecord (reader, type))
-        {
-            throw std::runtime_error ("unknown record in saved game");
+            case ESM::REC_ACTC:
+                MWMechanics::CreatureStats::readActorIdCounter(reader);
+                return;
+            case ESM::REC_ENAB:
+                reader.getHNT(mTeleportEnabled, "TELE");
+                reader.getHNT(mLevitationEnabled, "LEVT");
+                return;
+            default:
+                if (!mStore.readRecord (reader, type) &&
+                    !mGlobalVariables.readRecord (reader, type) &&
+                    !mPlayer->readRecord (reader, type) &&
+                    !mWeatherManager->readRecord (reader, type) &&
+                    !mCells.readRecord (reader, type, contentFileMap) &&
+                    !mProjectileManager->readRecord (reader, type))
+                {
+                    throw std::runtime_error ("unknown record in saved game");
+                }
+                break;
         }
     }
 
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index 67461d467..d5ba919b0 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -113,6 +113,7 @@ enum RecNameInts
     REC_PROJ = FourCC<'P','R','O','J'>::value,
     REC_DCOU = FourCC<'D','C','O','U'>::value,
     REC_MARK = FourCC<'M','A','R','K'>::value,
+    REC_ENAB = FourCC<'E','N','A','B'>::value,
 
     // format 1
     REC_FILT = 0x544C4946,