From e19ab77d00301108d06307142e201b4f6edbd813 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 6 Jan 2015 19:29:33 +0100
Subject: [PATCH] Store camera first person state in savegame (Fixes #2255)

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

diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index f77a90d8e..30dba2aaa 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -355,6 +355,7 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
                 case ESM::REC_ENAB:
                 case ESM::REC_LEVC:
                 case ESM::REC_LEVI:
+                case ESM::REC_CAM_:
 
                     MWBase::Environment::get().getWorld()->readRecord (reader, n.val, contentFileMap);
                     break;
@@ -406,6 +407,8 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
         // Use detectWorldSpaceChange=false, otherwise some of the data we just loaded would be cleared again
         MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition(), false);
 
+        // Vanilla MW will restart startup scripts when a save game is loaded. This is unintuive,
+        // but some mods may be using it as a reload detector.
         MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
 
         // Do not trigger erroneous cellChanged events
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 1c9b8b996..a939a6db9 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -201,6 +201,7 @@ namespace MWWorld
         setupPlayer();
 
         renderPlayer();
+        mRendering->resetCamera();
 
         MWBase::Environment::get().getWindowManager()->updatePlayer();
 
@@ -304,7 +305,8 @@ namespace MWWorld
             +1 // player record
             +1 // weather record
             +1 // actorId counter
-            +1; // levitation/teleport enabled state
+            +1 // levitation/teleport enabled state
+            +1; // camera
     }
 
     void World::write (ESM::ESMWriter& writer, Loading::Listener& progress) const
@@ -333,6 +335,11 @@ namespace MWWorld
         writer.writeHNT("LEVT", mLevitationEnabled);
         writer.endRecord(ESM::REC_ENAB);
         progress.increaseProgress();
+
+        writer.startRecord(ESM::REC_CAM_);
+        writer.writeHNT("FIRS", isFirstPerson());
+        writer.endRecord(ESM::REC_CAM_);
+        progress.increaseProgress();
     }
 
     void World::readRecord (ESM::ESMReader& reader, int32_t type,
@@ -347,6 +354,12 @@ namespace MWWorld
                 reader.getHNT(mTeleportEnabled, "TELE");
                 reader.getHNT(mLevitationEnabled, "LEVT");
                 return;
+            case ESM::REC_CAM_:
+                bool firstperson;
+                reader.getHNT(firstperson, "FIRS");
+                if (firstperson != isFirstPerson())
+                    togglePOV();
+                break;
             default:
                 if (!mStore.readRecord (reader, type) &&
                     !mGlobalVariables.readRecord (reader, type) &&
@@ -2073,7 +2086,6 @@ namespace MWWorld
         MWBase::Environment::get().getMechanicsManager()->add(mPlayer->getPlayer());
 
         mPhysics->addActor(mPlayer->getPlayer());
-        mRendering->resetCamera();
     }
 
     int World::canRest ()
diff --git a/components/esm/defs.hpp b/components/esm/defs.hpp
index d5ba919b0..fe45d6914 100644
--- a/components/esm/defs.hpp
+++ b/components/esm/defs.hpp
@@ -114,6 +114,7 @@ enum RecNameInts
     REC_DCOU = FourCC<'D','C','O','U'>::value,
     REC_MARK = FourCC<'M','A','R','K'>::value,
     REC_ENAB = FourCC<'E','N','A','B'>::value,
+    REC_CAM_ = FourCC<'C','A','M','_'>::value,
 
     // format 1
     REC_FILT = 0x544C4946,