Skip to content

Commit bd040ac

Browse files
committed
Merge branch 'master' into pd-upscaler
2 parents 76298bd + f59350b commit bd040ac

File tree

4 files changed

+293
-65
lines changed

4 files changed

+293
-65
lines changed

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,21 +154,21 @@ FetchContent_Declare(freetype
154154
)
155155
FetchContent_MakeAvailable(freetype)
156156

157-
message(STATUS "Fetching bddisasm (v1.34.10)...")
157+
message(STATUS "Fetching bddisasm (70db095765ab2066dd88dfb7bbcc42259ed167c5)...")
158158
FetchContent_Declare(bddisasm
159159
GIT_REPOSITORY
160160
"https://github.com/bitdefender/bddisasm"
161161
GIT_TAG
162-
v1.34.10
162+
70db095765ab2066dd88dfb7bbcc42259ed167c5
163163
)
164164
FetchContent_MakeAvailable(bddisasm)
165165

166-
message(STATUS "Fetching kananlib (c2081707cd50da11b8304deb529d18c88d46ba7a)...")
166+
message(STATUS "Fetching kananlib (8c27b656734355db0f2893581fd62e838fa130ad)...")
167167
FetchContent_Declare(kananlib
168168
GIT_REPOSITORY
169169
"https://github.com/cursey/kananlib"
170170
GIT_TAG
171-
c2081707cd50da11b8304deb529d18c88d46ba7a
171+
8c27b656734355db0f2893581fd62e838fa130ad
172172
)
173173
FetchContent_MakeAvailable(kananlib)
174174

cmake.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,11 @@ condition = "build-framework"
216216

217217
[fetch-content.bddisasm]
218218
git = "https://github.com/bitdefender/bddisasm"
219-
tag = "v1.34.10"
219+
tag = "70db095765ab2066dd88dfb7bbcc42259ed167c5"
220220

221221
[fetch-content.kananlib]
222222
git = "https://github.com/cursey/kananlib"
223-
tag = "c2081707cd50da11b8304deb529d18c88d46ba7a"
223+
tag = "8c27b656734355db0f2893581fd62e838fa130ad"
224224

225225
[target.utility]
226226
type = "static"

src/REFramework.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,9 @@ REFramework::REFramework(HMODULE reframework_module)
527527
IntegrityCheckBypass::immediate_patch_dd2();
528528
#endif
529529

530-
#if TDB_VER >= 83
530+
#if TDB_VER >= 82
531531
// Fixes new code added in RE9 only. Maybe >= TDB83 too. Probably will change.
532+
// Addendum: Found to be present in MHSTORIES3 (TDB 82) as well, so this is not RE9 exclusive.
532533
IntegrityCheckBypass::immediate_patch_re9();
533534
#endif
534535

0 commit comments

Comments
 (0)