Skip to content

Commit 03ff404

Browse files
qudixqudix
committed
chore: transition
1 parent 234c308 commit 03ff404

13 files changed

Lines changed: 133 additions & 176 deletions

File tree

‎include/OBSE/API.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "REX/REX/LOG.h"
3+
#include "REX/LOG.h"
44

55
namespace OBSE
66
{
@@ -17,9 +17,9 @@ namespace OBSE
1717
{
1818
bool log{ true };
1919
#ifndef NDEBUG
20-
REX::LOG_LEVEL logLevel{ REX::LOG_LEVEL::DEBUG };
20+
REX::ELogLevel logLevel{ REX::ELogLevel::Debug };
2121
#else
22-
REX::LOG_LEVEL logLevel{ REX::LOG_LEVEL::INFO };
22+
REX::ELogLevel logLevel{ REX::ELogLevel::Info };
2323
#endif
2424
const char* logName{ nullptr };
2525
const char* logPattern{ nullptr };

‎include/RE/A/ACTOR_BASE_DATA.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ namespace RE
2020
};
2121

2222
// members
23-
REX::EnumSet<Flags> actorBaseFlags; // 00
24-
std::uint16_t spellPoints; // 04
25-
std::uint16_t fatigue; // 06
26-
std::uint16_t barterGold; // 08
27-
std::int16_t level; // 0A
28-
std::uint16_t calcLevelMin; // 0C
29-
std::uint16_t calcLevelMax; // 0E
23+
REX::TEnumSet<Flags> actorBaseFlags; // 00
24+
std::uint16_t spellPoints; // 04
25+
std::uint16_t fatigue; // 06
26+
std::uint16_t barterGold; // 08
27+
std::int16_t level; // 0A
28+
std::uint16_t calcLevelMin; // 0C
29+
std::uint16_t calcLevelMax; // 0E
3030
};
3131
static_assert(sizeof(ACTOR_BASE_DATA) == 0x10);
3232
}

‎include/RE/B/BSExtraData.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ namespace RE
1616
virtual bool Compare(BSExtraData* a_other) const; // 001
1717

1818
// members
19-
REX::Enum<EXTRA_DATA_TYPE, std::uint8_t> type; // 008
20-
BSExtraData* next; // 010
19+
REX::TEnum<EXTRA_DATA_TYPE, std::uint8_t> type; // 008
20+
BSExtraData* next; // 010
2121
};
2222
static_assert(sizeof(BSExtraData) == 0x18);
2323
}

‎include/RE/H/HUDMainMenu.h‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,28 @@ namespace RE
4242
virtual void StartFadeIn() override; // 18
4343

4444
// members
45-
Tile* background; // 050
46-
Tile* health; // 058
47-
Tile* magic; // 060
48-
Tile* fatigue; // 068
49-
Tile* weapon; // 070
50-
Tile* spell; // 078
51-
Tile* compass; // 080
52-
Tile* compassFace; // 088
53-
Tile* frame; // 090
54-
Tile* playerGrab; // 098
55-
Tile* activeFXIcons; // 0A0
56-
Tile* levelupIcon; // 0A8
57-
Tile* brackets; // 0B0
58-
REX::Enum<MENU_POSITION, std::int32_t> currentLoc; // 0B8
59-
REX::Enum<MENU_POSITION, std::int32_t> destLoc; // 0BC
60-
BSSimpleList<TESQuestTarget*>* questList; // 0C0
61-
float mouseDownX; // 0C8
62-
float mouseDownY; // 0CC
63-
float zoomPos; // 0D0
64-
std::uint32_t killRegionDisplay; // 0D4
65-
IconArray activeFX; // 0D8
66-
bool isVisible; // 100
45+
Tile* background; // 050
46+
Tile* health; // 058
47+
Tile* magic; // 060
48+
Tile* fatigue; // 068
49+
Tile* weapon; // 070
50+
Tile* spell; // 078
51+
Tile* compass; // 080
52+
Tile* compassFace; // 088
53+
Tile* frame; // 090
54+
Tile* playerGrab; // 098
55+
Tile* activeFXIcons; // 0A0
56+
Tile* levelupIcon; // 0A8
57+
Tile* brackets; // 0B0
58+
REX::TEnum<MENU_POSITION, std::int32_t> currentLoc; // 0B8
59+
REX::TEnum<MENU_POSITION, std::int32_t> destLoc; // 0BC
60+
BSSimpleList<TESQuestTarget*>* questList; // 0C0
61+
float mouseDownX; // 0C8
62+
float mouseDownY; // 0CC
63+
float zoomPos; // 0D0
64+
std::uint32_t killRegionDisplay; // 0D4
65+
IconArray activeFX; // 0D8
66+
bool isVisible; // 100
6767
};
6868
static_assert(sizeof(HUDMainMenu) == 0x108);
6969
}

