mirror of
https://github.com/zeldaret/st
synced 2026-10-08 05:34:09 -04:00
Create Timer struct, improve angle usage and name known virtual functions (#154)
* name some actor vfuncs * name some map object vfuncs * remove angle union * fix lots of clangd errors * create Timer struct * fix regressions
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
#include "MapObject/MapObject.hpp"
|
||||
#include "MapObject/MapObjectProfile.hpp"
|
||||
#include "global.h"
|
||||
#include "timer.hpp"
|
||||
#include "types.h"
|
||||
|
||||
class ActorUnkNSSW;
|
||||
@@ -34,29 +35,19 @@ public:
|
||||
/* 0EC */ VecFx32 mUnk_0EC;
|
||||
/* 0F8 */ ActorUnkNSSW *mUnk_0F8;
|
||||
/* 0FC */ unk32 mUnk_0FC;
|
||||
/* 100 */ volatile u16 mUnk_100;
|
||||
/* 102 */ u16 mUnk_102;
|
||||
/* 100 */ Timer mUnk_100;
|
||||
/* 104 */ u8 mUnk_104;
|
||||
/* 105 */ u8 mUnk_105;
|
||||
/* 106 */ STRUCT_PAD(0x106, 0x108);
|
||||
/* 108 */ fx32 mUnk_108;
|
||||
/* 10C */ unk16 mUnk_10C;
|
||||
/* 10E */ volatile u16 mUnk_10E;
|
||||
/* 110 */ u16 mUnk_110;
|
||||
/* 10E */ Timer mUnk_10E;
|
||||
/* 114 */ ActorUnkNSSW *mUnk_114;
|
||||
/* 118 */
|
||||
|
||||
MapObjectUnkSWSW();
|
||||
|
||||
bool IsInternalTimerOut() {
|
||||
if (this->mUnk_100 < this->mUnk_102) {
|
||||
++this->mUnk_100;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/* 00 */ virtual bool vfunc_00() override;
|
||||
/* 00 */ virtual bool Init() override;
|
||||
/* 08 */ virtual void vfunc_08() override;
|
||||
/* 14 */ virtual void vfunc_14(unk32 param1) override;
|
||||
/* 1C */ virtual bool vfunc_1C(ActorRef param1, unk32 param2, VecFx32 *param3) override;
|
||||
|
||||
Reference in New Issue
Block a user