From 6d08eb716e7b60ba5c411dbd77a3aa71afaec494 Mon Sep 17 00:00:00 2001 From: dawnDus <96957561+dawndus@users.noreply.github.com> Date: Thu, 30 Jun 2022 11:40:24 -0400 Subject: [PATCH] Add missing fireplace smoke --- src/npc/ai/misc.rs | 10 +++++++++- src/npc/mod.rs | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/npc/ai/misc.rs b/src/npc/ai/misc.rs index a08ec46..77ddb48 100644 --- a/src/npc/ai/misc.rs +++ b/src/npc/ai/misc.rs @@ -465,7 +465,7 @@ impl NPC { Ok(()) } - pub(crate) fn tick_n038_fireplace(&mut self, state: &mut SharedGameState) -> GameResult { + pub(crate) fn tick_n038_fireplace(&mut self, state: &mut SharedGameState, npc_list: &NPCList) -> GameResult { match self.action_num { 0 => { self.anim_counter = (self.anim_counter + 1) % 16; @@ -475,6 +475,14 @@ impl NPC { 10 | 11 => { if self.action_num == 10 { self.action_num = 11; + npc_list.create_death_smoke( + self.x, + self.y, + self.display_bounds.right as usize, + 8, + state, + &self.rng, + ); } self.anim_rect.left = 0; diff --git a/src/npc/mod.rs b/src/npc/mod.rs index 7ffcead..d089460 100644 --- a/src/npc/mod.rs +++ b/src/npc/mod.rs @@ -280,7 +280,7 @@ impl GameEntity<([&mut Player; 2], &NPCList, &mut Stage, &mut BulletManager, &mu 35 => self.tick_n035_mannan(state, npc_list), 36 => self.tick_n036_balrog_hover(state, players, npc_list), 37 => self.tick_n037_sign(state), - 38 => self.tick_n038_fireplace(state), + 38 => self.tick_n038_fireplace(state, npc_list), 39 => self.tick_n039_save_sign(state), 40 => self.tick_n040_santa(state, players), 41 => self.tick_n041_busted_door(state),