mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-20 17:23:07 +00:00
Code Issues Releases Wiki Activity

Fix the spelling of mercantile

Browse source
This commit is contained in:
Evil Eye 2025-12-13 17:06:12 +01:00 committed by Alexei Kotov
parent 277a84ed94
commit 60e6b94498
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/opencs/model/world/infoselectwrapper.cpp
View file

@ -42,7 +42,7 @@ const char* CSMWorld::ConstInfoSelectWrapper::FunctionEnumStrings[] = {
"PC Light Armor",
"PC Short Blade",
"PC Marksman",
"PC Merchantile",
"PC Mercantile",
"PC Speechcraft",
"PC Hand to Hand",
"PC Sex",
@ -297,7 +297,7 @@ void CSMWorld::ConstInfoSelectWrapper::updateComparisonType()
case ESM::DialogueCondition::Function_PcLightArmor:
case ESM::DialogueCondition::Function_PcShortBlade:
case ESM::DialogueCondition::Function_PcMarksman:
case ESM::DialogueCondition::Function_PcMerchantile:
case ESM::DialogueCondition::Function_PcMercantile:
case ESM::DialogueCondition::Function_PcSpeechcraft:
case ESM::DialogueCondition::Function_PcHandToHand:
case ESM::DialogueCondition::Function_PcGender:
@ -485,7 +485,7 @@ std::pair<int, int> CSMWorld::ConstInfoSelectWrapper::getValidIntRange() const
case ESM::DialogueCondition::Function_PcLightArmor:
case ESM::DialogueCondition::Function_PcShortBlade:
case ESM::DialogueCondition::Function_PcMarksman:
case ESM::DialogueCondition::Function_PcMerchantile:
case ESM::DialogueCondition::Function_PcMercantile:
case ESM::DialogueCondition::Function_PcSpeechcraft:
case ESM::DialogueCondition::Function_PcHandToHand:
case ESM::DialogueCondition::Function_PcClothingModifier:

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

@ -426,7 +426,7 @@ int MWDialogue::Filter::getSelectStructInteger(const SelectWrapper& select) cons
case ESM::DialogueCondition::Function_PcLightArmor:
case ESM::DialogueCondition::Function_PcShortBlade:
case ESM::DialogueCondition::Function_PcMarksman:
case ESM::DialogueCondition::Function_PcMerchantile:
case ESM::DialogueCondition::Function_PcMercantile:
case ESM::DialogueCondition::Function_PcSpeechcraft:
case ESM::DialogueCondition::Function_PcHandToHand:
{

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

@ -130,7 +130,7 @@ int MWDialogue::SelectWrapper::getArgument() const
return 22;
case ESM::DialogueCondition::Function_PcMarksman:
return 23;
case ESM::DialogueCondition::Function_PcMerchantile:
case ESM::DialogueCondition::Function_PcMercantile:
return 24;
case ESM::DialogueCondition::Function_PcSpeechcraft:
return 25;
@ -193,7 +193,7 @@ MWDialogue::SelectWrapper::Type MWDialogue::SelectWrapper::getType() const
case ESM::DialogueCondition::Function_PcLightArmor:
case ESM::DialogueCondition::Function_PcShortBlade:
case ESM::DialogueCondition::Function_PcMarksman:
case ESM::DialogueCondition::Function_PcMerchantile:
case ESM::DialogueCondition::Function_PcMercantile:
case ESM::DialogueCondition::Function_PcSpeechcraft:
case ESM::DialogueCondition::Function_PcHandToHand:
case ESM::DialogueCondition::Function_FriendHit:

2
apps/openmw/mwlua/dialoguebindings.cpp
View file

@ -439,7 +439,7 @@ namespace MWLua
ESM::DialogueCondition::Function::Function_PcLightArmor, "PcShortBlade",
ESM::DialogueCondition::Function::Function_PcShortBlade, "PcMarksman",
ESM::DialogueCondition::Function::Function_PcMarksman, "PcMercantile",
ESM::DialogueCondition::Function::Function_PcMerchantile, "PcSpeechcraft",
ESM::DialogueCondition::Function::Function_PcMercantile, "PcSpeechcraft",
ESM::DialogueCondition::Function::Function_PcSpeechcraft, "PcHandToHand",
ESM::DialogueCondition::Function::Function_PcHandToHand, "PcGender",
ESM::DialogueCondition::Function::Function_PcGender, "PcExpelled",

2
components/esm3/dialoguecondition.hpp
View file

@ -52,7 +52,7 @@ namespace ESM
Function_PcLightArmor,
Function_PcShortBlade,
Function_PcMarksman,
Function_PcMerchantile,
Function_PcMercantile,
Function_PcSpeechcraft,
Function_PcHandToHand,
Function_PcGender,