remove unproductive members

MarathonData.md

@@ -756,7 +756,8 @@ Static Map Info is 88 bytes.
 | `Name`         | `u8[66]`   | `18`   |
 | `EntryFlags`   | `u32`      | `84`   |
 
-- `EnvCode` is an Environment Code enumeration.
+- `EnvCode` is a preset number for texture collections and some other things
+such as media (liquid) presets.
 - `MissionFlags` is a Mission Flags bit field.
 - `EnvFlags` is an Environment Flags bit field.
 - `Name` is the level name, intended to be 65 bytes, but one padding byte is

src/marathon/map.rs

@@ -53,23 +53,16 @@ pub fn read_lins(b: &[u8]) -> ResultS<(Line, usize)>
    let pnt_beg = c_u16b(b, 0)?;
    let pnt_end = c_u16b(b, 2)?;
    let flags   = c_u16b(b, 4)?;
-   let length  = c_u16b(b, 6)?;
-   let adj_hi  = c_u16b(b, 8)?;
-   let adj_lo  = c_u16b(b, 10)?;
    let side_fr = c_u16b(b, 12)?;
    let side_bk = c_u16b(b, 14)?;
    let poly_fr = c_u16b(b, 16)?;
    let poly_bk = c_u16b(b, 18)?;
    let flags   = ok!(LineFlags::from_bits(flags), "bad LineFlags")?;
-   let length  = Unit::from_bits(length);
-   let adj_hi  = Unit::from_bits(adj_hi);
-   let adj_lo  = Unit::from_bits(adj_lo);
    let side_fr = ObjID::from_repr(side_fr);
    let side_bk = ObjID::from_repr(side_bk);
    let poly_fr = ObjID::from_repr(poly_fr);
    let poly_bk = ObjID::from_repr(poly_bk);
-   Ok((Line{flags, length, adj_hi, adj_lo, pnt_beg, pnt_end, side_fr,
-            side_bk, poly_fr, poly_bk}, 32))
+   Ok((Line{flags, pnt_beg, pnt_end, side_fr, side_bk, poly_fr, poly_bk}, 32))
 }
 
 pub fn read_sids(b: &[u8]) -> ResultS<(Side, usize)>
@@ -79,24 +72,20 @@ pub fn read_sids(b: &[u8]) -> ResultS<(Side, usize)>
    let tex_pri  = read_sidetex(c_data(b, 4..10)?)?;
    let tex_sec  = read_sidetex(c_data(b, 10..16)?)?;
    let tex_tra  = read_sidetex(c_data(b, 16..22)?)?;
-   let ex_tleft = read_point(c_data(b, 22..26)?)?;
-   let ex_trigh = read_point(c_data(b, 26..30)?)?;
-   let ex_bleft = read_point(c_data(b, 30..34)?)?;
-   let ex_brigh = read_point(c_data(b, 34..38)?)?;
    let paneltyp = c_u16b(b, 38)?;
    let paneldat = c_i16b(b, 40)?;
    let xfer_pri = c_u16b(b, 42)?;
    let xfer_sec = c_u16b(b, 44)?;
    let xfer_tra = c_u16b(b, 46)?;
    let shade    = c_u32b(b, 48)?;
+   let stype    = SideType::from_repr(stype)?;
    let flags    = ok!(SideFlags::from_bits(flags), "bad SideFlags")?;
    let xfer_pri = TransferMode::from_repr(xfer_pri)?;
    let xfer_sec = TransferMode::from_repr(xfer_sec)?;
    let xfer_tra = TransferMode::from_repr(xfer_tra)?;
    let shade    = Fixed::from_bits(shade);
-   Ok((Side{stype, flags, tex_pri, tex_sec, tex_tra, ex_tleft, ex_trigh,
-            ex_bleft, ex_brigh, paneltyp, paneldat, xfer_pri, xfer_sec,
-            xfer_tra, shade}, 64))
+   Ok((Side{stype, flags, tex_pri, tex_sec, tex_tra, paneltyp, paneldat,
+            xfer_pri, xfer_sec, xfer_tra, shade}, 64))
 }
 
 #[derive(Serialize)]
@@ -110,9 +99,6 @@ pub struct Point
 pub struct Line
 {
    flags:   LineFlags,
-   length:  Unit,
-   adj_hi:  Unit,
-   adj_lo:  Unit,
    pnt_beg: u16,
    pnt_end: u16,
    side_fr: ObjID,
@@ -131,15 +117,11 @@ pub struct SideTex
 #[derive(Debug, Serialize)]
 pub struct Side
 {
-   stype:    u16,
+   stype:    SideType,
    flags:    SideFlags,
    tex_pri:  SideTex,
    tex_sec:  SideTex,
    tex_tra:  SideTex,
-   ex_tleft: Point,
-   ex_trigh: Point,
-   ex_bleft: Point,
-   ex_brigh: Point,
    paneltyp: u16,
    paneldat: i16,
    xfer_pri: TransferMode,
@@ -235,6 +217,18 @@ bitflags! {
    }
 }
 
+c_enum! {
+   #[derive(Debug, Serialize)]
+   pub enum SideType: u16
+   {
+      0 => Full,
+      1 => High,
+      2 => Low,
+      3 => Composite,
+      4 => Split,
+   }
+}
+
 impl fmt::Debug for Point
 {
    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result

src/marathon/trm.rs

@@ -25,7 +25,7 @@ fn read_face(b: &[u8]) -> ResultS<Face>
    let face  = c_u16b(b, 2)?;
    let color = c_u16b(b, 4)?;
 
-   Ok(Face { start, face, color })
+   Ok(Face{start, face, color})
 }
 
 pub fn read_term(b: &[u8]) -> ResultS<(Terminal, usize)>