From 60e6b94498f289636aec3d95d7fb8e4fff7797cc Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Sat, 13 Dec 2025 17:06:12 +0100
Subject: [PATCH] Fix the spelling of mercantile

---
 apps/opencs/model/world/infoselectwrapper.cpp | 6 +++---
 apps/openmw/mwdialogue/filter.cpp             | 2 +-
 apps/openmw/mwdialogue/selectwrapper.cpp      | 4 ++--
 apps/openmw/mwlua/dialoguebindings.cpp        | 2 +-
 components/esm3/dialoguecondition.hpp         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/opencs/model/world/infoselectwrapper.cpp b/apps/opencs/model/world/infoselectwrapper.cpp
index c22ae19d94..bdc7a7c3b4 100644
--- a/apps/opencs/model/world/infoselectwrapper.cpp
+++ b/apps/opencs/model/world/infoselectwrapper.cpp
@@ -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:
diff --git a/apps/openmw/mwdialogue/filter.cpp b/apps/openmw/mwdialogue/filter.cpp
index 95c38671db..1389f443ab 100644
--- a/apps/openmw/mwdialogue/filter.cpp
+++ b/apps/openmw/mwdialogue/filter.cpp
@@ -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:
         {
diff --git a/apps/openmw/mwdialogue/selectwrapper.cpp b/apps/openmw/mwdialogue/selectwrapper.cpp
index f9469bf9a9..20d91237ee 100644
--- a/apps/openmw/mwdialogue/selectwrapper.cpp
+++ b/apps/openmw/mwdialogue/selectwrapper.cpp
@@ -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:
diff --git a/apps/openmw/mwlua/dialoguebindings.cpp b/apps/openmw/mwlua/dialoguebindings.cpp
index 55ac0cb856..d2c9cbff23 100644
--- a/apps/openmw/mwlua/dialoguebindings.cpp
+++ b/apps/openmw/mwlua/dialoguebindings.cpp
@@ -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",
diff --git a/components/esm3/dialoguecondition.hpp b/components/esm3/dialoguecondition.hpp
index c06d50b601..c4069e01c1 100644
--- a/components/esm3/dialoguecondition.hpp
+++ b/components/esm3/dialoguecondition.hpp
@@ -52,7 +52,7 @@ namespace ESM
             Function_PcLightArmor,
             Function_PcShortBlade,
             Function_PcMarksman,
-            Function_PcMerchantile,
+            Function_PcMercantile,
             Function_PcSpeechcraft,
             Function_PcHandToHand,
             Function_PcGender,