logaritmisk/rust-smb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

get_tile now returns an Option<&Tile>

Browse Source
This commit is contained in:
logaritmisk
2015-01-12 14:26:26 +01:00
parent b481a4f3bb
commit b02f487e18
2 changed files with 42 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/main.rs
View File

@@ -87,7 +87,9 @@ fn main() {
match poll_event() {
Event::Quit(_) => break 'main,
Event::KeyDown(_, _, key, _, _, repeat) => {
keyboard.key_down(key);
if repeat == false {
keyboard.key_down(key);
}
},
Event::KeyUp(_, _, key, _, _, _) => {
keyboard.key_up(key);
@@ -155,11 +157,14 @@ fn main() {
break;
}
// @todo get_tile should return Option<Tile>
d = match *layer.get_tile(x, y) {
Tile::Empty => d,
Tile::Floor(_) => d.min(t)
};
if let Some(tile) = layer.get_tile(x, y) {
d = match *tile {
Tile::Empty => d,
Tile::Floor(_) => d.min(t)
};
} else {
break;
}
x += 1;
}
@@ -184,11 +189,14 @@ fn main() {
break;
}
// @todo get_tile should return Option<Tile>
d = match *layer.get_tile(x, y) {
Tile::Empty => d,
Tile::Floor(_) => d.max(t)
};
if let Some(tile) = layer.get_tile(x, y) {
d = match *tile {
Tile::Empty => d,
Tile::Floor(_) => d.max(t)
};
} else {
break;
}
x -= 1;
}
@@ -215,11 +223,14 @@ fn main() {
break;
}
// @todo get_tile should return Option<Tile>
d = match *layer.get_tile(x, y) {
Tile::Empty => d,
Tile::Floor(_) => d.min(t)
};
if let Some(tile) = layer.get_tile(x, y) {
d = match *tile {
Tile::Empty => d,
Tile::Floor(_) => d.min(t)
};
} else {
break;
}
y += 1;
}
@@ -242,17 +253,18 @@ fn main() {
loop {
let t = (y * TILE_HEIGHT + TILE_HEIGHT) as f32 - p;
println!("x={}, y={}, d={}, t={}", x, y, d, t);
if t < d {
break;
}
// @todo get_tile should return Option<Tile>
d = match *layer.get_tile(x, y) {
Tile::Empty => d,
Tile::Floor(_) => d.max(t)
};
if let Some(tile) = layer.get_tile(x, y) {
d = match *tile {
Tile::Empty => d,
Tile::Floor(_) => d.max(t)
};
} else {
break;
}
y -= 1;
}