Merge pull request #94 from TESRSkywind/AE-1130_Console_Updates

Console updates for 1130
powerof3 · Dec 16, 2023 · cd81ae2 · cd81ae2
2 parents 839607a + 6927cc7
commit cd81ae2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/include/RE/C/Console.h b/include/RE/C/Console.h
@@ -34,11 +34,23 @@ namespace RE
 		void*         opcode;  // 30
 		std::uint64_t unk38;   // 38
 		std::uint64_t unk40;   // 40
-		std::uint64_t unk48;   // 48
-		std::uint64_t unk50;   // 50
+#ifdef SKYRIM_SUPPORT_AE
+		std::uint32_t unk48;                   // 48
+		std::uint8_t  unk4c;                   // 4c
+		bool          showAchievementWarning;  // 4d -- only used in ctor
+		bool          ctrlKeyHeld;             // 4e
+		std::uint8_t  pad4f;                   // 4f
+#else
+		std::uint64_t unk48;  // 48
+		std::uint64_t unk50;  // 50
+#endif
 
 	protected:
 		void SetSelectedRef_Impl(ObjectRefHandle& a_handle);
 	};
+#ifdef SKYRIM_SUPPORT_AE
+	static_assert(sizeof(Console) == 0x50);
+#else
 	static_assert(sizeof(Console) == 0x58);
+#endif
 }
diff --git a/include/RE/Offsets.h b/include/RE/Offsets.h
@@ -171,7 +171,7 @@ namespace RE
 
 		namespace Console
 		{
-			inline constexpr REL::ID SelectedRef(static_cast<std::uint64_t>(405935));
+			inline constexpr REL::ID SelectedRef(static_cast<std::uint64_t>(504099));
 			inline constexpr REL::ID SetSelectedRef(static_cast<std::uint64_t>(51093));
 		}