fix: revert to original DDGame constructor, fix GfxHandler__LoadDir
Browse filesFix GfxHandler__LoadDir calling convention: usercall(EAX=handler) not
thiscall(ECX=handler). Add call_gfx_load_dir() bridge.
Revert game_session.rs to use original constructor bridge β create_ddgame()
is ~80% complete but crashes due to missing sprite loading, gradient
images, HUD, and display finalization. The remaining sections need the
DDGameWrapper vtable[0] sprite loader and 200+ lines of gradient
computation.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
crates/openwa-core/src/engine/ddgame.rs
CHANGED
|
@@ -503,8 +503,7 @@ unsafe fn init_graphics_and_resources(
|
|
| 503 |
let ddgame = (*wrapper).ddgame;
|
| 504 |
let fopen: unsafe extern "cdecl" fn(*const u8, *const u8) -> *mut u8 =
|
| 505 |
core::mem::transmute(rb(va::WA_FOPEN) as usize);
|
| 506 |
-
let
|
| 507 |
-
core::mem::transmute(rb(va::GFX_HANDLER_LOAD_DIR) as usize);
|
| 508 |
let gfx_handler_vtable = rb(0x664308) as u32;
|
| 509 |
|
| 510 |
// ββ GfxHandler #1 (primary) ββ
|
|
@@ -533,7 +532,7 @@ unsafe fn init_graphics_and_resources(
|
|
| 533 |
for (i, path) in paths.iter().enumerate() {
|
| 534 |
let fp = fopen(path.as_ptr(), b"rb\0".as_ptr());
|
| 535 |
*(gfx1.add(0x198) as *mut *mut u8) = fp;
|
| 536 |
-
if !fp.is_null() &&
|
| 537 |
gfx_loaded_idx = i as u32;
|
| 538 |
break;
|
| 539 |
}
|
|
@@ -545,8 +544,8 @@ unsafe fn init_graphics_and_resources(
|
|
| 545 |
let headless_offset = if f914 != 0 { 1u32 } else { 0u32 };
|
| 546 |
(*wrapper).gfx_mode = if gfx_loaded_idx.wrapping_sub(headless_offset) < 2 { 1 } else { 0 };
|
| 547 |
let _ = log_line(&format!(
|
| 548 |
-
"[DDGame] GfxHandler #1 loaded (idx={}
|
| 549 |
-
gfx_loaded_idx, (*wrapper).gfx_mode,
|
| 550 |
));
|
| 551 |
|
| 552 |
// ββ GfxHandler #2 (conditional) ββ
|
|
@@ -568,10 +567,10 @@ unsafe fn init_graphics_and_resources(
|
|
| 568 |
|
| 569 |
let fp = fopen(gfx_c_path.as_ptr(), b"rb\0".as_ptr());
|
| 570 |
*(gfx2.add(0x198) as *mut *mut u8) = fp;
|
| 571 |
-
if fp.is_null() ||
|
| 572 |
let fp2 = fopen(b"data\\Gfx\\Gfx.dir\0".as_ptr(), b"rb\0".as_ptr());
|
| 573 |
*(gfx2.add(0x198) as *mut *mut u8) = fp2;
|
| 574 |
-
if fp2.is_null() ||
|
| 575 |
panic!("DDGame: couldn't open secondary Gfx.dir");
|
| 576 |
}
|
| 577 |
}
|
|
@@ -964,6 +963,22 @@ unsafe fn init_graphics_and_resources(
|
|
| 964 |
// TODO: Display finalization (layer visibility)
|
| 965 |
}
|
| 966 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 967 |
/// Helper: load image via GfxDir__LoadImage + wrap with FUN_004F5F80.
|
| 968 |
/// Used by arrow sprite loop when GfxDir__FindEntry fails.
|
| 969 |
#[cfg(target_arch = "x86")]
|
|
|
|
| 503 |
let ddgame = (*wrapper).ddgame;
|
| 504 |
let fopen: unsafe extern "cdecl" fn(*const u8, *const u8) -> *mut u8 =
|
| 505 |
core::mem::transmute(rb(va::WA_FOPEN) as usize);
|
| 506 |
+
let gfx_load_dir_addr = rb(va::GFX_HANDLER_LOAD_DIR);
|
|
|
|
| 507 |
let gfx_handler_vtable = rb(0x664308) as u32;
|
| 508 |
|
| 509 |
// ββ GfxHandler #1 (primary) ββ
|
|
|
|
| 532 |
for (i, path) in paths.iter().enumerate() {
|
| 533 |
let fp = fopen(path.as_ptr(), b"rb\0".as_ptr());
|
| 534 |
*(gfx1.add(0x198) as *mut *mut u8) = fp;
|
| 535 |
+
if !fp.is_null() && call_gfx_load_dir(gfx1, gfx_load_dir_addr) != 0 {
|
| 536 |
gfx_loaded_idx = i as u32;
|
| 537 |
break;
|
| 538 |
}
|
|
|
|
| 544 |
let headless_offset = if f914 != 0 { 1u32 } else { 0u32 };
|
| 545 |
(*wrapper).gfx_mode = if gfx_loaded_idx.wrapping_sub(headless_offset) < 2 { 1 } else { 0 };
|
| 546 |
let _ = log_line(&format!(
|
| 547 |
+
"[DDGame] GfxHandler #1 loaded (idx={}, gfx_mode={}, gfx1=0x{:08X})",
|
| 548 |
+
gfx_loaded_idx, (*wrapper).gfx_mode, gfx1 as u32,
|
| 549 |
));
|
| 550 |
|
| 551 |
// ββ GfxHandler #2 (conditional) ββ
|
|
|
|
| 567 |
|
| 568 |
let fp = fopen(gfx_c_path.as_ptr(), b"rb\0".as_ptr());
|
| 569 |
*(gfx2.add(0x198) as *mut *mut u8) = fp;
|
| 570 |
+
if fp.is_null() || call_gfx_load_dir(gfx2, gfx_load_dir_addr) == 0 {
|
| 571 |
let fp2 = fopen(b"data\\Gfx\\Gfx.dir\0".as_ptr(), b"rb\0".as_ptr());
|
| 572 |
*(gfx2.add(0x198) as *mut *mut u8) = fp2;
|
| 573 |
+
if fp2.is_null() || call_gfx_load_dir(gfx2, gfx_load_dir_addr) == 0 {
|
| 574 |
panic!("DDGame: couldn't open secondary Gfx.dir");
|
| 575 |
}
|
| 576 |
}
|
|
|
|
| 963 |
// TODO: Display finalization (layer visibility)
|
| 964 |
}
|
| 965 |
|
| 966 |
+
/// Bridge to GfxHandler__LoadDir (0x5663E0).
|
| 967 |
+
/// Convention: usercall(EAX=handler), plain RET. Returns nonzero on success.
|
| 968 |
+
#[cfg(target_arch = "x86")]
|
| 969 |
+
unsafe fn call_gfx_load_dir(handler: *mut u8, addr: u32) -> i32 {
|
| 970 |
+
let result: i32;
|
| 971 |
+
core::arch::asm!(
|
| 972 |
+
"call {addr}",
|
| 973 |
+
addr = in(reg) addr,
|
| 974 |
+
inlateout("eax") handler => result,
|
| 975 |
+
out("ecx") _,
|
| 976 |
+
out("edx") _,
|
| 977 |
+
clobber_abi("C"),
|
| 978 |
+
);
|
| 979 |
+
result
|
| 980 |
+
}
|
| 981 |
+
|
| 982 |
/// Helper: load image via GfxDir__LoadImage + wrap with FUN_004F5F80.
|
| 983 |
/// Used by arrow sprite loop when GfxDir__FindEntry fails.
|
| 984 |
#[cfg(target_arch = "x86")]
|
crates/openwa-wormkit/src/replacements/game_session.rs
CHANGED
|
@@ -107,18 +107,14 @@ pub(crate) unsafe fn construct_ddgame_wrapper(
|
|
| 107 |
let timer_obj = (*session).timer_obj;
|
| 108 |
let net_game = (*session).net_game;
|
| 109 |
|
| 110 |
-
// Call
|
| 111 |
-
create_ddgame(
|
| 112 |
-
|
| 113 |
-
|
| 114 |
-
|
| 115 |
-
|
| 116 |
-
palette,
|
| 117 |
-
|
| 118 |
-
timer_obj,
|
| 119 |
-
net_game,
|
| 120 |
-
game_info,
|
| 121 |
-
input_ctrl as u32,
|
| 122 |
);
|
| 123 |
|
| 124 |
// Initialize DDGame's game-state fields.
|
|
@@ -143,8 +139,7 @@ pub fn install() -> Result<(), String> {
|
|
| 143 |
init_constructor_addrs();
|
| 144 |
// DDGameWrapper__Constructor is fully converted β trap the original.
|
| 145 |
hook::install_trap!("DDGameWrapper__Constructor", va::CONSTRUCT_DD_GAME_WRAPPER);
|
| 146 |
-
// DDGame__Constructor
|
| 147 |
-
hook::install_trap!("DDGame__Constructor", va::CONSTRUCT_DD_GAME);
|
| 148 |
}
|
| 149 |
Ok(())
|
| 150 |
}
|
|
|
|
| 107 |
let timer_obj = (*session).timer_obj;
|
| 108 |
let net_game = (*session).net_game;
|
| 109 |
|
| 110 |
+
// Call original DDGame__Constructor via bridge.
|
| 111 |
+
// create_ddgame() is ~80% complete but missing gradient images,
|
| 112 |
+
// sprite loading, HUD, and display finalization. Use original
|
| 113 |
+
// until fully ported.
|
| 114 |
+
DDGAME_CTOR_ECX = input_ctrl as u32;
|
| 115 |
+
ddgame_constructor_call(
|
| 116 |
+
this, display, sound, keyboard, palette, streaming_audio,
|
| 117 |
+
timer_obj, net_game, game_info,
|
|
|
|
|
|
|
|
|
|
|
|
|
| 118 |
);
|
| 119 |
|
| 120 |
// Initialize DDGame's game-state fields.
|
|
|
|
| 139 |
init_constructor_addrs();
|
| 140 |
// DDGameWrapper__Constructor is fully converted β trap the original.
|
| 141 |
hook::install_trap!("DDGameWrapper__Constructor", va::CONSTRUCT_DD_GAME_WRAPPER);
|
| 142 |
+
// DDGame__Constructor still uses original bridge (create_ddgame not yet complete).
|
|
|
|
| 143 |
}
|
| 144 |
Ok(())
|
| 145 |
}
|