refactor: remove DDGameWrapperHandle, retype DDGame.game_state to GameInfo

- Delete DDGameWrapperHandle — consumers use *const DDGameWrapper directly
- Retype DDGame.game_state (*mut u8) → game_info (*mut GameInfo)
- Add GameInfo.crosshair_overflow_threshold at 0xD778 (was raw pointer math)
- Use SpeechSlotTable::clear() instead of write_bytes

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

crates/openwa-core/src/address.rs

@@ -655,8 +655,8 @@ pub mod va {
     }
 
     // === GameInfo struct offsets ===
-    // These are offsets from the GameInfo pointer at DDGame+0x24 (also called
-    // "game_state" in some code). Access pattern: *(DDGame+0x24) + offset.
+    // These are offsets from the GameInfo pointer at DDGame+0x24
+    // (DDGame.game_info). Access pattern: *(DDGame+0x24) + offset.
 
     pub mod game_info_offsets {
         // === Speech configuration ===

crates/openwa-core/src/ddgame.rs

@@ -1,3 +1,4 @@
+use crate::game_info::GameInfo;
 use crate::render::RenderQueue;
 use crate::speech::SpeechSlotTable;
 
@@ -35,8 +36,8 @@ pub struct DDGame {
     pub _caller: *mut u8,
     /// 0x020: PCLandscape pointer (copied from DDGameWrapper[0x133])
     pub landscape: *mut u8,
-    /// 0x024: Game state pointer (param_10)
-    pub game_state: *mut u8,
+    /// 0x024: GameInfo pointer (passed as param_10 to constructor).
+    pub game_info: *mut GameInfo,
     /// 0x028: param_9
     pub _param_028: *mut u8,
     /// 0x02C: Secondary GfxDir object (0x70C bytes, conditional on GfxHandler 1)
@@ -119,7 +120,7 @@ pub struct DDGame {
     /// 0x7D84-0x7EFF: Unknown
     ///
     /// Known landmarks:
-    /// - 0x7EF8: flag from game_state+0xF914
+    /// - 0x7EF8: flag from game_info+0xF914
     /// - 0x7EFC: init 1
     pub _unknown_7d84: [u8; 0x7F00 - 0x7D84],
 
@@ -162,7 +163,7 @@ const _: () = assert!(core::mem::size_of::<DDGame>() == 0x98B8);
 pub mod offsets {
     // === Header / init params (0x000-0x02C) ===
     pub const LANDSCAPE: usize = 0x020;
-    pub const GAME_STATE: usize = 0x024;
+    pub const GAME_INFO: usize = 0x024;
     pub const SECONDARY_GFXDIR: usize = 0x02C;
     pub const GRADIENT_IMAGE: usize = 0x030;
 

crates/openwa-core/src/game_info.rs

@@ -17,8 +17,14 @@ pub struct GameInfo {
     /// Used by DSSound_LoadAllSpeechBanks to iterate teams.
     pub speech_team_count: u8,
 
-    /// 0x044D-0xDAE7: Unknown
-    pub _unknown_044d: [u8; 0xDAE8 - 0x44D],
+    /// 0x044D-0xD777: Unknown
+    pub _unknown_044d: [u8; 0xD778 - 0x44D],
+
+    /// 0xD778: Crosshair overflow clamp threshold (compared to 0x11E in render).
+    pub crosshair_overflow_threshold: i32,
+
+    /// 0xD77C-0xDAE7: Unknown
+    pub _unknown_d77c: [u8; 0xDAE8 - 0xD77C],
 
     // --- Cluster 1: data paths ---
 

crates/openwa-core/src/wa/ddgame.rs

@@ -1,43 +0,0 @@
-//! Typed handle for DDGameWrapper — the main game engine wrapper object.
-
-use crate::ddgame::DDGame;
-use crate::game_info::GameInfo;
-
-/// Zero-cost handle to a DDGameWrapper instance (raw pointer as u32).
-///
-/// DDGameWrapper is the top-level game engine object (~28KB). It holds
-/// the DDGame pointer, graphics handlers, landscape, and display state.
-///
-/// Pointer chain: DDGameWrapper → DDGame (+0x488) → GameInfo (+0x24).
-#[derive(Clone, Copy)]
-#[repr(transparent)]
-pub struct DDGameWrapperHandle(pub u32);
-
-impl DDGameWrapperHandle {
-    /// Wrap a raw DDGameWrapper pointer.
-    pub unsafe fn from_raw(ptr: u32) -> Self {
-        Self(ptr)
-    }
-
-    /// Read the DDGame pointer from DDGameWrapper+0x488.
-    pub unsafe fn ddgame(self) -> *mut DDGame {
-        *((self.0 + 0x488) as *const *mut DDGame)
-    }
-
-    /// Follow DDGameWrapper → DDGame(+0x488) → GameInfo(+0x24).
-    ///
-    /// GameInfo holds team configuration, speech paths, replay state, etc.
-    /// Some fields are mapped in the struct; others require offset constants
-    /// from `game_info_offsets`.
-    pub unsafe fn game_info(self) -> *mut GameInfo {
-        let ddgame = self.ddgame() as u32;
-        *((ddgame + 0x24) as *const *mut GameInfo)
-    }
-
-    /// Pointer to the speech slot table (DDGame+0x77E4, 0x5A0 bytes).
-    ///
-    /// Maps (team_index, speech_line_id) → DSSound buffer index.
-    pub unsafe fn speech_slot_table(self) -> *mut u8 {
-        (self.ddgame() as u32 + 0x77E4) as *mut u8
-    }
-}

crates/openwa-core/src/wa/mod.rs

@@ -1,6 +1,5 @@
 //! Typed wrappers for calling WA.exe and library functions.
 
-pub mod ddgame;
 pub mod frontend;
 pub mod mfc;
 pub mod registry;

crates/openwa-wormkit/src/replacements/render.rs

@@ -529,8 +529,7 @@ unsafe extern "cdecl" fn draw_crosshair_line_impl(task_ptr: u32) {
     let mut overflowed = false;
     let mut clamp_factor = 0i32;
 
-    let game_state = ddgame.game_state as *const u8;
-    let threshold = *(game_state.add(0xD778) as *const i32);
+    let threshold = (*ddgame.game_info).crosshair_overflow_threshold;
 
     if threshold > 0x11E {
         // Check X overflow: sin > 0 but endpoint wrapped below start

crates/openwa-wormkit/src/replacements/speech.rs

@@ -13,7 +13,7 @@ use std::sync::atomic::{AtomicU32, Ordering};
 use heapless::CString;
 
 use openwa_core::rebase::rb;
-use openwa_core::wa::ddgame::DDGameWrapperHandle;
+use openwa_core::ddgame_wrapper::DDGameWrapper;
 use openwa_core::address::va::{self, game_info_offsets};
 use openwa_core::speech::SpeechLineTableEntry;
 
@@ -314,7 +314,7 @@ usercall_trampoline!(fn trampoline_load_speech_bank; impl_fn = load_speech_bank_
     reg = eax; stack_params = 3; ret_bytes = "0xC");
 
 unsafe extern "cdecl" fn load_speech_bank_impl(
-    ddgw: DDGameWrapperHandle,
+    ddgw: *const DDGameWrapper,
     team_index: u32,
     speech_base_path: *const u8,
     speech_dir: *const u8,
@@ -327,7 +327,7 @@ unsafe extern "cdecl" fn load_speech_bank_impl(
         .unwrap_or("?");
     let _ = log_line(&format!(
         "[Speech] LoadSpeechBank: team={} path=\"{}\" dir=\"{}\" ddgw=0x{:08X}",
-        team_index, path_str, dir_str, ddgw.0
+        team_index, path_str, dir_str, ddgw as u32
     ));
 
     let table_base = rb(va::SPEECH_LINE_TABLE) as *const SpeechLineTableEntry;
@@ -357,7 +357,7 @@ unsafe extern "cdecl" fn load_speech_bank_impl(
         let _ = full_path.extend_from_bytes(wav_path.as_bytes());
 
         let result = call_load_speech_wav(
-            ddgw.0,
+            ddgw as u32,
             team_index,
             entry.id,
             wav_path.as_ptr(),
@@ -368,7 +368,7 @@ unsafe extern "cdecl" fn load_speech_bank_impl(
             // Failed — try fallback with default speech dir if no more alternates
             let next_entry = &*table_base.add(i + 1);
             if next_entry.name_ptr.is_null() || next_entry.id != entry.id {
-                let game_info = ddgw.game_info() as *const u8;
+                let game_info = (*(*ddgw).ddgame).game_info as *const u8;
                 let default_dir =
                     game_info.add(game_info_offsets::DEFAULT_SPEECH_DIR as usize);
                 let default_base =
@@ -386,7 +386,7 @@ unsafe extern "cdecl" fn load_speech_bank_impl(
                 let _ = full_path2.extend_from_bytes(wav_path2.as_bytes());
 
                 call_load_speech_wav(
-                    ddgw.0,
+                    ddgw as u32,
                     team_index,
                     entry.id,
                     wav_path2.as_ptr(),
@@ -417,21 +417,23 @@ unsafe extern "cdecl" fn load_speech_bank_impl(
 usercall_trampoline!(fn trampoline_load_all_speech_banks;
     impl_fn = load_all_speech_banks_impl; reg = esi);
 
-unsafe extern "cdecl" fn load_all_speech_banks_impl(ddgw: DDGameWrapperHandle) {
-    // Clear speech slot table: DDGame+0x77E4, 0x5A0 bytes
-    core::ptr::write_bytes(ddgw.speech_slot_table(), 0, 0x5A0);
+unsafe extern "cdecl" fn load_all_speech_banks_impl(ddgw: *const DDGameWrapper) {
+    let ddgame = &mut *(*ddgw).ddgame;
+
+    // Clear speech slot table
+    ddgame.speech_slot_table.clear();
 
     // Read team count from GameInfo
-    let game_info = ddgw.game_info();
-    let team_count = (*game_info).speech_team_count as u32;
+    let game_info = &*ddgame.game_info;
+    let team_count = game_info.speech_team_count as u32;
 
     let _ = log_line(&format!(
         "[Speech] LoadAllSpeechBanks: ddgw=0x{:08X} teams={}",
-        ddgw.0, team_count
+        ddgw as u32, team_count
     ));
 
     // Load speech bank for each team
-    let gi = game_info as *const u8;
+    let gi = ddgame.game_info as *const u8;
     for i in 0..team_count {
         let team_offset = (i * game_info_offsets::SPEECH_TEAM_STRIDE) as usize;
         let base_path =

crates/openwa-wormkit/src/validation/mod.rs

@@ -281,7 +281,7 @@ fn validate_struct_offsets(result: &mut ValidationResult) {
     let _ = log_validation("");
     let _ = log_validation("  DDGame:");
     check_offset!(result, DDGame, landscape, 0x20);
-    check_offset!(result, DDGame, game_state, 0x24);
+    check_offset!(result, DDGame, game_info, 0x24);
     check_offset!(result, DDGame, arrow_sprites, 0x38);
     check_offset!(result, DDGame, arrow_gfxdirs, 0xB8);
     check_offset!(result, DDGame, display_gfx, 0x138);