diff --git a/src/world/ipc/common_spawn.rs b/src/world/ipc/common_spawn.rs index c8fdbaf..e9cb0b5 100644 --- a/src/world/ipc/common_spawn.rs +++ b/src/world/ipc/common_spawn.rs @@ -3,8 +3,8 @@ use binrw::binrw; use crate::CHAR_NAME_MAX_LENGTH; use crate::common::{CustomizeData, read_string, write_string}; +use super::StatusEffect; use super::position::Position; -use super::{CharacterMode, StatusEffect}; #[binrw] #[brw(repr = u8)] @@ -30,6 +30,17 @@ pub enum ObjectKind { CardStand = 16, } +#[binrw] +#[brw(little)] +#[brw(repr = u8)] +#[derive(Debug, Clone, Default, PartialEq)] +pub enum CharacterMode { + None = 0x0, + #[default] + Normal = 0x1, + Dead = 0x2, +} + #[binrw] #[brw(little)] #[derive(Debug, Clone, Default)] diff --git a/src/world/ipc/mod.rs b/src/world/ipc/mod.rs index 1e1d11d..bf13d7d 100644 --- a/src/world/ipc/mod.rs +++ b/src/world/ipc/mod.rs @@ -9,7 +9,6 @@ pub use social_list::SocialListRequest; pub use social_list::SocialListRequestType; mod player_spawn; -pub use player_spawn::CharacterMode; pub use player_spawn::PlayerSpawn; mod position; @@ -38,7 +37,7 @@ mod npc_spawn; pub use npc_spawn::NpcSpawn; mod common_spawn; -pub use common_spawn::{CommonSpawn, ObjectKind}; +pub use common_spawn::{CharacterMode, CommonSpawn, ObjectKind}; use crate::common::read_string; use crate::common::write_string; diff --git a/src/world/ipc/player_spawn.rs b/src/world/ipc/player_spawn.rs index 2f09204..f149f80 100644 --- a/src/world/ipc/player_spawn.rs +++ b/src/world/ipc/player_spawn.rs @@ -7,17 +7,6 @@ use super::position::Position; use super::status_effect::StatusEffect; use super::{CommonSpawn, ObjectKind}; -#[binrw] -#[brw(little)] -#[brw(repr = u8)] -#[derive(Debug, Clone, Default, PartialEq)] -pub enum CharacterMode { - None = 0x0, - #[default] - Normal = 0x1, - Dead = 0x2, -} - #[binrw] #[brw(little)] #[derive(Debug, Clone, Default)] @@ -39,6 +28,8 @@ mod tests { use binrw::BinRead; + use crate::world::ipc::CharacterMode; + use super::*; #[test]