diff --git a/src/common/mod.rs b/src/common/mod.rs index 5fdc170..769ff8b 100644 --- a/src/common/mod.rs +++ b/src/common/mod.rs @@ -14,6 +14,9 @@ use crate::config::get_config; pub mod custom_ipc; +mod position; +pub use position::Position; + /// An invalid actor/object id. pub const INVALID_OBJECT_ID: u32 = 0xE0000000; diff --git a/src/world/ipc/position.rs b/src/common/position.rs similarity index 100% rename from src/world/ipc/position.rs rename to src/common/position.rs diff --git a/src/world/chat_handler.rs b/src/world/chat_handler.rs index 266eb68..531d001 100644 --- a/src/world/chat_handler.rs +++ b/src/world/chat_handler.rs @@ -1,5 +1,5 @@ use crate::{ - common::{CustomizeData, INVALID_OBJECT_ID, timestamp_secs}, + common::{CustomizeData, INVALID_OBJECT_ID, Position, timestamp_secs}, config::get_config, packet::{PacketSegment, SegmentType}, world::ipc::{ @@ -8,10 +8,7 @@ use crate::{ }, }; -use super::{ - ZoneConnection, - ipc::{ChatMessage, Position}, -}; +use super::{ZoneConnection, ipc::ChatMessage}; pub const CUSTOMIZE_DATA: CustomizeData = CustomizeData { race: 4, diff --git a/src/world/connection.rs b/src/world/connection.rs index 5352d59..7ba9659 100644 --- a/src/world/connection.rs +++ b/src/world/connection.rs @@ -1,7 +1,7 @@ use tokio::net::TcpStream; use crate::{ - common::timestamp_secs, + common::{Position, timestamp_secs}, packet::{ CompressionType, ConnectionType, PacketSegment, PacketState, SegmentType, parse_packet, send_packet, @@ -11,8 +11,8 @@ use crate::{ use super::{ Zone, ipc::{ - ActorSetPos, ClientZoneIpcSegment, InitZone, Position, ServerZoneIpcData, - ServerZoneIpcSegment, ServerZoneIpcType, UpdateClassInfo, WeatherChange, + ActorSetPos, ClientZoneIpcSegment, InitZone, ServerZoneIpcData, ServerZoneIpcSegment, + ServerZoneIpcType, UpdateClassInfo, WeatherChange, }, }; diff --git a/src/world/database.rs b/src/world/database.rs index 73e886d..f49b610 100644 --- a/src/world/database.rs +++ b/src/world/database.rs @@ -2,9 +2,12 @@ use std::sync::Mutex; use rusqlite::Connection; -use crate::lobby::{CharaMake, ClientSelectData, ipc::CharacterDetails}; +use crate::{ + common::Position, + lobby::{CharaMake, ClientSelectData, ipc::CharacterDetails}, +}; -use super::{PlayerData, ipc::Position}; +use super::PlayerData; pub struct WorldDatabase { connection: Mutex, diff --git a/src/world/ipc/common_spawn.rs b/src/world/ipc/common_spawn.rs index 12b8127..052b9b3 100644 --- a/src/world/ipc/common_spawn.rs +++ b/src/world/ipc/common_spawn.rs @@ -1,9 +1,8 @@ use binrw::binrw; -use crate::common::{CHAR_NAME_MAX_LENGTH, CustomizeData, read_string, write_string}; +use crate::common::{CHAR_NAME_MAX_LENGTH, CustomizeData, Position, read_string, write_string}; use super::StatusEffect; -use super::position::Position; #[binrw] #[brw(repr = u8)] diff --git a/src/world/ipc/mod.rs b/src/world/ipc/mod.rs index b6fce18..4f957fc 100644 --- a/src/world/ipc/mod.rs +++ b/src/world/ipc/mod.rs @@ -11,9 +11,6 @@ pub use social_list::SocialListRequestType; mod player_spawn; pub use player_spawn::PlayerSpawn; -mod position; -pub use position::Position; - mod status_effect; pub use status_effect::StatusEffect; @@ -50,6 +47,7 @@ pub use weather_change::WeatherChange; mod action_request; pub use action_request::ActionRequest; +use crate::common::Position; use crate::common::read_string; use crate::common::write_string; use crate::packet::IpcSegment;