Skip to content

Commit

Permalink
ifdef new 1130 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@powerof3
powerof3 committed Dec 16, 2023
1 parent cd81ae2 commit 74c406e
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 54 deletions.
17 changes: 14 additions & 3 deletions include/RE/B/BGSSaveLoadManager.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ namespace RE
std::uint64_t unk0C0; // 0C0
std::uint64_t unk0C8; // 0C8
std::uint64_t currentPlayerID; // 0D0
std::uint32_t unk0D8; // 0D8
std::uint32_t unk0DC; // 0DC
std::uint64_t displayPlayerID; // 0D8
std::uint32_t unk0E0; // 0E0
std::uint32_t unk0E4; // 0E4
BSTArray<void*> unk0E8; // 0E8
Expand Down Expand Up @@ -175,13 +174,25 @@ namespace RE
std::uint32_t unk2A0; // 2A0
std::uint32_t unk2A4; // 2A4
std::uint64_t unk2A8; // 2A8
Thread unk2B0; // 2B0
#ifdef SKYRIM_SUPPORT_AE
std::uint16_t unk2B0; // 2B0
std::uint16_t unk2B2; // 2B2
std::uint64_t unk2B8; // 2B8
BSTArray<void*> unk2C0; // 2C0
BSTArray<void*> unk2D8; // 2D8
std::uint8_t unk2F0; // 2F0
#endif
Thread thread; // 2B0

BSTCommonStaticMessageQueue<BSTSmartPointer<bgs::saveload::Request>, 8> unk370; // 370

