From f795c73ed8600941af4c0e4f885193c72349aeaa Mon Sep 17 00:00:00 2001 From: Jared Roberts Date: Mon, 10 Oct 2016 18:47:33 -0700 Subject: [PATCH] mark _unused fields as such, don't bind unused vars in match --- src/arena.rs | 8 ++++---- src/scenes/world.rs | 8 ++++---- src/town.rs | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/arena.rs b/src/arena.rs index a17bbf4..13f8edb 100644 --- a/src/arena.rs +++ b/src/arena.rs @@ -11,10 +11,10 @@ use tile::Tile; // 0x40 121 11x11 map matrix // 0xB9 7 ??? pub struct Arena { - monster_x: [u8; 16], - monster_y: [u8; 16], - party_x: [u8; 8], - party_y: [u8; 8], + _monster_x: [u8; 16], + _monster_y: [u8; 16], + _party_x: [u8; 8], + _party_y: [u8; 8], _unknown1: [u8; 16], map: Field, _unknown2: [u8; 7], diff --git a/src/scenes/world.rs b/src/scenes/world.rs index 541b89e..af977d0 100644 --- a/src/scenes/world.rs +++ b/src/scenes/world.rs @@ -184,16 +184,16 @@ impl { + Vr(Touch { dev_idx, .. }) => { self.pads.insert(dev_idx, (TrackMode::TOUCH, None)); }, - Vr(Press { dev_idx, controller }) => { + Vr(Press { dev_idx, .. }) => { self.pads.insert(dev_idx, (TrackMode::PRESS, None)); }, - Vr(Unpress { dev_idx, controller }) => { + Vr(Unpress { dev_idx, .. }) => { self.pads.insert(dev_idx, (TrackMode::TOUCH, None)); }, - Vr(Untouch { dev_idx, controller }) => { + Vr(Untouch { dev_idx, .. }) => { self.pads.remove(&dev_idx); }, _ => () diff --git a/src/town.rs b/src/town.rs index b42b104..58379db 100644 --- a/src/town.rs +++ b/src/town.rs @@ -15,14 +15,14 @@ enum Behavior { #[derive(Clone, Copy)] pub struct Town { map: Chunk, - npc_tile1: [Tile; 32], - npc_x1: [u8; 32], - npc_y1: [u8; 32], - npc_tile2: [Tile; 32], - npc_x2: [u8; 32], - npc_y2: [u8; 32], - npc_behavior: [Behavior; 32], - npc_talk_idx: [u8; 32], + _npc_tile1: [Tile; 32], + _npc_x1: [u8; 32], + _npc_y1: [u8; 32], + _npc_tile2: [Tile; 32], + _npc_x2: [u8; 32], + _npc_y2: [u8; 32], + _npc_behavior: [Behavior; 32], + _npc_talk_idx: [u8; 32], } impl HasMap for Town {