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

can't derive Default anymore here

Browse Source
This commit is contained in:
jake 2019-11-09 15:14:05 -08:00
parent 7475c5e083
commit 7dfd9205e5
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/character/character.rs
View File

@ -5,7 +5,7 @@ use psopacket::PSOPacketData;
use crate::{PSOPacketData, PacketParseError};
//use crate::PSOPacketData;
#[derive(PSOPacketData, Default, Copy, Clone)]
#[derive(PSOPacketData, Copy, Clone)]
#[repr(C)]
pub struct Character {
pub atp: u16,
@ -43,7 +43,7 @@ pub struct Character {
pub prop_x: f32,
pub prop_y: f32,
pub name: [u16; 16],
//pub config: [u8; 0xE8],
pub config: [u8; 0xE8],
pub techniques: [u8; 0x14],
}
@ -151,7 +151,19 @@ impl SelectScreenCharacter {
name: self.name,
play_time: self.play_time,
..Character::default()
_unknown1: 0,
_unknown2: [0; 2],
_unused: [0; 11],
atp: 0,
mst: 0,
evp: 0,
hp: 0,
dfp: 0,
ata: 0,
lck: 0,
config: [0; 0xE8],
meseta: 0,
techniques: [0; 0x14],
}
}
}