mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 14:38:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

c_cc_d inlines and enums progress

Browse Source
This commit is contained in:
LagoLunatic
2023-12-22 20:11:49 -05:00
parent e251cbabc2
commit ed66f75566
16 changed files with 96 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_cc_d.h
+69 -44
View File
@@ -47,19 +47,19 @@ enum cCcD_ObjAtType {
enum cCcD_AtSPrm_e {
/* 0x01 */ AT_SPRM_SET = 0x01,
/* 0x02 */ AT_SPRM_UNK2 = 0x02,
/* 0x04 */ AT_SPRM_UNK4 = 0x04,
/* 0x08 */ AT_SPRM_UNK8 = 0x08,
/* 0x0E */ AT_SPRM_GRP = AT_SPRM_UNK2 | AT_SPRM_UNK4 | AT_SPRM_UNK8,
/* 0x02 */ AT_SPRM_VS_ENEMY = 0x02,
/* 0x04 */ AT_SPRM_VS_PLAYER = 0x04,
/* 0x08 */ AT_SPRM_UNK8 = 0x08, // May be for interactable objects? Doesn't have inlines like enemy and player
/* 0x0E */ AT_SPRM_GRP = AT_SPRM_VS_ENEMY | AT_SPRM_VS_PLAYER | AT_SPRM_UNK8,
/* 0x10 */ AT_SPRM_NO_TG_HIT_INF_SET = 0x10,
};
enum cCcD_TgSPrm_e {
/* 0x01 */ TG_SPRM_SET = 0x01,
/* 0x02 */ TG_SPRM_UNK2 = 0x02,
/* 0x04 */ TG_SPRM_UNK4 = 0x04,
/* 0x02 */ TG_SPRM_IS_ENEMY = 0x02,
/* 0x04 */ TG_SPRM_IS_PLAYER = 0x04,
/* 0x08 */ TG_SPRM_UNK8 = 0x08,
/* 0x0E */ TG_SPRM_GRP = TG_SPRM_UNK2 | TG_SPRM_UNK4 | TG_SPRM_UNK8,
/* 0x0E */ TG_SPRM_GRP = TG_SPRM_IS_ENEMY | TG_SPRM_IS_PLAYER | TG_SPRM_UNK8,
/* 0x10 */ TG_SPRM_NO_AT_HIT_INF_SET = 0x10,
};
@@ -313,16 +313,16 @@ public:
STATIC_ASSERT(0x40 == sizeof(cCcD_DivideArea));
struct cCcD_SrcObjCommonBase {
/* 0x0 */ s32 mSPrm;
/* 0x0 */ u32 mSPrm;
};
struct cCcD_SrcObjTg {
/* 0x0 */ s32 mType;
/* 0x0 */ u32 mType;
/* 0x4 */ cCcD_SrcObjCommonBase mBase;
}; // Size: 0x8
struct cCcD_SrcObjAt {
/* 0x0 */ s32 mType;
/* 0x0 */ u32 mType;
/* 0x4 */ u8 mAtp;
/* 0x8 */ cCcD_SrcObjCommonBase mBase;
}; // Size: 0xC
@@ -338,7 +338,7 @@ struct cCcD_SrcObjHitInf {
}; // Size: 0x18
struct cCcD_SrcObj {
/* 0x0 */ int mFlags;
/* 0x0 */ u32 mFlags;
/* 0x4 */ cCcD_SrcObjHitInf mSrcObjHitInf;
}; // Size: 0x1C
@@ -407,13 +407,11 @@ public:
ClrObj();
}
void SetSPrm(u32 sprm) { mSPrm = sprm; }
u32 getSPrm() const { return mSPrm; }
void SetRPrm(u32 rprm) { mRPrm = rprm; }
u32 getRPrm() const { return mRPrm; }
cCcD_Obj* GetHitObj() { return mHitObj; }
cCcD_Obj* GetHitObj() const { return mHitObj; }
void ClrObj() { mHitObj = NULL; }
u32 MskSPrm(u32 mask) const { return mSPrm & mask; }
u32 MskRPrm(u32 mask) { return mRPrm & mask; }
u32 MskRPrm(u32 mask) const { return mRPrm & mask; }
void OnSPrmBit(u32 flag) { mSPrm |= flag; }
void OffSPrmBit(u32 flag) { mSPrm &= ~flag; }
void ClrRPrm(u32 flag) { mRPrm &= ~flag; }
@@ -440,7 +438,7 @@ public:
mAtp = src.mAtp;
}
void ClrHit() { ClrRPrm(1); ClrObj(); }
int GetType() const { return mType; }
u32 GetType() const { return mType; }
u32 GetGrp() const { return MskSPrm(AT_SPRM_GRP); }
bool ChkSet() const { return MskSPrm(AT_SPRM_SET); }
u8 GetAtp() const { return mAtp; }
@@ -450,10 +448,10 @@ public:
void ClrSet() { OffSPrmBit(AT_SPRM_SET); }
void OnHitBit() { SetRPrm(1); }
void OffHitBit() { ClrRPrm(1); }
u32 ChkHit() { return MskRPrm(1); }
u32 ChkHit() const { return MskRPrm(1); }
protected:
/* 0x10 */ int mType;
/* 0x10 */ u32 mType;
/* 0x14 */ u8 mAtp;
};
@@ -467,21 +465,24 @@ public:
cCcD_ObjCommonBase::Set(src.mBase);
mType = src.mType;
}
void SetGrp(u32);
void SetGrp(u32 grp) {
OffSPrmBit(TG_SPRM_GRP);
OnSPrmBit(grp);
}
void ClrHit() { ClrRPrm(1); ClrObj(); }
void SetHit(cCcD_Obj* obj) {
SetRPrm(1);
SetHitObj(obj);
}
int GetType() const { return mType; }
u32 GetType() const { return mType; }
void SetType(u32 type) { mType = type; }
u32 GetGrp() const { return MskSPrm(TG_SPRM_GRP); }
bool ChkSet() const { return MskSPrm(TG_SPRM_SET); }
void ClrSet() { OffSPrmBit(TG_SPRM_SET); }
u32 ChkHit() { return MskRPrm(1); }
u32 ChkHit() const { return MskRPrm(1); }
private:
/* 0x10 */ int mType;
/* 0x10 */ u32 mType;
};
STATIC_ASSERT(0x14 == sizeof(cCcD_ObjTg));
@@ -494,8 +495,14 @@ public:
SetHitObj(obj);
}
void ClrHit() { ClrRPrm(1); ClrObj(); }
void SetIGrp(u32);
void SetVsGrp(u32);
void SetIGrp(u32 grp) { // Fake inline, but exists in TP
OffSPrmBit(CO_SPRM_IGRP);
OnSPrmBit(grp);
}
void SetVsGrp(u32 grp) {
OffSPrmBit(CO_SPRM_VSGRP);
OnSPrmBit(grp);
}
u32 GetGrp() const { return MskSPrm(CO_SPRM_GRP); }
bool ChkSet() const { return MskSPrm(CO_SPRM_SET); }
u32 GetVsGrp() const { return MskSPrm(CO_SPRM_VSGRP); }
@@ -503,7 +510,7 @@ public:
u32 ChkNoCrr() const { return MskSPrm(CO_SPRM_NO_CRR); }
u32 ChkSph3DCrr() const { return MskSPrm(CO_SPRM_SPH_3D_CRR); }
void ClrSet() { OffSPrmBit(CO_SPRM_SET); }
u32 ChkHit() { return MskRPrm(1); }
u32 ChkHit() const { return MskRPrm(1); }
void Set(cCcD_SrcObjCo const& src) {
cCcD_ObjCommonBase::Set(src.mBase);
@@ -520,14 +527,19 @@ protected:
/* 0x03C vtable */
public:
virtual ~cCcD_ObjHitInf() {}
void Set(cCcD_SrcObjHitInf const&);
cCcD_ObjAt& GetObjAt() { return mObjAt; }
cCcD_ObjTg& GetObjTg() { return mObjTg; }
cCcD_ObjCo& GetObjCo() { return mObjCo; }
void Set(const cCcD_SrcObjHitInf& src) {
mObjAt.Set(src.mObjAt);
mObjTg.Set(src.mObjTg);
mObjCo.Set(src.mObjCo);
}
cCcD_ObjAt& GetObjAt() { return mObjAt; } // Fake inline
cCcD_ObjTg& GetObjTg() { return mObjTg; } // Fake inline
cCcD_ObjCo& GetObjCo() { return mObjCo; } // Fake inline
u32 GetTgGrp() const { return mObjTg.GetGrp(); }
u32 GetAtGrp() const { return mObjAt.GetGrp(); }
u32 GetCoGrp() const { return mObjCo.GetGrp(); }
int GetTgType() const { return mObjTg.GetType(); }
u32 GetCoGrp() const { return mObjCo.GetGrp(); } // Fake inline, included for completeness
u32 GetTgType() const { return mObjTg.GetType(); }
u32 GetAtType() const { return mObjAt.GetType(); }
bool ChkTgSet() const { return mObjTg.ChkSet(); }
bool ChkAtSet() const { return mObjAt.ChkSet(); }
@@ -537,7 +549,7 @@ public:
u8 GetAtAtp() const { return mObjAt.GetAtp(); }
u32 ChkAtNoTgHitInfSet() const { return mObjAt.MskSPrm(AT_SPRM_NO_TG_HIT_INF_SET); }
u32 ChkTgNoAtHitInfSet() const { return mObjTg.MskSPrm(TG_SPRM_NO_AT_HIT_INF_SET); }
u32 ChkCoNoCoHitInfSet() const { return mObjCo.MskSPrm(CO_SPRM_NO_CO_HIT_INF_SET); }
u32 ChkCoNoCoHitInfSet() { return mObjCo.MskSPrm(CO_SPRM_NO_CO_HIT_INF_SET); }
void SetAtHit(cCcD_Obj* obj) { mObjAt.SetHit(obj); }
void SetTgHit(cCcD_Obj* obj) { mObjTg.SetHit(obj); }
void SetCoHit(cCcD_Obj* obj) { mObjCo.SetHit(obj); }
@@ -560,21 +572,34 @@ public:
void OnTgSetBit() { mObjTg.OnSPrmBit(TG_SPRM_SET); }
void OffTgSetBit() { mObjTg.ClrSet(); }
void OnCoSetBit() { mObjCo.OnSPrmBit(CO_SPRM_SET); }
void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(0xC); }
void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(0xC); }
void OnAtVsBitSet(u32 prm) { mObjAt.OnSPrmBit(prm); }
void OffAtVsBitSet(u32 prm) { mObjAt.OffSPrmBit(prm); }
void OnAtVsEnemyBit() { mObjAt.OnSPrmBit(AT_SPRM_VS_ENEMY); }
void OffAtVsEnemyBit() { mObjAt.OffSPrmBit(AT_SPRM_VS_ENEMY); }
void OnAtVsPlayerBit() { mObjAt.OnSPrmBit(AT_SPRM_VS_PLAYER); }
void OffAtVsPlayerBit() { mObjAt.OffSPrmBit(AT_SPRM_VS_PLAYER); }
void OnCoSPrmBit(u32 flag) { mObjCo.OnSPrmBit(flag); }
void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); }
void SetTgSPrm(u32 prm) { mObjTg.SetSPrm(prm); } // Fake inline, but exists in TP
void SetCoSPrm(u32 prm) { mObjCo.SetSPrm(prm); }
void ClrAtHit() { mObjAt.ClrHit(); }
void ClrTgHit() { mObjTg.ClrHit(); }
void ClrCoHit() { mObjCo.ClrHit(); }
u32 ChkAtHit() { return mObjAt.ChkHit(); }
u32 ChkTgHit() { return mObjTg.ChkHit(); }
u32 ChkCoHit() { return mObjCo.ChkHit(); }
cCcD_Obj* GetAtHitObj() { return mObjAt.GetHitObj(); }
cCcD_Obj* GetTgHitObj() { return mObjTg.GetHitObj(); }
cCcD_Obj* GetCoHitObj() { return mObjCo.GetHitObj(); }
u32 ChkAtHit() const { return mObjAt.ChkHit(); }
u32 ChkTgHit() const { return mObjTg.ChkHit(); }
u32 ChkCoHit() const { return mObjCo.ChkHit(); }
cCcD_Obj* GetAtHitObj() const { return mObjAt.GetHitObj(); }
cCcD_Obj* GetTgHitObj() const { return mObjTg.GetHitObj(); }
cCcD_Obj* GetCoHitObj() const { return mObjCo.GetHitObj(); }
void ClrAtSet() { OffAtSetBit(); }
void ClrTgSet() { OffTgSetBit(); }
void ClrCoSet() { OffCoSetBit(); }
u32 MskAtSPrm(u32 prm) const { return mObjAt.MskSPrm(prm); }
void OnAtNoTgHitInfSet() { mObjAt.OnSPrmBit(AT_SPRM_NO_TG_HIT_INF_SET); }
void OffAtNoTgHitInfSet() { mObjAt.OffSPrmBit(AT_SPRM_NO_TG_HIT_INF_SET); }
void OnTgNoAtHitInfSet() { mObjTg.OnSPrmBit(TG_SPRM_NO_AT_HIT_INF_SET); }
void SetTgGrp(u32 grp) { mObjTg.SetGrp(grp); }
void SetCoIGrp(u32 grp) { mObjCo.SetIGrp(grp); } // Fake inline, but exists in TP
void SetCoVsGrp(u32 grp) { mObjCo.SetVsGrp(grp); }
}; // Size = 0x40
STATIC_ASSERT(0x40 == sizeof(cCcD_ObjHitInf));
@@ -599,11 +624,11 @@ public:
fopAc_ac_c* GetAc() { return GetStts() == NULL ? NULL : GetStts()->GetActor(); }
cCcD_DivideInfo& GetDivideInfo() { return mDivideInfo; }
cCcD_DivideInfo* GetPDivideInfo() { return &mDivideInfo; }
int ChkBsRevHit() const { return mFlags & 2; }
u32 ChkBsRevHit() const { return mFlags & 2; }
void OnBsRevHit() { mFlags |= 2; }
private:
/* 0x040 */ int mFlags;
/* 0x040 */ u32 mFlags;
/* 0x044 */ cCcD_Stts* mStts;
/* 0x048 */ cCcD_DivideInfo mDivideInfo;
}; // Size = 0x50
include/d/actor/d_a_hookshot.h
+1
View File
@@ -36,6 +36,7 @@ public:
void setCarryOffset(const cXyz*) {}
void setReturn() {}
void setShot() {}
cXyz getMoveVec() const { return m2C0; }
daHookshot_c() {}
BOOL draw();
src/SSystem/SComponent/c_cc_d.cpp
+1 -3
View File
@@ -218,9 +218,7 @@ void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) {
/* 80241C5C-80241C98 .text Set__8cCcD_ObjFRC11cCcD_SrcObj */
void cCcD_Obj::Set(const cCcD_SrcObj& src) {
mFlags = src.mFlags;
mObjAt.Set(src.mSrcObjHitInf.mObjAt);
mObjTg.Set(src.mSrcObjHitInf.mObjTg);
mObjCo.Set(src.mSrcObjHitInf.mObjCo);
cCcD_ObjHitInf::Set(src.mSrcObjHitInf);
}
/* 80241C98-80241D68 .text CrossAtTg__12cCcD_TriAttrCFRC12cCcD_CpsAttrP4cXyz */
src/c/c_damagereaction.cpp
+1 -1
View File
@@ -80,7 +80,7 @@ dCcD_SrcCyl cc_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_am.cpp
+2 -2
View File
@@ -1260,7 +1260,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1322,7 +1322,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_am2.cpp
+4 -4
View File
@@ -1369,7 +1369,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_NORMAL_ARROW | AT_TYPE_FIRE_ARROW | AT_TYPE_ICE_ARROW | AT_TYPE_LIGHT_ARROW | AT_TYPE_GRAPPLING_HOOK,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1401,7 +1401,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1433,7 +1433,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1463,7 +1463,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_UNK1000,
/* SrcObjAt Atp */ 1,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK4,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_PLAYER,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK20 | CO_SPRM_UNK40,
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ const dCcD_SrcCps daArrow_c::m_at_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_NORMAL_ARROW,
/* SrcObjAt Atp */ 2,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
src/d/actor/d_a_hookshot.cpp
+1 -1
View File
@@ -277,7 +277,7 @@ static dCcD_SrcCps l_at_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_HOOKSHOT,
/* SrcObjAt Atp */ 0x01,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
src/d/actor/d_a_nh.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_npc_kamome.cpp
+1 -1
View File
@@ -344,7 +344,7 @@ static dCcD_SrcSph l_tg_sph_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK4,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_npc_md.cpp
+3 -3
View File
@@ -54,7 +54,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG | AT_TYPE_LEAF_WIND | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK4,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -84,7 +84,7 @@ static dCcD_SrcCyl l_light_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_LIGHT,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -144,7 +144,7 @@ static dCcD_SrcCyl l_wind_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_LEAF_WIND,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_obj_barrier.cpp
+1 -1
View File
@@ -22,7 +22,7 @@ static const dCcD_SrcCyl l_cyl_at_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_UNK800,
/* SrcObjAt Atp */ 1,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK4,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_PLAYER,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
src/d/actor/d_a_player_main.cpp
+6 -6
View File
@@ -1860,7 +1860,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK4,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK2 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1890,7 +1890,7 @@ static dCcD_SrcCyl l_wind_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_LEAF_WIND,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK4,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -1918,7 +1918,7 @@ static dCcD_SrcCyl l_at_cyl_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_SWORD,
/* SrcObjAt Atp */ 0x02,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -1948,7 +1948,7 @@ static dCcD_SrcCps l_at_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_SWORD,
/* SrcObjAt Atp */ 0x01,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -1978,7 +1978,7 @@ static dCcD_SrcCps l_fan_wind_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_LEAF_WIND,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -2008,7 +2008,7 @@ static dCcD_SrcSph l_fan_wind_sph_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_LEAF_WIND,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK2 | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
src/d/actor/d_a_race_item.cpp
+1 -1
View File
@@ -19,7 +19,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/d_a_bomb_static.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ void daBomb_c::setBombNoHit() {
mSph.OffTgSPrmBit(TG_SPRM_SET);
mSph.OffCoSPrmBit(CO_SPRM_SET);
mSph.OffAtSPrmBit(AT_SPRM_SET);
mSph.OffAtSPrmBit(AT_SPRM_SET);
mSph.ClrAtSet();
field_0x6F3 = true;
}
@@ -156,7 +156,7 @@ void daBomb2::Act_c::set_no_hit() {
mSph.OffTgSPrmBit(TG_SPRM_SET);
mSph.OffCoSPrmBit(CO_SPRM_SET);
mSph.OffAtSPrmBit(AT_SPRM_SET);
mSph.OffAtSPrmBit(AT_SPRM_SET);
mSph.ClrAtSet();
}
bool daBomb2::Act_c::chk_explode() {
src/d/d_npc.cpp
+1 -1
View File
@@ -932,7 +932,7 @@ dCcD_SrcCyl dNpc_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK2,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,