mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 07:06:43 +00:00
Code Issues Releases Wiki Activity

removed bCollision variable from World

Browse source
This commit is contained in:
Marc Zinnschlag 2012-02-20 14:07:16 +01:00
parent 7eae24bb45
commit 781b16a00e
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwworld/world.cpp
View file

@ -148,7 +148,7 @@ namespace MWWorld
const std::string& master, const boost::filesystem::path& resDir, const std::string& master, const boost::filesystem::path& resDir,
bool newGame, Environment& environment, const std::string& encoding) bool newGame, Environment& environment, const std::string& encoding)
: mRendering (renderer,resDir, physEng, environment),mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0), : 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; mPhysEngine = physEng;
@ -612,8 +612,7 @@ namespace MWWorld
bool World::toggleCollisionMode() bool World::toggleCollisionMode()
{ {
bCollision = mPhysics->toggleCollisionMode(); return mPhysics->toggleCollisionMode();;
return bCollision;
} }
bool World::toggleRenderMode (RenderMode mode) bool World::toggleRenderMode (RenderMode mode)

1
apps/openmw/mwworld/world.hpp
View file

@ -77,7 +77,6 @@ namespace MWWorld
bool mSky; bool mSky;
Environment& mEnvironment; Environment& mEnvironment;
int mNextDynamicRecord; int mNextDynamicRecord;
bool bCollision;
Cells mCells; Cells mCells;