refactor: eliminate raw pointer arithmetic in weapon_release.rs

Replace DDGame raw offset accesses with named struct fields and methods:
- render_slot_count (0x72E4), render_entries, render_state_flag
- game_info, game_state_stream, version_flag_3 (direct field access)
- team_sound_id() method for 0x7768+team*0xF0 sound table
- weapon_stat_counter() method for 0x40CC-0x40D8 indexed counters
- fire_params.spread for type-4 subtype-4 sound ID

Replace raw vtable dispatch for HandleMessage with typed
lookup_team_task() + CTaskTeam::handle_message() bind macro.
Make lookup_team_task pub(crate) for cross-module reuse.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

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

@@ -207,8 +207,13 @@ pub struct DDGame {
     pub game_speed: i32,
     /// 0x72DC: Game speed target (Fixed-point, 0x10000 = 1.0x).
     pub game_speed_target: i32,
-    /// 0x72E0-0x72EB: Unknown
-    pub _unknown_72e0: [u8; 0x72EC - 0x72E0],
+    /// 0x72E0-0x72E3: Unknown
+    pub _unknown_72e0: u32,
+    /// 0x72E4: Active render/weapon slot count. Reset to 14 (0x0E) by WeaponRelease
+    /// sync check, matching the render_entries array size.
+    pub render_slot_count: u32,
+    /// 0x72E8-0x72EB: Unknown
+    pub _unknown_72e8: u32,
     /// 0x72EC: RNG state word 1 (changes every frame).
     pub rng_state_1: u32,
     /// 0x72F0: RNG state word 2 (changes every frame).
@@ -437,6 +442,39 @@ impl DDGame {
         rng
     }
 
+    /// Read a per-team sound ID from the team sound table at DDGame+0x7768.
+    ///
+    /// The table has stride 0xF0 per team (240-byte per-team config blocks).
+    /// The u32 at the base of each block is a sound ID used for type-2 (rope)
+    /// weapon release sounds.
+    ///
+    /// # Safety
+    /// `team_id` must be a valid team index (0–5).
+    pub unsafe fn team_sound_id(&self, team_id: u32) -> u32 {
+        let base = (self as *const DDGame as *const u8).add(0x7768);
+        *(base.add((team_id as usize) * 0xF0) as *const u32)
+    }
+
+    /// Get a mutable pointer to a per-team/per-worm weapon stat counter.
+    ///
+    /// Four counters exist at DDGame base offsets 0x40CC, 0x40D0, 0x40D4, 0x40D8,
+    /// indexed by `team_id * 0x51C + worm_id * 0x9C` (same stride as FullTeamBlock
+    /// and WormEntry). These track weapon usage stats during gameplay.
+    ///
+    /// # Safety
+    /// `team_id` and `worm_id` must be valid indices.
+    pub unsafe fn weapon_stat_counter(
+        &mut self,
+        team_id: u32,
+        worm_id: u32,
+        base_offset: usize,
+    ) -> *mut i32 {
+        (self as *mut DDGame as *mut u8)
+            .add(base_offset)
+            .add((team_id as usize) * 0x51C)
+            .add((worm_id as usize) * 0x9C) as *mut i32
+    }
+
     /// Show the "too many objects" warning on the HUD.
     ///
     /// Sets `hud_status_code = 6` and loads string resource 0x70F into

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

@@ -422,7 +422,7 @@ fn can_fire_subtype16(state: u32) -> bool {
 /// Look up the CTaskTeam entity for a worm via SharedData.
 ///
 /// Returns null if not found.
-unsafe fn lookup_team_task(worm: *const CTaskWorm) -> *mut openwa_core::task::CTaskTeam {
+pub(crate) unsafe fn lookup_team_task(worm: *const CTaskWorm) -> *mut openwa_core::task::CTaskTeam {
     use openwa_core::task::{SharedDataTable, Task};
 
     let table = SharedDataTable::from_task((*worm).as_task_ptr());

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

@@ -9,7 +9,7 @@ use openwa_core::address::va;
 use openwa_core::log::log_line;
 use openwa_core::rebase::rb;
 use openwa_core::task::worm::CTaskWorm;
-use openwa_core::task::{CGameTask, SharedDataTable, Task};
+use openwa_core::task::{CGameTask, Task};
 
 use crate::hook::{self, usercall_trampoline};
 use crate::replacements::{sound, weapon};
@@ -107,14 +107,12 @@ unsafe extern "cdecl" fn weapon_release_impl(
 
     // ── 1. Sync check ───────────────────────────────────────
     if w.fire_sync_frame_1 == w.fire_sync_frame_2 {
-        let ddgame = w.ddgame() as *mut u8;
-        *(ddgame.add(0x72E4) as *mut u32) = 0x0E;
-        let mut offset = 0u32;
-        while (offset as i32) < 0x118 {
-            *(ddgame.add(0x73B0).add(offset as usize) as *mut u32) = 0;
-            offset += 0x14;
+        let g = &mut *w.ddgame();
+        g.render_slot_count = 0x0E;
+        for entry in &mut g.render_entries {
+            entry.active = 0;
         }
-        *(ddgame.add(0x739C) as *mut u32) = 0;
+        g.render_state_flag = 0;
     }
 
     // ── 2. Populate context fields ──────────────────────────
@@ -185,11 +183,9 @@ unsafe extern "cdecl" fn weapon_release_impl(
     }
 
     // ── 5. Network timing ───────────────────────────────────
-    let ddgame_ptr = w.ddgame();
-    let ddgame_raw = ddgame_ptr as *const u8;
-    let ptr_at_24 = *(ddgame_raw.add(0x24) as *const *const u8);
-    let is_network = *ptr_at_24.add(0xD9D0);
-    let fe_version = *ptr_at_24.add(0xD9B1);
+    let game_info = (*w.ddgame()).game_info as *const u8;
+    let is_network = *game_info.add(0xD9D0);
+    let fe_version = *game_info.add(0xD9B1);
 
     let mut adjust = 0i32;
     let max_clients = if is_network == 0 {
@@ -227,20 +223,10 @@ unsafe extern "cdecl" fn weapon_release_impl(
     );
     write_u32(&mut msg_buf, 0x1C, weapon_id);
 
-    let table = SharedDataTable::from_task((*worm).as_task_ptr());
-    let team_entity = table.lookup(0, 0x14);
-    if !team_entity.is_null() {
-        let vtable = *(team_entity as *const *const usize);
-        let handle_msg: unsafe extern "thiscall" fn(
-            *mut u8,
-            *mut u8,
-            u32,
-            u32,
-            *const u8,
-        ) = core::mem::transmute(*vtable.add(2));
-        handle_msg(
-            team_entity as *mut u8,
-            (*worm).as_task_ptr_mut() as *mut u8,
+    let team = weapon::lookup_team_task(worm);
+    if !team.is_null() {
+        (*team).handle_message(
+            (*worm).as_task_ptr_mut(),
             0x49,
             0x408,
             msg_buf.as_ptr(),
@@ -248,42 +234,25 @@ unsafe extern "cdecl" fn weapon_release_impl(
     }
 
     // ── 8. Weapon stat counters ─────────────────────────────
-    let ddgame = (*worm).ddgame() as *mut u8;
+    let g = &mut *(*worm).ddgame();
     let team_id = (*worm).team_index;
     let worm_id = (*worm).worm_index;
-    let current_weapon_byte = *ddgame.add(0x7E3F);
-
-    if is_super_weapon(weapon_id, current_weapon_byte) {
-        let counter = ddgame
-            .add(0x40D8)
-            .add((team_id * 0x51C) as usize)
-            .add((worm_id * 0x9C) as usize) as *mut i32;
-        *counter += 1;
+
+    if is_super_weapon(weapon_id, g.version_flag_3) {
+        *g.weapon_stat_counter(team_id, worm_id, 0x40D8) += 1;
     }
 
     // Range 0x3E..=0x46
     if weapon_id.wrapping_sub(0x3E) <= 8 {
-        let counter = ddgame
-            .add(0x40D4)
-            .add((team_id * 0x51C) as usize)
-            .add((worm_id * 0x9C) as usize) as *mut i32;
-        *counter += 1;
+        *g.weapon_stat_counter(team_id, worm_id, 0x40D4) += 1;
     }
 
     if is_weapon_category_a(weapon_id) {
-        let counter = ddgame
-            .add(0x40D0)
-            .add((team_id * 0x51C) as usize)
-            .add((worm_id * 0x9C) as usize) as *mut i32;
-        *counter += 1;
+        *g.weapon_stat_counter(team_id, worm_id, 0x40D0) += 1;
     }
 
     if is_weapon_category_b(weapon_id) {
-        let counter = ddgame
-            .add(0x40CC)
-            .add((team_id * 0x51C) as usize)
-            .add((worm_id * 0x9C) as usize) as *mut i32;
-        *counter += 1;
+        *g.weapon_stat_counter(team_id, worm_id, 0x40CC) += 1;
     }
 
     // ── 9. Sound dispatch + 10. Visual effect ───────────────
@@ -342,10 +311,7 @@ unsafe extern "cdecl" fn weapon_release_impl(
         }
         2 => {
             if w._unknown_2cc == 0 || w._unknown_2c8 == 1 {
-                // Team sound from DDGame+0x7768 + team_id * 0xF0
-                let ddgame = w.ddgame() as *const u8;
-                let team_sound_offset = (team_id as usize) * 0xF0 + 0x7768;
-                let team_sound = *(ddgame.add(team_sound_offset) as *const u32);
+                let team_sound = (*w.ddgame()).team_sound_id(team_id);
                 sound::play_sound_local(task, team_sound, 3, 0x10000, 0x10000);
             }
         }
@@ -360,8 +326,8 @@ unsafe extern "cdecl" fn weapon_release_impl(
                     sound::play_sound_local(task, sound_id, 3, 0x10000, 0x10000);
                 }
                 4 => {
-                    let sound_id = *((&raw const (*entry).fire_params as *const u8).add(4)
-                        as *const u32);
+                    // Sound ID at entry+0x40 = fire_params.spread (polymorphic use)
+                    let sound_id = (*entry).fire_params.spread as u32;
                     sound::play_sound_local(task, sound_id, 3, 0x10000, 0x10000);
                 }
                 10 => {
@@ -383,7 +349,7 @@ unsafe extern "cdecl" fn weapon_release_impl(
     // ── 10. Visual effect (if triggered by sound dispatch) ──
     if do_effect {
         let ddgame = &mut *(*worm).ddgame();
-        let gfx_handler = *((&raw const *ddgame as *const u8).add(0x528) as *const *const u8);
+        let gfx_handler = ddgame.game_state_stream as *const u8;
         let palette = *(gfx_handler.add(0x22C) as *const u32);
 
         let rng1 = ddgame.advance_effect_rng();