Merge pull request #1091 from Allofich/coverity

Coverity fixes
coverity_scan^2
scrawl 8 years ago committed by GitHub
commit 97cd8c21e4

@ -217,7 +217,7 @@ namespace MWBase
virtual bool toggleSky() = 0; virtual bool toggleSky() = 0;
///< \return Resulting mode ///< \return Resulting mode
virtual void changeWeather(const std::string& region, unsigned int id) = 0; virtual void changeWeather(const std::string& region, const unsigned int id) = 0;
virtual int getCurrentWeather() const = 0; virtual int getCurrentWeather() const = 0;

@ -47,7 +47,7 @@ AiFollow::AiFollow(const std::string &actorId, bool commanded)
} }
AiFollow::AiFollow(const ESM::AiSequence::AiFollow *follow) AiFollow::AiFollow(const ESM::AiSequence::AiFollow *follow)
: mCommanded(follow->mCommanded), mRemainingDuration(follow->mRemainingDuration) : mAlwaysFollow(follow->mAlwaysFollow), mCommanded(follow->mCommanded), mRemainingDuration(follow->mRemainingDuration)
, mX(follow->mData.mX), mY(follow->mData.mY), mZ(follow->mData.mZ) , mX(follow->mData.mX), mY(follow->mData.mY), mZ(follow->mData.mZ)
, mActorRefId(follow->mTargetId), mActorId(-1) , mActorRefId(follow->mTargetId), mActorId(-1)
, mCellId(follow->mCellId), mActive(follow->mActive), mFollowIndex(mFollowIndexCounter++) , mCellId(follow->mCellId), mActive(follow->mActive), mFollowIndex(mFollowIndexCounter++)

@ -694,6 +694,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
, mAnimation(anim) , mAnimation(anim)
, mIdleState(CharState_None) , mIdleState(CharState_None)
, mMovementState(CharState_None) , mMovementState(CharState_None)
, mMovementAnimSpeed(0.f)
, mAdjustMovementAnimSpeed(false) , mAdjustMovementAnimSpeed(false)
, mHasMovedInXY(false) , mHasMovedInXY(false)
, mMovementAnimationControlled(true) , mMovementAnimationControlled(true)

@ -316,7 +316,7 @@ namespace MWWorld
virtual bool toggleSky(); virtual bool toggleSky();
///< \return Resulting mode ///< \return Resulting mode
virtual void changeWeather (const std::string& region, unsigned int id); virtual void changeWeather (const std::string& region, const unsigned int id);
virtual int getCurrentWeather() const; virtual int getCurrentWeather() const;

Loading…
Cancel
Save