mirror of
https://github.com/zeldaret/st
synced 2026-08-25 07:44:42 -04:00
Cleanup some actors of ov031 (#131)
* feat: mark NORE as completed in delink * feat: cleanup some functions * refactor: remove explicit dtors of MLCK * fix: match back vfunc_6C
This commit is contained in:
@@ -5,7 +5,6 @@
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
typedef u32 ActorUnkFLENState;
|
||||
enum ActorUnkFLENState_ {
|
||||
ActorUnkFLENState_0 = 0,
|
||||
ActorUnkFLENState_1 = 1,
|
||||
@@ -21,12 +20,10 @@ public:
|
||||
|
||||
ActorUnkFLEN();
|
||||
|
||||
/* 4C */ virtual ~ActorUnkFLEN() override;
|
||||
|
||||
/* 18 */ virtual bool vfunc_18(int param1) override;
|
||||
/* 20 */ virtual void vfunc_20() override;
|
||||
|
||||
void SetState(ActorUnkFLENState state);
|
||||
void SetState(ActorState state);
|
||||
bool func_ov031_020f81f8();
|
||||
};
|
||||
|
||||
@@ -36,7 +33,6 @@ public:
|
||||
/* 3C */
|
||||
|
||||
ActorProfileUnkFLEN();
|
||||
~ActorProfileUnkFLEN();
|
||||
|
||||
/* 0C */ virtual Actor *Create();
|
||||
|
||||
|
||||
@@ -106,8 +106,7 @@ public:
|
||||
|
||||
ActorUnkMLCK();
|
||||
|
||||
/* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020fac64
|
||||
/* 4C */ virtual ~ActorUnkMLCK() override;
|
||||
/* 18 */ virtual bool vfunc_18(unk32 param1) override; // func_ov031_020fac64
|
||||
/* 54 */ virtual void vfunc_54(unk32 param1, unk32 param2) override; // func_ov031_020fad88
|
||||
/* 58 */ virtual void vfunc_58() override; // func_ov031_020fada8
|
||||
/* 5C */ virtual void vfunc_5C() override; // func_ov031_020fadb4
|
||||
@@ -130,7 +129,6 @@ public:
|
||||
/* 00 (base) */
|
||||
|
||||
ActorProfileUnkMLCK();
|
||||
~ActorProfileUnkMLCK();
|
||||
|
||||
/* 0C */ virtual Actor *Create();
|
||||
|
||||
|
||||
@@ -5,16 +5,6 @@
|
||||
#include "global.h"
|
||||
#include "types.h"
|
||||
|
||||
class ActorUnkNORE_C4 : public Actor_C4 {
|
||||
public:
|
||||
ActorUnkNORE_C4(Actor *param1);
|
||||
|
||||
/* 00 */ virtual bool vfunc_00(ActorRef ref, unk32 param2) override;
|
||||
/* 04 */ virtual bool vfunc_04() override;
|
||||
/* 08 */ virtual void vfunc_08() override;
|
||||
/* 0C */ virtual void vfunc_0C(unk32 param1) override;
|
||||
};
|
||||
|
||||
class ActorUnkNORE : public Actor {
|
||||
public:
|
||||
/* 00 (base) */
|
||||
@@ -23,7 +13,6 @@ public:
|
||||
ActorUnkNORE();
|
||||
|
||||
/* 18 */ virtual bool vfunc_18(unk32 param1) override;
|
||||
/* 4C */ virtual ~ActorUnkNORE() override;
|
||||
};
|
||||
|
||||
class ActorProfileUnkNORE : public ActorProfile {
|
||||
@@ -31,7 +20,6 @@ public:
|
||||
/* 00 (base) */
|
||||
|
||||
ActorProfileUnkNORE();
|
||||
~ActorProfileUnkNORE();
|
||||
|
||||
/* 0C */ virtual Actor *Create();
|
||||
|
||||
|
||||
@@ -23,7 +23,8 @@ public:
|
||||
/* 09C */ bool mUnk_09C;
|
||||
#else
|
||||
/* 094 */ ActorUnkTGTZ_ModelRender mUnk_094;
|
||||
/* 100 */ STRUCT_PAD(0x100, 0x190);
|
||||
/* 100 */ unk32 mUnk_100;
|
||||
/* 104 */ STRUCT_PAD(0x104, 0x190);
|
||||
#endif
|
||||
/* 190 */ Mat3p mUnk_190;
|
||||
/* 1B4 */ ActorUnkNTTZ *mUnk_1B4;
|
||||
|
||||
Reference in New Issue
Block a user