Skip to content

Commit 24a5707

Browse files
praydogpraydog
authored
Merge branch 'master' into faulty_files_detector
2 parents 78f9c9e + d294aa7 commit 24a5707

File tree

12 files changed

+4129
-16
lines changed

12 files changed

+4129
-16
lines changed

‎.github/workflows/build-pr.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: windows-latest
88
strategy:
99
matrix:
10-
target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS, PRAGMATA]
10+
target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS, PRAGMATA, MHSTORIES3]
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

‎.github/workflows/dev-release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: windows-latest
88
strategy:
99
matrix:
10-
target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS, PRAGMATA]
10+
target: [RE2, RE2_TDB66, RE3, RE3_TDB67, RE4, RE7, RE7_TDB49, RE8, DMC5, MHRISE, SF6, DD2, MHWILDS, PRAGMATA, MHSTORIES3]
1111
steps:
1212
- name: Checkout
1313
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

‎CMakeLists.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ if(REF_BUILD_RE2_SDK OR REF_BUILD_FRAMEWORK) # build-re2-sdk
473473
"shared/sdk/ReClass_Internal.hpp"
474474
"shared/sdk/ReClass_Internal_DD2.hpp"
475475
"shared/sdk/ReClass_Internal_DMC5.hpp"
476+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
476477
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
477478
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
478479
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -1297,6 +1298,7 @@ if(REF_BUILD_RE2_TDB66SDK OR REF_BUILD_FRAMEWORK) # build-re2tdb66-sdk
12971298
"shared/sdk/ReClass_Internal.hpp"
12981299
"shared/sdk/ReClass_Internal_DD2.hpp"
12991300
"shared/sdk/ReClass_Internal_DMC5.hpp"
1301+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
13001302
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
13011303
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
13021304
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -2524,6 +2526,7 @@ if(REF_BUILD_RE3_SDK OR REF_BUILD_FRAMEWORK) # build-re3-sdk
25242526
"shared/sdk/ReClass_Internal.hpp"
25252527
"shared/sdk/ReClass_Internal_DD2.hpp"
25262528
"shared/sdk/ReClass_Internal_DMC5.hpp"
2529+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
25272530
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
25282531
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
25292532
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -3348,6 +3351,7 @@ if(REF_BUILD_RE3_TDB67SDK OR REF_BUILD_FRAMEWORK) # build-re3tdb67-sdk
33483351
"shared/sdk/ReClass_Internal.hpp"
33493352
"shared/sdk/ReClass_Internal_DD2.hpp"
33503353
"shared/sdk/ReClass_Internal_DMC5.hpp"
3354+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
33513355
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
33523356
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
33533357
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -4776,6 +4780,7 @@ if(REF_BUILD_RE4_SDK OR REF_BUILD_FRAMEWORK) # build-re4-sdk
47764780
"shared/sdk/ReClass_Internal.hpp"
47774781
"shared/sdk/ReClass_Internal_DD2.hpp"
47784782
"shared/sdk/ReClass_Internal_DMC5.hpp"
4783+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
47794784
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
47804785
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
47814786
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -5602,6 +5607,7 @@ if(REF_BUILD_RE7_SDK OR REF_BUILD_FRAMEWORK) # build-re7-sdk
56025607
"shared/sdk/ReClass_Internal.hpp"
56035608
"shared/sdk/ReClass_Internal_DD2.hpp"
56045609
"shared/sdk/ReClass_Internal_DMC5.hpp"
5610+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
56055611
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
56065612
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
56075613
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -6426,6 +6432,7 @@ if(REF_BUILD_RE7_TDB49SDK OR REF_BUILD_FRAMEWORK) # build-re7tdb49-sdk
64266432
"shared/sdk/ReClass_Internal.hpp"
64276433
"shared/sdk/ReClass_Internal_DD2.hpp"
64286434
"shared/sdk/ReClass_Internal_DMC5.hpp"
6435+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
64296436
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
64306437
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
64316438
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -7653,6 +7660,7 @@ if(REF_BUILD_RE8_SDK OR REF_BUILD_FRAMEWORK) # build-re8-sdk
76537660
"shared/sdk/ReClass_Internal.hpp"
76547661
"shared/sdk/ReClass_Internal_DD2.hpp"
76557662
"shared/sdk/ReClass_Internal_DMC5.hpp"
7663+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
76567664
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
76577665
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
76587666
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -8680,6 +8688,7 @@ if(REF_BUILD_DMC5_SDK OR REF_BUILD_FRAMEWORK) # build-dmc5-sdk
86808688
"shared/sdk/ReClass_Internal.hpp"
86818689
"shared/sdk/ReClass_Internal_DD2.hpp"
86828690
"shared/sdk/ReClass_Internal_DMC5.hpp"
8691+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
86838692
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
86848693
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
86858694
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -9705,6 +9714,7 @@ if(REF_BUILD_MHRISE_SDK OR REF_BUILD_FRAMEWORK) # build-mhrise-sdk
97059714
"shared/sdk/ReClass_Internal.hpp"
97069715
"shared/sdk/ReClass_Internal_DD2.hpp"
97079716
"shared/sdk/ReClass_Internal_DMC5.hpp"
9717+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
97089718
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
97099719
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
97109720
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -10732,6 +10742,7 @@ if(REF_BUILD_SF6_SDK OR REF_BUILD_FRAMEWORK) # build-sf6-sdk
1073210742
"shared/sdk/ReClass_Internal.hpp"
1073310743
"shared/sdk/ReClass_Internal_DD2.hpp"
1073410744
"shared/sdk/ReClass_Internal_DMC5.hpp"
10745+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
1073510746
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
1073610747
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
1073710748
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -11759,6 +11770,7 @@ if(REF_BUILD_DD2_SDK OR REF_BUILD_FRAMEWORK) # build-dd2-sdk
1175911770
"shared/sdk/ReClass_Internal.hpp"
1176011771
"shared/sdk/ReClass_Internal_DD2.hpp"
1176111772
"shared/sdk/ReClass_Internal_DMC5.hpp"
11773+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
1176211774
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
1176311775
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
1176411776
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -12786,6 +12798,7 @@ if(REF_BUILD_MHWILDS_SDK OR REF_BUILD_FRAMEWORK) # build-mhwilds-sdk
1278612798
"shared/sdk/ReClass_Internal.hpp"
1278712799
"shared/sdk/ReClass_Internal_DD2.hpp"
1278812800
"shared/sdk/ReClass_Internal_DMC5.hpp"
12801+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
1278912802
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
1279012803
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
1279112804
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -13813,6 +13826,7 @@ if(REF_BUILD_MHSTORIES3_SDK OR REF_BUILD_FRAMEWORK) # build-mhstories3-sdk
1381313826
"shared/sdk/ReClass_Internal.hpp"
1381413827
"shared/sdk/ReClass_Internal_DD2.hpp"
1381513828
"shared/sdk/ReClass_Internal_DMC5.hpp"
13829+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
1381613830
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
1381713831
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
1381813832
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"
@@ -14840,6 +14854,7 @@ if(REF_BUILD_PRAGMATA_SDK OR REF_BUILD_FRAMEWORK) # build-pragmata-sdk
1484014854
"shared/sdk/ReClass_Internal.hpp"
1484114855
"shared/sdk/ReClass_Internal_DD2.hpp"
1484214856
"shared/sdk/ReClass_Internal_DMC5.hpp"
14857+
"shared/sdk/ReClass_Internal_MHSTORIES3.hpp"
1484314858
"shared/sdk/ReClass_Internal_MHWILDS.hpp"
1484414859
"shared/sdk/ReClass_Internal_PRAGMATA.hpp"
1484514860
"shared/sdk/ReClass_Internal_RE2_TDB70.hpp"

