From 6c1ca016673b795734f207a33c49215bb0b134d6 Mon Sep 17 00:00:00 2001 From: CovenEsme <84377742+CovenEsme@users.noreply.github.com> Date: Fri, 14 Mar 2025 13:06:28 +0000 Subject: [PATCH] Make members private --- include/d/a/obj/d_a_obj_fence_boko.h | 3 +-- include/d/a/obj/d_a_obj_fence_boko2.h | 3 +-- include/d/a/obj/d_a_obj_fence_konsai.h | 3 +-- include/d/a/obj/d_a_obj_iron_stage.h | 3 +-- include/d/a/obj/d_a_obj_pumpkin_bar.h | 3 +-- include/d/a/obj/d_a_obj_shrine_after.h | 3 +-- include/d/a/obj/d_a_obj_shrine_bef_inside.h | 3 +-- include/d/a/obj/d_a_obj_shrine_before.h | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/include/d/a/obj/d_a_obj_fence_boko.h b/include/d/a/obj/d_a_obj_fence_boko.h index 9bc69e21..f44432ed 100644 --- a/include/d/a/obj/d_a_obj_fence_boko.h +++ b/include/d/a/obj/d_a_obj_fence_boko.h @@ -14,12 +14,11 @@ public: virtual ~dAcOfenceBoko_c() {} virtual int actorExecute() override; +private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mModel; /* 0x350 */ dBgW mCollision; /* 0x560 */ bool field_0x560; - -private: }; #endif diff --git a/include/d/a/obj/d_a_obj_fence_boko2.h b/include/d/a/obj/d_a_obj_fence_boko2.h index f270c1b9..2c638ba2 100644 --- a/include/d/a/obj/d_a_obj_fence_boko2.h +++ b/include/d/a/obj/d_a_obj_fence_boko2.h @@ -14,11 +14,10 @@ public: virtual ~dAcOfenceBoko2_c() {} virtual int actorExecute() override; +private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mModel; /* 0x350 */ dBgW mCollision; - -private: }; #endif diff --git a/include/d/a/obj/d_a_obj_fence_konsai.h b/include/d/a/obj/d_a_obj_fence_konsai.h index a72fc500..b2c69670 100644 --- a/include/d/a/obj/d_a_obj_fence_konsai.h +++ b/include/d/a/obj/d_a_obj_fence_konsai.h @@ -14,11 +14,10 @@ public: virtual ~dAcOfenceKonsai_c() {} virtual int actorExecute() override; +private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mModel; /* 0x350 */ dBgW mCollision; - -private: }; #endif diff --git a/include/d/a/obj/d_a_obj_iron_stage.h b/include/d/a/obj/d_a_obj_iron_stage.h index a27a5758..bc2a4933 100644 --- a/include/d/a/obj/d_a_obj_iron_stage.h +++ b/include/d/a/obj/d_a_obj_iron_stage.h @@ -16,11 +16,10 @@ public: virtual ~dAcOironStage_c() {} virtual int actorExecute() override; +private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mModel; /* 0x350 */ dBgW mCollision; - -private: }; #endif diff --git a/include/d/a/obj/d_a_obj_pumpkin_bar.h b/include/d/a/obj/d_a_obj_pumpkin_bar.h index bf6a1765..083342b1 100644 --- a/include/d/a/obj/d_a_obj_pumpkin_bar.h +++ b/include/d/a/obj/d_a_obj_pumpkin_bar.h @@ -15,12 +15,11 @@ public: virtual ~dAcOpumpkinBar_c() override; virtual int actorExecute() override; +private: /* 0x330 */ m3d::smdl_c mModel; /* 0x34C */ nw4r::g3d::ResFile mResFile; /* 0x350 */ dBgW mBarCollision; /* 0x560 */ dBgW mBarBirdCollision; - -private: }; #endif diff --git a/include/d/a/obj/d_a_obj_shrine_after.h b/include/d/a/obj/d_a_obj_shrine_after.h index 3b20746e..38bda595 100644 --- a/include/d/a/obj/d_a_obj_shrine_after.h +++ b/include/d/a/obj/d_a_obj_shrine_after.h @@ -13,10 +13,9 @@ public: virtual ~dAcOshrineAfter_c() {} virtual int actorExecute() override; +private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mModel; - -private: }; #endif diff --git a/include/d/a/obj/d_a_obj_shrine_bef_inside.h b/include/d/a/obj/d_a_obj_shrine_bef_inside.h index c6d9f64c..18b1b3c6 100644 --- a/include/d/a/obj/d_a_obj_shrine_bef_inside.h +++ b/include/d/a/obj/d_a_obj_shrine_bef_inside.h @@ -14,11 +14,10 @@ public: virtual ~dAcOshrineBefInside_c() {} virtual int actorExecute() override; +private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mModel[2]; /* 0x36C */ dBgW mCollision; - -private: }; #endif diff --git a/include/d/a/obj/d_a_obj_shrine_before.h b/include/d/a/obj/d_a_obj_shrine_before.h index 6930e772..4c470a69 100644 --- a/include/d/a/obj/d_a_obj_shrine_before.h +++ b/include/d/a/obj/d_a_obj_shrine_before.h @@ -13,10 +13,9 @@ public: virtual ~dAcOshrineBefore_c() {} virtual int actorExecute() override; +private: /* 0x330 */ nw4r::g3d::ResFile mResFile; /* 0x334 */ m3d::smdl_c mModel; - -private: }; #endif