d_a_obj_pumpkin_leaf OK (#58)

2 files changed, 35 insertions, 0 deletions

diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h
index 179e8f7f..52a15a81 100644
--- a/include/d/a/d_a_base.h
+++ b/include/d/a/d_a_base.h
@@ -147,6 +147,10 @@ public:
         return getSquareDistanceTo(point) > radius;
     }
 
+    u32 getRoomId() {
+        return roomid;
+    }
+
 public:
     // funcs found in TU
     /* 8002c650 */ static void setTempCreateParams(mVec3_c *pos, mAng3_c *rot, mVec3_c *scale, s32 roomId, u32 params2,
diff --git a/include/d/a/obj/d_a_obj_pumpkin_leaf.h b/include/d/a/obj/d_a_obj_pumpkin_leaf.h
new file mode 100644
index 00000000..cfbc91a0
--- /dev/null
+++ b/include/d/a/obj/d_a_obj_pumpkin_leaf.h
@@ -0,0 +1,31 @@
+#ifndef D_A_OBJ_PUMPKIN_LEAF_H
+#define D_A_OBJ_PUMPKIN_LEAF_H
+
+#include <d/a/obj/d_a_obj_base.h>
+#include <m/m3d/m_smdl.h>
+#include <s/s_State.hpp>
+#include <s/s_StateMgr.hpp>
+
+class dAcOPumpkinLeaf_c : public dAcObjBase_c {
+public:
+    dAcOPumpkinLeaf_c() : mStateMgr(*this, sStateID::null) {}
+    virtual ~dAcOPumpkinLeaf_c() {}
+    virtual bool createHeap() override;
+    virtual int create() override;
+    virtual int actorExecute() override;
+    virtual int draw() override;
+    virtual int doDelete() override;
+
+    STATE_FUNC_DECLARE(dAcOPumpkinLeaf_c, Wait);
+
+private:
+    nw4r::g3d::ResFile mBrres;
+    m3d::smdl_c mModel;
+    STATE_MGR_DECLARE(dAcOPumpkinLeaf_c);
+    void dummy_executeState() {
+        // Not called from the class but needed for weak function ordering
+        mStateMgr.executeState();
+    }
+};
+
+#endif