From 56c9c4dbd95270b8b0b98691bd188d961c490815 Mon Sep 17 00:00:00 2001
From: greye <greye@null.net>
Date: Fri, 10 Aug 2012 21:03:46 +0400
Subject: [PATCH] remove some redundant code

---
 apps/openmw/mwworld/scene.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ec557e35c7..40d0a634a4 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -140,19 +140,18 @@ namespace MWWorld
         const ESM::Position& pos,
         bool adjustPlayerPos)
     {
-        MWBase::Environment::get().getWorld()->getPlayer().setCell (cell);
-
         bool hasWater = cell->cell->data.flags & cell->cell->HasWater;
         mPhysics->setCurrentWater(hasWater, cell->cell->water);
 
         MWBase::World *world = MWBase::Environment::get().getWorld();
         MWWorld::Ptr player = world->getPlayer().getPlayer();
 
+        world->getPlayer().setCell(cell);
+
         if (adjustPlayerPos) {
             world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]);
             world->rotateObject(player, pos.rot[0], pos.rot[1], pos.rot[2]);
         }
-        world->getPlayer().setCell(cell);
 
         MWMechanics::MechanicsManager *mechMgr =
             MWBase::Environment::get().getMechanicsManager();