diff --git a/include/d/a/obj/d_a_obj_clearness_wall.h b/include/d/a/obj/d_a_obj_clearness_wall.h index 90a24755..a15f6352 100644 --- a/include/d/a/obj/d_a_obj_clearness_wall.h +++ b/include/d/a/obj/d_a_obj_clearness_wall.h @@ -6,9 +6,7 @@ class dAcOclearnessWall_c : public dAcObjBase_c { public: - dAcOclearnessWall_c() { - field_0x543 = 1; - } + dAcOclearnessWall_c(): field_0x543(true) {} virtual ~dAcOclearnessWall_c() {} virtual bool createHeap() override; @@ -18,8 +16,8 @@ public: virtual int draw() override; private: - char *getArcName(); - char *getModelName(); + const char *getArcName(); + const char *getModelName(); /* 0x330 */ dBgW mBgW; /* 0x540 */ u8 mSceneflag; diff --git a/src/REL/d/a/obj/d_a_obj_clearness_wall.cpp b/src/REL/d/a/obj/d_a_obj_clearness_wall.cpp index af9b8c82..9a2dbad0 100644 --- a/src/REL/d/a/obj/d_a_obj_clearness_wall.cpp +++ b/src/REL/d/a/obj/d_a_obj_clearness_wall.cpp @@ -9,8 +9,8 @@ SPECIAL_ACTOR_PROFILE(OBJ_CLEARNESS_WALL, dAcOclearnessWall_c, fProfile::OBJ_CLEARNESS_WALL, 0x15B, 0, 0); bool dAcOclearnessWall_c::createHeap() { - char *arcName = getArcName(); - char *modelName = getModelName(); + const char *arcName = getArcName(); + const char *modelName = getModelName(); void *dzb = OarcManager::GetInstance()->getDzbFromArc(arcName, modelName); void *plc = OarcManager::GetInstance()->getPlcFromArc(arcName, modelName); TRY_CREATE(!mBgW.Set((cBgD_t *)dzb, (PLC *)plc, cBgW::MOVE_BG_e, &mWorldMtx, &mScale)); @@ -92,7 +92,7 @@ int dAcOclearnessWall_c::draw() { return SUCCEEDED; } -char *dAcOclearnessWall_c::getArcName() { +const char *dAcOclearnessWall_c::getArcName() { switch (mVariant) { case 0: return "InvisibleWall"; case 1: return "InvisibleWallB"; @@ -103,7 +103,7 @@ char *dAcOclearnessWall_c::getArcName() { } } -char *dAcOclearnessWall_c::getModelName() { +const char *dAcOclearnessWall_c::getModelName() { switch (mVariant) { case 0: return "InvisibleWall"; case 1: return "InvisibleWall_yahane";