fix: split SoundId into newtype + KnownSoundId enum

SoundId is now an opaque newtype wrapping u32, accepting any WA sound
ID including speech/voice lines (IDs > 126). The known SFX enum is
renamed to KnownSoundId with From<KnownSoundId> for SoundId.

Fixes worm voice lines being silently dropped — the previous refactoring
made hook trampolines reject IDs outside the 1-126 enum range via
TryFrom, but WA's speech system uses higher IDs. Hooks now wrap the
raw u32 in SoundId unconditionally.

play_sound_local accepts impl Into<SoundId> so both KnownSoundId
variants and raw SoundId values work at call sites. Dynamic sound IDs
from weapon table data use SoundId(raw) directly.

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

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

@@ -15,6 +15,6 @@ pub use dssound::{
 };
 pub use dssound::{ChannelDescriptor, DSSound, DSSoundVtable};
 pub use music::Music;
-pub use sound::SoundId;
+pub use sound::{KnownSoundId, SoundId};
 pub use speech::{SpeechLineId, SpeechLineTableEntry, SpeechSlotTable, SPEECH_LINE_TABLE_COUNT};
 pub use streaming::StreamingAudio;

crates/openwa-core/src/audio/sound.rs

@@ -1,9 +1,23 @@
-/// Sound effect IDs. Range 1-126, contiguous.
+/// Opaque sound ID. WA uses a wider range than just the known SFX enum
+/// (e.g., speech/voice lines use IDs above 126). This newtype wraps the
+/// raw u32 value and can be constructed from [`KnownSoundId`] variants.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+#[repr(transparent)]
+pub struct SoundId(pub u32);
+
+impl From<KnownSoundId> for SoundId {
+    #[inline]
+    fn from(known: KnownSoundId) -> Self {
+        Self(known as u32)
+    }
+}
+
+/// Known sound effect IDs. Range 1-126, contiguous.
 ///
 /// Source: wkJellyWorm Constants.h
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 #[repr(u32)]
-pub enum SoundId {
+pub enum KnownSoundId {
     Morse = 1,
     CrowdPart1 = 2,
     CrowdPart2 = 3,
@@ -132,12 +146,12 @@ pub enum SoundId {
     RocketPowerdown = 126,
 }
 
-impl SoundId {
+impl KnownSoundId {
     pub const MIN: u32 = 1;
     pub const MAX: u32 = 126;
 }
 
-impl TryFrom<u32> for SoundId {
+impl TryFrom<u32> for KnownSoundId {
     type Error = u32;
 
     fn try_from(value: u32) -> Result<Self, Self::Error> {

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

@@ -10,7 +10,7 @@
 use std::sync::atomic::Ordering;
 
 use openwa_core::address::va;
-use openwa_core::audio::{play_sound, play_sound_pooled, SoundId};
+use openwa_core::audio::{play_sound, play_sound_pooled, KnownSoundId, SoundId};
 use openwa_core::engine::{DDGame, DDGameWrapper, SoundQueueEntry};
 use openwa_core::fixed::Fixed;
 use openwa_core::task::{CGameTask, CTask};
@@ -42,7 +42,7 @@ pub unsafe fn queue_sound(
     }
     let entry = &mut g.sound_queue[g.sound_queue_count as usize];
     *entry = SoundQueueEntry {
-        sound_id: sound_id as u32,
+        sound_id: sound_id.0,
         flags,
         volume: volume.0 as u32,
         pitch: pitch.0 as u32,
@@ -70,7 +70,7 @@ unsafe extern "thiscall" fn hook_play_sound_global(
     pitch: Fixed,
 ) -> u32 {
     if SOUND_LOG_ENABLED.load(Ordering::Relaxed) {
-        let sound_name = SoundId::try_from(sound_id)
+        let sound_name = KnownSoundId::try_from(sound_id)
             .map(|s| format!("{s:?}"))
             .unwrap_or_else(|v| format!("#{v}"));
         let _ = log_line(&format!(
@@ -79,11 +79,7 @@ unsafe extern "thiscall" fn hook_play_sound_global(
         ));
     }
 
-    let sid = match SoundId::try_from(sound_id) {
-        Ok(s) => s,
-        Err(_) => return 0,
-    };
-    queue_sound((*this).base.ddgame, sid, flags, volume, pitch).is_some() as u32
+    queue_sound((*this).base.ddgame, SoundId(sound_id), flags, volume, pitch).is_some() as u32
 }
 
 // ============================================================
@@ -103,7 +99,7 @@ unsafe extern "cdecl" fn play_sound_local_impl(
     flags: u32,
 ) -> u32 {
     if SOUND_LOG_ENABLED.load(Ordering::Relaxed) {
-        let sound_name = SoundId::try_from(sound_id)
+        let sound_name = KnownSoundId::try_from(sound_id)
             .map(|s| format!("{s:?}"))
             .unwrap_or_else(|v| format!("#{v}"));
         let _ = log_line(&format!(
@@ -112,13 +108,9 @@ unsafe extern "cdecl" fn play_sound_local_impl(
         ));
     }
 
-    let sid = match SoundId::try_from(sound_id) {
-        Ok(s) => s,
-        Err(_) => return 0,
-    };
     let gt = &*task;
     let ddgame = gt.base.ddgame;
-    let entry = match queue_sound(ddgame, sid, flags, volume, pitch) {
+    let entry = match queue_sound(ddgame, SoundId(sound_id), flags, volume, pitch) {
         Some(e) => e,
         None => return 0,
     };
@@ -145,14 +137,14 @@ unsafe extern "cdecl" fn play_sound_local_impl(
 /// increments the task's local sound count. Returns true on success.
 pub(crate) unsafe fn play_sound_local(
     task: *mut CGameTask,
-    sound_id: SoundId,
+    sound_id: impl Into<SoundId>,
     flags: u32,
     volume: Fixed,
     pitch: Fixed,
 ) -> bool {
     let gt = &*task;
     let ddgame = gt.base.ddgame;
-    let entry = match queue_sound(ddgame, sound_id, flags, volume, pitch) {
+    let entry = match queue_sound(ddgame, sound_id.into(), flags, volume, pitch) {
         Some(e) => e,
         None => return false,
     };

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

@@ -16,7 +16,7 @@
 use core::sync::atomic::{AtomicU32, Ordering};
 
 use openwa_core::address::va;
-use openwa_core::audio::SoundId;
+use openwa_core::audio::KnownSoundId;
 use openwa_core::engine::ddgame::{self, TeamArenaRef};
 use openwa_core::fixed::Fixed;
 use openwa_core::game::weapon::{WeaponEntry, WeaponFireParams, WeaponSpawnData};
@@ -614,7 +614,7 @@ unsafe fn fire_indian_nuclear_test(worm: *mut CTaskWorm) {
     }
 
     // PlaySoundGlobal(IndianAnthem, 8, 0x10000, 0x10000)
-    sound::queue_sound(ddgame, SoundId::IndianAnthem, 8, Fixed::ONE, Fixed::ONE);
+    sound::queue_sound(ddgame, KnownSoundId::IndianAnthem.into(), 8, Fixed::ONE, Fixed::ONE);
 
     // Message 0x51 (PoisonWorm): buf[0]=shot_count, buf[4]=2, buf[8]=team_index
     let team = lookup_team_task(worm);
@@ -627,7 +627,7 @@ unsafe fn fire_indian_nuclear_test(worm: *mut CTaskWorm) {
     }
 
     // PlaySoundGlobal(NukeFlash, 5, 0x10000, 0x10000)
-    sound::queue_sound(ddgame, SoundId::NukeFlash, 5, Fixed::ONE, Fixed::ONE);
+    sound::queue_sound(ddgame, KnownSoundId::NukeFlash.into(), 5, Fixed::ONE, Fixed::ONE);
 }
 
 // ── Air Strike sub-function bridges ───────────────────────

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

@@ -6,7 +6,7 @@
 //! Convention: usercall(EAX=CTaskWorm*) + 4 stack params, RET 0x10.
 
 use openwa_core::address::va;
-use openwa_core::audio::SoundId;
+use openwa_core::audio::{KnownSoundId, SoundId};
 use openwa_core::fixed::Fixed;
 use openwa_core::game::Weapon;
 use openwa_core::log::log_line;
@@ -304,11 +304,11 @@ unsafe extern "cdecl" fn weapon_release_impl(
                     effect_state = 0x73;
                 }
                 2 => {
-                    sound::play_sound_local(task, SoundId::ThrowRelease, 3, Fixed::ONE, Fixed::ONE);
+                    sound::play_sound_local(task, KnownSoundId::ThrowRelease, 3, Fixed::ONE, Fixed::ONE);
                     call_stop_worm_sound(worm, stop_worm_sound_addr);
                 }
                 3 | 7 | 0xB | 0xC => {
-                    sound::play_sound_local(task, SoundId::RocketRelease, 3, Fixed::ONE, Fixed::ONE);
+                    sound::play_sound_local(task, KnownSoundId::RocketRelease, 3, Fixed::ONE, Fixed::ONE);
                     call_stop_worm_sound(worm, stop_worm_sound_addr);
                 }
                 4 => {
@@ -319,17 +319,17 @@ unsafe extern "cdecl" fn weapon_release_impl(
                     effect_state = 0x73;
                 }
                 5 => {
-                    sound::play_sound_local(task, SoundId::ShotgunFire, 3, Fixed::ONE, Fixed::ONE);
+                    sound::play_sound_local(task, KnownSoundId::ShotgunFire, 3, Fixed::ONE, Fixed::ONE);
                     do_effect = true;
                     effect_state = 0x75;
                 }
                 6 => {
-                    sound::play_sound_local(task, SoundId::HandgunFire, 3, Fixed::ONE, Fixed::ONE);
+                    sound::play_sound_local(task, KnownSoundId::HandgunFire, 3, Fixed::ONE, Fixed::ONE);
                     do_effect = true;
                     effect_state = 0x73;
                 }
                 10 => {
-                    sound::play_sound_local(task, SoundId::LongbowRelease, 3, Fixed::ONE, Fixed::ONE);
+                    sound::play_sound_local(task, KnownSoundId::LongbowRelease, 3, Fixed::ONE, Fixed::ONE);
                     call_stop_worm_sound(worm, stop_worm_sound_addr);
                 }
                 _ => {}
@@ -338,9 +338,7 @@ unsafe extern "cdecl" fn weapon_release_impl(
         Ok(FireType::Rope) => {
             if w._unknown_2cc == 0 || w._unknown_2c8 == 1 {
                 let team_sound_raw = (*w.ddgame()).team_sound_id(team_id);
-                if let Ok(sid) = SoundId::try_from(team_sound_raw) {
-                    sound::play_sound_local(task, sid, 3, Fixed::ONE, Fixed::ONE);
-                }
+                sound::play_sound_local(task, SoundId(team_sound_raw), 3, Fixed::ONE, Fixed::ONE);
             }
         }
         // Type 3 (Strike): no sound
@@ -349,23 +347,19 @@ unsafe extern "cdecl" fn weapon_release_impl(
             match S::try_from((*entry).special_subtype) {
                 Ok(S::PneumaticDrill) => {
                     sound::play_sound_local(
-                        task, SoundId::BaseballBatRelease, 3, Fixed::ONE, Fixed::ONE,
+                        task, KnownSoundId::BaseballBatRelease, 3, Fixed::ONE, Fixed::ONE,
                     );
                 }
                 Ok(S::Girder) => {
-                    if let Ok(sid) = SoundId::try_from((*entry).fire_method as u32) {
-                        sound::play_sound_local(task, sid, 3, Fixed::ONE, Fixed::ONE);
-                    }
+                    sound::play_sound_local(task, SoundId((*entry).fire_method as u32), 3, Fixed::ONE, Fixed::ONE);
                 }
                 Ok(S::BaseballBat) => {
                     // Sound ID from fire_params.spread (polymorphic use of field)
-                    if let Ok(sid) = SoundId::try_from((*entry).fire_params.spread as u32) {
-                        sound::play_sound_local(task, sid, 3, Fixed::ONE, Fixed::ONE);
-                    }
+                    sound::play_sound_local(task, SoundId((*entry).fire_params.spread as u32), 3, Fixed::ONE, Fixed::ONE);
                 }
                 Ok(S::AirStrike) => {
                     if w._unknown_208 == 0 {
-                        sound::play_sound_local(task, SoundId::Teleport, 3, Fixed::ONE, Fixed::ONE);
+                        sound::play_sound_local(task, KnownSoundId::Teleport, 3, Fixed::ONE, Fixed::ONE);
                     }
                 }
                 Ok(S::ScalesOfJustice) => {