diff --git a/include/d/actor/d_a_itembase.h b/include/d/actor/d_a_itembase.h index fe66cd1b1..355e5018e 100644 --- a/include/d/actor/d_a_itembase.h +++ b/include/d/actor/d_a_itembase.h @@ -72,7 +72,7 @@ public: /* 0x2B0 */ mDoExt_brkAnm* mBrkAnm1; /* 0x2B4 */ mDoExt_brkAnm* mBrkAnm2; /* 0x2B8 */ mDoExt_bckAnm* mBckAnm; - /* 0x2BC */ dBgS_Acch mAcch; + /* 0x2BC */ dBgS_ObjAcch mAcch; /* 0x480 */ dBgS_AcchCir mAcchCir; /* 0x4C0 */ dCcD_Stts mStts; /* 0x4FC */ dCcD_Cyl mCyl; diff --git a/include/d/d_bg_s_acch.h b/include/d/d_bg_s_acch.h index 005bd6cef..645c3f732 100644 --- a/include/d/d_bg_s_acch.h +++ b/include/d/d_bg_s_acch.h @@ -202,7 +202,7 @@ public: class dBgS_ObjAcch : public dBgS_Acch { public: dBgS_ObjAcch() { - /* SetObj(); */ + SetObj(); } /* 80BB336C */ virtual ~dBgS_ObjAcch() {} diff --git a/include/d/d_bg_s_gnd_chk.h b/include/d/d_bg_s_gnd_chk.h index a597bb64f..2123482d9 100644 --- a/include/d/d_bg_s_gnd_chk.h +++ b/include/d/d_bg_s_gnd_chk.h @@ -20,7 +20,7 @@ public: class dBgS_ObjGndChk : public dBgS_GndChk { public: - dBgS_ObjGndChk() { /* SetObj(); */ } + dBgS_ObjGndChk() { SetObj(); } /* 8001E020 */ virtual ~dBgS_ObjGndChk(); }; diff --git a/include/d/d_bg_s_poly_pass_chk.h b/include/d/d_bg_s_poly_pass_chk.h index 99507e5dc..5bdc743ad 100644 --- a/include/d/d_bg_s_poly_pass_chk.h +++ b/include/d/d_bg_s_poly_pass_chk.h @@ -20,6 +20,8 @@ class dBgS_PolyPassChk : public cBgS_PolyPassChk { public: dBgS_PolyPassChk(); virtual ~dBgS_PolyPassChk(); + + void SetObj() { mbObjThrough = 1; } }; STATIC_ASSERT(sizeof(dBgS_PolyPassChk) == 0xC); diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 388d0327f..62216a60a 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -249,7 +249,6 @@ int daShopItem_c::_create() { } CreateInit(); - return result; } return result;