From f0ec5591c10573f51362450f0fce670c4eedd490 Mon Sep 17 00:00:00 2001 From: elijah-thomas774 Date: Thu, 8 Oct 2026 11:01:28 -0400 Subject: [PATCH] Remove dAcBomb_c include from d_a_en_base --- include/d/a/e/d_a_e_ks.h | 1 + include/d/a/e/d_a_en_base.h | 3 ++- include/d/a/npc/d_a_npc.h | 2 +- include/d/a/npc/d_a_npc_bee.h | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/d/a/e/d_a_e_ks.h b/include/d/a/e/d_a_e_ks.h index d63150e8..338dd383 100644 --- a/include/d/a/e/d_a_e_ks.h +++ b/include/d/a/e/d_a_e_ks.h @@ -7,6 +7,7 @@ #include "d/col/bg/d_bg_s_acch.h" #include "d/col/cc/d_cc_d.h" #include "d/d_light_env.h" +#include "d/d_shadow.h" #include "m/m3d/m_anmtexpat.h" #include "m/m_mtx.h" #include "m/m_vec.h" diff --git a/include/d/a/e/d_a_en_base.h b/include/d/a/e/d_a_en_base.h index 37836351..2342540b 100644 --- a/include/d/a/e/d_a_en_base.h +++ b/include/d/a/e/d_a_en_base.h @@ -3,13 +3,14 @@ #include "common.h" #include "d/a/obj/d_a_obj_base.h" -#include "d/a/obj/d_a_obj_bomb.h" #include "d/d_cc.h" #include "f/f_list_mg.h" #include "m/m3d/m_mdl.h" #include "m/m_angle.h" #include "m/m_vec.h" +class dAcBomb_c; + struct dAcEnData { // Unknown Size yet }; diff --git a/include/d/a/npc/d_a_npc.h b/include/d/a/npc/d_a_npc.h index b080e716..6fe293ea 100644 --- a/include/d/a/npc/d_a_npc.h +++ b/include/d/a/npc/d_a_npc.h @@ -29,7 +29,7 @@ class dAcNpc_c; class dNpcMdlCallbackEye_c : public nw4r::g3d::IScnObjCallback { public: dNpcMdlCallbackEye_c() {} - virtual ~dNpcMdlCallbackEye_c() {} + virtual ~dNpcMdlCallbackEye_c(); void create(m3d::smdl_c &mdl, u16 eyeMatL, u16 eyeMatR, u8, u8, dAcObjBase_c *); diff --git a/include/d/a/npc/d_a_npc_bee.h b/include/d/a/npc/d_a_npc_bee.h index 2e701b0e..78dbc79f 100644 --- a/include/d/a/npc/d_a_npc_bee.h +++ b/include/d/a/npc/d_a_npc_bee.h @@ -8,10 +8,10 @@ #include "d/a/obj/d_a_obj_base.h" #include "d/col/cc/d_cc_d.h" #include "d/d_cc.h" -#include "m/m3d/m_proc.h" #include "m/m_angle.h" #include "m/m_vec.h" #include "nw4r/g3d/res/g3d_resfile.h" +#include "toBeSorted/d_unk_mdl_stuff_2.h" class dAcOSpore_c;