refactor: replace raw DDGame pointers with typed *mut DDGame

Change CTask.ddgame, DDGameWrapper.ddgame, and PCLandscape.ddgame from
*mut u8 to *mut DDGame. Add named struct fields for crosshair line
params (0x7324/0x732C), fill_pixel (0x7338), and level dimensions
(0x77C0-0x77C8). Remove redundant casts and raw pointer arithmetic
in sound.rs, render.rs, input.rs, and validation.

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

crates/openwa-types/src/ddgame.rs

@@ -76,20 +76,44 @@ pub struct DDGame {
     pub _unknown_528: [u8; 0x20],
     /// 0x548: Weapon panel pointer
     pub weapon_panel: *mut u8,
-    /// 0x54C-0x7EFF: Sparse fields (see offsets module)
+    /// 0x54C-0x7323: Sparse fields (see offsets module)
     ///
     /// Known landmarks:
     /// - 0x64D8: cleared by init
     /// - 0x72A4: cleared by init
-    /// - 0x730C-0x732C: 9 GfxDir color entries
-    /// - 0x7338: fill pixel value
-    /// - 0x77C4: display-related value
-    /// - 0x7EF8: flag from game_state+0xF914
-    /// - 0x7EFC: init 1
+    /// - 0x730C-0x731C: 5 GfxDir color entries
     ///
     /// Also includes FUN_00526120 zeroed offsets at stride 0x194:
     /// 0x379C, 0x3930, 0x3AC4, 0x3C58, 0x3DEC, 0x3F80, 0x4114, 0x42A8, 0x443C, 0x45D0
-    pub _unknown_54c: [u8; 0x7F00 - 0x54C],
+    pub _unknown_54c: [u8; 0x7324 - 0x54C],
+
+    /// 0x7324: Crosshair line color param (DrawPolygon param_2).
+    /// Part of GfxDir color entries at 0x730C.
+    pub crosshair_line_color: u32,
+    /// 0x7328: Unknown (between crosshair params)
+    pub _unknown_7328: [u8; 4],
+    /// 0x732C: Crosshair line style param (DrawPolygon param_1).
+    pub crosshair_line_style: u32,
+    /// 0x7330-0x7337: Unknown
+    pub _unknown_7330: [u8; 8],
+    /// 0x7338: Fill pixel value
+    pub fill_pixel: u32,
+    /// 0x733C-0x77BF: Unknown
+    pub _unknown_733c: [u8; 0x77C0 - 0x733C],
+
+    /// 0x77C0: Level width in pixels (set by PCLandscape constructor).
+    pub level_width: u32,
+    /// 0x77C4: Level height in pixels (set by PCLandscape constructor).
+    pub level_height: u32,
+    /// 0x77C8: Total pixels (width × height).
+    pub level_total_pixels: u32,
+
+    /// 0x77CC-0x7EFF: Unknown
+    ///
+    /// Known landmarks:
+    /// - 0x7EF8: flag from game_state+0xF914
+    /// - 0x7EFC: init 1
+    pub _unknown_77cc: [u8; 0x7F00 - 0x77CC],
 
     // === Sound queue (0x7F00-0x8143) ===
     /// 0x7F00: Sound queue (16 entries, stride 0x24). Appended by PlaySoundGlobal.
@@ -178,12 +202,6 @@ pub mod offsets {
     pub const FIELD_64D8: usize = 0x64D8;
     pub const FIELD_72A4: usize = 0x72A4;
     pub const GFX_COLOR_ENTRIES: usize = 0x730C;
-    /// Crosshair line color param (DrawPolygon param_2). Part of GfxDir color entries.
-    pub const CROSSHAIR_LINE_PARAM_2: usize = 0x7324;
-    /// Crosshair line style param (DrawPolygon param_1). Part of GfxDir color entries.
-    pub const CROSSHAIR_LINE_PARAM_1: usize = 0x732C;
-    pub const FILL_PIXEL: usize = 0x7338;
-    pub const DISPLAY_77C4: usize = 0x77C4;
     pub const FLAG_7EF8: usize = 0x7EF8;
     pub const FIELD_7EFC: usize = 0x7EFC;
     /// Scale factor used by DrawCrosshairLine (multiplied by 0x140000).

crates/openwa-types/src/ddgame_wrapper.rs

@@ -1,3 +1,5 @@
+use crate::ddgame::DDGame;
+
 /// DDGameWrapper — large wrapper around DDGame.
 ///
 /// Created by DDGameWrapper__Constructor (0x56DEF0).
@@ -20,7 +22,7 @@ pub struct DDGameWrapper {
     /// 0x004-0x487: Unknown fields
     pub _unknown_004: [u8; 0x484],
     /// 0x488: Pointer to DDGame allocation (DWORD index 0x122)
-    pub ddgame: *mut u8,
+    pub ddgame: *mut DDGame,
     /// 0x48C: Secondary DDGame struct pointer (0x2C bytes, conditional)
     pub ddgame_secondary: *mut u8,
     /// 0x490-0x4BF: Unknown

crates/openwa-types/src/landscape.rs

@@ -1,3 +1,5 @@
+use crate::ddgame::DDGame;
+
 /// PCLandscape — terrain/landscape subsystem (0xB40 bytes).
 ///
 /// Created by `PCLandscape__Constructor` (0x57ACB0). Vtable: 0x66B208 (32 slots).
@@ -24,7 +26,7 @@ pub struct PCLandscape {
     /// 0x000: Vtable pointer (0x66B208)
     pub vtable: *mut u8,
     /// 0x004: Parent DDGame pointer (param_1[1])
-    pub ddgame: *mut u8,
+    pub ddgame: *mut DDGame,
     /// 0x008-0x0CB: Pre-rendered crater sprites for 15 explosion sizes.
     /// param_1[2..17]: crater image ptrs, param_1[18..33]: secondary ptrs.
     /// Indexed by `explosion_size * 15 / 100`.

crates/openwa-types/src/task.rs

@@ -1,4 +1,5 @@
 use crate::class_type::ClassType;
+use crate::ddgame::DDGame;
 use crate::fixed::Fixed;
 
 /// Base task class in WA's entity hierarchy.
@@ -44,7 +45,7 @@ pub struct CTask {
     /// 0x28: 1 if this task owns shared_data (root), 0 if inherited from parent
     pub owns_shared_data: u32,
     /// 0x2C: DDGame pointer (3rd param to CTask::Constructor, stored at this+0x2C)
-    pub ddgame: *mut u8,
+    pub ddgame: *mut DDGame,
 }
 
 const _: () = assert!(core::mem::size_of::<CTask>() == 0x30);

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

@@ -17,22 +17,23 @@ use crate::log_line;
 use openwa_lib::rebase::rb;
 use openwa_types::address::va;
 use openwa_types::ddgame::DDGame;
+use openwa_types::ddgame_wrapper::DDGameWrapper;
 
 /// Trampoline to the original TurnManager_ProcessFrame.
 static ORIG_TURN_MANAGER: AtomicU32 = AtomicU32::new(0);
 
-/// Get the DDGame pointer (session+0xA0 → DDGameWrapper+0x488).
+/// Get the DDGame pointer (session+0xA0 → DDGameWrapper.ddgame).
 #[inline]
 unsafe fn get_ddgame() -> *mut DDGame {
     let session = *(rb(va::G_GAME_SESSION) as *const u32);
     if session == 0 {
         return core::ptr::null_mut();
     }
-    let wrapper = *((session + 0xA0) as *const u32);
-    if wrapper == 0 {
+    let wrapper_ptr = *((session + 0xA0) as *const *const DDGameWrapper);
+    if wrapper_ptr.is_null() {
         return core::ptr::null_mut();
     }
-    *((wrapper + 0x488) as *const *mut DDGame)
+    (*wrapper_ptr).ddgame
 }
 
 /// Hook for TurnManager_ProcessFrame (stdcall, 1 param = TurnGame*).

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

@@ -5,7 +5,6 @@
 
 use openwa_lib::rebase::rb;
 use openwa_types::address::va;
-use openwa_types::ddgame::{offsets as dg, DDGame};
 use openwa_types::render::*;
 use openwa_types::task::{BungeeTrailTask, WeaponAimTask};
 
@@ -380,7 +379,7 @@ unsafe extern "stdcall" fn draw_bungee_trail_impl(
         return;
     }
 
-    let ddgame = &*(task.base.ddgame as *const DDGame);
+    let ddgame = &*task.base.ddgame;
     let rq = &mut *ddgame.render_queue;
 
     let seg_data = task.segment_data;
@@ -504,7 +503,7 @@ unsafe extern "cdecl" fn draw_crosshair_line_impl(task_ptr: u32) {
         return;
     }
 
-    let ddgame = &*(gt.base.ddgame as *const DDGame);
+    let ddgame = &*gt.base.ddgame;
     let rq = &mut *ddgame.render_queue;
 
     let start_x = gt.pos_x.0;
@@ -554,9 +553,8 @@ unsafe extern "cdecl" fn draw_crosshair_line_impl(task_ptr: u32) {
     }
 
     // Enqueue polygon line (2 vertices)
-    let ddgame_ptr = ddgame as *const DDGame as *const u8;
-    let poly_param_1 = *(ddgame_ptr.add(dg::CROSSHAIR_LINE_PARAM_1) as *const u32);
-    let poly_param_2 = *(ddgame_ptr.add(dg::CROSSHAIR_LINE_PARAM_2) as *const u32);
+    let poly_param_1 = ddgame.crosshair_line_style;
+    let poly_param_2 = ddgame.crosshair_line_color;
     let verts: [[i32; 3]; 2] = [
         [start_x, start_y, 0],
         [endpoint_x, endpoint_y, 0],

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

@@ -80,7 +80,7 @@ unsafe extern "thiscall" fn hook_play_sound_global(
     }
 
     let task = &*(this as *const CGameTask);
-    queue_sound(task.base.ddgame as *mut DDGame, sound_id, flags, volume, pitch).is_some() as u32
+    queue_sound(task.base.ddgame, sound_id, flags, volume, pitch).is_some() as u32
 }
 
 // ============================================================
@@ -110,7 +110,7 @@ unsafe extern "cdecl" fn play_sound_local_impl(
     }
 
     let gt = &*(task as *const CGameTask);
-    let ddgame = gt.base.ddgame as *mut DDGame;
+    let ddgame = gt.base.ddgame;
     let entry = match queue_sound(ddgame, sound_id, flags, volume, pitch) {
         Some(e) => e,
         None => return 0,

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

@@ -617,7 +617,7 @@ fn dump_landscape() {
         let _ = log_validation(&format!("  vtable: 0x{:08X} (expected 0x{:08X}) {}",
             land.vtable as u32, expected_vt, if vt_ok { "OK" } else { "MISMATCH" }));
 
-        let _ = log_validation(&format!("  ddgame: 0x{:08X}", land.ddgame as u32));
+        let _ = log_validation(&format!("  ddgame: 0x{:08X}", land.ddgame as usize));
         let _ = log_validation(&format!("  _unknown_900: 0x{:08X}", land._unknown_900 as u32));
         let _ = log_validation(&format!("  collision_bitmap: 0x{:08X}", land.collision_bitmap as u32));
         let _ = log_validation(&format!("  initialized: {}", land.initialized));
@@ -671,13 +671,10 @@ fn dump_landscape() {
         let _ = log_validation(&format!("  level_dir_path: {:?}", level_path));
         let _ = log_validation(&format!("  theme_dir_path: {:?}", theme_path));
 
-        let ddgame_ptr = land.ddgame as u32;
-        if ddgame_ptr != 0 {
-            let level_w = read_u32(ddgame_ptr + 0x77C0);
-            let level_h = read_u32(ddgame_ptr + 0x77C4);
-            let level_total = read_u32(ddgame_ptr + 0x77C8);
+        if !land.ddgame.is_null() {
+            let dg = &*land.ddgame;
             let _ = log_validation(&format!("  DDGame level dims: {}x{} (total={})",
-                level_w, level_h, level_total));
+                dg.level_width, dg.level_height, dg.level_total_pixels));
         }
 
         let _ = log_validation("  Vtable slots:");