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

guildcard structs and repr(c) cus the compiler hates me

Browse Source
This commit is contained in:
andy 2022-04-22 00:31:46 +00:00 committed by jake
parent 35c6e068e1
commit fcccba9554
1 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/character/guildcard.rs
View File

@ -1,53 +1,22 @@
use crate::packet::ship::{GuildcardAccept};
/*
typedef struct bb_guildcard_data {
uint8_t unk1[0x0114];
struct {
uint32_t guildcard;
uint16_t name[0x18];
uint16_t team[0x10];
uint16_t desc[0x58];
uint8_t reserved1;
uint8_t language;
uint8_t section;
uint8_t ch_class;
} blocked[29];
uint8_t unk2[0x78];
struct {
uint32_t guildcard;
uint16_t name[0x18];
uint16_t team[0x10];
uint16_t desc[0x58];
uint8_t reserved1;
uint8_t language;
uint8_t section;
uint8_t ch_class;
uint32_t padding;
uint16_t comment[0x58];
} entries[104];
uint8_t unk3[0x01BC];
} bb_gc_data_t;
*/
#[derive(Copy, Clone)]
pub struct BlockedGuildCard {
pub guildcard: u32,
pub name: [u16; 0x18],
pub team: [u16; 0x10],
pub desc: [u16; 0x58],
pub reserved1: u8,
pub language: u8,
pub section_id: u8,
pub class: u8,
#[derive(Copy, Clone, Debug)]
#[repr(C)]
pub struct BlockedGuildCard { // 264
pub id: u32, // 4
pub name: [u16; 0x18], // 48
pub team: [u16; 0x10], // 32
pub desc: [u16; 0x58], // 176
pub reserved1: u8, // 1
pub language: u8, // 1
pub section_id: u8, // 1
pub class: u8, // 1
}
impl Default for BlockedGuildCard {
fn default() -> BlockedGuildCard {
BlockedGuildCard {
guildcard: 0,
id: 0,
name: [0; 0x18],
team: [0; 0x10],
desc: [0; 0x58],
@ -59,25 +28,41 @@ impl Default for BlockedGuildCard {
}
}
#[derive(Copy, Clone)]
pub struct GuildCard {
pub guildcard: u32,
pub name: [u16; 0x18],
pub team: [u16; 0x10],
pub desc: [u16; 0x58],
pub reserved1: u8,
pub language: u8,
pub section_id: u8,
pub class: u8,
pub padding: u32,
pub comment: [u16; 0x58],
impl From<GuildCard> for BlockedGuildCard {
fn from(g: GuildCard) -> BlockedGuildCard {
BlockedGuildCard {
id: g.id,
name: g.name,
team: g.team,
desc: g.desc,
reserved1: g.reserved1,
language: g.language,
section_id: g.section_id,
class: g.class,
}
}
}
#[derive(Copy, Clone, Debug)]
#[repr(C)]
pub struct GuildCard { // 444
pub id: u32, // 4
pub name: [u16; 0x18], // 48
pub team: [u16; 0x10], // 32
pub desc: [u16; 0x58], // 176
pub reserved1: u8, // 1
pub language: u8, // 1
pub section_id: u8, // 1
pub class: u8, // 1
pub padding: u32, // 4
pub comment: [u16; 0x58], // 176
}
impl Default for GuildCard {
fn default() -> GuildCard {
GuildCard {
guildcard: 0,
id: 0,
name: [0; 0x18],
team: [0; 0x10],
desc: [0; 0x58],
@ -91,13 +76,30 @@ impl Default for GuildCard {
}
}
#[derive(Copy, Clone)]
pub struct GuildCardData {
pub _unknown1: [u8; 0x114],
pub blocked: [BlockedGuildCard; 29],
pub _unknown2: [u8; 0x78],
pub friends: [GuildCard; 104],
pub _unknown3: [u8; 0x1BC],
impl From<&GuildcardAccept> for GuildCard {
fn from(g: &GuildcardAccept) -> GuildCard {
GuildCard {
id: g.id,
name: g.name,
team: g.team,
desc: g.desc,
reserved1: g.one,
language: g.language,
section_id: g.section_id,
class: g.class,
padding: 0,
comment: [0; 0x58],
}
}
}
#[derive(Copy, Clone, Debug)]
#[repr(C)]
pub struct GuildCardData { // 54672 0xd590
pub _unknown1: [u8; 0x114], // 276
pub blocked: [BlockedGuildCard; 29], // 264 * 29 = 7656
pub _unknown2: [u8; 0x78], // 120
pub friends: [GuildCard; 105], // 444 * 105 = 46620
}
impl Default for GuildCardData {
@ -106,8 +108,7 @@ impl Default for GuildCardData {
_unknown1: [0; 0x114],
blocked: [BlockedGuildCard::default(); 29],
_unknown2: [0; 0x78],
friends: [GuildCard::default(); 104],
_unknown3: [0; 0x1BC],
friends: [GuildCard::default(); 105],
}
}
}