diff options
Diffstat (limited to 'shared/src')
-rw-r--r-- | shared/src/resources.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/shared/src/resources.rs b/shared/src/resources.rs index f93de65..042dff3 100644 --- a/shared/src/resources.rs +++ b/shared/src/resources.rs @@ -2,7 +2,10 @@ use crate::packets::{ReadWrite, Resource}; use anyhow::{Result, bail}; use glam::{Affine3A, Vec3A}; use log::warn; -use std::io::{Read, Write}; +use std::{ + fs::File, + io::{Read, Write}, +}; #[derive(Debug, Default, Clone)] pub struct Prefab(pub Vec<(Affine3A, Resource)>); @@ -134,7 +137,8 @@ impl ReadWrite for Part { Ok(s) } } -fn read_kv(r: &mut dyn Read) -> Result<(Vec<u8>, Vec<u8>)> { + +fn read_kv(r: &mut &[u8]) -> Result<(Vec<u8>, Vec<u8>)> { let mut key_size = [0; 2]; let mut value_size = [0; 2]; r.read_exact(&mut key_size)?; @@ -143,8 +147,8 @@ fn read_kv(r: &mut dyn Read) -> Result<(Vec<u8>, Vec<u8>)> { let value_size = u16::from_be_bytes(value_size); let mut key = vec![0; key_size as usize]; let mut value = vec![0; value_size as usize]; - r.read_exact(&mut value)?; r.read_exact(&mut key)?; + r.read_exact(&mut value)?; Ok((key, value)) } |