1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2024-09-27 20:48:54 +00:00

Maybe this implementation would be better

This commit is contained in:
biroder 2023-03-05 09:18:02 +02:00 committed by alula
parent f91e793062
commit 8992889e94

View file

@ -939,12 +939,12 @@ impl Player {
impl GameEntity<&NPCList> for Player { impl GameEntity<&NPCList> for Player {
fn tick(&mut self, state: &mut SharedGameState, npc_list: &NPCList) -> GameResult { fn tick(&mut self, state: &mut SharedGameState, npc_list: &NPCList) -> GameResult {
if !self.cond.alive() && self.life > 0 { if !self.cond.alive() {
return Ok(()); if self.life == 0 {
} else if !self.cond.alive() && self.life == 0 {
self.popup.x = self.x; self.popup.x = self.x;
self.popup.y = self.y - self.display_bounds.top as i32 + 0x1000; self.popup.y = self.y - self.display_bounds.top as i32 + 0x1000;
self.popup.tick(state, ())?; self.popup.tick(state, ())?;
}
return Ok(()); return Ok(());
} }