From a7b42b867bb559511886973d3b8ecfaa986588d3 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Thu, 5 Dec 2013 14:18:43 +0100
Subject: [PATCH] more cleanup

---
 apps/openmw/mwworld/worldimp.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index b2d18a27f..539c959b3 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -238,7 +238,6 @@ namespace MWWorld
         setupPlayer();
 
         renderPlayer();
-        mRendering->resetCamera();
 
         MWBase::Environment::get().getWindowManager()->updatePlayer();
 
@@ -289,6 +288,15 @@ namespace MWWorld
         mStore.setUp();
 
         mCells.clear();
+
+        mProjectiles.clear();
+        mDoorStates.clear();
+
+        mGodMode = false;
+        mSky = true;
+        mTeleportEnabled = true;
+        mPlayIntro = 0;
+        mFacedDistance = FLT_MAX;
     }
 
     void World::ensureNeededRecords()
@@ -1701,6 +1709,7 @@ namespace MWWorld
     {
         mRendering->renderPlayer(mPlayer->getPlayer());
         mPhysics->addActor(mPlayer->getPlayer());
+        mRendering->resetCamera();
     }
 
     void World::setupExternalRendering (MWRender::ExternalRendering& rendering)