d_a_obj_distant_ship OK

config/SOUE01/rels/d_a_obj_distant_shipNP/symbols.txt

@@ -2,12 +2,12 @@ _prolog = .text:0x00000000; // type:function size:0x2C scope:global
 _epilog = .text:0x00000030; // type:function size:0x2C scope:global
 _unresolved = .text:0x00000060; // type:function size:0x4 scope:global
 dAcOdistantShip_c_classInit__Fv = .text:0x00000070; // type:function size:0x5C
-AcOdistantShip__initModels = .text:0x000000D0; // type:function size:0x90
-AcOdistantShip__init = .text:0x00000160; // type:function size:0x100
-fn_616_260 = .text:0x00000260; // type:function size:0x8
-fn_616_270 = .text:0x00000270; // type:function size:0x8
-AcOdistantShip__draw = .text:0x00000280; // type:function size:0x34
-AcOdistantShip__getModelName = .text:0x000002C0; // type:function size:0x38
+createHeap__17dAcOdistantShip_cFv = .text:0x000000D0; // type:function size:0x90
+create__17dAcOdistantShip_cFv = .text:0x00000160; // type:function size:0x100
+doDelete__17dAcOdistantShip_cFv = .text:0x00000260; // type:function size:0x8
+actorExecute__17dAcOdistantShip_cFv = .text:0x00000270; // type:function size:0x8
+draw__17dAcOdistantShip_cFv = .text:0x00000280; // type:function size:0x34
+getModelName__17dAcOdistantShip_cFv = .text:0x000002C0; // type:function size:0x38
 __dt__17dAcOdistantShip_cFv = .text:0x00000300; // type:function size:0x68
 _ctors = .ctors:0x00000000; // type:label scope:global
 _dtors = .dtors:0x00000000; // type:label scope:global
@@ -18,4 +18,4 @@ 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
-AcOdistantShip__vtable = .data:0x00000068; // type:object size:0x80
+__vt__17dAcOdistantShip_c = .data:0x00000068; // type:object size:0x80

configure.py

@@ -2017,7 +2017,7 @@ config.libs = [
         "d_a_obj_display_only_nbs",
         "REL/d/a/obj/d_a_obj_display_only_nbs.cpp",
     ),
-    Rel(NonMatching, "d_a_obj_distant_ship", "REL/d/a/obj/d_a_obj_distant_ship.cpp"),
+    Rel(Matching, "d_a_obj_distant_ship", "REL/d/a/obj/d_a_obj_distant_ship.cpp"),
     Rel(
         NonMatching,
         "d_a_obj_diviner_crystal",

include/d/a/obj/d_a_obj_distant_ship.h

@@ -2,13 +2,25 @@
 #define D_A_OBJ_DISTANT_SHIP_H
 
 #include "d/a/obj/d_a_obj_base.h"
+#include "m/m3d/m_smdl.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
 
 class dAcOdistantShip_c : public dAcObjBase_c {
 public:
     dAcOdistantShip_c() {}
     virtual ~dAcOdistantShip_c() {}
+    virtual int create() override;
+    virtual int doDelete() override;
+    virtual int draw() override;
+    virtual bool createHeap() override;
+    virtual int actorExecute() override;
+    char *getModelName();
 
 private:
+    /* 0x330 */ nw4r::g3d::ResFile mBrres;
+    /* 0x334 */ m3d::smdl_c mModel;
+    /* 0x350 */ u8 mSubtype;
+    /* 0x351 */ bool mIsVisible;
 };
 
 #endif

src/REL/d/a/obj/d_a_obj_distant_ship.cpp

@@ -1,3 +1,61 @@
 #include "d/a/obj/d_a_obj_distant_ship.h"
 
+#include "common.h"
+#include "d/a/obj/d_a_obj_base.h"
+#include "d/flag/sceneflag_manager.h"
+#include "f/f_base.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
+#include "toBeSorted/arc_managers/current_stage_arc_manager.h"
+
 SPECIAL_ACTOR_PROFILE(OBJ_DIS_SHIP, dAcOdistantShip_c, fProfile::OBJ_DIS_SHIP, 0x143, 0, 0);
+
+bool dAcOdistantShip_c::createHeap() {
+    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;
+}
+
+int dAcOdistantShip_c::create() {
+    // Sure, why not
+    mIsVisible = false;
+    u32 p = params;
+    u16 r = (s32)roomid;
+    mSubtype = (p >> 8) & 0xF;
+
+    bool flag = SceneflagManager::sInstance->checkFlag(r, p & 0xFF);
+    if (flag) {
+        mIsVisible = true;
+    }
+
+    if (mIsVisible) {
+        CREATE_ALLOCATOR(dAcOdistantShip_c);
+        updateMatrix();
+        mModel.setLocalMtx(mWorldMtx);
+        boundingBox.Set(mVec3_c(-0.0f, -0.0f, -0.0f), mVec3_c(0.0f, 0.0f, 0.0f));
+    }
+    return SUCCEEDED;
+}
+
+int dAcOdistantShip_c::doDelete() {
+    return SUCCEEDED;
+}
+
+int dAcOdistantShip_c::actorExecute() {
+    return SUCCEEDED;
+}
+
+int dAcOdistantShip_c::draw() {
+    if (mIsVisible) {
+        drawModelType1(&mModel);
+    }
+    return SUCCEEDED;
+}
+
+char *dAcOdistantShip_c::getModelName() {
+    switch (mSubtype) {
+        case 0:  return "StageF301_D300";
+        case 1:  return "StageF301_3_D300";
+        default: return nullptr;
+    }
+}