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

reorder these

Browse Source
This commit is contained in:
jake 2019-11-08 23:02:05 -08:00
parent b7d4533aec
commit b8b418a7a0
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/lib.rs
View File

@ -38,22 +38,6 @@ impl PSOPacketData for u8 {
} }
} }
impl PSOPacketData for u32 {
fn from_bytes<R: Read>(cursor: &mut R) -> Result<u32, PacketParseError> {
let mut bytes = [0u8; 4];
let len = cursor.read(&mut bytes).map_err(|_| PacketParseError::ReadError)?;
if len == 4 {
Ok(u32::from_le_bytes(bytes))
}
else {
Err(PacketParseError::NotEnoughBytes)
}
}
fn as_bytes(&self) -> Vec<u8> {
u32::to_le_bytes(*self).to_vec()
}
}
impl PSOPacketData for u16 { impl PSOPacketData for u16 {
fn from_bytes<R: Read>(cursor: &mut R) -> Result<u16, PacketParseError> { fn from_bytes<R: Read>(cursor: &mut R) -> Result<u16, PacketParseError> {
let mut bytes = [0u8; 2]; let mut bytes = [0u8; 2];
@ -70,6 +54,22 @@ impl PSOPacketData for u16 {
} }
} }
impl PSOPacketData for u32 {
fn from_bytes<R: Read>(cursor: &mut R) -> Result<u32, PacketParseError> {
let mut bytes = [0u8; 4];
let len = cursor.read(&mut bytes).map_err(|_| PacketParseError::ReadError)?;
if len == 4 {
Ok(u32::from_le_bytes(bytes))
}
else {
Err(PacketParseError::NotEnoughBytes)
}
}
fn as_bytes(&self) -> Vec<u8> {
u32::to_le_bytes(*self).to_vec()
}
}
impl PSOPacketData for f32 { impl PSOPacketData for f32 {
fn from_bytes<R: Read>(cursor: &mut R) -> Result<f32, PacketParseError> { fn from_bytes<R: Read>(cursor: &mut R) -> Result<f32, PacketParseError> {
let mut bytes = [0u8; 4]; let mut bytes = [0u8; 4];