refactor: fully type CTaskCloud handler — no raw offsets

Replace all raw pointer arithmetic in CTaskCloud::HandleMessage with
typed DDGame fields. Render path now uses RenderQueue::alloc directly
instead of delegating to original WA function.

New/renamed DDGame fields:
- render_phase (+0x764C): rendering phase, clouds render when == 5
- parallax_scale (+0x8150): renamed from crosshair_scale, also used
for cloud parallax X offset computation
- level_bound_min_x/max_x: changed from i32 to Fixed type

Cloud handler improvements:
- Uses TaskMessage enum (FrameFinish, RenderScene, SetWind)
- Uses Fixed arithmetic with from_int(128) for padding
- Calls RenderQueue::alloc::<DrawSpriteCmd> directly for rendering
- No ORIG_HANDLE_MESSAGE needed — fully self-contained

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

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

@@ -1,5 +1,6 @@
 use crate::FieldRegistry;
 use crate::audio::active_sound::ActiveSoundTable;
+use crate::fixed::Fixed;
 use crate::audio::dssound::DSSound;
 use crate::audio::music::Music;
 use crate::audio::speech::SpeechSlotTable;
@@ -254,8 +255,11 @@ pub struct DDGame {
     /// 0x73B0: Render entry table (14 entries × 0x14 bytes).
     /// First u32 of each entry zeroed by InitRenderIndices.
     pub render_entries: [RenderEntry; 14],
-    /// 0x74C8-0x764F: Unknown
-    pub _unknown_74c8: [u8; 0x7650 - 0x74C8],
+    /// 0x74C8-0x764B: Unknown
+    pub _unknown_74c8: [u8; 0x764C - 0x74C8],
+    /// 0x764C: Rendering phase. Checked by CTaskCloud::HandleMessage:
+    /// clouds only render when this == 5 (in-game rendering active).
+    pub render_phase: i32,
 
     /// 0x7650: Team index permutation maps (3 × 0x64 bytes).
     /// Used for team-to-slot mapping (render order, turn order, display order).
@@ -268,10 +272,10 @@ pub struct DDGame {
     /// 0x7784-0x779B: Unknown
     pub _unknown_7784: [u8; 0x779C - 0x7784],
 
-    /// 0x779C: Level bound min X (Fixed-point, negative = off-screen left).
-    pub level_bound_min_x: i32,
-    /// 0x77A0: Level bound max X (Fixed-point).
-    pub level_bound_max_x: i32,
+    /// 0x779C: Level bound min X (Fixed16.16, negative = off-screen left).
+    pub level_bound_min_x: Fixed,
+    /// 0x77A0: Level bound max X (Fixed16.16).
+    pub level_bound_max_x: Fixed,
     /// 0x77A4: Level bound min Y (Fixed-point, same as min_x typically).
     pub level_bound_min_y: i32,
     /// 0x77A8: Level bound max Y (Fixed-point).
@@ -342,8 +346,10 @@ pub struct DDGame {
 
     /// 0x8144-0x814F: Unknown
     pub _unknown_8144: [u8; 0x8150 - 0x8144],
-    /// 0x8150: Scale factor used by DrawCrosshairLine (multiplied by 0x140000).
-    pub crosshair_scale: i32,
+    /// 0x8150: Parallax/camera scale factor (Fixed-point multiplier).
+    /// Used by DrawCrosshairLine (multiplied by 0x140000) and
+    /// CTaskCloud render (parallax X offset = wind_speed * this >> 16).
+    pub parallax_scale: i32,
 
     /// 0x8154-0x818B: Unknown
     pub _unknown_8154: [u8; 0x818C - 0x8154],
@@ -533,7 +539,7 @@ pub mod offsets {
     pub const TURN_TIME_LIMIT: usize = 0x7EA8;
     pub const SOUND_AVAILABLE: usize = 0x7EF8;
     /// Scale factor used by DrawCrosshairLine (multiplied by 0x140000).
-    pub const CROSSHAIR_SCALE: usize = 0x8150;
+    pub const PARALLAX_SCALE: usize = 0x8150;
     /// Turn status text (null-terminated ASCII, shown during gameplay).
     pub const TURN_STATUS_TEXT: usize = 0x818C;
     /// Checkpoint active flag.

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

@@ -507,8 +507,8 @@ unsafe extern "cdecl" fn draw_crosshair_line_impl(task_ptr: u32) {
     let sin_interp = trig_lookup(sin_table, angle);
     let cos_interp = trig_lookup(cos_table, angle);
 
-    // Scale = fixed_mul(DDGame.crosshair_scale, 0x140000) + task.aim_range_offset
-    let scale = fixed_mul(ddgame.crosshair_scale, 0x14_0000) + task.aim_range_offset;
+    // Scale = fixed_mul(DDGame.parallax_scale, 0x140000) + task.aim_range_offset
+    let scale = fixed_mul(ddgame.parallax_scale, 0x14_0000) + task.aim_range_offset;
 
     // Endpoint = start + direction * scale
     let mut endpoint_x = fixed_mul(sin_interp, scale).wrapping_add(start_x);

crates/openwa-wormkit/src/replacements/task/cloud.rs

@@ -3,18 +3,14 @@
 //! Replaces CTaskCloud::HandleMessage (vtable slot 2).
 //! Handles cloud position updates (wind parallax), rendering, and wind changes.
 
-use core::sync::atomic::{AtomicU32, Ordering};
-
 use openwa_core::address::va;
 use openwa_core::fixed::Fixed;
 use openwa_core::game::TaskMessage;
 use openwa_core::log::log_line;
+use openwa_core::render::queue::{command_type, DrawSpriteCmd};
 use openwa_core::task::cloud::CTaskCloud;
 use openwa_core::task::{CTask, Task};
 
-/// Original CTaskCloud::HandleMessage, saved for render call-through.
-static ORIG_HANDLE_MESSAGE: AtomicU32 = AtomicU32::new(0);
-
 /// CTaskCloud::HandleMessage replacement.
 ///
 /// Handles three message types:
@@ -42,16 +38,16 @@ unsafe extern "thiscall" fn cloud_handle_message(
             let wind = cloud.wind_accel.0;
             cloud.pos_x = Fixed(cloud.pos_x.0 + cloud.vel_x.0 + wind * 10);
 
-            // Wrap X at landscape bounds (with 0x800000 = 128.0 padding)
+            // Wrap X at landscape bounds (with 128.0 Fixed padding)
             let ddgame = &*cloud.ddgame();
-            let ddgame_raw = ddgame as *const _ as *const u8;
-            let level_left = *(ddgame_raw.add(0x779C) as *const i32) - 0x800000;
-            let level_right = *(ddgame_raw.add(0x77A0) as *const i32) + 0x800000;
-
-            if cloud.pos_x.0 < level_left {
-                cloud.pos_x = Fixed(level_right);
-            } else if cloud.pos_x.0 > level_right {
-                cloud.pos_x = Fixed(level_left);
+            let padding = Fixed::from_int(128);
+            let level_left = ddgame.level_bound_min_x - padding;
+            let level_right = ddgame.level_bound_max_x + padding;
+
+            if cloud.pos_x < level_left {
+                cloud.pos_x = level_right;
+            } else if cloud.pos_x > level_right {
+                cloud.pos_x = level_left;
             }
 
             // Converge wind_accel toward wind_target (clamp step to ±0x147)
@@ -68,13 +64,27 @@ unsafe extern "thiscall" fn cloud_handle_message(
         }
 
         Ok(TaskMessage::RenderScene) => {
-            // Delegate to original (uses usercall for RQ_DrawSpriteLocal)
-            let orig = ORIG_HANDLE_MESSAGE.load(Ordering::Relaxed);
-            let orig_fn: unsafe extern "thiscall" fn(
-                *mut CTaskCloud, *mut CTask, u32, u32, *const u8,
-            ) = core::mem::transmute(orig as usize);
-            orig_fn(this, sender, msg_type, size, data);
-            return; // original already calls base handler
+            let ddgame = &mut *cloud.ddgame();
+
+            // Only render when rendering phase == 5 (in-game rendering active)
+            if ddgame.render_phase == 5 {
+                // Compute parallax X offset: (vel_x + wind * 10) * parallax_scale
+                let scroll_speed = cloud.vel_x.0 + cloud.wind_accel.0 * 10;
+                let parallax_x = ((scroll_speed as i64 * ddgame.parallax_scale as i64) >> 16) as i32;
+                let x = parallax_x + cloud.pos_x.0;
+
+                let rq = &mut *ddgame.render_queue;
+                if let Some(entry) = rq.alloc::<DrawSpriteCmd>() {
+                    *entry = DrawSpriteCmd {
+                        command_type: command_type::DRAW_SPRITE_LOCAL,
+                        layer: cloud.layer_depth.0 as u32,
+                        x_pos: x as u32 & 0xFFFF0000,
+                        y_pos: cloud.pos_y.0 as u32 & 0xFFFF0000,
+                        sprite_id: cloud.sprite_id,
+                        frame: 0,
+                    };
+                }
+            }
         }
 
         Ok(TaskMessage::SetWind) => {
@@ -96,7 +106,7 @@ pub fn install() -> Result<(), String> {
     use openwa_core::vtable_replace;
 
     vtable_replace!(openwa_core::task::cloud::CTaskCloudVTable, va::CTASK_CLOUD_VTABLE, {
-        handle_message [ORIG_HANDLE_MESSAGE] => cloud_handle_message,
+        handle_message => cloud_handle_message,
     })?;
 
     let _ = log_line("[Cloud] HandleMessage hooked via vtable_replace");