diff --git a/include/d/actor/d_a_obj_catdoor.h b/include/d/actor/d_a_obj_catdoor.h index 78f5525d8c..77d285dc07 100644 --- a/include/d/actor/d_a_obj_catdoor.h +++ b/include/d/actor/d_a_obj_catdoor.h @@ -67,7 +67,7 @@ private: /* 0x790 */ s16 mRotSpeed; public: - static u32 const M_attr; + static s16 const M_attr[2]; }; #endif /* D_A_OBJ_CATDOOR_H */ diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index e1f3373e87..a2438515f2 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -10,7 +10,7 @@ static const char* l_arcName = "CatDoor"; -u32 const daObjCatDoor_c::M_attr = 0x001E0578; +s16 const daObjCatDoor_c::M_attr[2] = {0x001E, 0x0578}; daObjCatDoor_c::~daObjCatDoor_c() { if (mDoor1.bgw.ChkUsed()) { @@ -71,7 +71,7 @@ int daObjCatDoor_c::execute() { } const s16* daObjCatDoor_c::attr() const { - return (const s16*)&daObjCatDoor_c::M_attr; + return daObjCatDoor_c::M_attr; } static int createSolidHeap(fopAc_ac_c* i_this) {