teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

For dialogue filtering, use the Vampirism magic effect instead of the untouched NpcStats::mVampire

Browse source
This commit is contained in:
scrawl 2014-01-04 20:02:29 +01:00
parent 356b53bd22
commit f4517c8221
3 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwdialogue/filter.cpp
View file

@ -514,7 +514,8 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
case SelectWrapper::Function_PcVampire: case SelectWrapper::Function_PcVampire:
return MWWorld::Class::get (player).getNpcStats (player).isVampire(); return MWWorld::Class::get (player).getCreatureStats(player).getMagicEffects().
get(ESM::MagicEffect::Vampirism).mMagnitude > 0;
case SelectWrapper::Function_TalkedToPc: case SelectWrapper::Function_TalkedToPc:

11
apps/openmw/mwmechanics/npcstats.cpp
View file

@ -28,7 +28,6 @@ MWMechanics::NpcStats::NpcStats()
, mBounty (0) , mBounty (0)
, mLevelProgress(0) , mLevelProgress(0)
, mDisposition(0) , mDisposition(0)
, mVampire (0)
, mReputation(0) , mReputation(0)
, mWerewolfKills (0) , mWerewolfKills (0)
, mProfit(0) , mProfit(0)
@ -318,16 +317,6 @@ void MWMechanics::NpcStats::setFactionReputation (const std::string& faction, in
mFactionReputation[faction] = value; mFactionReputation[faction] = value;
} }
bool MWMechanics::NpcStats::isVampire() const
{
return mVampire;
}
void MWMechanics::NpcStats::setVampire (bool set)
{
mVampire = set;
}
int MWMechanics::NpcStats::getReputation() const int MWMechanics::NpcStats::getReputation() const
{ {
return mReputation; return mReputation;

5
apps/openmw/mwmechanics/npcstats.hpp
View file

@ -50,7 +50,6 @@ namespace MWMechanics
int mBounty; int mBounty;
std::set<std::string> mExpelled; std::set<std::string> mExpelled;
std::map<std::string, int> mFactionReputation; std::map<std::string, int> mFactionReputation;
bool mVampire;
int mReputation; int mReputation;
int mWerewolfKills; int mWerewolfKills;
int mProfit; int mProfit;
@ -135,10 +134,6 @@ namespace MWMechanics
void setFactionReputation (const std::string& faction, int value); void setFactionReputation (const std::string& faction, int value);
bool isVampire() const;
void setVampire (bool set);
bool hasSkillsForRank (const std::string& factionId, int rank) const; bool hasSkillsForRank (const std::string& factionId, int rank) const;
bool isWerewolf() const; bool isWerewolf() const;