mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-15 12:59:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

daObjLadder OK (#2211)

Browse Source 
* daObjLadder OK

* daObjFPillar_c OK

* Remove commented out code
This commit is contained in:
hatal175
2024-10-16 00:09:38 +03:00
committed by GitHub
parent ae77e60de8
commit 030d6533f0
8 changed files with 633 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_firepillar.h
+36 -6
View File
@@ -1,7 +1,10 @@
#ifndef D_A_OBJ_FIREPILLAR_H
#define D_A_OBJ_FIREPILLAR_H
#include "d/d_bg_s_acch.h"
#include "f_op/f_op_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "d/d_cc_d.h"
/**
* @ingroup actors-objects
@@ -13,11 +16,27 @@
*/
class daObjFPillar_c : public fopAc_ac_c {
public:
typedef void (daObjFPillar_c::*actionFunc)();
enum Action {
ACTION_OFF,
ACTION_ON_WAIT,
ACTION_ON,
};
class daObjFPillar_prm {
public:
static u8 getArg0(daObjFPillar_c* i_this) { return fopAcM_GetParam(i_this) >> 8; }
static u8 getArg1(daObjFPillar_c* i_this) { return fopAcM_GetParam(i_this) >> 24; }
static u8 getArg2(daObjFPillar_c* i_this) { return fopAcM_GetParam(i_this) >> 16; }
static u8 getSwNo(daObjFPillar_c* i_this) { return fopAcM_GetParam(i_this); }
};
/* 80BE9118 */ void initBaseMtx();
/* 80BE9138 */ void setBaseMtx();
/* 80BE9190 */ void Create();
/* 80BE9230 */ void create();
/* 80BE94E4 */ void execute();
/* 80BE9190 */ int Create();
/* 80BE9230 */ int create();
/* 80BE94E4 */ int execute();
/* 80BE9610 */ void action();
/* 80BE96B4 */ void actionOffInit();
/* 80BE96E0 */ void actionOff();
@@ -25,11 +44,22 @@ public:
/* 80BE97B8 */ void actionOnWait();
/* 80BE986C */ void actionOnInit();
/* 80BE98A0 */ void actionOn();
/* 80BE9984 */ void draw();
/* 80BE99B8 */ bool _delete();
/* 80BE9984 */ int draw();
/* 80BE99B8 */ int _delete();
private:
/* 0x568 */ u8 field_0x568[0x974 - 0x568];
/* 0x568 */ request_of_phase_process_class mPhase;
/* 0x570 */ int field_0x570;
/* 0x574 */ dBgS_ObjAcch mAcch;
/* 0x74C */ dBgS_AcchCir mAcchCir;
/* 0x78C */ dCcD_Stts mStts;
/* 0x7C8 */ dCcD_Cps mCps;
/* 0x90C */ u8 field_0x90c[0x93c - 0x90c];
/* 0x93C */ cXyz mCylScale;
/* 0x948 */ Vec field_0x948;
/* 0x954 */ cM3dGCpsS field_0x954;
/* 0x970 */ u8 mAction;
/* 0x972 */ u16 mActionTimer;
};
STATIC_ASSERT(sizeof(daObjFPillar_c) == 0x974);