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

Dialog function 72 is not player-specific

Browse source 
It's used to force any NPC in werewolf form to play the appropriate
growls for combat.
This commit is contained in:
Chris Robinson 2013-08-08 06:02:16 -07:00
parent 0de4a34d75
commit e3d5a1b38d
4 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/esmtool/labels.cpp
View file

@ -609,8 +609,7 @@ std::string ruleFunction(int idx)
"Alarm", "Alarm",
"Flee", "Flee",
"Should Attack", "Should Attack",
//Unkown but causes NPCs to growl and roar. "Werewolf"
"UNKNOWN 72"
}; };
if (idx >= 0 && idx <= 72) if (idx >= 0 && idx <= 72)
return ruleFunctions[idx]; return ruleFunctions[idx];

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

@ -538,9 +538,9 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
return MWWorld::Class::get (mActor).getCreatureStats (mActor).getCreatureTargetted(); 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: default:

6
apps/openmw/mwdialogue/selectwrapper.cpp
View file

@ -91,7 +91,7 @@ MWDialogue::SelectWrapper::Function MWDialogue::SelectWrapper::decodeFunction()
case 66: return Function_FriendlyHit; case 66: return Function_FriendlyHit;
case 67: case 68: case 69: case 70: return Function_AiSetting; case 67: case 68: case 69: case 70: return Function_AiSetting;
case 71: return Function_ShouldAttack; case 71: return Function_ShouldAttack;
case 72: return Function_PCWerewolf; case 72: return Function_Werewolf;
case 73: return Function_WerewolfKills; case 73: return Function_WerewolfKills;
} }
@ -226,7 +226,7 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
Function_Alarmed, Function_Detected, Function_Alarmed, Function_Detected,
Function_Attacked, Function_ShouldAttack, Function_Attacked, Function_ShouldAttack,
Function_CreatureTargetted, Function_CreatureTargetted,
Function_PCWerewolf, Function_Werewolf,
Function_None // end marker Function_None // end marker
}; };
@ -270,7 +270,7 @@ bool MWDialogue::SelectWrapper::isNpcOnly() const
Function_PcCrimeLevel, Function_PcCrimeLevel,
Function_RankRequirement, Function_RankRequirement,
Function_Reputation, Function_FactionRankDiff, Function_Reputation, Function_FactionRankDiff,
Function_PCWerewolf, Function_WerewolfKills, Function_Werewolf, Function_WerewolfKills,
Function_RankLow, Function_RankHigh, Function_RankLow, Function_RankHigh,
Function_None // end marker Function_None // end marker
}; };

2
apps/openmw/mwdialogue/selectwrapper.hpp
View file

@ -42,7 +42,7 @@ namespace MWDialogue
Function_Reputation, Function_Alarmed, Function_FactionRankDiff, Function_Detected, Function_Reputation, Function_Alarmed, Function_FactionRankDiff, Function_Detected,
Function_Attacked, Function_ShouldAttack, Function_Attacked, Function_ShouldAttack,
Function_CreatureTargetted, Function_CreatureTargetted,
Function_PCWerewolf, Function_WerewolfKills, Function_Werewolf, Function_WerewolfKills,
Function_RankLow, Function_RankHigh Function_RankLow, Function_RankHigh
}; };