mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 21:49:55 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'main/master'

Browse source
This commit is contained in:
Chris Robinson 2015-12-13 17:06:04 -08:00
commit 12eda97e64
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/model/world/nestedcoladapterimp.cpp
View file

@ -606,7 +606,7 @@ namespace CSMWorld
funcMap["09"] = "PC Fatigue";
funcMap["10"] = "PC Strength";
funcMap["11"] = "PC Block";
funcMap["12"] = "PC Armoror";
funcMap["12"] = "PC Armorer";
funcMap["13"] = "PC Medium Armor";
funcMap["14"] = "PC Heavy Armor";
funcMap["15"] = "PC Blunt Weapon";

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

@ -313,7 +313,7 @@ int MWDialogue::Filter::getSelectStructInteger (const SelectWrapper& select) con
int value = 0;
for (int i=0; i<=15; ++i) // everything except thigns held in hands and amunition
for (int i=0; i<=15; ++i) // everything except things held in hands and ammunition
{
MWWorld::ContainerStoreIterator slot = store.getSlot (i);

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

@ -263,10 +263,6 @@ bool MWDialogue::SelectWrapper::isNpcOnly() const
{
Function_NotFaction, Function_NotClass, Function_NotRace,
Function_SameGender, Function_SameRace, Function_SameFaction,
Function_PcSkill,
Function_PcExpelled,
Function_PcVampire,
Function_PcCrimeLevel,
Function_RankRequirement,
Function_Reputation, Function_FactionRankDiff,
Function_Werewolf, Function_WerewolfKills,