voxel/kubi
1
1
Fork 0
mirror of https://github.com/griffi-gh/kubi.git synced 2024-11-22 06:48:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

magic -> subheader

Browse source
This commit is contained in:
griffi-gh 2023-11-25 21:12:29 +01:00
parent 672007ac7b
commit f4c2bcf998
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
kubi-shared/src/data.rs
View file

@ -22,9 +22,9 @@ const RESERVED_SIZE: usize = 1048576; //~1mb (16 sectors assuming 32x32x32 world
const RESERVED_SECTOR_COUNT: usize = RESERVED_SIZE / SECTOR_SIZE; const RESERVED_SECTOR_COUNT: usize = RESERVED_SIZE / SECTOR_SIZE;
//magic = "KUBI" + IDENTITY (4 bytes) //magic = "KUBI" + IDENTITY (4 bytes)
const HEADER_MAGIC_SIZE: usize = 8; const SUBHEADER_SIZE: usize = 8;
const HEADER_MAGIC_STR: [u8; 4] = *b"KUBI"; const SUBHEADER_MAGIC: [u8; 4] = *b"KUBI";
const HEADER_MAGIC_IDENTITY: u32 = 1; const SUBHEADER_IDENTITY: u32 = 1;
// #[repr(transparent)] // #[repr(transparent)]
// struct IVec3Hash(IVec3); // struct IVec3Hash(IVec3);
@ -66,16 +66,16 @@ impl WorldSaveFile {
fn read_header(&mut self) -> Result<()> { fn read_header(&mut self) -> Result<()> {
self.file.rewind()?; self.file.rewind()?;
let mut subheader = [0u8; HEADER_MAGIC_SIZE]; let mut subheader = [0u8; SUBHEADER_SIZE];
self.file.read_exact(&mut subheader)?; self.file.read_exact(&mut subheader)?;
if subheader[0..4] != HEADER_MAGIC_STR { if subheader[0..4] != SUBHEADER_MAGIC {
return Err(anyhow::anyhow!("invalid file header")); return Err(anyhow::anyhow!("invalid file header"));
} }
if subheader[4..8] != HEADER_MAGIC_IDENTITY.to_be_bytes() { if subheader[4..8] != SUBHEADER_IDENTITY.to_be_bytes() {
return Err(anyhow::anyhow!("this save file cannot be loaded by this version of the game")); return Err(anyhow::anyhow!("this save file cannot be loaded by this version of the game"));
} }
let limit = (RESERVED_SIZE - HEADER_MAGIC_SIZE) as u64; let limit = (RESERVED_SIZE - SUBHEADER_SIZE) as u64;
self.header = bincode::deserialize_from((&self.file).take(limit))?; self.header = bincode::deserialize_from((&self.file).take(limit))?;
Ok(()) Ok(())
@ -83,8 +83,8 @@ impl WorldSaveFile {
fn write_header(&mut self) -> Result<()> { fn write_header(&mut self) -> Result<()> {
self.file.rewind()?; self.file.rewind()?;
self.file.write_all(&HEADER_MAGIC_STR)?; self.file.write_all(&SUBHEADER_MAGIC)?;
self.file.write_all(&HEADER_MAGIC_IDENTITY.to_be_bytes())?; self.file.write_all(&SUBHEADER_IDENTITY.to_be_bytes())?;
//XXX: this can cause the header to destroy chunk data (if it's WAY too long) //XXX: this can cause the header to destroy chunk data (if it's WAY too long)
// read has checks against this, but write doesn't // read has checks against this, but write doesn't
// 1mb is pretty generous tho, so it's not a *big* deal // 1mb is pretty generous tho, so it's not a *big* deal