misc work here and there (#19)

* chore: Cleanup enum declaration. * fix: Class override incorrect. * oopsies * fix: Missing import. * fix: Misc. adjustments/comments. * feat: Fix `ICallBack` class & add mising value in `InitDataRepairFailure`. * fix: `ENUM_FORM_ID` used in `REX::EnumSet` incorrectly. * chore: Enum value specifications. * chore: Enum values declared all around. --------- Co-authored-by: FalloutCascadia <[email protected]>
shad0wshayd3-FO4 · Aug 13, 2024 · afe2eea · afe2eea
1 parent 1884a18
commit afe2eea
Show file tree

Hide file tree

Showing 53 changed files with 1,388 additions and 1,385 deletions.
diff --git a/CommonLibF4/include/RE/Bethesda/Actor.h b/CommonLibF4/include/RE/Bethesda/Actor.h
@@ -111,86 +111,87 @@ namespace RE
 
 	enum class ACTOR_CRITICAL_STAGE : std::int32_t
 	{
-		kNone,
-		kGooStart,
-		kGooEnd,
-		kDisintegrateStart,
-		kDisintegrateEnd,
-		kFreezeStart,
-		kFreezeEnd,
-		kCount
+		kNone = 0x0,
+		kGooStart = 0x1,
+		kGooEnd = 0x2,
+		kDisintegrateStart = 0x3,
+		kDisintegrateEnd = 0x4,
+		kFreezeStart = 0x5,
+		kFreezeEnd = 0x6,
+		kCount = 0x7
 	};
 
 	enum class ACTOR_LIFE_STATE : std::int32_t
 	{
-		kAlive,
-		kDying,
-		kDead,
-		kUnconscious,
-		kReanimate,
-		kRecycle,
-		kRestrained,
-		kEssentialDown,
-		kBleedout
+		kAlive = 0x0,
+		kDying = 0x1,
+		kDead = 0x2,
+		kUnconscious = 0x3,
+		kReanimate = 0x4,
+		kRecycle = 0x5,
+		kRestrained = 0x6,
+		kEssentialDown = 0x7,
+		kBleedout = 0x8
 	};
 
 	enum class ACTOR_LOS_LOCATION : std::int32_t
 	{
-		kNone,
-		kEye,
-		kHead,
-		kTorse,
-		kFeet,
-		kCount
+		kNone = 0x0,
+		kEye = 0x1,
+		kHead = 0x2,
+		kTorse = 0x3,
+		kFeet = 0x4,
+		kCount = 0x5
 	};
 
 	enum class PTYPE : std::int32_t
 	{
-		kExplore = 0,
-		kFollow = 1,
-		kEscore = 2,
-		kEat = 3,
-		kSleep = 4,
-		kWander = 5,
-		kTravel = 6,
-		kAccompany = 7,
-		kUseItemAt = 8,
-		kAmbush = 9,
-		kFleeNonCombat = 10,
-		kCastMagic = 11,
-		kSandbox = 12,
-		kPatrol = 13,
-		kGuard = 14,
-		kDialogue = 15,
-		kUseWeapon = 16,
-		kFind = 17,
-		kCustom = 18,
-		kTemplate = 19,
-		kActivate = 20,
-		kAlarm = 21,
-		kFlee = 22,
-		kTrespass = 23,
-		kSpectator = 24,
-		kGreet = 25,
-		kGetUp = 26,
-		kDoNothing = 27,
-		kInGameDialogue = 28,
-		kSurface = 29,
-		kSearchForAttacker = 30,
-		kAvoidReference = 31,
-		kBumpReaction = 32,
-		kGrenadeMineReaction = 33,
-		kStealWarning = 34,
-		kPickpocketWarning = 35,
-		kMovementBlocked = 36,
-		kVampireFeed = 37,
-		kCannibal = 38,
-		kLand = 39,
-		kUnused = 40,
-		kMountActor = 41,
-		kDismountActor = 42,
-		kClearMountPosition = 43,
-		kClearPowerArmorExit = 44,
+		kExplore = 0x0,
+		kFollow = 0x1,
+		kEscore = 0x2,
+		kEat = 0x3,
+		kSleep = 0x4,
+		kWander = 0x5,
+		kTravel = 0x6,
+		kAccompany = 0x7,
+		kUseItemAt = 0x8,
+		kAmbush = 0x9,
+		kFleeNonCombat = 0xA,
+		kCastMagic = 0xB,
+		kSandbox = 0xC,
+		kPatrol = 0xD,
+		kGuard = 0xE,
+		kDialogue = 0xF,
+		kUseWeapon = 0x10,
+		kFind = 0x11,
+		kCustom = 0x12,
+		kTemplate = 0x13,
+		kActivate = 0x14,
+		kAlarm = 0x15,
+		kFlee = 0x16,
+		kTrespass = 0x17,
+		kSpectator = 0x18,
+		kGreet = 0x19,
+		kGetUp = 0x1A,
+		kDoNothing = 0x1B,
+		kInGameDialogue = 0x1C,
+		kSurface = 0x1D,
+		kSearchForAttacker = 0x1E,
+		kAvoidReference = 0x1F,
+		kBumpReaction = 0x20,
+		kGrenadeMineReaction = 0x21,
+		kStealWarning = 0x22,
+		kPickpocketWarning = 0x23,
+		kMovementBlocked = 0x24,
+		kVampireFeed = 0x25,
+		kCannibal = 0x26,
+		kLand = 0x27,
+		kUnused = 0x28,
+		kMountActor = 0x29,
+		kDismountActor = 0x2A,
+		kClearMountPosition = 0x2B,
+		kClearPowerArmorExit = 0x2C,
+		kCount = 0x2D
 	};
 
 	struct MiddleLowProcessData
@@ -522,9 +523,9 @@ namespace RE
 
 	enum class WEAPON_CULL_TYPE
 	{
-		kGeneral,
-		kAnimation,
-		kWeaponSwitch,
+		kGeneral = 0x0,
+		kAnimation = 0x1,
+		kWeaponSwitch = 0x2,
 	};
 
 	class AITimer
@@ -729,46 +730,46 @@ namespace RE
 
 	enum class LIFE_STATE : std::uint32_t
 	{
-		kAlive,
-		kDying,
-		kDead,
-		kUnconscious,
-		kReanimate,
-		kRecycle,
-		kRestrained,
-		kEssentialDown,
-		kBleedout
+		kAlive = 0x0,
+		kDying = 0x1,
+		kDead = 0x2,
+		kUnconscious = 0x3,
+		kReanimate = 0x4,
+		kRecycle = 0x5,
+		kRestrained = 0x6,
+		kEssentialDown = 0x7,
+		kBleedout = 0x8
 	};
 
 	enum class WEAPON_STATE : std::uint32_t
 	{
-		kSheathed,
-		kWantToDraw,
-		kDrawing,
-		kDrawn,
-		kWantToSheathe,
-		kSheathing
+		kSheathed = 0x0,
+		kWantToDraw = 0x1,
+		kDrawing = 0x2,
+		kDrawn = 0x3,
+		kWantToSheathe = 0x4,
+		kSheathing = 0x5
 	};
 
 	enum class GUN_STATE : std::uint32_t
 	{
-		kDrawn,
-		kRelaxed,
-		kBlocked,
-		kAlert,
-		kReloading,
-		kThrowing,
-		kSighted,
-		kFire,
-		kFireSighted
+		kDrawn = 0x0,
+		kRelaxed = 0x1,
+		kBlocked = 0x2,
+		kAlert = 0x3,
+		kReloading = 0x4,
+		kThrowing = 0x5,
+		kSighted = 0x6,
+		kFire = 0x7,
+		kFireSighted = 0x8
 	};
 
 	enum class INTERACTING_STATE : std::uint32_t
 	{
-		kNotInteracting,
-		kWaitingToInteract,
-		kInteracting,
-		kWaitingToStopInteracting
+		kNotInteracting = 0x0,
+		kWaitingToInteract = 0x1,
+		kInteracting = 0x2,
+		kWaitingToStopInteracting = 0x3
 	};
 
 	class __declspec(novtable) ActorState :
@@ -913,12 +914,12 @@ namespace RE
 
 		enum class DETECTION_PRIORITY
 		{
-			kNone = 0,
-			kVeryLow = 1,
-			kLow = 2,
-			kNormal = 3,
-			kHigh = 4,
-			kCritical = 5,
+			kNone = 0x0,
+			kVeryLow = 0x1,
+			kLow = 0x2,
+			kNormal = 0x3,
+			kHigh = 0x4,
+			kCritical = 0x5,
 		};
 
 		// add

diff --git a/CommonLibF4/include/RE/Bethesda/ActorValueInfo.h b/CommonLibF4/include/RE/Bethesda/ActorValueInfo.h
@@ -17,16 +17,16 @@ namespace RE
 	public:
 		enum class AVType
 		{
-			kDerivedAttribute,
-			kAttribute,
-			kSkill,
-			kAIAttribute,
-			kResistance,
-			kCondition,
-			kCharge,
-			kIntValue,
-			kVariable,
-			kResource
+			kDerivedAttribute = 0x0,
+			kAttribute = 0x1,
+			kSkill = 0x2,
+			kAIAttribute = 0x3,
+			kResistance = 0x4,
+			kCondition = 0x5,
+			kCharge = 0x6,
+			kIntValue = 0x7,
+			kVariable = 0x8,
+			kResource = 0x9
 		};
 
 		enum class Flags : std::int32_t

diff --git a/CommonLibF4/include/RE/Bethesda/BGSBaseAliases.h b/CommonLibF4/include/RE/Bethesda/BGSBaseAliases.h
@@ -73,14 +73,14 @@ namespace RE
 
 		enum class FILL_TYPE
 		{
-			kConditions,
-			kForced,
-			kFromAlias,
-			kFromEvent,
-			kCreated,
-			kFromExternal,
-			kUniqueActor,
-			kNearAlias,
+			kConditions = 0x0,
+			kForced = 0x1,
+			kFromAlias = 0x2,
+			kFromEvent = 0x3,
+			kCreated = 0x4,
+			kFromExternal = 0x5,
+			kUniqueActor = 0x6,
+			kNearAlias = 0x7,
 		};
 
 		struct GenericFillData

diff --git a/CommonLibF4/include/RE/Bethesda/BGSCharacterTint.h b/CommonLibF4/include/RE/Bethesda/BGSCharacterTint.h
@@ -14,12 +14,12 @@ namespace RE
 	{
 		enum BlendOp : std::uint32_t
 		{
-			kDefault = 0,
-			kMultiply = 1,
-			kOverlay = 2,
-			kSoftLight = 3,
-			kHardLight = 4,
-			kTotal = 5
+			kDefault = 0x0,
+			kMultiply = 0x1,
+			kOverlay = 0x2,
+			kSoftLight = 0x3,
+			kHardLight = 0x4,
+			kTotal = 0x5
 		};
 
 		enum EntryType : std::uint32_t
@@ -32,32 +32,32 @@ namespace RE
 
 		enum class EntrySlot
 		{
-			kForeheadMask,
-			kEyesMask,
-			kNoseMask,
-			kEarsMask,
-			kCheeksMask,
-			kMouthMask,
-			kNeckMask,
-			kLipColor,
-			kCheekColor,
-			kEyeliner,
-			kEyeSocketUpper,
-			kEyeSocketLower,
-			kSkinTone,
-			kPaint,
-			kLaughLines,
-			kCheekColorLower,
-			kNose,
-			kChin,
-			kNeck,
-			kForehead,
-			kDirt,
-			kScars,
-			kFaceDetail,
-			kBrow,
-			kWrinkles,
-			kBeard
+			kForeheadMask = 0x0,
+			kEyesMask = 0x1,
+			kNoseMask = 0x2,
+			kEarsMask = 0x3,
+			kCheeksMask = 0x4,
+			kMouthMask = 0x5,
+			kNeckMask = 0x6,
+			kLipColor = 0x7,
+			kCheekColor = 0x8,
+			kEyeliner = 0x9,
+			kEyeSocketUpper = 0xA,
+			kEyeSocketLower = 0xB,
+			kSkinTone = 0xC,
+			kPaint = 0xD,
+			kLaughLines = 0xE,
+			kCheekColorLower = 0xF,
+			kNose = 0x10,
+			kChin = 0x11,
+			kNeck = 0x12,
+			kForehead = 0x13,
+			kDirt = 0x14,
+			kScars = 0x15,
+			kFaceDetail = 0x16,
+			kBrow = 0x17,
+			kWrinkles = 0x18,
+			kBeard = 0x19
 		};
 
 		namespace Template