mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-10 15:13:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_obj_amiShutter equivalent (#2342)

Browse Source 
* init commit

* functions matching progress

* new inline function

added new inline function `OnRoofRegist` to cBgW class

* use of inline function

uses the inline function as in the debug version

* d_a_obj_amiShutter equivalent

* cleanup and field rename

* addressed PR comments
This commit is contained in:
Łukasz Starzyk
2025-03-23 21:29:10 +01:00
committed by GitHub
parent a4cdad86f4
commit 3f67b00c6e
5 changed files with 279 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_amiShutter.h
+56 -13
View File
@@ -1,8 +1,11 @@
#ifndef D_A_OBJ_AMISHUTTER_H
#define D_A_OBJ_AMISHUTTER_H
#include "d/d_bg_s_movebg_actor.h"
#include "d/d_event_lib.h"
#include "f_op/f_op_actor_mng.h"
/**
* @ingroup actors-objects
* @class daAmiShutter_c
@@ -11,19 +14,37 @@
* @details
*
*/
class daAmiShutter_c : public fopAc_ac_c {
struct fakeAmiShutterPadding {
u8 padding[8];
};
class daAmiShutter_c : public dBgS_MoveBgActor, public fakeAmiShutterPadding, public dEvLib_callback_c {
public:
typedef void (daAmiShutter_c::*modeProc)();
enum Mode {
MODE_WAIT = 0,
MODE_WAIT_EVENT = 1,
MODE_CLOSE = 2,
MODE_CLOSE_EVENT = 3,
MODE_CLOSE_END = 4,
MODE_OPEN = 5
};
daAmiShutter_c(): dEvLib_callback_c(this) {}
/* 80BA22E8 */ ~daAmiShutter_c() {};
/* 80BA155C */ void setBaseMtx();
/* 80BA15E4 */ void CreateHeap();
/* 80BA1650 */ void create();
/* 80BA182C */ void Execute(f32 (**)[3][4]);
/* 80BA15E4 */ int CreateHeap();
/* 80BA1650 */ cPhs__Step create();
/* 80BA182C */ int Execute(Mtx**);
/* 80BA1888 */ void moveShutter();
/* 80BA1974 */ void playerAreaCheck();
/* 80BA1974 */ BOOL playerAreaCheck();
/* 80BA1B4C */ void init_modeWait();
/* 80BA1B58 */ void modeWait();
/* 80BA1BCC */ void init_modeWaitEvent();
/* 80BA1BD8 */ void modeWaitEvent();
/* 80BA1C90 */ void eventStart();
/* 80BA1C90 */ BOOL eventStart();
/* 80BA1CB4 */ void init_modeClose();
/* 80BA1D48 */ void modeClose();
/* 80BA1DCC */ void init_modeCloseEvent();
@@ -32,22 +53,44 @@ public:
/* 80BA1F7C */ void modeCloseEnd();
/* 80BA1F80 */ void init_modeOpen();
/* 80BA2004 */ void modeOpen();
/* 80BA2080 */ void Draw();
/* 80BA2124 */ void Delete();
/* 80BA22E8 */ ~daAmiShutter_c();
/* 80BA2080 */ int Draw();
/* 80BA2124 */ int Delete();
u8 getType() { return fopAcM_GetParamBit(this, 16, 4); }
u8 getSwBit() { return fopAcM_GetParamBit(this, 8, 8); }
int getEvent() { return fopAcM_GetParamBit(this, 0, 8); }
bool isShutterOpen() { return mOpen; }
private:
/* 0x568 */ u8 field_0x568[0x5d9 - 0x568];
/* 0x5D9 */ bool mOpen;
/* 0x5b8 */ request_of_phase_process_class mPhaseReq;
/* 0x5c0 */ J3DModel* mpModel;
/* 0x5c4 */ u8 mMode;
/* 0x5c5 */ u8 mType;
/* 0x5c6 */ u8 mSwBit;
/* 0x5c7 */ u8 mSwitch;
/* 0x5c8 */ f32 mPosZ;
/* 0x5cc */ cXyz mPos;
/* 0x5d8 */ u8 mWaitTime;
/* 0x5d9 */ bool mOpen;
};
STATIC_ASSERT(sizeof(daAmiShutter_c) == 0x5dc);
class daAmiShutter_HIO_c {
struct daAmiShutter_HIO_c : public mDoHIO_entry_c {
/* 0x04 */ f32 mRange;
/* 0x08 */ f32 mMaxOpenSpeed;
/* 0x0c */ f32 mMaxCloseSpeed;
/* 0x10 */ u8 mWaitTime;
/* 0x11 */ u8 field_0x11;
/* 80BA14CC */ daAmiShutter_HIO_c();
/* 80BA21E0 */ ~daAmiShutter_HIO_c();
/* 80BA21E0 */ ~daAmiShutter_HIO_c() {};
void genMessage(JORMContext*);
};
include/d/d_bg_w.h
+1
View File
@@ -221,6 +221,7 @@ public:
bool ChkFlush() { return field_0x91 & 8; }
void SetLock() { mFlags |= LOCK_e; }
void OffRoofRegist() { field_0x91 |= 0x4; }
void OnRoofRegist() { field_0x91 &= ~0x04; }
bool ChkRoofRegist() { return field_0x91 & 4;}
cBgD_Vtx_t* GetVtxTbl() const { return pm_vtx_tbl; }
int GetVtxNum() const { return pm_bgd->m_v_num; }