Skip to content

Commit c3a707d

Browse files
committed
Remove wait_attach_auto_detect, trust asr version
latest patch uses V3 now, so the assumption behind the old wait_attach_auto_detect no longer holds
1 parent f8b5736 commit c3a707d

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

src/hollow_knight_memory.rs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2519,7 +2519,7 @@ impl GameManagerFinder {
25192519
let mut found_module = false;
25202520
let mut needed_retry = false;
25212521
loop {
2522-
let module = wait_attach_auto_detect(process).await;
2522+
let module = mono::Module::wait_attach_auto_detect(process).await;
25232523
if !found_module {
25242524
found_module = true;
25252525
asr::print_message("GameManagerFinder wait_attach: module get_default_image...");
@@ -7409,24 +7409,6 @@ pub fn attach_hollow_knight() -> Option<Process> {
74097409
HOLLOW_KNIGHT_NAMES.into_iter().find_map(Process::attach)
74107410
}
74117411

7412-
async fn wait_attach_auto_detect(process: &Process) -> mono::Module {
7413-
retry(|| attach_auto_detect(process)).await
7414-
}
7415-
7416-
fn attach_auto_detect(process: &Process) -> Option<mono::Module> {
7417-
if process.get_module_address("mono.dll").is_ok()
7418-
|| process.get_module_address("libmono.so").is_ok()
7419-
|| process.get_module_address("libmono.0.dylib").is_ok()
7420-
{
7421-
// V1 or V1Cattrs
7422-
mono::Module::attach_auto_detect(process)
7423-
} else {
7424-
// if it's not V1 or V1Cattrs,
7425-
// it's always V2, never V3
7426-
mono::Module::attach(process, mono::Version::V2)
7427-
}
7428-
}
7429-
74307412
fn scene_path_to_name_string<const N: usize>(scene_path: ArrayCString<N>) -> Option<String> {
74317413
String::from_utf8(scene_manager::get_name(&scene_path).to_vec()).ok()
74327414
}

0 commit comments

Comments
 (0)