‎shared/sdk/REManagedObject.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ void resolve_release() {
5757
constexpr std::array<std::string_view, 4> possible_patterns{
5858
"40 53 48 83 EC ? 8B 41 08 48 8B D9 85 C0 0F", // RE2+
5959
"40 53 48 83 EC ? 8B 41 08 48 8B D9 48 83 C1 08 85 C0 78", // RE7
60-
"41 57 41 56 41 55 41 54 56 57 55 53 48 83 EC ? 48 8B 05 ? ? ? ? 48 31 E0 48 89 44 24 30 8B 41 08", // MHWILDS+ (or unoptimized compiler builds?)
6160
"41 57 41 56 41 55 41 54 56 57 55 53 48 83 EC ? 48 8B 05 ? ? ? ? 48 31 E0 48 89 ? ? ? 8B 41 08 85 C0", // MHWILDS TU4+
61+
"41 57 41 56 41 55 41 54 56 57 55 53 48 83 EC ? 48 8B 05 ? ? ? ? 48 31 E0 48 89 44 24 30 8B 41 08", // MHWILDS+ (or unoptimized compiler builds?)
6262
};
6363

6464
spdlog::info("[REManagedObject] Finding release function...");

‎shared/sdk/RETypeDB.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,7 @@ std::span<uint32_t> REModule::get_types() const {
11911191
std::span<uint32_t> REModule::get_methods() const {
11921192
auto tdb = RETypeDB::get();
11931193

1194-
#if TDB_VER == 81
1194+
#if TDB_VER >= 81
11951195
spdlog::warn("This TDB version does not support REModule::get_methods()");
11961196
return {};
11971197
#else
@@ -1202,7 +1202,7 @@ std::span<uint32_t> REModule::get_methods() const {
12021202
std::span<uint32_t> REModule::get_instantiated_methods() const {
12031203
auto tdb = RETypeDB::get();
12041204

1205-
#if TDB_VER == 81
1205+
#if TDB_VER >= 81
12061206
spdlog::warn("This TDB version does not support REModule::get_instantiated_methods()");
12071207
return {};
12081208
#else
@@ -1213,7 +1213,7 @@ std::span<uint32_t> REModule::get_instantiated_methods() const {
12131213
std::span<uint32_t> REModule::get_member_references() const {
12141214
auto tdb = RETypeDB::get();
12151215

1216-
#if TDB_VER == 81
1216+
#if TDB_VER >= 81
12171217
spdlog::warn("This TDB version does not support REModule::get_member_references()");
12181218
return {};
12191219
#else

‎shared/sdk/RETypeDB.hpp‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ struct TDB {
15261526
#pragma pack(pop)
15271527
}
15281528

1529-
#if TDB_VER == 81
1529+
#if TDB_VER >= 81
15301530
struct REModule_: public sdk::tdb81::REModule {};
15311531
#else
15321532
struct REModule_: public sdk::tdb74::REModule {};
@@ -1546,6 +1546,19 @@ struct REParameterDef : public sdk::tdb84::REParameterDef {};
15461546
struct GenericListData : public sdk::tdb84::GenericListData {};
15471547
using ParamList = sdk::tdb84::ParamList;
15481548

1549+
#elif TDB_VER >= 82
1550+
struct RETypeDB_ : public sdk::tdb82::TDB {};
1551+
struct REMethodDefinition_ : public sdk::tdb82::REMethodDefinition {};
1552+
struct REMethodImpl : public sdk::tdb82::REMethodImpl {};
1553+
using REField_ = sdk::tdb82::REField;
1554+
struct REFieldImpl : public sdk::tdb82::REFieldImpl {};
1555+
struct RETypeImpl : public sdk::tdb82::RETypeImpl {};
1556+
struct REPropertyImpl : public sdk::tdb82::REPropertyImpl {};
1557+
struct REProperty : public sdk::tdb82::REProperty {};
1558+
struct REParameterDef : public sdk::tdb82::REParameterDef {};
1559+
struct GenericListData : public sdk::tdb82::GenericListData {};
1560+
using ParamList = sdk::tdb82::ParamList;
1561+
15491562
#elif TDB_VER >= 81
15501563
struct RETypeDB_ : public sdk::tdb81::TDB {};
15511564
struct REMethodDefinition_ : public sdk::tdb81::REMethodDefinition {};

0 commit comments

Comments
 (0)