jake/libpso
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

use Formatter::debug_struct for packet debug impl #23

Merged
jake merged 2 commits from improve_packet_debug into master 2022-08-03 00:23:45 -04:00
Conversation 0 Commits 2 Files Changed 3 +1 -27
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1424332e7 - Show all commits

16
src/character/character.rs
View File

@ -138,7 +138,7 @@ impl std::default::Default for Character {
}
}
#[derive(Copy, Clone, Debug, PartialEq, Default)]
#[derive(Copy, Clone, PSOPacketData, Default)]
#[repr(C)]
pub struct SelectScreenCharacter {
pub exp: u32,
@ -169,20 +169,6 @@ pub struct SelectScreenCharacter {
}
impl SelectScreenCharacter {
pub const SIZE: usize = 0x7C;
pub fn from_le_bytes(bytes: [u8; 0x7C]) -> Result<SelectScreenCharacter, crate::PacketParseError> {
unsafe {
Ok(std::mem::transmute(bytes))
}
}
pub fn to_le_bytes(&self) -> [u8; 0x7C] {
unsafe {
std::mem::transmute(*self)
}
}
pub fn as_character(&self) -> Character {
Character {
exp: self.exp,

12
src/packet/login.rs
View File

@ -292,18 +292,6 @@ pub struct CharAck {
pub code: u32, // TODO: enum?
}
impl PSOPacketData for SelectScreenCharacter {
fn from_bytes<R: Read>(cursor: &mut R) -> Result<Self, PacketParseError> {
let mut buf = [0u8; SelectScreenCharacter::SIZE];
cursor.read(&mut buf).map_err(|_| PacketParseError::ReadError)?;
SelectScreenCharacter::from_le_bytes(buf)
}
fn as_bytes(&self) -> Vec<u8> {
self.to_le_bytes().to_vec()
}
}
#[pso_packet(0xE5)]
pub struct CharacterPreview {
pub slot: u32,