diff --git a/crates/openwa-core/Cargo.toml b/crates/openwa-core/Cargo.toml index f91cb233c3ec2e0a09a9671458d016e9f34911b3..dca855d8c819b55409d456b3cac21a2f49b534c3 100644 --- a/crates/openwa-core/Cargo.toml +++ b/crates/openwa-core/Cargo.toml @@ -6,6 +6,7 @@ description = "Core library for Worms Armageddon reverse engineering — types, [target.'cfg(target_os = "windows")'.dependencies] windows-sys = { version = "0.59", features = [ + "Win32_System_Memory", "Win32_System_Registry", "Win32_UI_WindowsAndMessaging", ] } diff --git a/crates/openwa-core/src/active_sound.rs b/crates/openwa-core/src/audio/active_sound.rs similarity index 98% rename from crates/openwa-core/src/active_sound.rs rename to crates/openwa-core/src/audio/active_sound.rs index ea13648ce3a3787f5f5dba2a7615493af203f48e..68193e214e0f6818d99d8e1ec64140d45949bb78 100644 --- a/crates/openwa-core/src/active_sound.rs +++ b/crates/openwa-core/src/audio/active_sound.rs @@ -1,4 +1,4 @@ -use crate::ddgame::DDGame; +use crate::engine::ddgame::DDGame; use crate::fixed::Fixed; /// Active sound tracking table — manages positional (local) sound playback. diff --git a/crates/openwa-core/src/dssound.rs b/crates/openwa-core/src/audio/dssound.rs similarity index 100% rename from crates/openwa-core/src/dssound.rs rename to crates/openwa-core/src/audio/dssound.rs diff --git a/crates/openwa-core/src/audio/mod.rs b/crates/openwa-core/src/audio/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..8ccd16d0aabc5bf6328fd145bad923f938fdf270 --- /dev/null +++ b/crates/openwa-core/src/audio/mod.rs @@ -0,0 +1,13 @@ +pub mod active_sound; +pub mod dssound; +pub mod music; +pub mod sound; +pub mod speech; +pub mod streaming; + +pub use active_sound::{ActiveSoundEntry, ActiveSoundTable}; +pub use dssound::DSSound; +pub use music::Music; +pub use sound::SoundId; +pub use speech::{SpeechLineId, SpeechLineTableEntry, SpeechSlotTable, SPEECH_LINE_TABLE_COUNT}; +pub use streaming::StreamingAudio; diff --git a/crates/openwa-core/src/music.rs b/crates/openwa-core/src/audio/music.rs similarity index 100% rename from crates/openwa-core/src/music.rs rename to crates/openwa-core/src/audio/music.rs diff --git a/crates/openwa-core/src/sound.rs b/crates/openwa-core/src/audio/sound.rs similarity index 100% rename from crates/openwa-core/src/sound.rs rename to crates/openwa-core/src/audio/sound.rs diff --git a/crates/openwa-core/src/speech.rs b/crates/openwa-core/src/audio/speech.rs similarity index 100% rename from crates/openwa-core/src/speech.rs rename to crates/openwa-core/src/audio/speech.rs diff --git a/crates/openwa-core/src/streaming_audio.rs b/crates/openwa-core/src/audio/streaming.rs similarity index 100% rename from crates/openwa-core/src/streaming_audio.rs rename to crates/openwa-core/src/audio/streaming.rs diff --git a/crates/openwa-core/src/display_base.rs b/crates/openwa-core/src/display/base.rs similarity index 100% rename from crates/openwa-core/src/display_base.rs rename to crates/openwa-core/src/display/base.rs diff --git a/crates/openwa-core/src/dddisplay.rs b/crates/openwa-core/src/display/dd_display.rs similarity index 100% rename from crates/openwa-core/src/dddisplay.rs rename to crates/openwa-core/src/display/dd_display.rs diff --git a/crates/openwa-core/src/display_gfx.rs b/crates/openwa-core/src/display/gfx.rs similarity index 100% rename from crates/openwa-core/src/display_gfx.rs rename to crates/openwa-core/src/display/gfx.rs diff --git a/crates/openwa-core/src/display/mod.rs b/crates/openwa-core/src/display/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..b9608ef6a36f35f55b2351317ee1bc63b37925c4 --- /dev/null +++ b/crates/openwa-core/src/display/mod.rs @@ -0,0 +1,11 @@ +pub mod base; +pub mod dd_display; +pub mod gfx; +pub mod opengl; +pub mod palette; + +pub use base::{DisplayBase, DisplayBaseVtable, SpriteBufferCtrl, SpriteCacheWrapper}; +pub use dd_display::DDDisplay; +pub use gfx::DisplayGfx; +pub use opengl::OpenGLState; +pub use palette::{Palette, PaletteVtable}; diff --git a/crates/openwa-core/src/opengl.rs b/crates/openwa-core/src/display/opengl.rs similarity index 100% rename from crates/openwa-core/src/opengl.rs rename to crates/openwa-core/src/display/opengl.rs diff --git a/crates/openwa-core/src/palette.rs b/crates/openwa-core/src/display/palette.rs similarity index 100% rename from crates/openwa-core/src/palette.rs rename to crates/openwa-core/src/display/palette.rs diff --git a/crates/openwa-core/src/ddgame.rs b/crates/openwa-core/src/engine/ddgame.rs similarity index 98% rename from crates/openwa-core/src/ddgame.rs rename to crates/openwa-core/src/engine/ddgame.rs index a8cc8f569f6b31cf60d78a280bf88a3ea55f9d6a..c58f6ced0014d7303ab9b52e54cca1a7a3323826 100644 --- a/crates/openwa-core/src/ddgame.rs +++ b/crates/openwa-core/src/engine/ddgame.rs @@ -1,14 +1,14 @@ -use crate::active_sound::ActiveSoundTable; -use crate::dddisplay::DDDisplay; -use crate::ddkeyboard::DDKeyboard; -use crate::dssound::DSSound; -use crate::game_info::GameInfo; -use crate::landscape::PCLandscape; -use crate::music::Music; -use crate::palette::Palette; -use crate::render::RenderQueue; -use crate::speech::SpeechSlotTable; -use crate::turn_order::TurnOrderWidget; +use crate::audio::active_sound::ActiveSoundTable; +use crate::display::dd_display::DDDisplay; +use crate::input::keyboard::DDKeyboard; +use crate::audio::dssound::DSSound; +use crate::engine::game_info::GameInfo; +use crate::render::landscape::PCLandscape; +use crate::audio::music::Music; +use crate::display::palette::Palette; +use crate::render::queue::RenderQueue; +use crate::audio::speech::SpeechSlotTable; +use crate::render::turn_order::TurnOrderWidget; /// DDGame — the main game engine object. /// diff --git a/crates/openwa-core/src/ddgame_wrapper.rs b/crates/openwa-core/src/engine/ddgame_wrapper.rs similarity index 93% rename from crates/openwa-core/src/ddgame_wrapper.rs rename to crates/openwa-core/src/engine/ddgame_wrapper.rs index 3087a92d7ca291a4ad49c0b64ebea196d57d5b3e..0f3c22a29fdb9857f25351fe68b47b2563519363 100644 --- a/crates/openwa-core/src/ddgame_wrapper.rs +++ b/crates/openwa-core/src/engine/ddgame_wrapper.rs @@ -1,7 +1,7 @@ -use crate::dddisplay::DDDisplay; -use crate::ddgame::DDGame; -use crate::dssound::DSSound; -use crate::landscape::PCLandscape; +use crate::display::dd_display::DDDisplay; +use crate::engine::ddgame::DDGame; +use crate::audio::dssound::DSSound; +use crate::render::landscape::PCLandscape; /// DDGameWrapper — large wrapper around DDGame. /// diff --git a/crates/openwa-core/src/game_info.rs b/crates/openwa-core/src/engine/game_info.rs similarity index 100% rename from crates/openwa-core/src/game_info.rs rename to crates/openwa-core/src/engine/game_info.rs diff --git a/crates/openwa-core/src/game_session.rs b/crates/openwa-core/src/engine/game_session.rs similarity index 95% rename from crates/openwa-core/src/game_session.rs rename to crates/openwa-core/src/engine/game_session.rs index a0adbf1930941bc35ffcf2f32afa8fbece5d7e0f..b5bfbea93d7c99fd5d92414e282436960db79032 100644 --- a/crates/openwa-core/src/game_session.rs +++ b/crates/openwa-core/src/engine/game_session.rs @@ -1,7 +1,7 @@ -use crate::ddgame_wrapper::DDGameWrapper; -use crate::ddkeyboard::DDKeyboard; -use crate::dssound::DSSound; -use crate::palette::Palette; +use crate::engine::ddgame_wrapper::DDGameWrapper; +use crate::input::keyboard::DDKeyboard; +use crate::audio::dssound::DSSound; +use crate::display::palette::Palette; /// Top-level game session context, allocated once per game run. /// diff --git a/crates/openwa-core/src/game_timer.rs b/crates/openwa-core/src/engine/game_timer.rs similarity index 100% rename from crates/openwa-core/src/game_timer.rs rename to crates/openwa-core/src/engine/game_timer.rs diff --git a/crates/openwa-core/src/engine/mod.rs b/crates/openwa-core/src/engine/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..71128d8535e1f37fa6478244558fa8e8522e0aee --- /dev/null +++ b/crates/openwa-core/src/engine/mod.rs @@ -0,0 +1,16 @@ +pub mod ddgame; +pub mod ddgame_wrapper; +pub mod game_info; +pub mod game_session; +pub mod game_timer; +pub mod net_wrapper; + +pub use ddgame::{ + DDGame, FullTeamBlock, SoundQueueEntry, TeamArenaRef, TeamArenaState, TeamBlockHeader, + TeamBlockSlot0, WormEntry, GAME_PHASE_NORMAL_MIN, GAME_PHASE_SUDDEN_DEATH, +}; +pub use ddgame_wrapper::DDGameWrapper; +pub use game_info::GameInfo; +pub use game_session::GameSession; +pub use game_timer::GameTimer; +pub use net_wrapper::DDNetGameWrapper; diff --git a/crates/openwa-core/src/ddnetgame_wrapper.rs b/crates/openwa-core/src/engine/net_wrapper.rs similarity index 100% rename from crates/openwa-core/src/ddnetgame_wrapper.rs rename to crates/openwa-core/src/engine/net_wrapper.rs diff --git a/crates/openwa-core/src/class_type.rs b/crates/openwa-core/src/game/class_type.rs similarity index 100% rename from crates/openwa-core/src/class_type.rs rename to crates/openwa-core/src/game/class_type.rs diff --git a/crates/openwa-core/src/frontend.rs b/crates/openwa-core/src/game/frontend.rs similarity index 100% rename from crates/openwa-core/src/frontend.rs rename to crates/openwa-core/src/game/frontend.rs diff --git a/crates/openwa-core/src/message.rs b/crates/openwa-core/src/game/message.rs similarity index 100% rename from crates/openwa-core/src/message.rs rename to crates/openwa-core/src/game/message.rs diff --git a/crates/openwa-core/src/game/mod.rs b/crates/openwa-core/src/game/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..3830176d374a98c33fa421827a97163a4d2b3beb --- /dev/null +++ b/crates/openwa-core/src/game/mod.rs @@ -0,0 +1,17 @@ +pub mod class_type; +pub mod frontend; +pub mod message; +pub mod scheme; +pub mod weapon; + +pub use class_type::ClassType; +pub use frontend::ScreenId; +pub use message::TaskMessage; +pub use scheme::{ + ExtendedOptions, SchemeError, SchemeFile, SchemeFileError, SchemeOptions, SchemeVersion, + WeaponSettings, EXTENDED_OPTIONS_DEFAULTS, EXTENDED_OPTIONS_OFFSET, EXTENDED_OPTIONS_SIZE, + OPTIONS_OFFSET, OPTIONS_SIZE, SCHEME_HEADER_SIZE, SCHEME_MAGIC, SCHEME_PAYLOAD_V1, + SCHEME_PAYLOAD_V2, SCHEME_PAYLOAD_V3, SCHEME_WEAPON_ORDER, WEAPONS_TOTAL_COUNT, + WEAPONS_V1_COUNT, WEAPONS_V1_OFFSET, WEAPONS_V2_COUNT, WEAPONS_V2_OFFSET, WEAPON_ENTRY_SIZE, +}; +pub use weapon::Weapon; diff --git a/crates/openwa-core/src/scheme.rs b/crates/openwa-core/src/game/scheme.rs similarity index 100% rename from crates/openwa-core/src/scheme.rs rename to crates/openwa-core/src/game/scheme.rs diff --git a/crates/openwa-core/src/weapon.rs b/crates/openwa-core/src/game/weapon.rs similarity index 100% rename from crates/openwa-core/src/weapon.rs rename to crates/openwa-core/src/game/weapon.rs diff --git a/crates/openwa-core/src/input_ctrl.rs b/crates/openwa-core/src/input/controller.rs similarity index 100% rename from crates/openwa-core/src/input_ctrl.rs rename to crates/openwa-core/src/input/controller.rs diff --git a/crates/openwa-core/src/ddkeyboard.rs b/crates/openwa-core/src/input/keyboard.rs similarity index 100% rename from crates/openwa-core/src/ddkeyboard.rs rename to crates/openwa-core/src/input/keyboard.rs diff --git a/crates/openwa-core/src/input/mod.rs b/crates/openwa-core/src/input/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..80bcf05625f9bb20bf75504a87179c54c89c550d --- /dev/null +++ b/crates/openwa-core/src/input/mod.rs @@ -0,0 +1,5 @@ +pub mod controller; +pub mod keyboard; + +pub use controller::{InputCtrl, InputCtrlVtable}; +pub use keyboard::DDKeyboard; diff --git a/crates/openwa-core/src/lib.rs b/crates/openwa-core/src/lib.rs index 7d862ac5a5dcd258103bc99eae30a6dc223f4728..924e15c525022f67c8062e750411856e41a0ef6a 100644 --- a/crates/openwa-core/src/lib.rs +++ b/crates/openwa-core/src/lib.rs @@ -3,39 +3,18 @@ #[macro_use] pub mod macros; -pub mod active_sound; -pub mod class_type; -pub mod message; -pub mod weapon; -pub mod sound; -pub mod sprite; +pub mod audio; +pub mod display; +pub mod engine; +pub mod game; +pub mod input; +pub mod render; + pub mod fixed; pub mod task; -pub mod ddgame; -pub mod ddgame_wrapper; -pub mod landscape; -pub mod render; -pub mod dddisplay; -pub mod ddkeyboard; -pub mod dssound; -pub mod music; -pub mod opengl; -pub mod palette; -pub mod frontend; -pub mod game_info; -pub mod scheme; -pub mod speech; -pub mod turn_order; -pub mod game_session; pub mod address; pub mod rebase; pub mod wa; pub mod wa_call; pub mod wa_alloc; -pub mod display_gfx; -pub mod input_ctrl; -pub mod game_timer; -pub mod streaming_audio; -pub mod ddnetgame_wrapper; -pub mod display_base; pub mod vtable; diff --git a/crates/openwa-core/src/landscape.rs b/crates/openwa-core/src/render/landscape.rs similarity index 99% rename from crates/openwa-core/src/landscape.rs rename to crates/openwa-core/src/render/landscape.rs index daf1d14fc084927c2f11c072a1b0a6eca3ed6ab5..677cd29a4379c04a001fca3a7f8e61a92a7c3cac 100644 --- a/crates/openwa-core/src/landscape.rs +++ b/crates/openwa-core/src/render/landscape.rs @@ -1,4 +1,4 @@ -use crate::ddgame::DDGame; +use crate::engine::ddgame::DDGame; /// PCLandscape — terrain/landscape subsystem (0xB40 bytes). /// diff --git a/crates/openwa-core/src/render/mod.rs b/crates/openwa-core/src/render/mod.rs new file mode 100644 index 0000000000000000000000000000000000000000..d5bdd0cc712ec0a973bd27c2c96d9852bab6cc62 --- /dev/null +++ b/crates/openwa-core/src/render/mod.rs @@ -0,0 +1,14 @@ +pub mod landscape; +pub mod queue; +pub mod sprite; +pub mod turn_order; + +pub use landscape::{DirtyRect, PCLandscape}; +pub use queue::{ + DrawBitmapGlobalCmd, DrawLineStripHeader, DrawPixelCmd, DrawPolygonHeader, DrawRectCmd, + DrawScaledCmd, DrawSpriteCmd, DrawSpriteOffsetCmd, DrawTextboxLocalCmd, RenderQueue, +}; +pub use sprite::{Sprite, SpriteFrame, SpriteId}; +pub use turn_order::{ + AnimatedItemList, TurnOrderAllianceGroup, TurnOrderTeamEntry, TurnOrderWidget, +}; diff --git a/crates/openwa-core/src/render.rs b/crates/openwa-core/src/render/queue.rs similarity index 100% rename from crates/openwa-core/src/render.rs rename to crates/openwa-core/src/render/queue.rs diff --git a/crates/openwa-core/src/sprite.rs b/crates/openwa-core/src/render/sprite.rs similarity index 100% rename from crates/openwa-core/src/sprite.rs rename to crates/openwa-core/src/render/sprite.rs diff --git a/crates/openwa-core/src/turn_order.rs b/crates/openwa-core/src/render/turn_order.rs similarity index 99% rename from crates/openwa-core/src/turn_order.rs rename to crates/openwa-core/src/render/turn_order.rs index 50040e2745e3702c0c9dc44de5f5bbf2c4643902..c1e59fce36ad4f6e83a286ea65aaa0e9a53b0572 100644 --- a/crates/openwa-core/src/turn_order.rs +++ b/crates/openwa-core/src/render/turn_order.rs @@ -8,7 +8,7 @@ //! All inherit from an animated item list base class (vtable 0x669C90) that //! provides sin-table interpolated sliding transitions between items. -use crate::ddgame::DDGame; +use crate::engine::ddgame::DDGame; /// Animated item list — base class for the turn order hierarchy. /// diff --git a/crates/openwa-core/src/task/base.rs b/crates/openwa-core/src/task/base.rs index 0627441cd73ca3b7f4c6b0baeaea9b87fba94fb1..aa33d9126128451fb63aca547ff8d16dae4ec3c5 100644 --- a/crates/openwa-core/src/task/base.rs +++ b/crates/openwa-core/src/task/base.rs @@ -1,5 +1,5 @@ -use crate::class_type::ClassType; -use crate::ddgame::DDGame; +use crate::game::class_type::ClassType; +use crate::engine::ddgame::DDGame; /// Base task class in WA's entity hierarchy. /// diff --git a/crates/openwa-core/tests/scheme_parse.rs b/crates/openwa-core/tests/scheme_parse.rs index 100bdc31a47cf3c6dab13922500fe3997a0bdcf9..9013fedbcb5fc1b6646f18ec8988052a7cca03eb 100644 --- a/crates/openwa-core/tests/scheme_parse.rs +++ b/crates/openwa-core/tests/scheme_parse.rs @@ -1,6 +1,6 @@ use std::path::Path; -use openwa_core::scheme::{ +use openwa_core::game::scheme::{ ExtendedOptions, SchemeFile, SchemeVersion, EXTENDED_OPTIONS_DEFAULTS, EXTENDED_OPTIONS_SIZE, SCHEME_PAYLOAD_V1, SCHEME_PAYLOAD_V2, WEAPONS_V1_COUNT, }; diff --git a/crates/openwa-debugui/src/app.rs b/crates/openwa-debugui/src/app.rs index 73e2f00953ac8af61827db408daa7bc6ceb17e4e..a46eff9eae88e488e2e2b1c6520f9ca6279d2d21 100644 --- a/crates/openwa-debugui/src/app.rs +++ b/crates/openwa-debugui/src/app.rs @@ -1,7 +1,6 @@ use eframe::egui; use openwa_core::address::va; -use openwa_core::ddgame::DDGame; -use openwa_core::ddgame_wrapper::DDGameWrapper; +use openwa_core::engine::{DDGame, DDGameWrapper}; use openwa_core::rebase::rb; use openwa_core::task::{CTask, CTaskCloud, CTaskFire, CTaskMine, CTaskOilDrum, CTaskTeam, CTaskTurnGame, CTaskWorm, TurnGameCtx}; @@ -539,7 +538,7 @@ impl DebugApp { } // --- CTaskWorm-specific fields --- - if name == "CTaskWorm" || (*task).class_type == openwa_core::class_type::ClassType::Worm { + if name == "CTaskWorm" || (*task).class_type == openwa_core::game::ClassType::Worm { let worm = addr as *const CTaskWorm; egui::CollapsingHeader::new("CTaskWorm") .default_open(true) diff --git a/crates/openwa-wormkit/src/replacements/config.rs b/crates/openwa-wormkit/src/replacements/config.rs index f5f105248182f68e154f54c84d678b40c5dceb38..a18a2b27fac921896cd6712a7d1ecce2ee22c5aa 100644 --- a/crates/openwa-wormkit/src/replacements/config.rs +++ b/crates/openwa-wormkit/src/replacements/config.rs @@ -9,7 +9,7 @@ //! - GameInfo__LoadOptions (0x460AC0): game options from registry //! - Options__GetCrashReportURL (0x5A63F0): crash report URL from registry -use openwa_core::{address::va, game_info::GameInfo}; +use openwa_core::{address::va, engine::GameInfo}; use crate::log_line; use openwa_core::rebase::rb; diff --git a/crates/openwa-wormkit/src/replacements/display.rs b/crates/openwa-wormkit/src/replacements/display.rs index 090d4e3ff57ff9c7210c47e5b9741c837a90aef1..38ea4f09717296e5e99ad8528bf147c2d1363126 100644 --- a/crates/openwa-wormkit/src/replacements/display.rs +++ b/crates/openwa-wormkit/src/replacements/display.rs @@ -6,7 +6,7 @@ //! correctly frees our Rust-allocated sprite cache sub-objects use openwa_core::address::va; -use openwa_core::display_base::{DisplayBase, SpriteCacheWrapper, SpriteBufferCtrl}; +use openwa_core::display::{DisplayBase, SpriteCacheWrapper, SpriteBufferCtrl}; use openwa_core::rebase::rb; use openwa_core::vtable::patch_vtable; use openwa_core::wa_alloc::wa_free; diff --git a/crates/openwa-wormkit/src/replacements/frontend.rs b/crates/openwa-wormkit/src/replacements/frontend.rs index 56b5372623102ead97e9928f25eaecbe13c415ef..9cc1f8d28b50c57babbd0fa5a7c70a06fc5277df 100644 --- a/crates/openwa-wormkit/src/replacements/frontend.rs +++ b/crates/openwa-wormkit/src/replacements/frontend.rs @@ -9,7 +9,7 @@ use crate::log_line; use openwa_core::wa::mfc::{CDialogHandle, CWndHandle}; use openwa_core::wa_call; use openwa_core::address::va; -use openwa_core::frontend::ScreenId; +use openwa_core::game::ScreenId; // Frontend dialog struct offsets (MFC CDialog-derived) const DIALOG_FLAGS: usize = 0x3C; diff --git a/crates/openwa-wormkit/src/replacements/game_session.rs b/crates/openwa-wormkit/src/replacements/game_session.rs index ac9499de21dc8349492dab416c3eb2a2504e0b12..2b387bdbd8fd99f848953040698353841ba99d8b 100644 --- a/crates/openwa-wormkit/src/replacements/game_session.rs +++ b/crates/openwa-wormkit/src/replacements/game_session.rs @@ -15,13 +15,13 @@ //! - `DDGame__InitGameState` (0x526500): plain stdcall(this), called via transmute. use openwa_core::address::va; -use openwa_core::game_info::GameInfo; +use openwa_core::engine::GameInfo; use openwa_core::rebase::rb; -use openwa_core::ddgame_wrapper::DDGameWrapper; -use openwa_core::dddisplay::DDDisplay; -use openwa_core::dssound::DSSound; -use openwa_core::game_session::GameSession; -use openwa_core::palette::Palette; +use openwa_core::engine::DDGameWrapper; +use openwa_core::display::DDDisplay; +use openwa_core::audio::DSSound; +use openwa_core::engine::GameSession; +use openwa_core::display::Palette; use crate::hook; use crate::log_line; diff --git a/crates/openwa-wormkit/src/replacements/hardware_init.rs b/crates/openwa-wormkit/src/replacements/hardware_init.rs index d37730ac363c954c852a98b09ae9d309a75dba3f..7a9aeeadc231639c770dff851242dd6f428b0618 100644 --- a/crates/openwa-wormkit/src/replacements/hardware_init.rs +++ b/crates/openwa-wormkit/src/replacements/hardware_init.rs @@ -43,19 +43,10 @@ use openwa_core::address::va; use openwa_core::rebase::rb; -use openwa_core::game_info::GameInfo; -use openwa_core::game_session::GameSession; -use openwa_core::ddgame_wrapper::DDGameWrapper; -use openwa_core::ddkeyboard::DDKeyboard; -use openwa_core::dddisplay::DDDisplay; -use openwa_core::dssound::DSSound; -use openwa_core::palette::Palette; -use openwa_core::input_ctrl::{InputCtrl, InputCtrlVtable}; -use openwa_core::game_timer::GameTimer; -use openwa_core::display_base::DisplayBase; -use openwa_core::display_gfx::DisplayGfx; -use openwa_core::streaming_audio::StreamingAudio; -use openwa_core::ddnetgame_wrapper::DDNetGameWrapper; +use openwa_core::engine::{GameInfo, GameSession, DDGameWrapper, GameTimer, DDNetGameWrapper}; +use openwa_core::input::{DDKeyboard, InputCtrl, InputCtrlVtable}; +use openwa_core::display::{DDDisplay, DisplayBase, DisplayGfx, Palette}; +use openwa_core::audio::{DSSound, StreamingAudio}; use openwa_core::wa_alloc::WABox; use crate::hook; use crate::log_line; diff --git a/crates/openwa-wormkit/src/replacements/input.rs b/crates/openwa-wormkit/src/replacements/input.rs index f2ebf3b6e32716458eeea05adb2e9b1461d391f1..32e7ee16332cab269570c8f6ad8a48d53250a5b2 100644 --- a/crates/openwa-wormkit/src/replacements/input.rs +++ b/crates/openwa-wormkit/src/replacements/input.rs @@ -18,8 +18,7 @@ use crate::hook; use crate::log_line; use openwa_core::rebase::rb; use openwa_core::address::va; -use openwa_core::ddgame::DDGame; -use openwa_core::ddgame_wrapper::DDGameWrapper; +use openwa_core::engine::{DDGame, DDGameWrapper}; extern "system" { fn IsBadReadPtr(lp: *const u8, ucb: u32) -> i32; diff --git a/crates/openwa-wormkit/src/replacements/render.rs b/crates/openwa-wormkit/src/replacements/render.rs index 05f66c9eabcc8c5d7da4a7cb33b72f20f68a834e..a666721ab8315b84862537a3eb626ee20d6d7937 100644 --- a/crates/openwa-wormkit/src/replacements/render.rs +++ b/crates/openwa-wormkit/src/replacements/render.rs @@ -5,7 +5,7 @@ use openwa_core::rebase::rb; use openwa_core::address::va; -use openwa_core::render::*; +use openwa_core::render::queue::*; use openwa_core::task::{BungeeTrailTask, WeaponAimTask}; use crate::hook::{self, usercall_trampoline}; diff --git a/crates/openwa-wormkit/src/replacements/scheme.rs b/crates/openwa-wormkit/src/replacements/scheme.rs index b2a1ec77c1227f8a53160c4cb0e38970d48768ca..a28deff28dc563899c960078b3ec226cee0f47e6 100644 --- a/crates/openwa-wormkit/src/replacements/scheme.rs +++ b/crates/openwa-wormkit/src/replacements/scheme.rs @@ -17,7 +17,7 @@ use std::sync::atomic::{AtomicU32, Ordering}; use crate::log_line; use openwa_core::rebase::rb; use openwa_core::address::va; -use openwa_core::scheme::{ +use openwa_core::game::scheme::{ ExtendedOptions, SchemeFile, SchemeVersion, EXTENDED_OPTIONS_DEFAULTS, EXTENDED_OPTIONS_SIZE, SCHEME_PAYLOAD_V1, SCHEME_PAYLOAD_V2, SCHEME_PAYLOAD_V3, }; diff --git a/crates/openwa-wormkit/src/replacements/sound.rs b/crates/openwa-wormkit/src/replacements/sound.rs index c78fcf0c5e499ce2eaf10743929e81d3e15fff99..497f06b8b8cb9f7101a46c14bb6be0bfd4a45b77 100644 --- a/crates/openwa-wormkit/src/replacements/sound.rs +++ b/crates/openwa-wormkit/src/replacements/sound.rs @@ -10,8 +10,8 @@ use std::sync::atomic::Ordering; use openwa_core::address::va; -use openwa_core::ddgame::{DDGame, SoundQueueEntry}; -use openwa_core::sound::SoundId; +use openwa_core::engine::{DDGame, SoundQueueEntry}; +use openwa_core::audio::SoundId; use openwa_core::task::CGameTask; use crate::hook; diff --git a/crates/openwa-wormkit/src/replacements/speech.rs b/crates/openwa-wormkit/src/replacements/speech.rs index 351cced183b034c600d7aa82896ac4e6e1226216..c44f2d22391301d334e1af6a8c768e75baab60ed 100644 --- a/crates/openwa-wormkit/src/replacements/speech.rs +++ b/crates/openwa-wormkit/src/replacements/speech.rs @@ -13,9 +13,9 @@ use std::sync::atomic::{AtomicU32, Ordering}; use heapless::CString; use openwa_core::rebase::rb; -use openwa_core::ddgame_wrapper::DDGameWrapper; +use openwa_core::engine::DDGameWrapper; use openwa_core::address::va::{self, game_info_offsets}; -use openwa_core::speech::SpeechLineTableEntry; +use openwa_core::audio::SpeechLineTableEntry; use crate::hook::{self, usercall_trampoline}; use crate::log_line; diff --git a/crates/openwa-wormkit/src/replacements/team.rs b/crates/openwa-wormkit/src/replacements/team.rs index 82a2773cf0cc3b67d175a09e119d05997dd090ff..429226b929ebc2b33918d42c8abe0acf454269d9 100644 --- a/crates/openwa-wormkit/src/replacements/team.rs +++ b/crates/openwa-wormkit/src/replacements/team.rs @@ -11,7 +11,7 @@ //! - SetActiveWorm_Maybe (0x522500): update team active state and counters use openwa_core::address::va; -use openwa_core::ddgame::{self, TeamArenaRef}; +use openwa_core::engine::ddgame::{self, TeamArenaRef}; use crate::hook::{self, usercall_trampoline}; diff --git a/crates/openwa-wormkit/src/replacements/weapon.rs b/crates/openwa-wormkit/src/replacements/weapon.rs index 099ef7d31fabceb71f3a00aa0624257419c5e681..627296420f254820d21d2adaa8dddf7798c7705a 100644 --- a/crates/openwa-wormkit/src/replacements/weapon.rs +++ b/crates/openwa-wormkit/src/replacements/weapon.rs @@ -7,8 +7,8 @@ //! - CountAliveWorms (0x5225A0): check if >1 worm alive on team use openwa_core::address::va; -use openwa_core::ddgame::{self, TeamArenaRef}; -use openwa_core::weapon::Weapon; +use openwa_core::engine::ddgame::{self, TeamArenaRef}; +use openwa_core::game::Weapon; use crate::hook::{self, usercall_trampoline}; diff --git a/crates/openwa-wormkit/src/validation/mod.rs b/crates/openwa-wormkit/src/validation/mod.rs index a2e063a2dc3f8ae161bdcc11dd50682e60ecaeac..284fd158c6286e40a1d26ab8e83d705230583b27 100644 --- a/crates/openwa-wormkit/src/validation/mod.rs +++ b/crates/openwa-wormkit/src/validation/mod.rs @@ -12,8 +12,7 @@ use std::sync::atomic::{AtomicU32, Ordering}; use openwa_core::rebase::rb; use openwa_core::address::va; use openwa_core::task::{CTask, CTaskBfsIter, CGameTask, CTaskMissile, CTaskTeam, CTaskTurnGame, TurnGameCtx, SharedDataTable}; -use openwa_core::ddgame::DDGame; -use openwa_core::ddgame_wrapper::DDGameWrapper; +use openwa_core::engine::{DDGame, DDGameWrapper}; static DUMP_COUNTER: AtomicU32 = AtomicU32::new(0); @@ -452,7 +451,7 @@ fn deferred_global_validation() { // --------------------------------------------------------------------------- fn dump_team_blocks() { - use openwa_core::ddgame::{offsets, TeamArenaRef}; + use openwa_core::engine::ddgame::{offsets, TeamArenaRef}; let dump_num = DUMP_COUNTER.fetch_add(1, Ordering::Relaxed); let _ = log_validation(""); @@ -647,7 +646,7 @@ fn dump_team_blocks() { // --------------------------------------------------------------------------- fn dump_landscape() { - use openwa_core::landscape::PCLandscape; + use openwa_core::render::PCLandscape; let dump_num = DUMP_COUNTER.fetch_add(1, Ordering::Relaxed); let _ = log_validation("");