diff --git a/apps/opencs/view/render/object.cpp b/apps/opencs/view/render/object.cpp index ec184a563..6ddea913a 100644 --- a/apps/opencs/view/render/object.cpp +++ b/apps/opencs/view/render/object.cpp @@ -115,7 +115,7 @@ const CSMWorld::CellRef& CSVRender::Object::getReference() const CSVRender::Object::Object (CSMWorld::Data& data, osg::Group* parentNode, const std::string& id, bool referenceable, bool forceBaseToZero) -: mResourceSystem(data.getResourceSystem()), mData (data), mBaseNode(0), mParentNode(parentNode), mForceBaseToZero (forceBaseToZero) +: mData (data), mBaseNode(0), mParentNode(parentNode), mResourceSystem(data.getResourceSystem()), mForceBaseToZero (forceBaseToZero) { mBaseNode = new osg::PositionAttitudeTransform; parentNode->addChild(mBaseNode); diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp index 5ce1607b5..08dba334f 100644 --- a/apps/openmw/engine.cpp +++ b/apps/openmw/engine.cpp @@ -204,8 +204,8 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager) , mFSStrict (false) , mScriptBlacklistUse (true) , mNewGame (false) - , mCfgMgr(configurationManager) , mSimulationTime(0.0) + , mCfgMgr(configurationManager) { Misc::Rng::init(); MWClass::registerClasses(); diff --git a/apps/openmw/mwgui/inventorywindow.cpp b/apps/openmw/mwgui/inventorywindow.cpp index e9c973fc3..b96e79ca9 100644 --- a/apps/openmw/mwgui/inventorywindow.cpp +++ b/apps/openmw/mwgui/inventorywindow.cpp @@ -54,8 +54,6 @@ namespace MWGui InventoryWindow::InventoryWindow(DragAndDrop* dragAndDrop, osgViewer::Viewer* viewer, Resource::ResourceSystem* resourceSystem) : WindowPinnableBase("openmw_inventory_window.layout") - , mViewer(viewer) - , mResourceSystem(resourceSystem) , mDragAndDrop(dragAndDrop) , mSelectedItem(-1) , mSortModel(NULL) @@ -63,6 +61,8 @@ namespace MWGui , mGuiMode(GM_Inventory) , mLastXSize(0) , mLastYSize(0) + , mResourceSystem(resourceSystem) + , mViewer(viewer) , mPreview(new MWRender::InventoryPreview(viewer, resourceSystem, MWBase::Environment::get().getWorld()->getPlayerPtr())) , mTrading(false) { diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp index 7a3dd5e18..1b5abc099 100644 --- a/apps/openmw/mwinput/inputmanagerimp.cpp +++ b/apps/openmw/mwinput/inputmanagerimp.cpp @@ -131,8 +131,8 @@ namespace MWInput , mSneakToggles(Settings::Manager::getBool("toggle sneak", "Input")) , mSneaking(false) , mAttemptJump(false) - , mFakeDeviceID(1) , mInvUiScalingFactor(1.f) + , mFakeDeviceID(1) { mInputManager = new SDLUtil::InputWrapper(window, viewer, grab); mInputManager->setMouseEventCallback (this); diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp index afc81da8b..b32ac2f52 100644 --- a/apps/openmw/mwphysics/physicssystem.cpp +++ b/apps/openmw/mwphysics/physicssystem.cpp @@ -590,10 +590,10 @@ namespace MWPhysics PhysicsSystem::PhysicsSystem(Resource::ResourceSystem* resourceSystem, osg::ref_ptr parentNode) : mShapeManager(new NifBullet::BulletShapeManager(resourceSystem->getVFS(), resourceSystem->getSceneManager())) + , mDebugDrawEnabled(false) , mTimeAccum(0.0f) - , mWaterEnabled(false) , mWaterHeight(0) - , mDebugDrawEnabled(false) + , mWaterEnabled(false) , mParentNode(parentNode) { mCollisionConfiguration = new btDefaultCollisionConfiguration(); diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp index e8d6bbcc9..1c436d440 100644 --- a/apps/openmw/mwrender/animation.cpp +++ b/apps/openmw/mwrender/animation.cpp @@ -234,8 +234,8 @@ namespace MWRender }; Animation::Animation(const MWWorld::Ptr &ptr, osg::ref_ptr parentNode, Resource::ResourceSystem* resourceSystem) - : mPtr(ptr) - , mInsert(parentNode) + : mInsert(parentNode) + , mPtr(ptr) , mResourceSystem(resourceSystem) , mAccumulate(1.f, 1.f, 0.f) , mTextKeyListener(NULL) diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp index 5fafa6d59..aeff1f60a 100644 --- a/apps/openmw/mwrender/npcanimation.cpp +++ b/apps/openmw/mwrender/npcanimation.cpp @@ -186,17 +186,16 @@ NpcAnimation::~NpcAnimation() mPtr.getClass().getInventoryStore(mPtr).setListener(NULL, mPtr); } - NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr parentNode, Resource::ResourceSystem* resourceSystem, int visibilityFlags, bool disableListener, bool disableSounds, ViewMode viewMode) : Animation(ptr, parentNode, resourceSystem), - mVisibilityFlags(visibilityFlags), mListenerDisabled(disableListener), mViewMode(viewMode), mShowWeapons(false), mShowCarriedLeft(true), //mFirstPersonOffset(0.f, 0.f, 0.f), - mAlpha(1.f), mNpcType(Type_Normal), + mVisibilityFlags(visibilityFlags), + mAlpha(1.f), mSoundsDisabled(disableSounds) //mHeadPitch(0.f), //mHeadYaw(0.f) diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp index 237e90b74..3d981a9c7 100644 --- a/apps/openmw/mwrender/objects.cpp +++ b/apps/openmw/mwrender/objects.cpp @@ -65,8 +65,8 @@ namespace MWRender { Objects::Objects(Resource::ResourceSystem* resourceSystem, osg::ref_ptr rootNode) - : mResourceSystem(resourceSystem) - , mRootNode(rootNode) + : mRootNode(rootNode) + , mResourceSystem(resourceSystem) { } diff --git a/apps/openmw/mwrender/pathgrid.cpp b/apps/openmw/mwrender/pathgrid.cpp index 5e559eeed..9fffd76d1 100644 --- a/apps/openmw/mwrender/pathgrid.cpp +++ b/apps/openmw/mwrender/pathgrid.cpp @@ -125,10 +125,10 @@ osg::ref_ptr Pathgrid::createPathgridPoints(const ESM::Pathgrid * } Pathgrid::Pathgrid(osg::ref_ptr root) - : mRootNode(root) - , mPathgridEnabled(false) - , mInteriorPathgridNode(NULL) + : mPathgridEnabled(false) + , mRootNode(root) , mPathGridRoot(NULL) + , mInteriorPathgridNode(NULL) { } diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp index 6b432ae5e..43c88427e 100644 --- a/apps/openmw/mwrender/sky.cpp +++ b/apps/openmw/mwrender/sky.cpp @@ -326,8 +326,8 @@ public: Moon(osg::Group* parentNode, Resource::SceneManager* sceneManager, float scaleFactor, Type type) : CelestialBody(parentNode, sceneManager, scaleFactor, 2) - , mPhase(Phase_Unspecified) , mType(type) + , mPhase(Phase_Unspecified) { mUpdater = new MoonUpdater; mGeode->addUpdateCallback(mUpdater); @@ -487,6 +487,7 @@ SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneMana , mMonth(0) , mCloudAnimationTimer(0.f) , mRainTimer(0.f) + , mStormDirection(0,-1,0) , mClouds() , mNextClouds() , mCloudBlendFactor(0.0f) @@ -503,7 +504,6 @@ SkyManager::SkyManager(osg::Group* parentNode, Resource::SceneManager* sceneMana , mSunEnabled(true) , mMasserEnabled(true) , mSecundaEnabled(true) - , mStormDirection(0,-1,0) { osg::ref_ptr skyroot (new CameraRelativeTransform); parentNode->addChild(skyroot); diff --git a/components/nif/niffile.cpp b/components/nif/niffile.cpp index a73985cfb..0a6f8f505 100644 --- a/components/nif/niffile.cpp +++ b/components/nif/niffile.cpp @@ -11,8 +11,8 @@ namespace Nif NIFFile::NIFFile(Files::IStreamPtr stream, const std::string &name) : ver(0) , filename(name) - , mStream(stream) , mUseSkinning(false) + , mStream(stream) { parse(); } diff --git a/components/nifosg/controller.cpp b/components/nifosg/controller.cpp index 27665b6c6..d676bc3f8 100644 --- a/components/nifosg/controller.cpp +++ b/components/nifosg/controller.cpp @@ -349,7 +349,7 @@ AlphaController::AlphaController() } AlphaController::AlphaController(const AlphaController ©, const osg::CopyOp ©op) - : StateSetUpdater(copy, copyop), ValueInterpolator(), Controller(copy) + : StateSetUpdater(copy, copyop), Controller(copy), ValueInterpolator() , mData(copy.mData) { } diff --git a/components/nifosg/particle.cpp b/components/nifosg/particle.cpp index 3cfd91f1f..b733987d0 100644 --- a/components/nifosg/particle.cpp +++ b/components/nifosg/particle.cpp @@ -155,9 +155,9 @@ void ParticleColorAffector::operate(osgParticle::Particle* particle, double /* d GravityAffector::GravityAffector(const Nif::NiGravity *gravity) : mForce(gravity->mForce) , mType(static_cast(gravity->mType)) - , mDecay(gravity->mDecay) , mPosition(gravity->mPosition) , mDirection(gravity->mDirection) + , mDecay(gravity->mDecay) { } diff --git a/components/nifosg/particle.hpp b/components/nifosg/particle.hpp index 416477cdd..5e463aae3 100644 --- a/components/nifosg/particle.hpp +++ b/components/nifosg/particle.hpp @@ -61,7 +61,7 @@ namespace NifOsg { } InverseWorldMatrix(const InverseWorldMatrix& copy, const osg::CopyOp& op = osg::CopyOp::SHALLOW_COPY) - : osg::NodeCallback(), osg::Object() + : osg::Object(), osg::NodeCallback() { } diff --git a/components/sceneutil/lightcontroller.cpp b/components/sceneutil/lightcontroller.cpp index 484cea447..d31e3d107 100644 --- a/components/sceneutil/lightcontroller.cpp +++ b/components/sceneutil/lightcontroller.cpp @@ -47,9 +47,9 @@ namespace SceneUtil LightController::LightController() : mType(LT_Normal) , mPhase((Misc::Rng::rollClosedProbability() * 2.f - 1.f) * 500.f) - , mLastTime(0.0) , mDeltaCount(0.f) , mDirection(1.f) + , mLastTime(0.0) { } diff --git a/components/sceneutil/skeleton.cpp b/components/sceneutil/skeleton.cpp index f105977ba..96941126b 100644 --- a/components/sceneutil/skeleton.cpp +++ b/components/sceneutil/skeleton.cpp @@ -34,8 +34,8 @@ private: Skeleton::Skeleton() : mBoneCacheInit(false) , mNeedToUpdateBoneMatrices(true) - , mLastFrameNumber(0) , mActive(true) + , mLastFrameNumber(0) { } @@ -44,8 +44,8 @@ Skeleton::Skeleton(const Skeleton ©, const osg::CopyOp ©op) : osg::Group(copy, copyop) , mBoneCacheInit(false) , mNeedToUpdateBoneMatrices(true) - , mLastFrameNumber(0) , mActive(copy.mActive) + , mLastFrameNumber(0) { }