mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-08 13:46:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_bg_s_acch 70%

Browse Source
This commit is contained in:
LagoLunatic
2023-10-09 08:27:32 -04:00
parent 387a9bf4ca
commit 2e70dd019b
13 changed files with 290 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_bg_s_chk.h
+6 -1
View File
@@ -27,7 +27,12 @@ public:
mGrpPassChk = NULL;
unk_0x0C = 1;
}
void SetExtChk(cBgS_Chk&);
void SetExtChk(cBgS_Chk& other) {
mPolyPassChk = other.mPolyPassChk;
mGrpPassChk = other.mGrpPassChk;
mActorPid = other.mActorPid;
unk_0x0C = other.unk_0x0C;
}
bool ChkSameActorPid(unsigned int) const;
void SetActorPid(u32 pid) { mActorPid = pid; }
include/SSystem/SComponent/c_m3d_g_cir.h
+1 -1
View File
@@ -21,7 +21,7 @@ class cM3dGCir : public cM2dGCir {
f32 mPosZ;
public:
cM3dGCir(void);
cM3dGCir(void) {}
virtual ~cM3dGCir(void) {}
void Set(f32, f32, f32, f32);
};
include/d/actor/d_a_player_link.h
-2
View File
@@ -1061,8 +1061,6 @@ public:
/* 0x0708 */ dBgS_BoomerangLinChk mBoomerangLinChk;
/* 0x0774 */ dBgS_LinkGndChk mGndChk;
/* 0x07C8 */ dBgS_LinkRoofChk mRoofChk;
/* 0x080C */ void* field_0x080c;
/* 0x0810 */ void* field_0x0810;
/* 0x0814 */ dBgS_ArrowLinChk mArrowLinChk;
/* 0x0880 */ dBgS_MirLightLinChk mMirLightLinChk;
/* 0x08EC */ u8 field_0x08EC[0x0910 - 0x08EC];
include/d/d_bg_s_acch.h
+24 -18
View File
@@ -68,6 +68,9 @@ public:
/* 0x004000 */ LINE_CHECK_NONE = (1 << 14),
/* 0x008000 */ CLR_SPEED_Y = (1 << 15),
/* 0x010000 */ LINE_CHECK_HIT = (1 << 16),
/* 0x020000 */ SEA_CHECK = (1 << 17),
/* 0x040000 */ SEA_WATER_HEIGHT = (1 << 18),
/* 0x080000 */ SEA_IN = (1 << 19),
/* 0x100000 */ MOVE_BG_ONLY = (1 << 20),
/* 0x200000 */ GND_THIN_CELLING_OFF = (1 << 21),
/* 0x400000 */ WALL_SORT = (1 << 22),
@@ -103,16 +106,17 @@ public:
void OnWallSort();
bool ChkWallSort();
bool ChkLineDown();
bool ChkRoofHit() const;
void ClrGroundHit();
bool ChkGroundHit() const;
f32 GetOnePolyInfo(cBgS_PolyInfo*);
f32 GetWallAddY(Vec&, int);
virtual ~dBgS_Acch();
cXyz* GetPos() { return pm_pos; }
cXyz* GetOldPos() { return pm_old_pos; }
f32 GetGroundH() const { return m_ground_h; }
f32 GetRoofHeight() const { return m_roof_height; }
f32 GetGroundH() { return m_ground_h; }
f32 GetRoofHeight() { return m_roof_height; }
f32 GetSeaHeight() { return m_sea_height; }
void SetLin() { m_lin.SetStartEnd(*pm_old_pos, *pm_pos); }
bool ChkGroundFind() { return m_flags & GROUND_FIND; }
bool ChkGroundHit() { return m_flags & GROUND_HIT; }
@@ -155,6 +159,9 @@ public:
bool ChkMoveBGOnly() const { return m_flags & MOVE_BG_ONLY; }
void SetWallHit() { m_flags |= WALL_HIT; }
void ClrWallNone() { m_flags &= ~WALL_NONE; }
bool ChkSeaCheckOn() { return m_flags & SEA_CHECK;}
bool ChkSeaWaterHeight() { return m_flags & SEA_WATER_HEIGHT;}
bool ChkSeaIn() { return m_flags & SEA_IN;}
cM3dGCyl* GetWallBmdCylP() { return &m_wall_cyl; }
public:
@@ -167,28 +174,27 @@ public:
/* 0x040 */ cM3dGLin m_lin;
/* 0x05C */ cM3dGCyl m_wall_cyl;
/* 0x074 */ int m_bg_index;
/* 0x078 */ void* field_0x7c;
/* 0x07C */ u32 field_0x80;
/* 0x078 */ void* field_0x78;
/* 0x07C */ u32 field_0x7c;
/* 0x080 */ fopAc_ac_c* m_my_ac;
/* 0x084 */ int m_tbl_size;
/* 0x088 */ dBgS_AcchCir* field_0x8c;
/* 0x08C */ f32 field_0x90;
/* 0x090 */ f32 field_0x94;
/* 0x088 */ dBgS_AcchCir* mp_acch_cir;
/* 0x08C */ f32 m_ground_up_h;
/* 0x090 */ f32 m_ground_up_h_diff;
/* 0x094 */ f32 m_ground_h;
/* 0x098 */ f32 field_0x9c;
/* 0x09C */ cM3dGPla field_0xa0;
/* 0x0B0 */ u8 field_0xb4;
/* 0x0B4 */ f32 field_0xb8;
/* 0x0B8 */ f32 field_0xbc;
/* 0x0BC */ u8 field_0xc0;
/* 0x098 */ f32 field_0x98;
/* 0x09C */ cM3dGPla m_pla;
/* 0x0B0 */ u8 field_0xb0;
/* 0x0B4 */ f32 field_0xb4;
/* 0x0B8 */ f32 field_0xb8;
/* 0x0BC */ f32 m_roof_y;
/* 0x0C0 */ f32 m_roof_height;
/* 0x0C4 */ f32 m_roof_crr_height;
/* 0x0C8 */ f32 field_0xc8;
/* 0x0CC */ int field_0xd4;
/* 0x0D0 */ f32 field_0xd8;
/* 0x0CC */ cBgS_PolyInfo* pm_out_poly_info;
/* 0x0D0 */ f32 m_sea_height;
/* 0x0D4 */ dBgS_GndChk m_gnd;
/* 0x128 */ dBgS_RoofChk m_roof;
/* 0x16C */ u8 field_0x16c[0x174 - 0x16C];
/* 0x174 */ dBgS_WtrChk m_wtr;
}; // Size: 0x1C4
include/d/d_bg_s_poly_pass_chk.h
+4
View File
@@ -36,6 +36,10 @@ public:
void SetBomb() { mbBombThrough = true; }
void SetBoomerang() { mbBoomerangThrough = true; }
void SetRope() { mbRopeThrough = true; }
void SetPassChkInfo(dBgS_PolyPassChk& other) {
*this = other;
}
};
STATIC_ASSERT(sizeof(dBgS_PolyPassChk) == 0xC);
include/d/d_bg_s_roof_chk.h
+16 -7
View File
@@ -7,25 +7,34 @@
class dBgS_RoofChk : public cBgS_PolyInfo, public cBgS_Chk, public dBgS_Chk {
public:
dBgS_RoofChk();
dBgS_RoofChk() {
SetPolyPassChk(GetPolyPassChkInfo());
SetGrpPassChk(GetGrpPassChkInfo());
m_pos.x = 0.0f;
m_pos.y = 0.0f;
m_pos.z = 0.0f;
SetActorPid(-1);
field_0x44 = 0;
}
void Init();
void SetPos(cXyz const&);
virtual ~dBgS_RoofChk();
virtual ~dBgS_RoofChk() {}
void i_SetPos(cXyz const& pos) { m_pos = pos; }
void SetPos(cXyz const& pos) { m_pos = pos; }
cXyz* GetPosP() { return &m_pos; }
private:
/* 0x38 */ cXyz m_pos;
}; // Size: 0x44
/* 0x44 */ void* field_0x44;
/* 0x48 */ void* field_0x48;
}; // Size: 0x4C
STATIC_ASSERT(sizeof(dBgS_RoofChk) == 0x44);
STATIC_ASSERT(sizeof(dBgS_RoofChk) == 0x4C);
class dBgS_LinkRoofChk : public dBgS_RoofChk {
public:
dBgS_LinkRoofChk() { /* SetLink(); */ }
virtual ~dBgS_LinkRoofChk();
};
}; // Size: 0x4C
#endif /* D_BG_D_BG_S_ROOF_CHK_H */
include/d/d_bg_s_spl_grp_chk.h
+6 -3
View File
@@ -13,11 +13,10 @@ public:
/* 0x4 */ MOVE_BG_ONLY = 4
};
void Set(cXyz&, f32);
dBgS_SplGrpChk();
dBgS_SplGrpChk() {}
void Init();
virtual ~dBgS_SplGrpChk();
virtual ~dBgS_SplGrpChk() {}
void OffFind() { m_flags &= ~FIND; }
void OffIn() { m_flags &= ~IN; }
@@ -29,6 +28,10 @@ public:
f32 GetHeight() { return m_height; }
cXyz& GetPosP() { return m_ground; }
f32 GetRoof() const { return m_roof; }
void Set(cXyz& ground, f32 roof) {
m_ground = ground;
m_roof = roof;
}
private:
/* 0x38 */ cXyz m_ground;
include/d/d_bg_s_wtr_chk.h
+1 -1
View File
@@ -7,7 +7,7 @@ class dBgS_WtrChk : public dBgS_SplGrpChk {
public:
dBgS_WtrChk();
virtual ~dBgS_WtrChk();
virtual ~dBgS_WtrChk() {}
}; // Size: 0x50
STATIC_ASSERT(sizeof(dBgS_WtrChk) == 0x50);
include/d/d_com_inf_game.h
+4
View File
@@ -1139,6 +1139,10 @@ inline s32 dComIfGp_roomControl_getStayNo() {
return dStage_roomControl_c::getStayNo();
}
inline dBgW* dComIfGp_roomControl_getBgW(int i_roomNo) {
return dStage_roomControl_c::getBgW(i_roomNo);
}
inline void dComIfGp_roomControl_init() {
g_dComIfG_gameInfo.play.getRoomControl()->init();
}
include/d/d_stage.h
+4 -4
View File
@@ -770,7 +770,7 @@ public:
/* 0x18 */ int field_0x18[2];
};
class dBgW_base;
class dBgW;
class dStage_roomStatus_c : public dStage_roomDt_c {
public:
/* 0x054 */ dKy_tevstr_c mTevStr;
@@ -780,7 +780,7 @@ public:
/* 0x107 */ s8 mZoneNo;
/* 0x108 */ s8 mMemBlockID;
/* 0x10C */ int mProcID;
/* 0x110 */ dBgW_base* mpBgW;
/* 0x110 */ dBgW* mpBgW;
int getZoneNo() const { return mZoneNo; }
~dStage_roomStatus_c() {}
@@ -801,7 +801,7 @@ public:
void checkDrawArea() const;
dStage_darkStatus_c* getDarkStatus();
u32 getDarkMode();
void getBgW(int);
static dBgW* getBgW(int i_roomNo);
static JKRExpHeap* createMemoryBlock(int, u32);
static void destroyMemoryBlock();
@@ -830,7 +830,7 @@ public:
mStatus[i_roomNo].mMemBlockID = i_blockID;
}
static void setBgW(int param_0, dBgW_base* i_bgw) { mStatus[param_0].mpBgW = i_bgw; }
static void setBgW(int i_roomNo, dBgW* i_bgw) { mStatus[i_roomNo].mpBgW = i_bgw; }
BOOL checkStatusFlag(int i_roomNo, u8 flag) const {
return cLib_checkBit(mStatus[i_roomNo].mFlags, flag);
include/f_op/f_op_actor.h
+6 -8
View File
@@ -89,13 +89,12 @@ struct actor_process_profile_definition2 {
class JKRSolidHeap;
enum dEvt_Command_e {
dEvtCmd_NONE_e,
dEvtCmd_INTALK_e,
dEvtCmd_INDEMO_e,
dEvtCmd_INDOOR_e,
dEvtCmd_INGETITEM_e,
dEvtCmd_INCATCH_e = 6,
dEvtCmd_DUMMY = 0xFFFF,
dEvtCmd_NONE_e = 0x0000,
dEvtCmd_INTALK_e = 0x0001,
dEvtCmd_INDEMO_e = 0x0002,
dEvtCmd_INDOOR_e = 0x0003,
dEvtCmd_INGETITEM_e = 0x0004,
dEvtCmd_INCATCH_e = 0x0006,
};
enum dEvt_Condition_e {
@@ -104,7 +103,6 @@ enum dEvt_Condition_e {
dEvtCnd_CANDOOR_e = 0x0004,
dEvtCnd_CANGETITEM_e = 0x0008,
dEvtCnd_CANTALKITEM_e = 0x0020,
dEvtCnd_DUMMY = 0x8000,
};
class dEvt_info_c {