Merge remote-tracking branch 'main/master'

apps/opencs/model/world/nestedcoladapterimp.cpp

@@ -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";

apps/openmw/mwdialogue/filter.cpp

@@ -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);
 

apps/openmw/mwdialogue/selectwrapper.cpp

@@ -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,