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

more collision enums and inlines

Browse Source
This commit is contained in:
LagoLunatic
2023-12-22 21:02:23 -05:00
parent 7a80acf503
commit 0490fd3c84
37 changed files with 95 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_rd.cpp
+8 -8
View File
@@ -38,7 +38,7 @@ const dCcD_SrcCyl daRd_c::m_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK400000),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IGRP | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -694,16 +694,16 @@ bool daRd_c::checkTgHit() {
/* 00001650-000017D0 .text setCollision__6daRd_cFv */
void daRd_c::setCollision() {
if (mMode == MODE_DEATH) {
mCyl.OffCoSPrmBit(0x10);
mCyl.OffCoSPrmBit(0x02);
mCyl.OffCoSPrmBit(CO_SPRM_VS_UNK2);
mCyl.OffCoSPrmBit(CO_SPRM_IS_UNK2);
mCyl.OffTgSPrmBit(TG_SPRM_SET);
mCyl.OffTgSPrmBit(0x08);
mCyl.OffTgSPrmBit(TG_SPRM_IS_OTHER);
} else if (mMode == MODE_ATTACK || mMode == MODE_CRY || dComIfGp_evmng_startCheck("DEFAULT_RD_CRY")) {
mCyl.OffCoSPrmBit(0x10);
mCyl.OffCoSPrmBit(0x02);
mCyl.OffCoSPrmBit(CO_SPRM_VS_UNK2);
mCyl.OffCoSPrmBit(CO_SPRM_IS_UNK2);
} else {
mCyl.OnCoSPrmBit(0x10);
mCyl.OnCoSPrmBit(0x02);
mCyl.OnCoSPrmBit(CO_SPRM_VS_UNK2);
mCyl.OnCoSPrmBit(CO_SPRM_IS_UNK2);
}
if (isAnm(AnmPrm_SUWARIP)) {