From 6d8debe009ea0a9cc9ae4253b4a45857eddb4721 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Fri, 1 May 2020 17:10:06 +0200
Subject: [PATCH] Initialize variable without reading itself
---
apps/openmw/mwrender/npcanimation.cpp | 14 ++++++++++----
apps/openmw/mwrender/npcanimation.hpp | 3 ++-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index a797a9876..629b10ba4 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -266,16 +266,22 @@ void HeadAnimationTime::setBlinkStop(float value)
// ----------------------------------------------------
-NpcAnimation::NpcType NpcAnimation::getNpcType()
+NpcAnimation::NpcType NpcAnimation::getNpcType() const
{
const MWWorld::Class &cls = mPtr.getClass();
// Dead vampires should typically stay vampires.
if (mNpcType == Type_Vampire && cls.getNpcStats(mPtr).isDead() && !cls.getNpcStats(mPtr).isWerewolf())
return mNpcType;
+ return getNpcType(mPtr);
+}
+
+NpcAnimation::NpcType NpcAnimation::getNpcType(const MWWorld::Ptr& ptr)
+{
+ const MWWorld::Class &cls = ptr.getClass();
NpcAnimation::NpcType curType = Type_Normal;
- if (cls.getCreatureStats(mPtr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0)
+ if (cls.getCreatureStats(ptr).getMagicEffects().get(ESM::MagicEffect::Vampirism).getMagnitude() > 0)
curType = Type_Vampire;
- if (cls.getNpcStats(mPtr).isWerewolf())
+ if (cls.getNpcStats(ptr).isWerewolf())
curType = Type_Werewolf;
return curType;
@@ -326,7 +332,7 @@ NpcAnimation::NpcAnimation(const MWWorld::Ptr& ptr, osg::ref_ptr<osg::Group> par
mViewMode(viewMode),
mShowWeapons(false),
mShowCarriedLeft(true),
- mNpcType(getNpcType()),
+ mNpcType(getNpcType(ptr)),
mFirstPersonFieldOfView(firstPersonFieldOfView),
mSoundsDisabled(disableSounds),
mAccurateAiming(false),
diff --git a/apps/openmw/mwrender/npcanimation.hpp b/apps/openmw/mwrender/npcanimation.hpp
index 9e7969976..e102f5097 100644
--- a/apps/openmw/mwrender/npcanimation.hpp
+++ b/apps/openmw/mwrender/npcanimation.hpp
@@ -74,7 +74,7 @@ private:
void updateNpcBase();
- NpcType getNpcType();
+ NpcType getNpcType() const;
PartHolderPtr insertBoundedPart(const std::string &model, const std::string &bonename,
const std::string &bonefilter, bool enchantedGlow, osg::Vec4f* glowColor=nullptr);
@@ -94,6 +94,7 @@ private:
static bool isFirstPersonPart(const ESM::BodyPart* bodypart);
static bool isFemalePart(const ESM::BodyPart* bodypart);
+ static NpcType getNpcType(const MWWorld::Ptr& ptr);
protected:
virtual void addControllers();