diff --git a/apps/esmtool/labels.cpp b/apps/esmtool/labels.cpp index 3fb1166e8..7b1fc7fb2 100644 --- a/apps/esmtool/labels.cpp +++ b/apps/esmtool/labels.cpp @@ -609,8 +609,7 @@ std::string ruleFunction(int idx) "Alarm", "Flee", "Should Attack", - //Unkown but causes NPCs to growl and roar. - "UNKNOWN 72" + "Werewolf" }; if (idx >= 0 && idx <= 72) return ruleFunctions[idx]; diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp index 52c7bd4f3..a7b0f1924 100644 --- a/apps/openmw/mwdialogue/filter.cpp +++ b/apps/openmw/mwdialogue/filter.cpp @@ -538,9 +538,9 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co return MWWorld::Class::get (mActor).getCreatureStats (mActor).getCreatureTargetted(); - case SelectWrapper::Function_PCWerewolf: + case SelectWrapper::Function_Werewolf: - return MWWorld::Class::get (player).getNpcStats (player).isWerewolf(); + return MWWorld::Class::get (mActor).getNpcStats (mActor).isWerewolf(); default: diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp index 64bd1d244..3f22998f0 100644 --- a/apps/openmw/mwdialogue/selectwrapper.cpp +++ b/apps/openmw/mwdialogue/selectwrapper.cpp @@ -91,7 +91,7 @@ MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::decodeFunction() case 66: return Function_FriendlyHit; case 67: case 68: case 69: case 70: return Function_AiSetting; case 71: return Function_ShouldAttack; - case 72: return Function_PCWerewolf; + case 72: return Function_Werewolf; case 73: return Function_WerewolfKills; } @@ -226,7 +226,7 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const Function_Alarmed, Function_Detected, Function_Attacked, Function_ShouldAttack, Function_CreatureTargetted, - Function_PCWerewolf, + Function_Werewolf, Function_None // end marker }; @@ -270,7 +270,7 @@ bool MWDialogue::SelectWrapper::isNpcOnly() const Function_PcCrimeLevel, Function_RankRequirement, Function_Reputation, Function_FactionRankDiff, - Function_PCWerewolf, Function_WerewolfKills, + Function_Werewolf, Function_WerewolfKills, Function_RankLow, Function_RankHigh, Function_None // end marker }; diff --git a/apps/openmw/mwdialogue/selectwrapper.hpp b/apps/openmw/mwdialogue/selectwrapper.hpp index f4bc898a4..ef787d8ee 100644 --- a/apps/openmw/mwdialogue/selectwrapper.hpp +++ b/apps/openmw/mwdialogue/selectwrapper.hpp @@ -42,7 +42,7 @@ namespace MWDialogue Function_Reputation, Function_Alarmed, Function_FactionRankDiff, Function_Detected, Function_Attacked, Function_ShouldAttack, Function_CreatureTargetted, - Function_PCWerewolf, Function_WerewolfKills, + Function_Werewolf, Function_WerewolfKills, Function_RankLow, Function_RankHigh };