alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2025-01-11 09:31:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Fix clippy lints in the-purple-night

Browse source
This commit is contained in:
Gwilym Kuiper 2022-02-26 21:21:54 +00:00
parent 548e88f7c4
commit e86bb71abd
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
examples/the-purple-night/src/main.rs
View file

@ -6,6 +6,8 @@ extern crate alloc;
mod rng; mod rng;
mod sfx; mod sfx;
use core::cmp::Ordering;
use alloc::vec::Vec; use alloc::vec::Vec;
use rng::get_random; use rng::get_random;
@ -324,7 +326,7 @@ impl SwordState {
*counter = 0; *counter = 0;
} }
match self { match self {
SwordState::LongSword => (0 + *counter / 8) * 4, SwordState::LongSword => (*counter / 8) * 4,
SwordState::ShortSword => (41 + *counter / 8) * 4, SwordState::ShortSword => (41 + *counter / 8) * 4,
SwordState::Dagger => (96 + *counter / 8) * 4, SwordState::Dagger => (96 + *counter / 8) * 4,
SwordState::Swordless => (154 + *counter / 8) * 4, SwordState::Swordless => (154 + *counter / 8) * 4,
@ -943,12 +945,10 @@ impl SlimeData {
.set_tile_id((29 + self.sprite_offset / 16) * 4); .set_tile_id((29 + self.sprite_offset / 16) * 4);
if (player.entity.position - entity.position).manhattan_distance() < 40.into() { if (player.entity.position - entity.position).manhattan_distance() < 40.into() {
let direction = if player.entity.position.x > entity.position.x { let direction = match player.entity.position.x.cmp(&entity.position.x) {
Tri::Positive Ordering::Equal => Tri::Zero,
} else if player.entity.position.x < entity.position.x { Ordering::Greater => Tri::Positive,
Tri::Negative Ordering::Less => Tri::Negative,
} else {
Tri::Zero
}; };
self.slime_state = SlimeState::Chasing(direction); self.slime_state = SlimeState::Chasing(direction);
@ -1200,14 +1200,18 @@ impl EmuData {
.signum(); .signum();
entity.velocity.x = velocity; entity.velocity.x = velocity;
if velocity > 0.into() { match velocity.cmp(&0.into()) {
entity.sprite.set_hflip(true); Ordering::Greater => {
self.state = EmuState::Charging(Tri::Positive); entity.sprite.set_hflip(true);
} else if velocity < 0.into() { self.state = EmuState::Charging(Tri::Positive);
self.state = EmuState::Charging(Tri::Negative); }
entity.sprite.set_hflip(false); Ordering::Less => {
} else { self.state = EmuState::Charging(Tri::Negative);
self.state = EmuState::Idle; entity.sprite.set_hflip(false);
}
Ordering::Equal => {
self.state = EmuState::Idle;
}
} }
} }
@ -1916,13 +1920,12 @@ impl<'a> Game<'a> {
} }
self.input.update(); self.input.update();
match self.player.update(&self.input, &self.level, sfx) { if let UpdateInstruction::CreateParticle(data, position) =
UpdateInstruction::CreateParticle(data, position) => { self.player.update(&self.input, &self.level, sfx)
let new_particle = Particle::new(object_controller, data, position); {
let new_particle = Particle::new(object_controller, data, position);
self.particles.insert(new_particle); self.particles.insert(new_particle);
}
_ => {}
} }
let mut remove = Vec::with_capacity(10); let mut remove = Vec::with_capacity(10);