use correct magic number instead of padding
This commit is contained in:
parent
77af5e386a
commit
cffc68a10d
20
src/v0.rs
20
src/v0.rs
@ -171,23 +171,34 @@ pub struct WorldEventReset{
|
|||||||
#[binrw]
|
#[binrw]
|
||||||
#[brw(little)]
|
#[brw(little)]
|
||||||
pub struct WorldEventButton{
|
pub struct WorldEventButton{
|
||||||
#[br(pad_after=8)]
|
|
||||||
pub button_id:u32,
|
pub button_id:u32,
|
||||||
|
// This field does not exist in the final struct and
|
||||||
|
// exists purely to de/serialize the magic number.
|
||||||
|
#[br(temp)]
|
||||||
|
#[bw(ignore)]
|
||||||
|
#[brw(magic=b"quatdata")]
|
||||||
|
_magic:(),
|
||||||
}
|
}
|
||||||
#[binrw]
|
#[binrw]
|
||||||
#[brw(little)]
|
#[brw(little)]
|
||||||
pub struct WorldEventSetTime{
|
pub struct WorldEventSetTime{
|
||||||
#[br(map=read_trey_double)]
|
#[br(map=read_trey_double)]
|
||||||
#[br(pad_after=4)]
|
|
||||||
pub time:f64,
|
pub time:f64,
|
||||||
|
#[br(temp)]
|
||||||
|
#[bw(ignore)]
|
||||||
|
#[brw(magic=b"data")]
|
||||||
|
_magic:(),
|
||||||
}
|
}
|
||||||
#[binrw]
|
#[binrw]
|
||||||
#[brw(little)]
|
#[brw(little)]
|
||||||
pub struct WorldEventSetPaused{
|
pub struct WorldEventSetPaused{
|
||||||
#[br(map=|paused:u32|paused!=0)]
|
#[br(map=|paused:u32|paused!=0)]
|
||||||
#[bw(map=|paused:&bool|*paused as u32)]
|
#[bw(map=|paused:&bool|*paused as u32)]
|
||||||
#[br(pad_after=8)]
|
|
||||||
pub paused:bool,
|
pub paused:bool,
|
||||||
|
#[br(temp)]
|
||||||
|
#[bw(ignore)]
|
||||||
|
#[brw(magic=b"quatdata")]
|
||||||
|
_magic:(),
|
||||||
}
|
}
|
||||||
#[binrw]
|
#[binrw]
|
||||||
#[brw(little)]
|
#[brw(little)]
|
||||||
@ -279,8 +290,7 @@ pub enum FlagReason{
|
|||||||
Teleport,
|
Teleport,
|
||||||
#[brw(magic=9u32)]
|
#[brw(magic=9u32)]
|
||||||
Practice,
|
Practice,
|
||||||
// b"data"
|
#[brw(magic=b"data")]
|
||||||
#[brw(magic=1635017060u32)]
|
|
||||||
None,
|
None,
|
||||||
}
|
}
|
||||||
#[binrw]
|
#[binrw]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user