Use the proper types

components/esm3/debugprofile.hpp

@@ -12,7 +12,7 @@ namespace ESM
 
     struct DebugProfile
     {
-        constexpr static unsigned int sRecordId = REC_DBGP;
+        constexpr static RecNameInts sRecordId = REC_DBGP;
 
 
         enum Flags

components/esm3/filter.hpp

@@ -11,7 +11,7 @@ namespace ESM
 
     struct Filter
     {
-        constexpr static unsigned int sRecordId = REC_FILT;
+        constexpr static RecNameInts sRecordId = REC_FILT;
 
 
         unsigned int mRecordFlags;

components/esm3/globalmap.hpp

@@ -16,7 +16,7 @@ namespace ESM
     ///< \brief An image containing the explored areas on the global map.
     struct GlobalMap
     {
-        constexpr static unsigned int sRecordId = REC_GMAP;
+        constexpr static RecNameInts sRecordId = REC_GMAP;
 
 
         // The minimum and maximum cell coordinates

components/esm3/loadacti.cpp

@@ -2,7 +2,6 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadacti.hpp

@@ -12,7 +12,7 @@ class ESMWriter;
 
 struct Activator
 {
-    constexpr static unsigned int sRecordId = REC_ACTI;
+    constexpr static RecNameInts sRecordId = REC_ACTI;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Activator"; }

components/esm3/loadalch.hpp

@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Potion
 {
-    constexpr static unsigned int sRecordId = REC_ALCH;
+    constexpr static RecNameInts sRecordId = REC_ALCH;
 
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.

components/esm3/loadappa.hpp

@@ -17,7 +17,7 @@ class ESMWriter;
 
 struct Apparatus
 {
-    constexpr static unsigned int sRecordId = REC_APPA;
+    constexpr static RecNameInts sRecordId = REC_APPA;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Apparatus"; }

components/esm3/loadarmo.cpp

@@ -2,7 +2,6 @@
 
 #include "esmreader.hpp"
 #include "esmwriter.hpp"
-#include "components/esm/defs.hpp"
 
 namespace ESM
 {

components/esm3/loadarmo.hpp

@@ -67,7 +67,7 @@ struct PartReferenceList
 
 struct Armor
 {
-    constexpr static unsigned int sRecordId = REC_ARMO;
+    constexpr static RecNameInts sRecordId = REC_ARMO;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Armor"; }

components/esm3/loadbody.hpp

@@ -12,7 +12,7 @@ class ESMWriter;
 
 struct BodyPart
 {
-    constexpr static unsigned int sRecordId = REC_BODY;
+    constexpr static RecNameInts sRecordId = REC_BODY;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "BodyPart"; }

components/esm3/loadbook.hpp

@@ -15,7 +15,7 @@ class ESMWriter;
 
 struct Book
 {
-    constexpr static unsigned int sRecordId = REC_BOOK;
+    constexpr static RecNameInts sRecordId = REC_BOOK;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Book"; }

components/esm3/loadbsgn.hpp

@@ -14,7 +14,7 @@ class ESMWriter;
 
 struct BirthSign
 {
-    constexpr static unsigned int sRecordId = REC_BSGN;
+    constexpr static RecNameInts sRecordId = REC_BSGN;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "BirthSign"; }

components/esm3/loadcell.hpp

@@ -63,7 +63,7 @@ struct CellRefTrackerPredicate
  */
 struct Cell
 {
-    constexpr static unsigned int sRecordId = REC_CELL;
+    constexpr static RecNameInts sRecordId = REC_CELL;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Cell"; }

components/esm3/loadclas.hpp

@@ -19,7 +19,7 @@ class ESMWriter;
 // class
 struct Class
 {
-    constexpr static unsigned int sRecordId = REC_CLAS;
+    constexpr static RecNameInts sRecordId = REC_CLAS;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Class"; }

components/esm3/loadclot.hpp

@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Clothing
 {
-    constexpr static unsigned int sRecordId = REC_CLOT;
+    constexpr static RecNameInts sRecordId = REC_CLOT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Clothing"; }

components/esm3/loadcont.hpp

@@ -36,7 +36,7 @@ struct InventoryList
 
 struct Container
 {
-    constexpr static unsigned int sRecordId = REC_CONT;
+    constexpr static RecNameInts sRecordId = REC_CONT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Container"; }

components/esm3/loadcrea.hpp

@@ -23,7 +23,7 @@ class ESMWriter;
 
 struct Creature
 {
-    constexpr static unsigned int sRecordId = REC_CREA;
+    constexpr static RecNameInts sRecordId = REC_CREA;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Creature"; }

components/esm3/loaddial.hpp

@@ -21,7 +21,7 @@ class ESMWriter;
 
 struct Dialogue
 {
-    constexpr static unsigned int sRecordId = REC_DIAL;
+    constexpr static RecNameInts sRecordId = REC_DIAL;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Dialogue"; }
 

components/esm3/loaddoor.hpp

@@ -13,7 +13,7 @@ class ESMWriter;
 
 struct Door
 {
-    constexpr static unsigned int sRecordId = REC_DOOR;
+    constexpr static RecNameInts sRecordId = REC_DOOR;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Door"; }

components/esm3/loadench.hpp

@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Enchantment
 {
-    constexpr static unsigned int sRecordId = REC_ENCH;
+    constexpr static RecNameInts sRecordId = REC_ENCH;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Enchantment"; }

components/esm3/loadfact.hpp

@@ -32,7 +32,7 @@ struct RankData
 
 struct Faction
 {
-    constexpr static unsigned int sRecordId = REC_FACT;
+    constexpr static RecNameInts sRecordId = REC_FACT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Faction"; }

components/esm3/loadglob.hpp

@@ -19,7 +19,7 @@ class ESMWriter;
 
 struct Global
 {
-    constexpr static unsigned int sRecordId = REC_GLOB;
+    constexpr static RecNameInts sRecordId = REC_GLOB;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Global"; }

components/esm3/loadgmst.hpp

@@ -20,7 +20,7 @@ class ESMWriter;
 
 struct GameSetting
 {
-    constexpr static unsigned int sRecordId = REC_GMST;
+    constexpr static RecNameInts sRecordId = REC_GMST;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "GameSetting"; }

components/esm3/loadinfo.hpp

@@ -20,7 +20,7 @@ class ESMWriter;
 
 struct DialInfo
 {
-    constexpr static unsigned int sRecordId = REC_INFO;
+    constexpr static RecNameInts sRecordId = REC_INFO;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "DialInfo"; }

components/esm3/loadingr.hpp

@@ -17,7 +17,7 @@ class ESMWriter;
 
 struct Ingredient
 {
-    constexpr static unsigned int sRecordId = REC_INGR;
+    constexpr static RecNameInts sRecordId = REC_INGR;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Ingredient"; }

components/esm3/loadland.hpp

@@ -20,7 +20,7 @@ class ESMWriter;
 
 struct Land
 {
-    constexpr static unsigned int sRecordId = REC_LAND;
+    constexpr static RecNameInts sRecordId = REC_LAND;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Land"; }

components/esm3/loadligh.hpp

@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Light
 {
-    constexpr static unsigned int sRecordId = REC_LIGH;
+    constexpr static RecNameInts sRecordId = REC_LIGH;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Light"; }

components/esm3/loadlock.hpp

@@ -13,7 +13,7 @@ class ESMWriter;
 
 struct Lockpick
 {
-    constexpr static unsigned int sRecordId = REC_LOCK;
+    constexpr static RecNameInts sRecordId = REC_LOCK;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Lockpick"; }

components/esm3/loadltex.hpp

@@ -20,7 +20,7 @@ class ESMWriter;
 
 struct LandTexture
 {
-    constexpr static unsigned int sRecordId = REC_LTEX;
+    constexpr static RecNameInts sRecordId = REC_LTEX;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "LandTexture"; }

components/esm3/loadmgef.hpp

@@ -15,7 +15,7 @@ class ESMWriter;
 
 struct MagicEffect
 {
-    constexpr static unsigned int sRecordId = REC_MGEF;
+    constexpr static RecNameInts sRecordId = REC_MGEF;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "MagicEffect"; }

components/esm3/loadmisc.hpp

@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Miscellaneous
 {
-    constexpr static unsigned int sRecordId = REC_MISC;
+    constexpr static RecNameInts sRecordId = REC_MISC;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Miscellaneous"; }

components/esm3/loadnpc.hpp

@@ -23,7 +23,7 @@ class ESMWriter;
 
 struct NPC
 {
-    constexpr static unsigned int sRecordId = REC_NPC_;
+    constexpr static RecNameInts sRecordId = REC_NPC_;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "NPC"; }

components/esm3/loadpgrd.hpp

@@ -17,7 +17,7 @@ class ESMWriter;
  */
 struct Pathgrid
 {
-    constexpr static unsigned int sRecordId = REC_PGRD;
+    constexpr static RecNameInts sRecordId = REC_PGRD;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Pathgrid"; }

components/esm3/loadprob.hpp

@@ -13,7 +13,7 @@ class ESMWriter;
 
 struct Probe
 {
-    constexpr static unsigned int sRecordId = REC_PROB;
+    constexpr static RecNameInts sRecordId = REC_PROB;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Probe"; }

components/esm3/loadrace.hpp

@@ -18,7 +18,7 @@ class ESMWriter;
 
 struct Race
 {
-    constexpr static unsigned int sRecordId = REC_RACE;
+    constexpr static RecNameInts sRecordId = REC_RACE;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Race"; }

components/esm3/loadregn.hpp

@@ -19,7 +19,7 @@ class ESMWriter;
 
 struct Region
 {
-    constexpr static unsigned int sRecordId = REC_REGN;
+    constexpr static RecNameInts sRecordId = REC_REGN;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Region"; }

components/esm3/loadrepa.hpp

@@ -13,7 +13,7 @@ class ESMWriter;
 
 struct Repair
 {
-    constexpr static unsigned int sRecordId = REC_REPA;
+    constexpr static RecNameInts sRecordId = REC_REPA;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Repair"; }

components/esm3/loadscpt.hpp

@@ -20,7 +20,7 @@ class ESMWriter;
 class Script
 {
 public:
-    constexpr static unsigned int sRecordId = REC_SCPT;
+    constexpr static RecNameInts sRecordId = REC_SCPT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Script"; }

components/esm3/loadskil.hpp

@@ -20,7 +20,7 @@ class ESMWriter;
 struct Skill
 {
 
-    constexpr static unsigned int sRecordId = REC_SKIL;
+    constexpr static RecNameInts sRecordId = REC_SKIL;
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Skill"; }
 

components/esm3/loadsndg.hpp

@@ -17,7 +17,7 @@ class ESMWriter;
 
 struct SoundGenerator
 {
-    constexpr static unsigned int sRecordId = REC_SNDG;
+    constexpr static RecNameInts sRecordId = REC_SNDG;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "SoundGenerator"; }

components/esm3/loadsoun.hpp

@@ -18,7 +18,7 @@ struct SOUNstruct
 
 struct Sound
 {
-    constexpr static unsigned int sRecordId = REC_SOUN;
+    constexpr static RecNameInts sRecordId = REC_SOUN;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Sound"; }

components/esm3/loadspel.hpp

@@ -14,7 +14,7 @@ class ESMWriter;
 
 struct Spell
 {
-    constexpr static unsigned int sRecordId = REC_SPEL;
+    constexpr static RecNameInts sRecordId = REC_SPEL;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Spell"; }

components/esm3/loadsscr.hpp

@@ -21,7 +21,7 @@ class ESMWriter;
 
 struct StartScript
 {
-    constexpr static unsigned int sRecordId = REC_SSCR;
+    constexpr static RecNameInts sRecordId = REC_SSCR;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "StartScript"; }

components/esm3/loadstat.hpp

@@ -25,7 +25,7 @@ class ESMWriter;
 
 struct Static
 {
-    constexpr static unsigned int sRecordId = REC_STAT;
+    constexpr static RecNameInts sRecordId = REC_STAT;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Static"; }

components/esm3/loadweap.hpp

@@ -17,7 +17,7 @@ class ESMWriter;
 
 struct Weapon
 {
-    constexpr static unsigned int sRecordId = REC_WEAP;
+    constexpr static RecNameInts sRecordId = REC_WEAP;
 
     /// Return a string descriptor for this record type. Currently used for debugging / error logs only.
     static std::string_view getRecordType() { return "Weapon"; }

components/esm3/savedgame.hpp

@@ -15,7 +15,7 @@ namespace ESM
 
     struct SavedGame
     {
-        constexpr static unsigned int sRecordId = REC_SAVE;
+        constexpr static RecNameInts sRecordId = REC_SAVE;
 
         static int sCurrentFormat;