From 5203f300e2836c59cf95e05fc0c216fd99eca8eb Mon Sep 17 00:00:00 2001
From: SkyHasACat <h@tribble.dev>
Date: Sat, 2 Aug 2025 05:33:27 -0700
Subject: [PATCH] Requested changes

---
 apps/openmw/mwlua/types/npc.cpp  |  4 ++--
 apps/openmw/mwworld/esmstore.cpp | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/openmw/mwlua/types/npc.cpp b/apps/openmw/mwlua/types/npc.cpp
index 9d5277eb72..3aa84257bd 100644
--- a/apps/openmw/mwlua/types/npc.cpp
+++ b/apps/openmw/mwlua/types/npc.cpp
@@ -88,7 +88,7 @@ namespace
         }
 
         if (rec["baseDisposition"] != sol::nil)
-            npc.mNpdt.mDisposition = static_cast<int>(rec["baseDisposition"]);
+            npc.mNpdt.mDisposition = rec["baseDisposition"].get<int>();
 
         if (rec["baseGold"] != sol::nil)
             npc.mNpdt.mGold = static_cast<int>(rec["baseGold"]);
@@ -101,7 +101,7 @@ namespace
         {
             const sol::table services = rec["servicesOffered"];
             int flags = 0;
-            auto setFlag = [&](const char* key, int mask) {
+            auto setFlag = [&](const std::string_view& key, int mask) {
                 if (services[key] != sol::nil && services[key])
                     flags |= mask;
             };
diff --git a/apps/openmw/mwworld/esmstore.cpp b/apps/openmw/mwworld/esmstore.cpp
index 1f41ff3d2c..369731a019 100644
--- a/apps/openmw/mwworld/esmstore.cpp
+++ b/apps/openmw/mwworld/esmstore.cpp
@@ -726,8 +726,6 @@ namespace MWWorld
         switch (type)
         {
             case ESM::REC_ALCH:
-            case ESM::REC_MISC:
-            case ESM::REC_ACTI:
             case ESM::REC_ARMO:
             case ESM::REC_BOOK:
             case ESM::REC_CLAS:
@@ -735,14 +733,16 @@ namespace MWWorld
             case ESM::REC_ENCH:
             case ESM::REC_SPEL:
             case ESM::REC_WEAP:
+                mStoreImp->mRecNameToStore[type]->read(reader);
+                return true;
+            case ESM::REC_NPC_:
+            case ESM::REC_CREA:
+            case ESM::REC_CONT:
+            case ESM::REC_MISC:
+            case ESM::REC_ACTI:
             case ESM::REC_LEVI:
             case ESM::REC_LEVC:
             case ESM::REC_LIGH:
-            case ESM::REC_NPC_:
-                mStoreImp->mRecNameToStore[type]->read(reader);
-                return true;
-            case ESM::REC_CREA:
-            case ESM::REC_CONT:
                 mStoreImp->mRecNameToStore[type]->read(reader, true);
                 return true;