alex/gba
1
0
Fork 0
mirror of https://github.com/italicsjenga/gba.git synced 2024-12-23 19:01:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

outline the two checks from the if

Browse source
This commit is contained in:
Lokathor 2023-01-01 00:20:11 -07:00
parent d51e2d3c1f
commit 38de4e8f5a
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
examples/game.rs
View file

@ -141,56 +141,56 @@ extern "C" fn main() -> ! {
if keys.up() { if keys.up() {
let new_p = Position { x: player.x, y: player.y - 1 }; let new_p = Position { x: player.x, y: player.y - 1 };
let new_r = Rect { x: new_p.x, y: new_p.y, w: 8, h: 8 }; let new_r = Rect { x: new_p.x, y: new_p.y, w: 8, h: 8 };
if new_r let terrain_clear = new_r
.iter_tiles() .iter_tiles()
.all(|(tx, ty)| allows_movement(world[ty as usize][tx as usize])) .all(|(tx, ty)| allows_movement(world[ty as usize][tx as usize]));
&& enemies.iter().all(|enemy| { let enemy_clear = enemies.iter().all(|enemy| {
let enemy_r = Rect { x: enemy.x, y: enemy.y, w: 8, h: 8 }; let enemy_r = Rect { x: enemy.x, y: enemy.y, w: 8, h: 8 };
!new_r.intersect(enemy_r) !new_r.intersect(enemy_r)
}) });
{ if terrain_clear && enemy_clear {
*player = new_p; *player = new_p;
} }
} }
if keys.down() { if keys.down() {
let new_p = Position { x: player.x, y: player.y + 1 }; let new_p = Position { x: player.x, y: player.y + 1 };
let new_r = Rect { x: new_p.x, y: new_p.y, w: 8, h: 8 }; let new_r = Rect { x: new_p.x, y: new_p.y, w: 8, h: 8 };
if new_r let terrain_clear = new_r
.iter_tiles() .iter_tiles()
.all(|(tx, ty)| allows_movement(world[ty as usize][tx as usize])) .all(|(tx, ty)| allows_movement(world[ty as usize][tx as usize]));
&& enemies.iter().all(|enemy| { let enemy_clear = enemies.iter().all(|enemy| {
let enemy_r = Rect { x: enemy.x, y: enemy.y, w: 8, h: 8 }; let enemy_r = Rect { x: enemy.x, y: enemy.y, w: 8, h: 8 };
!new_r.intersect(enemy_r) !new_r.intersect(enemy_r)
}) });
{ if terrain_clear && enemy_clear {
*player = new_p; *player = new_p;
} }
} }
if keys.left() { if keys.left() {
let new_p = Position { x: player.x - 1, y: player.y }; let new_p = Position { x: player.x - 1, y: player.y };
let new_r = Rect { x: new_p.x, y: new_p.y, w: 8, h: 8 }; let new_r = Rect { x: new_p.x, y: new_p.y, w: 8, h: 8 };
if new_r let terrain_clear = new_r
.iter_tiles() .iter_tiles()
.all(|(tx, ty)| allows_movement(world[ty as usize][tx as usize])) .all(|(tx, ty)| allows_movement(world[ty as usize][tx as usize]));
&& enemies.iter().all(|enemy| { let enemy_clear = enemies.iter().all(|enemy| {
let enemy_r = Rect { x: enemy.x, y: enemy.y, w: 8, h: 8 }; let enemy_r = Rect { x: enemy.x, y: enemy.y, w: 8, h: 8 };
!new_r.intersect(enemy_r) !new_r.intersect(enemy_r)
}) });
{ if terrain_clear && enemy_clear {
*player = new_p; *player = new_p;
} }
} }
if keys.right() { if keys.right() {
let new_p = Position { x: player.x + 1, y: player.y }; let new_p = Position { x: player.x + 1, y: player.y };
let new_r = Rect { x: new_p.x, y: new_p.y, w: 8, h: 8 }; let new_r = Rect { x: new_p.x, y: new_p.y, w: 8, h: 8 };
if new_r let terrain_clear = new_r
.iter_tiles() .iter_tiles()
.all(|(tx, ty)| allows_movement(world[ty as usize][tx as usize])) .all(|(tx, ty)| allows_movement(world[ty as usize][tx as usize]));
&& enemies.iter().all(|enemy| { let enemy_clear = enemies.iter().all(|enemy| {
let enemy_r = Rect { x: enemy.x, y: enemy.y, w: 8, h: 8 }; let enemy_r = Rect { x: enemy.x, y: enemy.y, w: 8, h: 8 };
!new_r.intersect(enemy_r) !new_r.intersect(enemy_r)
}) });
{ if terrain_clear && enemy_clear {
*player = new_p; *player = new_p;
} }
} }