protected:
bool Save_Impl(std::int32_t a_deviceID, std::uint32_t a_outputStats, const char* a_fileName);
bool Load_Impl(const char* a_fileName, std::int32_t a_deviceID, std::uint32_t a_outputStats, bool a_checkForMods);
};
#ifdef SKYRIM_SUPPORT_AE
static_assert(sizeof(BGSSaveLoadManager) == 0x418);
#else
static_assert(sizeof(BGSSaveLoadManager) == 0x3D0);
#endif
}
4 changes: 4 additions & 0 deletions include/RE/C/ControlMap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,9 @@ namespace RE
std::uint8_t pad123; // 123
stl::enumeration<PC_GAMEPAD_TYPE, std::uint32_t> gamePadMapType; // 124
};
#ifdef SKYRIM_SUPPORT_AE
static_assert(sizeof(ControlMap) == 0x130);
#else
static_assert(sizeof(ControlMap) == 0x128);
#endif
}
6 changes: 3 additions & 3 deletions include/RE/I/InterfaceStrings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace RE
BSFixedString creditsMenu; // 188 - "Credits Menu"
BSFixedString modManagerMenu; // 190 - "Mod Manager Menu"
BSFixedString creationClubMenu; // 198 - "Creation Club Menu"
#ifndef SKYRIM_SUPPORT_AE
#ifdef SKYRIM_SUPPORT_AE
BSFixedString marketplaceMenu; // 1A0 - "Marketplace Menu"
#endif
BSFixedString titleSequenceMenu; // 1A8 - "TitleSequence Menu"
Expand All @@ -91,13 +91,13 @@ namespace RE
BSFixedString refreshMenu; // 248 - "RefreshMenu"
BSFixedString cancelLoading; // 250 - "CancelLoading"
BSFixedString menuTextureDegradeEvent; // 258 - "Menu Texture Degrade Event"
#ifndef SKYRIM_SUPPORT_AE
#ifdef SKYRIM_SUPPORT_AE
BSFixedString userSettingsLoaded; // 260 - "UserSettingsLoaded"
BSFixedString activityStarted; // 268 - "ActivityStarted"
#endif
BSFixedString diamondMarker; // 270 - "<img src='DiamondMarker' width='10' height='15' align='baseline' vspace='5'>"
};
#ifndef SKYRIM_SUPPORT_AE
#ifdef SKYRIM_SUPPORT_AE
static_assert(sizeof(InterfaceStrings) == 0x278);
#else
static_assert(sizeof(InterfaceStrings) == 0x260);
Expand Down
98 changes: 52 additions & 46 deletions include/RE/T/TES.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,52 +114,58 @@ namespace RE
std::uint8_t unk133; // 133
std::uint32_t unk134; // 134
std::uint64_t unk138; // 138
std::uint64_t unk140; // 140 - actual offset change is somewhere near showLandBorder
TESWorldSpace* worldSpace; // 140
BSSimpleList<BSTTuple<TESNPC*, std::uint16_t>*> deadCount; // 148
void* unk158; // 158 - smart ptr
void* unk160; // 160 - smart ptr
void* unk168; // 168 - smart ptr
void* unk170; // 170 - smart ptr
std::uint64_t unk178; // 178
std::uint64_t unk180; // 180
std::uint64_t unk188; // 188
std::uint64_t unk190; // 190
std::uint64_t unk198; // 198
std::uint64_t unk1A0; // 1A0
std::uint64_t unk1A8; // 1A8
std::uint64_t unk1B0; // 1B0
std::uint64_t unk1B8; // 1B8
std::uint64_t unk1C0; // 1C0
std::uint64_t unk1C8; // 1C8
std::uint64_t unk1D0; // 1D0
std::uint64_t unk1D8; // 1D8
std::uint64_t unk1E0; // 1E0
std::uint64_t unk1E8; // 1E8
std::uint64_t unk1F0; // 1F0
std::uint64_t unk1F8; // 1F8
std::uint64_t unk200; // 200
std::uint64_t unk208; // 208
std::uint64_t unk210; // 210
std::uint64_t unk218; // 218
std::uint64_t unk220; // 220
std::uint64_t unk228; // 228
std::uint64_t unk230; // 230
std::uint64_t unk238; // 238
std::uint64_t unk240; // 240
std::uint64_t unk248; // 248
std::uint64_t unk250; // 250
std::uint64_t unk258; // 258
std::uint64_t unk260; // 260
std::uint64_t unk268; // 268
std::uint64_t unk270; // 270
std::uint64_t unk278; // 278
std::uint64_t unk280; // 280
std::uint64_t unk288; // 288
SystemEventAdapter unk290; // 290
std::uint64_t unk2A0; // 2A0
NavMeshInfoMap* unk2A8; // 2A8
std::uint64_t unk2B0; // 2B0
#ifdef SKYRIM_SUPPORT_AE
std::uint64_t unk140; // 140 - actual offset change is somewhere near showLandBorder
#endif
TESWorldSpace* worldSpace; // 140
BSSimpleList<BSTTuple<TESNPC*, std::uint16_t>*> deadCount; // 148
void* unk158; // 158 - smart ptr
void* unk160; // 160 - smart ptr
void* unk168; // 168 - smart ptr
void* unk170; // 170 - smart ptr
std::uint64_t unk178; // 178
std::uint64_t unk180; // 180
std::uint64_t unk188; // 188
std::uint64_t unk190; // 190
std::uint64_t unk198; // 198
std::uint64_t unk1A0; // 1A0
std::uint64_t unk1A8; // 1A8
std::uint64_t unk1B0; // 1B0
std::uint64_t unk1B8; // 1B8
std::uint64_t unk1C0; // 1C0
std::uint64_t unk1C8; // 1C8
std::uint64_t unk1D0; // 1D0
std::uint64_t unk1D8; // 1D8
std::uint64_t unk1E0; // 1E0
std::uint64_t unk1E8; // 1E8
std::uint64_t unk1F0; // 1F0
std::uint64_t unk1F8; // 1F8
std::uint64_t unk200; // 200
std::uint64_t unk208; // 208
std::uint64_t unk210; // 210
std::uint64_t unk218; // 218
std::uint64_t unk220; // 220
std::uint64_t unk228; // 228
std::uint64_t unk230; // 230
std::uint64_t unk238; // 238
std::uint64_t unk240; // 240
std::uint64_t unk248; // 248
std::uint64_t unk250; // 250
std::uint64_t unk258; // 258
std::uint64_t unk260; // 260
std::uint64_t unk268; // 268
std::uint64_t unk270; // 270
std::uint64_t unk278; // 278
std::uint64_t unk280; // 280
std::uint64_t unk288; // 288
SystemEventAdapter unk290; // 290
std::uint64_t unk2A0; // 2A0
NavMeshInfoMap* unk2A8; // 2A8
std::uint64_t unk2B0; // 2B0
};
#ifdef SKYRIM_SUPPORT_AE
static_assert(sizeof(TES) == 0x2C0);
#else
static_assert(sizeof(TES) == 0x2B8);
#endif
}
6 changes: 4 additions & 2 deletions include/RE/U/UserEvents.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,14 @@ namespace RE
kTFCMode,
kMapDebug,
kLockpicking,
#ifdef SKYRIM_SUPPORT_AE
kMarketplace,
#endif
kFavor,

kTotal = 18,
kTotal,

kNone = 19
kNone
};
};
using INPUT_CONTEXT_ID = INPUT_CONTEXT_IDS::INPUT_CONTEXT_ID;
Expand Down

0 comments on commit 74c406e

Please sign in to comment.