From 4482a4159cb30cc7c7d15ad680ac3bd62dac2559 Mon Sep 17 00:00:00 2001 From: JoshuaMKW Date: Thu, 27 Jun 2024 19:08:29 -0500 Subject: [PATCH] Fix types and add target arrow class --- include/SMS/MapObj/MapObjBase.hxx | 4 ++-- include/SMS/System/TargetArrow.hxx | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 include/SMS/System/TargetArrow.hxx diff --git a/include/SMS/MapObj/MapObjBase.hxx b/include/SMS/MapObj/MapObjBase.hxx index 7ef9df6..2bed41d 100644 --- 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 new file mode 100644 index 0000000..8004cab --- /dev/null +++ b/include/SMS/System/TargetArrow.hxx @@ -0,0 +1,22 @@ +#pragma once + +#include + +#include + +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; +}; \ No newline at end of file