style: cargo fmt, add automatic cargo fmt hook

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

.claude/settings.json

@@ -4,5 +4,18 @@
       "Bash(target/i686-pc-windows-msvc/release/openwa-debug resume:*)",
       "Bash(taskkill /f /im WA.exe)"
     ]
+  },
+  "hooks": {
+    "PostToolUse": [
+      {
+        "matcher": "Write|Edit|MultiEdit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "cd \"$CLAUDE_TOOL_INPUT_FILE_PATH\" && cargo fmt 2>/dev/null || cargo fmt --manifest-path \"$(git rev-parse --show-toplevel)/Cargo.toml\" 2>/dev/null || true"
+          }
+        ]
+      }
+    ]
   }
-}
+}

crates/openwa-config/src/lib.rs

@@ -28,7 +28,11 @@ fn from_env() -> Option<PathBuf> {
     let val = std::env::var_os("OPENWA_WA_PATH")?;
     let path = PathBuf::from(val);
     // Accept either a WA.exe path or a directory.
-    if path.extension().map(|e| e.eq_ignore_ascii_case("exe")).unwrap_or(false) {
+    if path
+        .extension()
+        .map(|e| e.eq_ignore_ascii_case("exe"))
+        .unwrap_or(false)
+    {
         path.parent().map(|p| p.to_path_buf())
     } else {
         Some(path)
@@ -50,13 +54,7 @@ fn from_registry() -> Option<PathBuf> {
 fn read_registry_sz(key: &[u8], value: &[u8], buf: &mut [u8]) -> Option<usize> {
     unsafe {
         let mut hkey: HKEY = std::ptr::null_mut();
-        let status = RegOpenKeyExA(
-            HKEY_CURRENT_USER,
-            key.as_ptr(),
-            0,
-            KEY_READ,
-            &mut hkey,
-        );
+        let status = RegOpenKeyExA(HKEY_CURRENT_USER, key.as_ptr(), 0, KEY_READ, &mut hkey);
         if status != 0 {
             return None;
         }

crates/openwa-core/src/address.rs

@@ -65,11 +65,10 @@ pub mod va {
     // Re-exported from audio modules
     pub use crate::audio::dssound::DS_SOUND_VTABLE;
     pub use crate::audio::music::{
-        MUSIC_CONSTRUCTOR, MUSIC_DESTRUCTOR, MUSIC_PLAY_TRACK, MUSIC_VOLUME_DB_TABLE,
-        MUSIC_VTABLE, STREAMING_AUDIO_FILL_AND_START, STREAMING_AUDIO_INIT,
-        STREAMING_AUDIO_INIT_PLAYBACK, STREAMING_AUDIO_OPEN, STREAMING_AUDIO_OPEN_WAV,
-        STREAMING_AUDIO_READ_CHUNK, STREAMING_AUDIO_RESET, STREAMING_AUDIO_STOP,
-        STREAMING_AUDIO_TIMER_CALLBACK,
+        MUSIC_CONSTRUCTOR, MUSIC_DESTRUCTOR, MUSIC_PLAY_TRACK, MUSIC_VOLUME_DB_TABLE, MUSIC_VTABLE,
+        STREAMING_AUDIO_FILL_AND_START, STREAMING_AUDIO_INIT, STREAMING_AUDIO_INIT_PLAYBACK,
+        STREAMING_AUDIO_OPEN, STREAMING_AUDIO_OPEN_WAV, STREAMING_AUDIO_READ_CHUNK,
+        STREAMING_AUDIO_RESET, STREAMING_AUDIO_STOP, STREAMING_AUDIO_TIMER_CALLBACK,
     };
     pub use crate::display::base::DISPLAY_BASE_VTABLE;
     pub use crate::display::dd_display::DD_DISPLAY_VTABLE;

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

@@ -212,19 +212,19 @@ pub struct MusicVtable {
 /// Track ID to WAV filename mapping (from PlayTrack switch at 0x58BD20).
 /// Track IDs 1-13 map to these filenames.
 pub const MUSIC_TRACKS: [&str; 13] = [
-    "ingame-01-generic.wav",        // 1
-    "ingame-02-cavern.wav",          // 2
-    "ingame-03-jungle.wav",          // 3
-    "ingame-04-battlezone.wav",      // 4
-    "ingame-05-forest.wav",          // 5
+    "ingame-01-generic.wav",          // 1
+    "ingame-02-cavern.wav",           // 2
+    "ingame-03-jungle.wav",           // 3
+    "ingame-04-battlezone.wav",       // 4
+    "ingame-05-forest.wav",           // 5
     "ingame-06-weird-alien-plan.wav", // 6
-    "ingame-07-outerspace.wav",      // 7
-    "ingame-08-desert.wav",          // 8
-    "ingame-09-hell.wav",            // 9
-    "ingame-10-mech-workshop.wav",   // 10
-    "ingame-11-rain&surf.wav",       // 11
-    "suddendeath2-loop.wav",         // 12
-    "suddendeath1-loop.wav",         // 13
+    "ingame-07-outerspace.wav",       // 7
+    "ingame-08-desert.wav",           // 8
+    "ingame-09-hell.wav",             // 9
+    "ingame-10-mech-workshop.wav",    // 10
+    "ingame-11-rain&surf.wav",        // 11
+    "suddendeath2-loop.wav",          // 12
+    "suddendeath1-loop.wav",          // 13
 ];
 
 /// Streaming audio flags.
@@ -250,12 +250,11 @@ pub mod streaming_flags {
 /// Copied from WA.exe .rdata at 0x6AF960.
 /// Index 0 = -10000 cB (silence), index 64 = 0 cB (full volume).
 const MUSIC_VOLUME_DB: [i32; 65] = [
-    -10000, -6644, -5644, -5059, -4644, -4322, -4059, -3837, -3644, -3473, -3322,
-    -3185, -3059, -2943, -2837, -2737, -2644, -2557, -2474, -2396, -2322, -2251,
-    -2184, -2119, -2059, -2000, -1943, -1889, -1837, -1787, -1737, -1690, -1644,
-    -1600, -1557, -1515, -1474, -1434, -1396, -1358, -1322, -1286, -1251, -1217,
-    -1184, -1151, -1119, -1088, -1059, -1028, -1000, -971, -943, -915, -889,
-    -862, -837, -811, -787, -762, -737, -714, -690, -667, 0,
+    -10000, -6644, -5644, -5059, -4644, -4322, -4059, -3837, -3644, -3473, -3322, -3185, -3059,
+    -2943, -2837, -2737, -2644, -2557, -2474, -2396, -2322, -2251, -2184, -2119, -2059, -2000,
+    -1943, -1889, -1837, -1787, -1737, -1690, -1644, -1600, -1557, -1515, -1474, -1434, -1396,
+    -1358, -1322, -1286, -1251, -1217, -1184, -1151, -1119, -1088, -1059, -1028, -1000, -971, -943,
+    -915, -889, -862, -837, -811, -787, -762, -737, -714, -690, -667, 0,
 ];
 
 // ============================================================
@@ -265,9 +264,7 @@ const MUSIC_VOLUME_DB: [i32; 65] = [
 use std::io::{Read, Seek, SeekFrom};
 use std::sync::atomic::{AtomicU32, Ordering};
 
-use windows::Win32::Media::Audio::DirectSound::{
-    IDirectSound, IDirectSoundBuffer, DSBUFFERDESC,
-};
+use windows::Win32::Media::Audio::DirectSound::{IDirectSound, IDirectSoundBuffer, DSBUFFERDESC};
 use windows::Win32::Media::Audio::{WAVEFORMATEX, WAVE_FORMAT_PCM};
 
 /// Global pointer to the active StreamingAudio for the timer callback.
@@ -294,7 +291,11 @@ impl StreamingAudio {
     pub fn init(&mut self) {
         // Zero everything except keep the struct's memory layout intact
         unsafe {
-            core::ptr::write_bytes(self as *mut Self as *mut u8, 0, core::mem::size_of::<Self>());
+            core::ptr::write_bytes(
+                self as *mut Self as *mut u8,
+                0,
+                core::mem::size_of::<Self>(),
+            );
         }
     }
 
@@ -303,12 +304,7 @@ impl StreamingAudio {
     /// `flags` is a combination of `streaming_flags` constants.
     /// `path` is the absolute path to the WAV file.
     /// `ds` is the IDirectSound instance for buffer creation.
-    pub unsafe fn open(
-        &mut self,
-        path: &str,
-        flags: u32,
-        ds: Ptr32,
-    ) -> bool {
+    pub unsafe fn open(&mut self, path: &str, flags: u32, ds: Ptr32) -> bool {
         // If already initialized, stop first
         if self.is_initialized != 0 {
             self.stop();
@@ -380,7 +376,8 @@ impl StreamingAudio {
             Ok(r) => r,
             Err(e) => {
                 let _ = crate::log::log_line(&format!(
-                    "[Music] init_playback: failed to open \"{}\": {}", path_str, e
+                    "[Music] init_playback: failed to open \"{}\": {}",
+                    path_str, e
                 ));
                 return false;
             }
@@ -423,8 +420,8 @@ impl StreamingAudio {
         // Compute buffer size matching original float arithmetic (constant at 0x679760 = 1000.0):
         //   per_tick = round(timer_delay_ms * avg_bytes_per_sec / 1000.0)
         //   ds_buffer_size = per_tick * buffer_segments
-        let per_tick = (self.timer_delay_ms as f64 * avg_bytes_per_sec as f64 / 1000.0)
-            .round() as u32;
+        let per_tick =
+            (self.timer_delay_ms as f64 * avg_bytes_per_sec as f64 / 1000.0).round() as u32;
         let buffer_bytes = per_tick * self.buffer_segments;
         self.ds_buffer_size = buffer_bytes;
 
@@ -522,9 +519,10 @@ impl StreamingAudio {
         }
 
         // Read from WAV file into buffer
-        let bytes_read = self.read_file_data(
-            core::slice::from_raw_parts_mut(ptr1 as *mut u8, len1 as usize),
-        );
+        let bytes_read = self.read_file_data(core::slice::from_raw_parts_mut(
+            ptr1 as *mut u8,
+            len1 as usize,
+        ));
 
         // Zero-fill remainder if we didn't fill the whole buffer
         if (bytes_read as u32) < len1 {
@@ -597,7 +595,6 @@ impl StreamingAudio {
         self.bytes_played_snapshot = 0;
     }
 
-
     /// Close the WAV file handle.
     unsafe fn close_file(&mut self) {
         if self.file_handle != 0 {
@@ -754,11 +751,7 @@ impl StreamingAudio {
                     }
                 } else {
                     // End of file: zero-fill remainder
-                    core::ptr::write_bytes(
-                        (ptr1 as *mut u8).add(read),
-                        0,
-                        len1 as usize - read,
-                    );
+                    core::ptr::write_bytes((ptr1 as *mut u8).add(read), 0, len1 as usize - read);
                     total_written += len1;
                 }
             } else {
@@ -786,11 +779,7 @@ impl StreamingAudio {
                         );
                     }
                 } else {
-                    core::ptr::write_bytes(
-                        (ptr2 as *mut u8).add(read),
-                        0,
-                        len2 as usize - read,
-                    );
+                    core::ptr::write_bytes((ptr2 as *mut u8).add(read), 0, len2 as usize - read);
                     total_written += len2;
                 }
             } else {
@@ -850,11 +839,7 @@ impl Music {
     ///
     /// `ds` is the IDirectSound instance (from DSSound).
     /// `base_path` is the music directory path (e.g. "DATA\\Music").
-    pub unsafe fn init(
-        this: *mut Music,
-        ds: Ptr32,
-        base_path: &str,
-    ) {
+    pub unsafe fn init(this: *mut Music, ds: Ptr32, base_path: &str) {
         // Zero the streaming sub-object
         (*this).streaming.init();
 
@@ -898,7 +883,9 @@ impl Music {
             flags |= streaming_flags::LOOP;
         }
 
-        let _ = (*this).streaming.open(&full_path, flags, (*this).direct_sound);
+        let _ = (*this)
+            .streaming
+            .open(&full_path, flags, (*this).direct_sound);
     }
 
     /// Start a specific music track (looping). Port of vtable[1] at 0x58BE70.
@@ -938,8 +925,7 @@ impl Music {
         if (*this).streaming.is_playing() {
             return;
         }
-        (*this).current_track_index =
-            ((*this).current_track_index + 1) % (*this).playlist_count;
+        (*this).current_track_index = ((*this).current_track_index + 1) % (*this).playlist_count;
         let track_id = (*this).playlist[(*this).current_track_index as usize];
         Music::play_track(this, track_id, false);
     }

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

@@ -36,4 +36,3 @@ impl SoundId {
         Self(self.0 & 0xFFFE_FFFF)
     }
 }
-

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

@@ -36,55 +36,55 @@ const MAX_PATH: usize = 260;
 /// Used for fanfare WAV file paths (e.g. "user\Fanfare\Finland.wav").
 /// Note: "Leichtenstein" is WA's original misspelling — must match for file lookup.
 const TEAM_CONFIG_NAMES: [&str; 49] = [
-    "UK",             // 0
-    "Argentina",      // 1
-    "Australia",      // 2
-    "Austria",        // 3
-    "Belgium",        // 4
-    "Brazil",         // 5
-    "Canada",         // 6
-    "Croatia",        // 7
-    "Simple",         // 8
-    "Cyprus",         // 9
-    "Simple",         // 10
-    "Denmark",        // 11
-    "Finland",        // 12
-    "France",         // 13
-    "Simple",         // 14
-    "Germany",        // 15
-    "Greece",         // 16
-    "Simple",         // 17
-    "Hungary",        // 18
-    "Iceland",        // 19
-    "India",          // 20
-    "Simple",         // 21
-    "Psycho Laugh",   // 22
-    "Psycho Laugh",   // 23
-    "Ireland",        // 24
-    "Israel",         // 25
-    "Italy",          // 26
-    "Japan",          // 27
-    "Leichtenstein",  // 28
-    "Luxembourg",     // 29
-    "Simple",         // 30
-    "Malta",          // 31
-    "Mexico",         // 32
-    "Morocco",        // 33
-    "Netherlands",    // 34
-    "New Zealand",    // 35
-    "Norway",         // 36
-    "Poland",         // 37
-    "Portugal",       // 38
-    "Simple",         // 39
-    "Romania",        // 40
-    "Russia",         // 41
-    "Singapore",      // 42
-    "South Africa",   // 43
-    "Spain",          // 44
-    "Sweden",         // 45
-    "Switzerland",    // 46
-    "Turkey",         // 47
-    "USA",            // 48
+    "UK",            // 0
+    "Argentina",     // 1
+    "Australia",     // 2
+    "Austria",       // 3
+    "Belgium",       // 4
+    "Brazil",        // 5
+    "Canada",        // 6
+    "Croatia",       // 7
+    "Simple",        // 8
+    "Cyprus",        // 9
+    "Simple",        // 10
+    "Denmark",       // 11
+    "Finland",       // 12
+    "France",        // 13
+    "Simple",        // 14
+    "Germany",       // 15
+    "Greece",        // 16
+    "Simple",        // 17
+    "Hungary",       // 18
+    "Iceland",       // 19
+    "India",         // 20
+    "Simple",        // 21
+    "Psycho Laugh",  // 22
+    "Psycho Laugh",  // 23
+    "Ireland",       // 24
+    "Israel",        // 25
+    "Italy",         // 26
+    "Japan",         // 27
+    "Leichtenstein", // 28
+    "Luxembourg",    // 29
+    "Simple",        // 30
+    "Malta",         // 31
+    "Mexico",        // 32
+    "Morocco",       // 33
+    "Netherlands",   // 34
+    "New Zealand",   // 35
+    "Norway",        // 36
+    "Poland",        // 37
+    "Portugal",      // 38
+    "Simple",        // 39
+    "Romania",       // 40
+    "Russia",        // 41
+    "Singapore",     // 42
+    "South Africa",  // 43
+    "Spain",         // 44
+    "Sweden",        // 45
+    "Switzerland",   // 46
+    "Turkey",        // 47
+    "USA",           // 48
 ];
 
 /// Look up a team config name by team_type (1-49). Returns "Simple" for out-of-range.
@@ -291,7 +291,8 @@ pub unsafe fn load_speech_wav(
     }
 
     let slot_idx = count as u32 + SpeechSlotTable::BUFFER_OFFSET;
-    let result = crate::audio::dssound::load_wav(wrapper.sound, slot_idx as i32, full_path as *const u8);
+    let result =
+        crate::audio::dssound::load_wav(wrapper.sound, slot_idx as i32, full_path as *const u8);
 
     if result != 0 {
         slot_table.set(team_index as usize, line_id, slot_idx);

crates/openwa-core/src/lib.rs

@@ -43,10 +43,10 @@ pub mod log;
 pub mod mem;
 pub mod rebase;
 pub mod registry;
+pub mod rng;
 pub mod snapshot;
 pub mod task;
 pub mod vtable;
 pub mod wa;
-pub mod rng;
 pub mod wa_alloc;
 pub mod wa_call;

crates/openwa-core/src/task/cloud.rs

@@ -254,4 +254,3 @@ impl CTaskCloud {
         }
     }
 }
-

crates/openwa-launcher/src/main.rs

@@ -294,4 +294,3 @@ fn path_to_cstring(p: &Path) -> Result<CString, String> {
     )
     .map_err(|e| format!("path contains nul byte: {e}"))
 }
-

crates/openwa-test-runner/src/main.rs

@@ -24,7 +24,6 @@ const TIMEOUT_SECS: u64 = 120;
 const REPLAYS_DIR: &str = "testdata/replays";
 const RUNS_DIR: &str = "testdata/runs";
 
-
 // ─── Types ──────────────────────────────────────────────────────────────────
 
 struct TestCase {
@@ -698,9 +697,7 @@ fn parse_headful_args(argv: &[String]) -> HeadfulArgs {
             "--timeout" | "-t" => {
                 i += 1;
                 if i < argv.len() {
-                    args.timeout_secs = argv[i]
-                        .parse()
-                        .unwrap_or(DEFAULT_HEADFUL_TIMEOUT_SECS);
+                    args.timeout_secs = argv[i].parse().unwrap_or(DEFAULT_HEADFUL_TIMEOUT_SECS);
                 }
             }
             s if !s.starts_with('-') && args.filter_or_replay.is_none() => {

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

@@ -16,8 +16,8 @@
 use std::ffi::{c_char, CStr};
 
 use openwa_core::address::va;
-use openwa_core::audio::{speech_ops, wav_player};
 use openwa_core::audio::wav_player::WavPlayer;
+use openwa_core::audio::{speech_ops, wav_player};
 use openwa_core::engine::DDGameWrapper;
 use openwa_core::rebase::rb;