mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 23:15:43 +00:00
Code Issues Releases Wiki Activity

Merge branch 'clang_warning' into 'master'

Browse source 
Fix two -Wreorder clang warnings

See merge request OpenMW/openmw!1136
This commit is contained in:
elsid 2021-08-13 13:01:14 +00:00
commit 4e0e2fb52f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwphysics/physicssystem.cpp
View file

@ -991,13 +991,13 @@ namespace MWPhysics
, mHalfExtentsZ(actor.getHalfExtents().z()) , mHalfExtentsZ(actor.getHalfExtents().z())
, mOldHeight(0) , mOldHeight(0)
, mFallHeight(0) , mFallHeight(0)
, mStuckFrames(0)
, mFlying(MWBase::Environment::get().getWorld()->isFlying(actor.getPtr())) , mFlying(MWBase::Environment::get().getWorld()->isFlying(actor.getPtr()))
, mWasOnGround(actor.getOnGround()) , mWasOnGround(actor.getOnGround())
, mIsAquatic(actor.getPtr().getClass().isPureWaterCreature(actor.getPtr())) , mIsAquatic(actor.getPtr().getClass().isPureWaterCreature(actor.getPtr()))
, mWaterCollision(waterCollision) , mWaterCollision(waterCollision)
, mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode()) , mSkipCollisionDetection(actor.skipCollisions() || !actor.getCollisionMode())
, mNeedLand(false) , mNeedLand(false)
, mStuckFrames(0)
{ {
} }

2
components/resource/scenemanager.cpp
View file

@ -228,6 +228,7 @@ namespace Resource
, mApplyLightingToEnvMaps(false) , mApplyLightingToEnvMaps(false)
, mLightingMethod(SceneUtil::LightingMethod::FFP) , mLightingMethod(SceneUtil::LightingMethod::FFP)
, mConvertAlphaTestToAlphaToCoverage(false) , mConvertAlphaTestToAlphaToCoverage(false)
, mDepthFormat(0)
, mInstanceCache(new MultiObjectCache) , mInstanceCache(new MultiObjectCache)
, mSharedStateManager(new SharedStateManager) , mSharedStateManager(new SharedStateManager)
, mImageManager(imageManager) , mImageManager(imageManager)
@ -237,7 +238,6 @@ namespace Resource
, mMaxAnisotropy(1) , mMaxAnisotropy(1)
, mUnRefImageDataAfterApply(false) , mUnRefImageDataAfterApply(false)
, mParticleSystemMask(~0u) , mParticleSystemMask(~0u)
, mDepthFormat(0)
{ {
} }