diff --git a/src/fot/entitylist.rs b/src/fot/entitylist.rs index 3da4c22..a29306d 100644 --- a/src/fot/entitylist.rs +++ b/src/fot/entitylist.rs @@ -105,7 +105,7 @@ impl DecoderCtx for EntityList { first = false; } - let ent: Entity = rd.read_ctx(0, &mut ent_list)?; + let ent: Entity = rd.read_ctx(&mut ent_list)?; ent_list.ents.push(ent); } @@ -123,7 +123,7 @@ impl DecoderCtx for EntityList { let ent_count = rd.read_u16()?; ent_list.unk1 = rd.read_u32()?; for _ in 1..ent_count { - let ent: Entity = rd.read_ctx(0, &mut ent_list)?; + let ent: Entity = rd.read_ctx(&mut ent_list)?; ent_list.ents.push(ent); } diff --git a/src/fot/stream.rs b/src/fot/stream.rs index a69594f..640df70 100644 --- a/src/fot/stream.rs +++ b/src/fot/stream.rs @@ -58,11 +58,7 @@ impl<'a> ReadStream<'a> { // read_opt - decode with optional paramters. required for complex structure // with different origins (save / entfile) like entities - pub fn read_ctx, DCtx, ECtx>( - &mut self, - size: usize, - ctx: DCtx, - ) -> Result { + pub fn read_ctx, DCtx, ECtx>(&mut self, ctx: DCtx) -> Result { Ok(T::decode(self, ctx)?) } diff --git a/src/fot/world.rs b/src/fot/world.rs index a220e3a..eeaeeb8 100644 --- a/src/fot/world.rs +++ b/src/fot/world.rs @@ -85,7 +85,7 @@ impl DecoderCtx for World { let sgd: SGD = rd.read()?; let ssg: SSG = rd.read()?; - let entlist: EntityList = rd.read_ctx(0, EntityEncoding::World)?; + let entlist: EntityList = rd.read_ctx(EntityEncoding::World)?; let unparsed = rd.read_bytes(data.len() - rd.offset())?;