‎include/RE/M/Menu.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,15 @@ namespace RE
5151
virtual void StartFadeIn(); // 18
5252

5353
// members
54-
TileMenu* tileMenu; // 18
55-
BSSimpleList<Tile::TileTemplate*> templates; // 20
56-
Tile* lastTile; // 30
57-
std::int32_t isModal; // 38
58-
std::int32_t menuThickness; // 3C
59-
bool forceFadeOut; // 40
60-
bool deleteTemplates; // 41
61-
REX::Enum<MENU_CLASS, std::int32_t> menuClass; // 44
62-
REX::Enum<FADE_STATE, std::int32_t> fadeState; // 48
54+
TileMenu* tileMenu; // 18
55+
BSSimpleList<Tile::TileTemplate*> templates; // 20
56+
Tile* lastTile; // 30
57+
std::int32_t isModal; // 38
58+
std::int32_t menuThickness; // 3C
59+
bool forceFadeOut; // 40
60+
bool deleteTemplates; // 41
61+
REX::TEnum<MENU_CLASS, std::int32_t> menuClass; // 44
62+
REX::TEnum<FADE_STATE, std::int32_t> fadeState; // 48
6363
};
6464
static_assert(sizeof(Menu) == 0x50);
6565
}

‎include/RE/RTTI.h‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ namespace RE
6060
};
6161

6262
// members
63-
RVA<TypeDescriptor> typeDescriptor; // 00
64-
std::uint32_t numContainedBases; // 04
65-
PMD pmd; // 08
66-
REX::EnumSet<Attribute, std::uint32_t> attributes; // 14
63+
RVA<TypeDescriptor> typeDescriptor; // 00
64+
std::uint32_t numContainedBases; // 04
65+
PMD pmd; // 08
66+
REX::TEnumSet<Attribute, std::uint32_t> attributes; // 14
6767
};
6868
static_assert(sizeof(BaseClassDescriptor) == 0x18);
6969

@@ -79,10 +79,10 @@ namespace RE
7979
};
8080

8181
// members
82-
std::uint32_t signature; // 00
83-
REX::EnumSet<Attribute, std::uint32_t> attributes; // 04
84-
std::uint32_t numBaseClasses; // 08
85-
RVA<BaseClassDescriptor> baseClassArray; // 0C
82+
std::uint32_t signature; // 00
83+
REX::TEnumSet<Attribute, std::uint32_t> attributes; // 04
84+
std::uint32_t numBaseClasses; // 08
85+
RVA<BaseClassDescriptor> baseClassArray; // 0C
8686
};
8787
static_assert(sizeof(ClassHierarchyDescriptor) == 0x10);
8888

@@ -96,9 +96,9 @@ namespace RE
9696
};
9797

9898
// members
99-
REX::EnumSet<Signature, std::uint32_t> signature; // 00
100-
std::uint32_t offset; // 04
101-
std::uint32_t ctorDispOffset; // 08
99+
REX::TEnumSet<Signature, std::uint32_t> signature; // 00
100+
std::uint32_t offset; // 04
101+
std::uint32_t ctorDispOffset; // 08
102102
RVA<TypeDescriptor> typeDescriptor; // 0C
103103
RVA<ClassHierarchyDescriptor> classDescriptor; // 10
104104
};

‎include/RE/T/TESFile.h‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -78,44 +78,44 @@ namespace RE
7878
}
7979

