mark _unused fields as such, don't bind unused vars in match

This commit is contained in:
2016-10-10 18:47:33 -07:00
parent 8eb9ab2d63
commit f795c73ed8
3 changed files with 16 additions and 16 deletions

View File

@@ -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],

View File

@@ -184,16 +184,16 @@ impl<D: gfx::Device,
use scene::Event::*;
use vr::Event::*;
match event {
Vr(Touch { dev_idx, controller }) => {
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);
},
_ => ()

View File

@@ -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 {