From a1b695a8d5692ac79f6919c9746a19be5366c877 Mon Sep 17 00:00:00 2001
From: Mads Buvik Sandvei <madssandvei@protonmail.com>
Date: Fri, 31 May 2024 23:10:54 +0200
Subject: [PATCH] De-duplicate ManualRef constructor

---
 apps/openmw/mwworld/manualref.cpp | 243 +++++++++++-------------------
 1 file changed, 88 insertions(+), 155 deletions(-)

diff --git a/apps/openmw/mwworld/manualref.cpp b/apps/openmw/mwworld/manualref.cpp
index d4979eb494..fce66d2919 100644
--- a/apps/openmw/mwworld/manualref.cpp
+++ b/apps/openmw/mwworld/manualref.cpp
@@ -27,171 +27,104 @@ namespace
         refValue = *static_cast<MWWorld::LiveCellRef<T>*>(template_.getBase());
         ptrValue = MWWorld::Ptr(&std::any_cast<MWWorld::LiveCellRef<T>&>(refValue), nullptr);
     }
+
+    template <typename F>
+    void createGeneric(F func, const MWWorld::ESMStore& store, ESM::RefId name)
+    {
+        switch (store.find(name))
+        {
+            case ESM::REC_ACTI:
+                func(store.get<ESM::Activator>());
+                break;
+            case ESM::REC_ALCH:
+                func(store.get<ESM::Potion>());
+                break;
+            case ESM::REC_APPA:
+                func(store.get<ESM::Apparatus>());
+                break;
+            case ESM::REC_ARMO:
+                func(store.get<ESM::Armor>());
+                break;
+            case ESM::REC_BOOK:
+                func(store.get<ESM::Book>());
+                break;
+            case ESM::REC_CLOT:
+                func(store.get<ESM::Clothing>());
+                break;
+            case ESM::REC_CONT:
+                func(store.get<ESM::Container>());
+                break;
+            case ESM::REC_CREA:
+                func(store.get<ESM::Creature>());
+                break;
+            case ESM::REC_DOOR:
+                func(store.get<ESM::Door>());
+                break;
+            case ESM::REC_INGR:
+                func(store.get<ESM::Ingredient>());
+                break;
+            case ESM::REC_LEVC:
+                func(store.get<ESM::CreatureLevList>());
+                break;
+            case ESM::REC_LEVI:
+                func(store.get<ESM::ItemLevList>());
+                break;
+            case ESM::REC_LIGH:
+                func(store.get<ESM::Light>());
+                break;
+            case ESM::REC_LOCK:
+                func(store.get<ESM::Lockpick>());
+                break;
+            case ESM::REC_MISC:
+                func(store.get<ESM::Miscellaneous>());
+                break;
+            case ESM::REC_NPC_:
+                func(store.get<ESM::NPC>());
+                break;
+            case ESM::REC_PROB:
+                func(store.get<ESM::Probe>());
+                break;
+            case ESM::REC_REPA:
+                func(store.get<ESM::Repair>());
+                break;
+            case ESM::REC_STAT:
+                func(store.get<ESM::Static>());
+                break;
+            case ESM::REC_WEAP:
+                func(store.get<ESM::Weapon>());
+                break;
+            case ESM::REC_BODY:
+                func(store.get<ESM::BodyPart>());
+                break;
+            case ESM::REC_STAT4:
+                func(store.get<ESM4::Static>());
+                break;
+            case ESM::REC_TERM4:
+                func(store.get<ESM4::Terminal>());
+                break;
+            case 0:
+                throw std::logic_error(
+                    "failed to create manual cell ref for " + name.toDebugString() + " (unknown ID)");
+
+            default:
+                throw std::logic_error(
+                    "failed to create manual cell ref for " + name.toDebugString() + " (unknown type)");
+        }
+    }
 }
 
 MWWorld::ManualRef::ManualRef(const MWWorld::ESMStore& store, const ESM::RefId& name, const int count)
 {
-    switch (store.find(name))
-    {
-        case ESM::REC_ACTI:
-            create(store.get<ESM::Activator>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_ALCH:
-            create(store.get<ESM::Potion>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_APPA:
-            create(store.get<ESM::Apparatus>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_ARMO:
-            create(store.get<ESM::Armor>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_BOOK:
-            create(store.get<ESM::Book>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_CLOT:
-            create(store.get<ESM::Clothing>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_CONT:
-            create(store.get<ESM::Container>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_CREA:
-            create(store.get<ESM::Creature>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_DOOR:
-            create(store.get<ESM::Door>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_INGR:
-            create(store.get<ESM::Ingredient>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_LEVC:
-            create(store.get<ESM::CreatureLevList>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_LEVI:
-            create(store.get<ESM::ItemLevList>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_LIGH:
-            create(store.get<ESM::Light>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_LOCK:
-            create(store.get<ESM::Lockpick>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_MISC:
-            create(store.get<ESM::Miscellaneous>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_NPC_:
-            create(store.get<ESM::NPC>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_PROB:
-            create(store.get<ESM::Probe>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_REPA:
-            create(store.get<ESM::Repair>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_STAT:
-            create(store.get<ESM::Static>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_WEAP:
-            create(store.get<ESM::Weapon>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_BODY:
-            create(store.get<ESM::BodyPart>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_STAT4:
-            create(store.get<ESM4::Static>(), name, mRef, mPtr);
-            break;
-        case ESM::REC_TERM4:
-            create(store.get<ESM4::Terminal>(), name, mRef, mPtr);
-            break;
-        case 0:
-            throw std::logic_error("failed to create manual cell ref for " + name.toDebugString() + " (unknown ID)");
-
-        default:
-            throw std::logic_error("failed to create manual cell ref for " + name.toDebugString() + " (unknown type)");
-    }
+    auto cb = [&](const auto& store) { create(store, name, mRef, mPtr); };
+    createGeneric(cb, store, name);
 
     mPtr.getCellRef().setCount(count);
 }
 
 MWWorld::ManualRef::ManualRef(const ESMStore& store, const Ptr& template_, const int count)
 {
-    ESM::RefId name = template_.getCellRef().getRefId();
-    switch (store.find(name))
-    {
-        case ESM::REC_ACTI:
-            create(store.get<ESM::Activator>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_ALCH:
-            create(store.get<ESM::Potion>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_APPA:
-            create(store.get<ESM::Apparatus>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_ARMO:
-            create(store.get<ESM::Armor>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_BOOK:
-            create(store.get<ESM::Book>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_CLOT:
-            create(store.get<ESM::Clothing>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_CONT:
-            create(store.get<ESM::Container>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_CREA:
-            create(store.get<ESM::Creature>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_DOOR:
-            create(store.get<ESM::Door>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_INGR:
-            create(store.get<ESM::Ingredient>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_LEVC:
-            create(store.get<ESM::CreatureLevList>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_LEVI:
-            create(store.get<ESM::ItemLevList>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_LIGH:
-            create(store.get<ESM::Light>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_LOCK:
-            create(store.get<ESM::Lockpick>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_MISC:
-            create(store.get<ESM::Miscellaneous>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_NPC_:
-            create(store.get<ESM::NPC>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_PROB:
-            create(store.get<ESM::Probe>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_REPA:
-            create(store.get<ESM::Repair>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_STAT:
-            create(store.get<ESM::Static>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_WEAP:
-            create(store.get<ESM::Weapon>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_BODY:
-            create(store.get<ESM::BodyPart>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_STAT4:
-            create(store.get<ESM4::Static>(), template_, mRef, mPtr);
-            break;
-        case ESM::REC_TERM4:
-            create(store.get<ESM4::Terminal>(), template_, mRef, mPtr);
-            break;
-        case 0:
-            throw std::logic_error("failed to create manual cell ref for " + name.toDebugString() + " (unknown ID)");
-
-        default:
-            throw std::logic_error("failed to create manual cell ref for " + name.toDebugString() + " (unknown type)");
-    }
+    auto cb = [&](const auto& store) { create(store, template_, mRef, mPtr); };
+    createGeneric(cb, store, template_.getCellRef().getRefId());
 
     mPtr.getCellRef().setCount(count);
     mPtr.getCellRef().unsetRefNum();