Fix types and add target arrow class

DotKuribo · Jun 28, 2024 · 4482a41 · 4482a41
1 parent 6aa07e2
commit 4482a41
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/include/SMS/MapObj/MapObjBase.hxx b/include/SMS/MapObj/MapObjBase.hxx
@@ -115,8 +115,8 @@ public:
     static f32 getJointTransZ(J3DJoint *);
     static s32 getWaterID(THitActor *);
     static void *getWaterPlane(THitActor *);
-    static void *getWaterPos(THitActor *);
-    static void *getWaterSpeed(THitActor *);
+    static TVec3f *getWaterPos(THitActor *);
+    static TVec3f *getWaterSpeed(THitActor *);
     static void initPacketColor(J3DModel *, GXTevRegID, const GXColorS10 *);
     static bool isCoin(THitActor *);
     static bool isDemo();

diff --git a/include/SMS/System/TargetArrow.hxx b/include/SMS/System/TargetArrow.hxx
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <JSystem/JDrama/JDRViewObj.hxx>
+
+#include <SMS/M3DUtil/MActor.hxx>
+
+class TTargetArrow : public JDrama::TViewObj {
+public:
+    TTargetArrow(const char *name) : JDrama::TViewObj(name) {
+        mActor     = nullptr;
+        mIsVisible = false;
+    }
+
+    void loadAfter() override;
+    void perform(u32, JDrama::TGraphics *) override;
+
+    void setPos(const TVec3f &pos);
+
+    u16 _0E;
+    MActor *mActor;
+    bool mIsVisible;
+};