8080
// members
81-
REX::EnumSet<TES_RETURN_CODE, std::int32_t> lastError; // 000
82-
TESFile* threadSafeParent; // 008
83-
NiTPointerMap<std::uint32_t, TESFile*>* threadSafeFileMap; // 010
84-
BSFile* lockedFile; // 018
85-
BSFile* file; // 020
86-
char filename[REX::W32::MAX_PATH]; // 028
87-
char path[REX::W32::MAX_PATH]; // 12C
88-
char* buffer; // 230
89-
std::uint32_t bufferAllocSize; // 238
90-
std::uint32_t firstCellOffset; // 23C
91-
std::uint32_t currCellOffset; // 240
92-
TESObjectCELL* currCell; // 248
93-
std::uint32_t currRefOffset; // 250
94-
FORM currentform; // 254
95-
REX::EnumSet<CHUNK_ID, std::int32_t> currentchunkID; // 268
96-
std::uint32_t actualChunkSize; // 26C
97-
std::uint32_t filesize; // 270
98-
std::uint32_t fileoffset; // 274
99-
std::uint32_t formoffset; // 278
100-
std::uint32_t chunkoffset; // 27C
101-
FORM saveform; // 280
102-
std::uint32_t saveformoffset; // 294
103-
std::uint32_t savechunkoffset; // 298
104-
BSSimpleList<FORM_GROUP*> grouplist; // 2A0
105-
bool hasGroups; // 2B0
106-
REX::W32::WIN32_FIND_DATAA fileInfo; // 2B4
107-
FILE_HEADER fileHeaderInfo; // 3F4
108-
REX::EnumSet<RecordFlag, std::uint32_t> flags; // 400
109-
BSSimpleList<char*> listMasters; // 408
110-
BSSimpleList<std::uint64_t*> listMastersData; // 418
111-
std::uint32_t masterCount; // 428
112-
TESFile** masterPtrs; // 430
113-
REX::W32::FILETIME deletedFormTime; // 438
114-
std::uint8_t compileIndex; // 440
115-
BSString createdBy; // 448
116-
BSString summary; // 458
117-
char* decompressedFormBuffer; // 468
118-
std::uint32_t decompressedFormBufferSize; // 470
81+
REX::TEnumSet<TES_RETURN_CODE, std::int32_t> lastError; // 000
82+
TESFile* threadSafeParent; // 008
83+
NiTPointerMap<std::uint32_t, TESFile*>* threadSafeFileMap; // 010
84+
BSFile* lockedFile; // 018
85+
BSFile* file; // 020
86+
char filename[REX::W32::MAX_PATH]; // 028
87+
char path[REX::W32::MAX_PATH]; // 12C
88+
char* buffer; // 230
89+
std::uint32_t bufferAllocSize; // 238
90+
std::uint32_t firstCellOffset; // 23C
91+
std::uint32_t currCellOffset; // 240
92+
TESObjectCELL* currCell; // 248
93+
std::uint32_t currRefOffset; // 250
94+
FORM currentform; // 254
95+
REX::TEnumSet<CHUNK_ID, std::int32_t> currentchunkID; // 268
96+
std::uint32_t actualChunkSize; // 26C
97+
std::uint32_t filesize; // 270
98+
std::uint32_t fileoffset; // 274
99+
std::uint32_t formoffset; // 278
100+
std::uint32_t chunkoffset; // 27C
101+
FORM saveform; // 280
102+
std::uint32_t saveformoffset; // 294
103+
std::uint32_t savechunkoffset; // 298
104+
BSSimpleList<FORM_GROUP*> grouplist; // 2A0
105+
bool hasGroups; // 2B0
106+
REX::W32::WIN32_FIND_DATAA fileInfo; // 2B4
107+
FILE_HEADER fileHeaderInfo; // 3F4
108+
REX::TEnumSet<RecordFlag, std::uint32_t> flags; // 400
109+
BSSimpleList<char*> listMasters; // 408
110+
BSSimpleList<std::uint64_t*> listMastersData; // 418
111+
std::uint32_t masterCount; // 428
112+
TESFile** masterPtrs; // 430
113+
REX::W32::FILETIME deletedFormTime; // 438
114+
std::uint8_t compileIndex; // 440
115+
BSString createdBy; // 448
116+
BSString summary; // 458
117+
char* decompressedFormBuffer; // 468
118+
std::uint32_t decompressedFormBufferSize; // 470
119119
};
120120
static_assert(sizeof(TESFile) == 0x478);
121121
}

‎include/RE/T/TESForm.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,11 @@ namespace RE
227227
}
228228

229229
// members
230-
REX::Enum<FormType, std::uint8_t> formType; // 08
231-
std::uint32_t formFlags; // 0C
232-
TESFormID formID; // 10
233-
BSSimpleList<TESFile*> files; // 18
234-
ExportTESForm* exportForm; // 28
230+
REX::TEnum<FormType, std::uint8_t> formType; // 08
231+
std::uint32_t formFlags; // 0C
232+
TESFormID formID; // 10
233+
BSSimpleList<TESFile*> files; // 18
234+
ExportTESForm* exportForm; // 28
235235
};
236236
static_assert(sizeof(TESForm) == 0x30);
237237
}

‎lib/commonlib-shared‎

Submodule commonlib-shared updated 79 files

‎res/commonlibob64.natvis‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
33
<Type Name="REL::Relocation&lt;*&gt;">
44
<DisplayString>{($T1)_impl}</DisplayString>
55
<Expand>
66
<Item Name="[object]">($T1)_impl</Item>
77
</Expand>
88
</Type>
9-
10-
<Type Name="REX::EnumSet&lt;*&gt;">
9+
10+
<Type Name="REX::TEnumSet&lt;*&gt;">
1111
<DisplayString Optional="true">{static_cast&lt;$T1&gt;(_impl),en}</DisplayString>
1212
</Type>
1313

0 commit comments

Comments
 (0)