Merge pull request #41 from FalloutCascadia/main

Misc. additions.

Author: qudix

include/RE/B/BGSArtObject.h

@@ -16,7 +16,14 @@ namespace RE
 		static constexpr auto VTABLE{ VTABLE::BGSArtObject };
 		static constexpr auto FORM_ID{ ENUM_FORM_ID::kARTO };
 
-		enum class ArtType;
+		enum class ArtType
+		{
+			kMagicCastingArt = 0x0,
+			kMagicHitEffect = 0x1,
+			kMagicEnchantEffect = 0x2,
+
+			kTotal = 0x3
+		};
 
 		class Data
 		{

include/RE/B/BGSCameraShot.h

@@ -17,8 +17,25 @@ namespace RE
 		static constexpr auto VTABLE{ VTABLE::BGSCameraShot };
 		static constexpr auto FORM_ID{ ENUM_FORM_ID::kCAMS };
 
-		enum class CAM_ACTION;
-		enum class CAM_OBJECT;
+		enum class CAM_ACTION
+		{
+			kShoot = 0x0,
+			kFly = 0x1,
+			kHit = 0x2,
+			kZoom = 0x3,
+
+			kTotal = 0x4
+		};
+
+		enum class CAM_OBJECT
+		{
+			kAttacker = 0x0,
+			kProjectile = 0x1,
+			kTarget = 0x2,
+			kLeadActor = 0x3,
+
+			kTotal = 0x4
+		};
 
 		class CAMERA_SHOT_DATA
 		{

include/RE/B/BSScript_Internal_LinkerProcessor.h

@@ -38,7 +38,7 @@ namespace RE
 			ErrorLogger*                errorLogger;         // 10
 			ILoader*                    loader;              // 18
 			std::uint64_t               unk20;               // 20
-			char*                       unk28;               // 28
+			bool                        forceReload;         // 28
 			BSScrapArray<BSFixedString> loadedParents;       // 30
 			BSScrapArray<BSFixedString> objectsToTypecheck;  // 50
 			BSScrapArray<BSFixedString> processQueue;        // 70

include/RE/B/BSTArray.h

@@ -190,9 +190,9 @@ namespace RE
 			const auto mem = _allocator->Allocate(a_bytes, alignof(void*));
 			if (!mem) {
 				REX::FAIL("failed to handle allocation request");
-			} else {
-				return mem;
 			}
+
+			return mem;
 		}
 
 		void deallocate(void* a_ptr)

include/RE/D/DialogueMenuUtils.h

@@ -0,0 +1,28 @@
+#pragma once
+
+namespace RE
+{
+	namespace DialogueMenuUtils
+	{
+		inline void OpenMenu()
+		{
+			using func_t = decltype(&DialogueMenuUtils::OpenMenu);
+			static REL::Relocation<func_t> func{ ID::DialogueMenuUtils::OpenMenu };
+			return func();
+		}
+
+		inline void CloseMenu()
+		{
+			using func_t = decltype(&DialogueMenuUtils::CloseMenu);
+			static REL::Relocation<func_t> func{ ID::DialogueMenuUtils::CloseMenu };
+			return func();
+		}
+
+		inline void ShowSpeechChallengeAnim()
+		{
+			using func_t = decltype(&DialogueMenuUtils::ShowSpeechChallengeAnim);
+			static REL::Relocation<func_t> func{ ID::DialogueMenuUtils::ShowSpeechChallengeAnim };
+			return func();
+		}
+	}
+}

include/RE/D/_D3DBLEND.h

@@ -0,0 +1,26 @@
+#pragma once
+
+namespace RE
+{
+	enum class _D3DBLEND
+	{
+		kZero = 0x1,
+		kOne = 0x2,
+		kSrcColor = 0x3,
+		kInvSrcColor = 0x4,
+		kSrcAlpha = 0x5,
+		kInvSrcAlpha = 0x6,
+		kDestAlpha = 0x7,
+		kInvDestAlpha = 0x8,
+		kDestColor = 0x9,
+		kInvDestColor = 0xA,
+		kSrcAlphaSat = 0xB,
+		kBothSrcAlpha = 0xC,
+		kBothInvSrcAlpha = 0xD,
+		kBlendFactor = 0xE,
+		kInvBlendFactor = 0xF,
+		kSrcColor2 = 0x10,
+		kInvSrcColor2 = 0x11,
+		kForce_DWORD = 0x7FFFFFFF
+	};
+}

include/RE/D/_D3DBLENDOP.h

@@ -0,0 +1,14 @@
+#pragma once
+
+namespace RE
+{
+	enum class _D3DBLENDOP
+	{
+		kAdd = 0x1,
+		kSubtract = 0x2,
+		kRevSubtract = 0x3,
+		kMin = 0x4,
+		kMax = 0x5,
+		kForce_DWORD = 0x7FFFFFFF
+	};
+}

include/RE/D/_D3DCMPFUNC.h

@@ -0,0 +1,17 @@
+#pragma once
+
+namespace RE
+{
+	enum class _D3DCMPFUNC
+	{
+		kNever = 0x1,
+		kLess = 0x2,
+		kEqual = 0x3,
+		kLessEqual = 0x4,
+		kGreater = 0x5,
+		kNotEqual = 0x6,
+		kGreaterEqual = 0x7,
+		kAlways = 0x8,
+		kForce_DWORD = 0x7FFFFFFF
+	};
+}

include/RE/E/EffectShaderData.h

@@ -1,11 +1,11 @@
 #pragma once
 
+#include "RE/D/_D3DBLEND.h"
+#include "RE/D/_D3DBLENDOP.h"
+#include "RE/D/_D3DCMPFUNC.h"
+
 namespace RE
 {
-	enum class _D3DBLEND;
-	enum class _D3DBLENDOP;
-	enum class _D3DCMPFUNC;
-
 	class EffectShaderData
 	{
 	public:

include/RE/E/ExamineMenu.h

@@ -19,7 +19,14 @@ namespace RE
 		static constexpr auto VTABLE{ VTABLE::ExamineMenu };
 		static constexpr auto MENU_NAME{ "ExamineMenu"sv };
 
-		enum class INSPECT_MODE_STATE;
+		enum class INSPECT_MODE_STATE
+		{
+			kModSlotSelect = 0,
+			kSelectNewMod = 1,
+			kInvComponentSelect = 2,
+			kItemSelect = 3,
+			kConfirm = 4
+		};
 
 		class ComponentBuilderFunctor
 		{