From 5949d51270665a743a8aabe96202e09119200380 Mon Sep 17 00:00:00 2001 From: Alula Date: Sun, 27 Dec 2020 09:30:02 +0100 Subject: [PATCH] bug / warning fixes --- src/npc/ai/sand_zone.rs | 1 + src/npc/utils.rs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/npc/ai/sand_zone.rs b/src/npc/ai/sand_zone.rs index ae2fd87..b299194 100644 --- a/src/npc/ai/sand_zone.rs +++ b/src/npc/ai/sand_zone.rs @@ -113,6 +113,7 @@ impl NPC { if self.life <= 100 { npc_list.create_death_smoke(self.x, self.y, self.display_bounds.right, 8, state, &self.rng); state.sound_manager.play_sfx(25); + self.cond.set_alive(false); let mut npc = NPC::create(45, &state.npc_table); npc.cond.set_alive(true); diff --git a/src/npc/utils.rs b/src/npc/utils.rs index 454e393..e47ae84 100644 --- a/src/npc/utils.rs +++ b/src/npc/utils.rs @@ -263,7 +263,7 @@ impl NPCList { heart_pick.y = npc.y; heart_pick.exp = if npc.exp > 6 { 6 } else { 2 }; - let _ = self.spawn(0x100, heart_pick.clone()); + let _ = self.spawn(0x100, heart_pick); } 1 if can_drop_missile => { let mut missile_pick = NPC::create(86, &state.npc_table); @@ -273,7 +273,7 @@ impl NPCList { missile_pick.y = npc.y; missile_pick.exp = if npc.exp > 6 { 3 } else { 1 }; - let _ = self.spawn(0x100, missile_pick.clone()); + let _ = self.spawn(0x100, missile_pick); } _ => { npc.create_xp_drop(state, self);