redstrate/kawari
1
Fork 0
mirror of https://github.com/redstrate/Kawari.git synced 2025-04-23 23:57:46 +00:00
Code Activity

Move ObjectKind enum to common_spawn module

Browse source
This commit is contained in:
Joshua Goins 2025-03-18 22:15:27 -04:00
parent bd67eb0127
commit cfb9aad6e6
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,31 @@ use crate::CHAR_NAME_MAX_LENGTH;
use crate::common::{CustomizeData, read_string, write_string}; use crate::common::{CustomizeData, read_string, write_string};
use super::position::Position; use super::position::Position;
use super::{CharacterMode, ObjectKind, StatusEffect}; use super::{CharacterMode, StatusEffect};
#[binrw]
#[brw(repr = u8)]
#[derive(Clone, PartialEq, Debug, Default)]
pub enum ObjectKind {
#[default]
None = 0,
Player = 1,
BattleNpc = 2,
EventNpc = 3,
Treasure = 4,
Aetheryte = 5,
GatheringPoint = 6,
EventObj = 7,
Mount = 8,
Companion = 9,
Retainer = 10,
AreaObject = 11,
HousingEventObject = 12,
Cutscene = 13,
MjiObject = 14,
Ornament = 15,
CardStand = 16,
}
#[binrw] #[binrw]
#[brw(little)] #[brw(little)]

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

@ -38,7 +38,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; pub use common_spawn::{CommonSpawn, ObjectKind};
use crate::common::read_string; use crate::common::read_string;
use crate::common::write_string; use crate::common::write_string;
@ -128,30 +128,6 @@ pub enum GameMasterCommandType {
ChangeTerritory = 0x58, ChangeTerritory = 0x58,
} }
#[binrw]
#[brw(repr = u8)]
#[derive(Clone, PartialEq, Debug, Default)]
pub enum ObjectKind {
#[default]
None = 0,
Player = 1,
BattleNpc = 2,
EventNpc = 3,
Treasure = 4,
Aetheryte = 5,
GatheringPoint = 6,
EventObj = 7,
Mount = 8,
Companion = 9,
Retainer = 10,
AreaObject = 11,
HousingEventObject = 12,
Cutscene = 13,
MjiObject = 14,
Ornament = 15,
CardStand = 16,
}
#[binrw] #[binrw]
#[brw(repr = u16)] #[brw(repr = u16)]
#[derive(Clone, PartialEq, Debug)] #[derive(Clone, PartialEq, Debug)]