redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-04-30 18:37:45 +00:00
Code Activity

Move CharacterMode enum to common_spawn module

Browse source
This commit is contained in:
Joshua Goins 2025-03-18 22:17:06 -04:00
parent cfb9aad6e6
commit da0860cdd7
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/world/ipc/common_spawn.rs
View file

@ -3,8 +3,8 @@ use binrw::binrw;
use crate::CHAR_NAME_MAX_LENGTH; use crate::CHAR_NAME_MAX_LENGTH;
use crate::common::{CustomizeData, read_string, write_string}; use crate::common::{CustomizeData, read_string, write_string};
use super::StatusEffect;
use super::position::Position; use super::position::Position;
use super::{CharacterMode, StatusEffect};
#[binrw] #[binrw]
#[brw(repr = u8)] #[brw(repr = u8)]
@ -30,6 +30,17 @@ pub enum ObjectKind {
CardStand = 16, CardStand = 16,
} }
#[binrw]
#[brw(little)]
#[brw(repr = u8)]
#[derive(Debug, Clone, Default, PartialEq)]
pub enum CharacterMode {
None = 0x0,
#[default]
Normal = 0x1,
Dead = 0x2,
}
#[binrw] #[binrw]
#[brw(little)] #[brw(little)]
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]

3
src/world/ipc/mod.rs
View file

@ -9,7 +9,6 @@ pub use social_list::SocialListRequest;
pub use social_list::SocialListRequestType; pub use social_list::SocialListRequestType;
mod player_spawn; mod player_spawn;
pub use player_spawn::CharacterMode;
pub use player_spawn::PlayerSpawn; pub use player_spawn::PlayerSpawn;
mod position; mod position;
@ -38,7 +37,7 @@ mod npc_spawn;
pub use npc_spawn::NpcSpawn; pub use npc_spawn::NpcSpawn;
mod common_spawn; mod common_spawn;
pub use common_spawn::{CommonSpawn, ObjectKind}; pub use common_spawn::{CharacterMode, CommonSpawn, ObjectKind};
use crate::common::read_string; use crate::common::read_string;
use crate::common::write_string; use crate::common::write_string;

13
src/world/ipc/player_spawn.rs
View file

@ -7,17 +7,6 @@ use super::position::Position;
use super::status_effect::StatusEffect; use super::status_effect::StatusEffect;
use super::{CommonSpawn, ObjectKind}; 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] #[binrw]
#[brw(little)] #[brw(little)]
#[derive(Debug, Clone, Default)] #[derive(Debug, Clone, Default)]
@ -39,6 +28,8 @@ mod tests {
use binrw::BinRead; use binrw::BinRead;
use crate::world::ipc::CharacterMode;
use super::*; use super::*;
#[test] #[test]