diff --git a/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt b/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt index 9c6df247..0db61b3a 100644 --- a/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt +++ b/config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt @@ -11,11 +11,11 @@ getModelName__17dAcOdistantShip_cFv = .text:0x000002C0; // type:function size:0x __dt__17dAcOdistantShip_cFv = .text:0x00000300; // type:function size:0x68 _ctors = .ctors:0x00000000; // type:label scope:global _dtors = .dtors:0x00000000; // type:label scope:global -lbl_616_rodata_0 = .rodata:0x00000000; // type:object size:0x4 data:float -lbl_616_rodata_4 = .rodata:0x00000004; // type:object size:0x4 align:4 data:float +lbl_616_rodata_0 = .rodata:0x00000000; // type:object size:0x4 scope:local data:float +lbl_616_rodata_4 = .rodata:0x00000004; // type:object size:0x4 scope:local align:4 data:float g_profile_OBJ_DIS_SHIP = .data:0x00000000; // type:object size:0x10 -lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 data:string -lbl_616_data_20 = .data:0x00000020; // type:object size:0x20 -lbl_616_data_40 = .data:0x00000040; // type:object size:0x10 -lbl_616_data_50 = .data:0x00000050; // type:object size:0x18 +lbl_616_data_10 = .data:0x00000010; // type:object size:0x10 scope:local data:string +lbl_616_data_20 = .data:0x00000020; // type:object size:0x20 scope:local +lbl_616_data_40 = .data:0x00000040; // type:object size:0x10 scope:local +lbl_616_data_50 = .data:0x00000050; // type:object size:0x18 scope:local __vt__17dAcOdistantShip_c = .data:0x00000068; // type:object size:0x80 diff --git a/include/d/a/obj/d_a_obj_distant_ship.h b/include/d/a/obj/d_a_obj_distant_ship.h index 0771a1f6..d1df78b2 100644 --- a/include/d/a/obj/d_a_obj_distant_ship.h +++ b/include/d/a/obj/d_a_obj_distant_ship.h @@ -14,7 +14,7 @@ public: virtual int draw() override; virtual bool createHeap() override; virtual int actorExecute() override; - char *getModelName(); + const char *getModelName(); private: /* 0x330 */ nw4r::g3d::ResFile mBrres; diff --git a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp index 6ca6c8ef..45d773c3 100644 --- a/src/REL/d/a/obj/d_a_obj_distant_ship.cpp +++ b/src/REL/d/a/obj/d_a_obj_distant_ship.cpp @@ -10,7 +10,7 @@ SPECIAL_ACTOR_PROFILE(OBJ_DIS_SHIP, dAcOdistantShip_c, fProfile::OBJ_DIS_SHIP, 0x143, 0, 0); bool dAcOdistantShip_c::createHeap() { - char *modelName = getModelName(); + const char *modelName = getModelName(); mBrres = (nw4r::g3d::ResFile)CurrentStageArcManager::GetInstance()->getData("g3d/stage.brres"); TRY_CREATE(mModel.create(mBrres.GetResMdl(modelName), &heap_allocator, 0x120, 1, 0)); return SUCCEEDED; @@ -49,7 +49,7 @@ int dAcOdistantShip_c::draw() { return SUCCEEDED; } -char *dAcOdistantShip_c::getModelName() { +const char *dAcOdistantShip_c::getModelName() { switch (mSubtype) { case 0: return "StageF301_D300"; case 1: return "StageF301_3_D300";