From 2e2cd34ce537695998b95c8f20d3c9102dbaeb97 Mon Sep 17 00:00:00 2001 From: biroder <107300789+biroder@users.noreply.github.com> Date: Sun, 5 Mar 2023 09:18:02 +0200 Subject: [PATCH] Maybe this implementation would be better --- src/game/player/mod.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/game/player/mod.rs b/src/game/player/mod.rs index 95d9824..c43a110 100644 --- a/src/game/player/mod.rs +++ b/src/game/player/mod.rs @@ -939,13 +939,13 @@ impl Player { impl GameEntity<&NPCList> for Player { fn tick(&mut self, state: &mut SharedGameState, npc_list: &NPCList) -> GameResult { - if !self.cond.alive() && self.life > 0 { - return Ok(()); - } else if !self.cond.alive() && self.life == 0 { - self.popup.x = self.x; - self.popup.y = self.y - self.display_bounds.top as i32 + 0x1000; - self.popup.tick(state, ())?; - + if !self.cond.alive() { + if self.life == 0 { + self.popup.x = self.x; + self.popup.y = self.y - self.display_bounds.top as i32 + 0x1000; + self.popup.tick(state, ())?; + } + return Ok(()); }