From d2e98c4de1732107a75ee93690eea4a995987b73 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 5 Jun 2014 17:21:02 +0200
Subject: [PATCH] Fix forced switch to third person on death not always working

For instance, when dying from fall damage
---
 apps/openmw/mwmechanics/character.cpp   | 7 +++++++
 apps/openmw/mwrender/camera.cpp         | 4 ++--
 apps/openmw/mwrender/camera.hpp         | 3 ++-
 apps/openmw/mwstate/statemanagerimp.cpp | 1 -
 apps/openmw/mwworld/worldimp.cpp        | 2 +-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c9da912dd..db4e59929 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -409,6 +409,13 @@ MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::I
 
 void CharacterController::playDeath(float startpoint, CharacterState death)
 {
+    if (mPtr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+    {
+        // The first-person animations do not include death, so we need to
+        // force-switch to third person before playing the death animation.
+        MWBase::Environment::get().getWorld()->useDeathCamera();
+    }
+
     switch (death)
     {
     case CharState_SwimDeath:
diff --git a/apps/openmw/mwrender/camera.cpp b/apps/openmw/mwrender/camera.cpp
index 294264951..9e683cc15 100644
--- a/apps/openmw/mwrender/camera.cpp
+++ b/apps/openmw/mwrender/camera.cpp
@@ -140,11 +140,11 @@ namespace MWRender
         }
     }
 
-    void Camera::toggleViewMode()
+    void Camera::toggleViewMode(bool force)
     {
         // Changing the view will stop all playing animations, so if we are playing
         // anything important, queue the view change for later
-        if (!mAnimation->allowSwitchViewMode())
+        if (!mAnimation->allowSwitchViewMode() && !force)
         {
             mViewModeToggleQueued = true;
             return;
diff --git a/apps/openmw/mwrender/camera.hpp b/apps/openmw/mwrender/camera.hpp
index 808f817cf..1e86bfb48 100644
--- a/apps/openmw/mwrender/camera.hpp
+++ b/apps/openmw/mwrender/camera.hpp
@@ -75,7 +75,8 @@ namespace MWRender
         /// Attach camera to object
         void attachTo(const MWWorld::Ptr &);
 
-        void toggleViewMode();
+        /// @param Force view mode switch, even if currently not allowed by the animation.
+        void toggleViewMode(bool force=false);
 
         bool toggleVanityMode(bool enable);
         void allowVanityMode(bool allow);
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index 29b5318d7..0e56365d6 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -144,7 +144,6 @@ void MWState::StateManager::newGame (bool bypass)
 void MWState::StateManager::endGame()
 {
     mState = State_Ended;
-    MWBase::Environment::get().getWorld()->useDeathCamera();
 }
 
 void MWState::StateManager::saveGame (const std::string& description, const Slot *slot)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 5cde556ec..2bd835561 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -432,7 +432,7 @@ namespace MWWorld
             mRendering->getCamera()->toggleVanityMode(false);
         }
         if(mRendering->getCamera()->isFirstPerson())
-            togglePOV();
+            mRendering->getCamera()->toggleViewMode(true);
     }
 
     MWWorld::Player& World::getPlayer()