From 583e7221efb0733f6d92f6aa0244cc2d0e9a55cb Mon Sep 17 00:00:00 2001 From: Marc Zinnschlag Date: Sat, 29 Oct 2011 09:55:22 +0200 Subject: [PATCH] silenced a warning and removed some tabs --- apps/openmw/mwworld/world.cpp | 14 +++++++------- apps/openmw/mwworld/world.hpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index dfacffc5b..fafea5e12 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -176,10 +176,10 @@ namespace MWWorld const Files::Collections& fileCollections, const std::string& master, const boost::filesystem::path& resDir, bool newGame, Environment& environment, const std::string& encoding) - : mRendering (renderer,resDir), mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0), - mSky (false), mEnvironment (environment), mNextDynamicRecord (0), mCells (mStore, mEsm, *this), mDebugging(physEng) + : mRendering (renderer,resDir), mDebugging(physEng), mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0), + mSky (false), mEnvironment (environment), mNextDynamicRecord (0), mCells (mStore, mEsm, *this) { - std::cout << "Creating myworld\n"; + std::cout << "Creating myworld\n"; mPhysEngine = physEng; mPhysics = new PhysicsSystem(renderer, physEng); @@ -208,17 +208,17 @@ namespace MWWorld mPhysEngine = physEng; mWorldScene = new Scene(environment, this, mRendering.getOgreRenderer(), mRendering.getRoot(), mPhysics); - + } World::~World() { delete mWorldScene; delete mGlobalVariables; - + delete mPhysics; - - delete mPlayer; + + delete mPlayer; } const ESM::Cell *World::getExterior (const std::string& cellName) const diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp index b1ce69b3d..b00b8dead 100644 --- a/apps/openmw/mwworld/world.hpp +++ b/apps/openmw/mwworld/world.hpp @@ -66,7 +66,7 @@ namespace MWWorld private: MWRender::RenderingManager mRendering; - MWRender::Debugging mDebugging; + MWRender::Debugging mDebugging; MWWorld::Scene *mWorldScene; MWWorld::Player *mPlayer; ESM::ESMReader mEsm;