From dc722d5199068f74b9057e1f196d5a8d1a232f2e Mon Sep 17 00:00:00 2001 From: Corwin Date: Tue, 21 Jun 2022 02:07:38 +0100 Subject: [PATCH] flip wizard sprite to match direction regardless of hat state --- .../the-hat-chooses-the-wizard/src/main.rs | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/examples/the-hat-chooses-the-wizard/src/main.rs b/examples/the-hat-chooses-the-wizard/src/main.rs index d387e08a..2853f864 100644 --- a/examples/the-hat-chooses-the-wizard/src/main.rs +++ b/examples/the-hat-chooses-the-wizard/src/main.rs @@ -503,6 +503,22 @@ impl<'a> Player<'a> { _ => (0, 8).into(), }; + match self.facing { + agb::input::Tri::Negative => { + self.wizard.sprite.set_hflip(true); + self.hat + .sprite + .set_sprite(controller.sprite(hat_base_tile.sprite(5))); + } + agb::input::Tri::Positive => { + self.wizard.sprite.set_hflip(false); + self.hat + .sprite + .set_sprite(controller.sprite(hat_base_tile.sprite(0))); + } + _ => {} + } + match self.hat_state { HatState::Thrown => { // hat is thrown, make hat move towards wizard @@ -554,21 +570,6 @@ impl<'a> Player<'a> { self.hat_slow_counter = 0; self.hat_left_range = false; self.hat.position = self.wizard.position - hat_resting_position; - match self.facing { - agb::input::Tri::Negative => { - self.wizard.sprite.set_hflip(true); - self.hat - .sprite - .set_sprite(controller.sprite(hat_base_tile.sprite(5))); - } - agb::input::Tri::Positive => { - self.wizard.sprite.set_hflip(false); - self.hat - .sprite - .set_sprite(controller.sprite(hat_base_tile.sprite(0))); - } - _ => {} - } } HatState::WizardTowards => { self.hat.sprite.set_sprite(