From 781b16a00e9e1571fd955c50eda070e2dfa4eb39 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 20 Feb 2012 14:07:16 +0100
Subject: [PATCH] removed bCollision variable from World

---
 apps/openmw/mwworld/world.cpp | 5 ++---
 apps/openmw/mwworld/world.hpp | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp
index 73439ff64..c9e177566 100644
--- a/apps/openmw/mwworld/world.cpp
+++ b/apps/openmw/mwworld/world.cpp
@@ -148,7 +148,7 @@ namespace MWWorld
         const std::string& master, const boost::filesystem::path& resDir,
         bool newGame, Environment& environment, const std::string& encoding)
     : mRendering (renderer,resDir, physEng, environment),mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0),
-      mSky (false), bCollision(false), mEnvironment (environment), mNextDynamicRecord (0), mCells (mStore, mEsm, *this)
+      mSky (false), mEnvironment (environment), mNextDynamicRecord (0), mCells (mStore, mEsm, *this)
     {
         mPhysEngine = physEng;
 
@@ -612,8 +612,7 @@ namespace MWWorld
 
     bool World::toggleCollisionMode()
     {
-        bCollision = mPhysics->toggleCollisionMode();
-        return bCollision;
+        return mPhysics->toggleCollisionMode();;
     }
 
     bool World::toggleRenderMode (RenderMode mode)
diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp
index b4c61eebb..59cddb1c1 100644
--- a/apps/openmw/mwworld/world.hpp
+++ b/apps/openmw/mwworld/world.hpp
@@ -77,7 +77,6 @@ namespace MWWorld
             bool mSky;
             Environment& mEnvironment;
             int mNextDynamicRecord;
-            bool bCollision;
 
             Cells mCells;