From d64a4167d8d7d9f9e4eaa7082a0bf3ef966031a7 Mon Sep 17 00:00:00 2001 From: Alison Watson Date: Thu, 13 Jun 2019 23:20:57 -0400 Subject: [PATCH] maraiah: rename Minf to Info --- source/map/chnk.rs | 2 +- source/map/minf.rs | 16 ++++++++-------- tests/data/map/minf.out | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/map/chnk.rs b/source/map/chnk.rs index 9f71407..02c88f7 100644 --- a/source/map/chnk.rs +++ b/source/map/chnk.rs @@ -96,7 +96,7 @@ pub enum Chunk /** `LINS` chunks. */ Lins(Vec), /** `LITE` chunks. */ Lite(Vec), /** `MNpx` chunks. */ Mnpx(Vec), - /** `Minf` chunks. */ Minf(map::minf::Minf), + /** `Minf` chunks. */ Minf(map::minf::Info), /** `NAME` chunks. */ Name(Vec), /** `NOTE` chunks. */ Note(Vec), /** `OBJS` chunks. */ Objs(Vec), diff --git a/source/map/minf.rs b/source/map/minf.rs index 602c33f..af6b106 100644 --- a/source/map/minf.rs +++ b/source/map/minf.rs @@ -1,10 +1,10 @@ -//! `Minf` type. +//! `Info` type. use crate::{err::*, text::*}; use bitflags::bitflags; /// Reads a `Minf` chunk. -pub fn read(b: &[u8]) -> ResultS +pub fn read(b: &[u8]) -> ResultS { read_data! { endian: BIG, buf: b, size: 88, start: 0, data { @@ -18,12 +18,12 @@ pub fn read(b: &[u8]) -> ResultS } } - Ok(Minf{texture_id, physics_id, skypict_id, miss_flags, envi_flags, + Ok(Info{texture_id, physics_id, skypict_id, miss_flags, envi_flags, entr_flags, level_name}) } /// Writes a `Minf` chunk. -pub fn write(v: &Minf) -> Vec +pub fn write(v: &Info) -> Vec { let mut o = Vec::with_capacity(4); o.extend(&v.texture_id.to_be_bytes()); @@ -37,7 +37,7 @@ pub fn write(v: &Minf) -> Vec } /// Reads an old `Minf` chunk. -pub fn read_old(b: &[u8]) -> ResultS +pub fn read_old(b: &[u8]) -> ResultS { let minf = read(b)?; @@ -51,10 +51,10 @@ pub fn read_old(b: &[u8]) -> ResultS entr_flags.insert(EntFlags::CO_OP) } - Ok(Minf{entr_flags, ..minf}) + Ok(Info{entr_flags, ..minf}) } -impl Default for Minf +impl Default for Info { fn default() -> Self { @@ -71,7 +71,7 @@ impl Default for Minf /// Static map information. #[cfg_attr(feature = "serde_obj", derive(serde::Serialize))] #[derive(Clone, Debug, Eq, PartialEq)] -pub struct Minf +pub struct Info { pub texture_id: u16, pub physics_id: u16, diff --git a/tests/data/map/minf.out b/tests/data/map/minf.out index ea56dd9..1e67f78 100644 --- a/tests/data/map/minf.out +++ b/tests/data/map/minf.out @@ -1,4 +1,4 @@ -map::minf::Minf{ +map::minf::Info{ texture_id: 0, physics_id: 1, skypict_id: 1,