From e9844f81f3a23bd258d6927558352ff3510d90f9 Mon Sep 17 00:00:00 2001 From: Spectral Platypus Date: Wed, 13 Dec 2023 16:05:09 -0500 Subject: [PATCH 1/5] Console updates for 1130 --- include/RE/C/Console.h | 8 +++++++- include/RE/Offsets.h | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/RE/C/Console.h b/include/RE/C/Console.h index 643b5ee9c..8f441a664 100644 --- a/include/RE/C/Console.h +++ b/include/RE/C/Console.h @@ -35,10 +35,16 @@ namespace RE std::uint64_t unk38; // 38 std::uint64_t unk40; // 40 std::uint64_t unk48; // 48 - std::uint64_t unk50; // 50 +#ifndef SKYRIM_SUPPORT_AE + 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 index c81ba6a85..894d1d45f 100644 --- 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(405935)); + inline constexpr REL::ID SelectedRef(static_cast(504099)); inline constexpr REL::ID SetSelectedRef(static_cast(51093)); } From 415679b2586a07499ef03e2899fbef790eca187d Mon Sep 17 00:00:00 2001 From: Spectral Platypus Date: Wed, 13 Dec 2023 16:21:27 -0500 Subject: [PATCH 2/5] Console class layout changes --- include/RE/C/Console.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/RE/C/Console.h b/include/RE/C/Console.h index 8f441a664..459448348 100644 --- a/include/RE/C/Console.h +++ b/include/RE/C/Console.h @@ -34,8 +34,13 @@ namespace RE void* opcode; // 30 std::uint64_t unk38; // 38 std::uint64_t unk40; // 40 - std::uint64_t unk48; // 48 -#ifndef SKYRIM_SUPPORT_AE +#ifdef SKYRIM_SUPPORT_AE + std::uint32_t unk48; // 48 + std::uint16_t unk4c; // 4c + bool ctrlKeyHeld; // 4e + std::uint8_t pad4f; // 4f +#else + std::uint64_t unk48; // 48 std::uint64_t unk50; // 50 #endif From 89866e08ee8e9db109ed1a0520f4a6d530fd6447 Mon Sep 17 00:00:00 2001 From: SpectralPlatypus Date: Wed, 13 Dec 2023 21:21:50 +0000 Subject: [PATCH 3/5] maintenance --- include/RE/C/Console.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/RE/C/Console.h b/include/RE/C/Console.h index 459448348..025183819 100644 --- a/include/RE/C/Console.h +++ b/include/RE/C/Console.h @@ -35,8 +35,8 @@ namespace RE std::uint64_t unk38; // 38 std::uint64_t unk40; // 40 #ifdef SKYRIM_SUPPORT_AE - std::uint32_t unk48; // 48 - std::uint16_t unk4c; // 4c + std::uint32_t unk48; // 48 + std::uint16_t unk4c; // 4c bool ctrlKeyHeld; // 4e std::uint8_t pad4f; // 4f #else From bf4c25a8300bb887cf8fa2c8b095bf5d2091e6ed Mon Sep 17 00:00:00 2001 From: Spectral Platypus Date: Wed, 13 Dec 2023 16:23:49 -0500 Subject: [PATCH 4/5] Forgot to save before pushing --- include/RE/C/Console.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/RE/C/Console.h b/include/RE/C/Console.h index 025183819..85e5a0384 100644 --- a/include/RE/C/Console.h +++ b/include/RE/C/Console.h @@ -35,10 +35,11 @@ namespace RE std::uint64_t unk38; // 38 std::uint64_t unk40; // 40 #ifdef SKYRIM_SUPPORT_AE - std::uint32_t unk48; // 48 - std::uint16_t unk4c; // 4c - bool ctrlKeyHeld; // 4e - std::uint8_t pad4f; // 4f + 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 From 6927cc789c1bd08b0f6f2dd5b6da7aa19ada920c Mon Sep 17 00:00:00 2001 From: SpectralPlatypus Date: Wed, 13 Dec 2023 21:25:04 +0000 Subject: [PATCH 5/5] maintenance --- include/RE/C/Console.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/RE/C/Console.h b/include/RE/C/Console.h index 85e5a0384..2c0a19888 100644 --- a/include/RE/C/Console.h +++ b/include/RE/C/Console.h @@ -35,11 +35,11 @@ namespace RE std::uint64_t unk38; // 38 std::uint64_t unk40; // 40 #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 + 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