mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-16 20:48:11 -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/c/c_damagereaction.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ dCcD_SrcCyl cc_cyl_src = {
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_agbsw0.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_BOMB,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_am.cpp
+3 -3
View File
@@ -1292,7 +1292,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_UNK40 | CO_SPRM_NO_CRR,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VS_UNK8 | CO_SPRM_NO_CRR,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -1323,7 +1323,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* 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_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -1355,7 +1355,7 @@ static s32 daAM_Create(fopAc_ac_c* i_actor) {
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_GRP,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0x06,
src/d/actor/d_a_am2.cpp
+2 -2
View File
@@ -1434,7 +1434,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* 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_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -1466,7 +1466,7 @@ static s32 daAM2_Create(fopAc_ac_c* i_actor) {
/* 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,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_VS_UNK4 | CO_SPRM_VS_UNK8,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0x06,
src/d/actor/d_a_arrow.cpp
+3 -3
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_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
@@ -62,7 +62,7 @@ const dCcD_SrcSph daArrow_c::m_co_sph_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10 | CO_SPRM_NO_CRR,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2 | CO_SPRM_NO_CRR,
/* SrcGObjAt Se */ 0x07,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -252,7 +252,7 @@ void daArrow_c::setDrawShapeMaterial() {
if (mbSetByZelda) {
mAtCps.SetAtAtp(4);
mAtCps.SetAtType(arrow_mat[0].mAtType);
mAtCps.OnAtSPrmBit(0xE);
mAtCps.OnAtSPrmBit(AT_SPRM_GRP);
}
if (arrow_mat[mArrowType].mTipJointIdx != 0) {
src/d/actor/d_a_bomb.cpp
+2 -2
View File
@@ -197,7 +197,7 @@ BOOL daBomb_c::draw() {
}
if(fopAcM_GetModel(this) == 0 && mAcch.GetGroundH() != -1.0e9f) {
cM3dGPla* pNormal = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd.GetBgIndex(), mAcch.m_gnd.GetPolyIndex());
cM3dGPla* pNormal = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd);
if(pNormal) {
dComIfGd_setSimpleShadow(&current.pos, mAcch.GetGroundH(), 25.0f, &pNormal->mNormal, 0, 1.0f, dDlst_shadowControl_c::getSimpleTex());
}
@@ -480,7 +480,7 @@ void daBomb_c::posMoveF() {
if(!chk_state(STATE_5) && !chk_state(STATE_6) && field_0x6F3 != 1) {
water_tention();
tri = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd.GetBgIndex(), mAcch.m_gnd.GetPolyIndex());
tri = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd);
f32 mag = mWindVec.getSquareMag();
if(mag > 0.01f) {
src/d/actor/d_a_bomb2.cpp
+3 -3
View File
@@ -308,8 +308,8 @@ namespace daBomb2 {
/* SrcObjAt Atp */ 0x04,
/* SrcObjAt SPrm */ AT_SPRM_GRP,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0x01,
@@ -1017,7 +1017,7 @@ namespace daBomb2 {
}
void Act_c::tensor_wait_ground() {
cM3dGPla* pNormal = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd.GetBgIndex(), mAcch.m_gnd.GetPolyIndex());
cM3dGPla* pNormal = dComIfG_Bgsp()->GetTriPla(mAcch.m_gnd);
if(pNormal) {
field_0x784 = pNormal->mNormal.z * attr().field_0x64;
field_0x788 = pNormal->mNormal.x * attr().field_0x64;
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_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
src/d/actor/d_a_ib.cpp
+2 -2
View File
@@ -331,8 +331,8 @@ dCcD_SrcCyl daIball_c::m_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_item.cpp
+3 -3
View File
@@ -1102,7 +1102,7 @@ void daItem_c::checkWall() {
return;
}
cM3dGPla* wallPlane = dComIfG_Bgsp()->GetTriPla(mAcchCir.GetBgIndex(), mAcchCir.GetPolyIndex());
cM3dGPla* wallPlane = dComIfG_Bgsp()->GetTriPla(mAcchCir);
cXyz wallNorm = wallPlane->mNormal;
cXyz vel;
@@ -1478,8 +1478,8 @@ dCcD_SrcCyl daItem_c::m_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10 | CO_SPRM_UNK40,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2 | CO_SPRM_VS_UNK8,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_lamp.cpp
+1 -1
View File
@@ -17,7 +17,7 @@ static dCcD_SrcSph sph_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_FIRE | AT_TYPE_UNK20000 | AT_TYPE_FIRE_ARROW | 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 */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_nh.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_npc_kamome.cpp
+3 -3
View File
@@ -313,10 +313,10 @@ static dCcD_SrcSph l_sph_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_SWORD,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_OTHER,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -371,7 +371,7 @@ static dCcD_SrcCps l_kam_at_cps_src = {
/* Flags */ 0,
/* SrcObjAt Type */ AT_TYPE_SWORD,
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_OTHER,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
src/d/actor/d_a_npc_md.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG | AT_TYPE_LEAF_WIND | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_PLAYER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_obj_barrier.cpp
+1 -1
View File
@@ -54,7 +54,7 @@ static const dCcD_SrcCyl l_cyl_tg_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_WATER | AT_TYPE_UNK20000 | AT_TYPE_UNK400000 | AT_TYPE_LIGHT),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_obj_dragonhead.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ static dCcD_SrcSph sph_check_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_FIRE_ARROW,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_obj_hfuck1.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ namespace {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_HOOKSHOT,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_obj_hole.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ void daObj_Hole_c::getPosAndAngle() {
mLinChk.Set(&posUp, &posDown, this);
if (dComIfG_Bgsp()->LineCross(&mLinChk) != 0) {
cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinChk.GetBgIndex(), mLinChk.GetPolyIndex());
cM3dGPla* triPla = dComIfG_Bgsp()->GetTriPla(mLinChk);
triPla->CalcAngleXz(&shape_angle.x, &shape_angle.z);
triPla->getCrossY(current.pos, &current.pos.y);
src/d/actor/d_a_obj_movebox.cpp
+2 -2
View File
@@ -389,8 +389,8 @@ namespace daObjMovebox {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_BOMB,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_obj_mtest.cpp
+1 -1
View File
@@ -77,7 +77,7 @@ const dCcD_SrcCyl daObjMtest::Act_c::M_cyl_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_BOMB,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_obj_paper.cpp
+1 -1
View File
@@ -62,7 +62,7 @@ namespace daObjPaper {
/* 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_GRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_obj_toripost.cpp
+1 -1
View File
@@ -44,7 +44,7 @@ const dCcD_SrcCyl daObjTpost_c::m_cyl_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_obj_zouK.cpp
+1 -1
View File
@@ -34,7 +34,7 @@ namespace daObjZouk {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL & ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_GRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_player_main.cpp
+5 -5
View File
@@ -1861,7 +1861,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* 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_IS_PLAYER,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK2 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK2 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 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_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER,
/* 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_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER,
/* 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_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER,
/* 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_VS_ENEMY | AT_SPRM_UNK8,
/* SrcObjAt SPrm */ AT_SPRM_SET | AT_SPRM_VS_ENEMY | AT_SPRM_VS_OTHER,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ 0,
src/d/actor/d_a_race_item.cpp
+3 -3
View File
@@ -20,7 +20,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ AT_TYPE_ALL,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
@@ -154,8 +154,8 @@ BOOL daRaceItem_c::execute() {
mCyl.ClrTgHit();
mCyl.ClrCoHit();
mCyl.OffCoSPrmBit(0x1);
mCyl.OffTgSPrmBit(0x1);
mCyl.ClrCoSet();
mCyl.ClrTgSet();
field_0x645 &= 0xFE;
field_0x640 = 2;
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)) {
src/d/actor/d_a_swattack.cpp
+1 -1
View File
@@ -18,7 +18,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_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_swhit0.cpp
+2 -2
View File
@@ -18,7 +18,7 @@ static dCcD_SrcSph l_sph_src = {
/* SrcObjAt Atp */ 0,
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_LIGHT | AT_TYPE_UNK400000 | AT_TYPE_LEAF_WIND | AT_TYPE_UNK20000 | AT_TYPE_WATER), // 0xFF1DFEFF
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
@@ -48,7 +48,7 @@ static dCcD_SrcCyl l_cyl_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/actor/d_a_switem.cpp
+1 -1
View File
@@ -20,7 +20,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_UNK8,
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_OTHER,
/* SrcObjCo SPrm */ 0,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
src/d/actor/d_a_tag_ret.cpp
+1 -1
View File
@@ -21,7 +21,7 @@ static dCcD_SrcCyl cyl_check_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ 0,
/* SrcObjTg SPrm */ 0,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK8 | CO_SPRM_UNK10 | CO_SPRM_NO_CRR,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK8 | CO_SPRM_VS_UNK2 | CO_SPRM_NO_CRR,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,
src/d/d_bg_s.cpp
+3 -3
View File
@@ -298,7 +298,7 @@ s32 dBgS::GetRoomId(cBgS_PolyInfo& polyInfo) {
}
/* 800A0F88-800A111C .text ChkPolyHSStick__4dBgSFR13cBgS_PolyInfo */
BOOL dBgS::ChkPolyHSStick(cBgS_PolyInfo& polyInfo) {
u32 dBgS::ChkPolyHSStick(cBgS_PolyInfo& polyInfo) {
s32 bg_index = polyInfo.GetBgIndex();
JUT_ASSERT(0x583, 0 <= bg_index && bg_index < 256);
if (!m_chk_element[bg_index].ChkUsed())
@@ -571,7 +571,7 @@ void dBgS_CrrPos::CrrPos(dBgS& i_bgs) {
if (i_bgs.LineCross(&linChk)) {
*pm_pos = linChk.GetCross();
cM3dGPla* plane = i_bgs.GetTriPla(linChk.GetBgIndex(), linChk.GetPolyIndex());
cM3dGPla* plane = i_bgs.GetTriPla(linChk);
pm_pos->x += plane->GetNP()->x;
pm_pos->y += plane->GetNP()->y - mWallHeight;
pm_pos->z += plane->GetNP()->z;
@@ -590,7 +590,7 @@ void dBgS_CrrPos::CrrPos(dBgS& i_bgs) {
if (i_bgs.LineCross(&linChk)) {
*pm_pos = linChk.GetCross();
cM3dGPla* plane = i_bgs.GetTriPla(linChk.GetBgIndex(), linChk.GetPolyIndex());
cM3dGPla* plane = i_bgs.GetTriPla(linChk);
pm_pos->x += plane->GetNP()->x;
pm_pos->y += plane->GetNP()->y - mWallHeight;
pm_pos->z += plane->GetNP()->z;
src/d/d_com_inf_game.cpp
+1 -1
View File
@@ -559,7 +559,7 @@ int dComIfGd_setSimpleShadow2(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyIn
s16 i_angle, f32 param_5, GXTexObj* i_tex) {
if (i_floorPoly.ChkSetInfo() && -1000000000.0f != param_1) {
cM3dGPla* plane_p =
dComIfG_Bgsp()->GetTriPla(i_floorPoly.GetBgIndex(), i_floorPoly.GetPolyIndex());
dComIfG_Bgsp()->GetTriPla(i_floorPoly);
return dComIfGd_setSimpleShadow(i_pos, param_1, param_2, &plane_p->mNormal, i_angle,
param_5, i_tex);
src/d/d_kankyo_rain.cpp
+2 -11
View File
@@ -754,7 +754,7 @@ BOOL light_at_hit_check(cXyz* pPos) {
dCcMassS_HitInf hitInfo;
BOOL ret = FALSE;
fopAc_ac_c * pActor;
u32 res = dComIfG_Ccsp()->mMass_Mng.Chk(pPos, &pActor, &hitInfo);
u32 res = dComIfG_Ccsp()->ChkMass(pPos, &pActor, &hitInfo);
if (((res & 1) != 0) && (hitInfo.GetAtHitObj()->GetAtType() & AT_TYPE_LIGHT) != 0)
ret = TRUE;
return ret;
@@ -775,16 +775,7 @@ void dKyr_poison_light_colision() {
if (!dKyr_poison_live_check())
return;
// inline should match, but doesn't
#if 0
dComIfG_Ccsp()->mMass_Mng.SetAttr(220.0f, 140.0f, 0x0B, 0x03);
#else
dCcMassS_Mng * mass = &dComIfG_Ccsp()->mMass_Mng;
dComIfG_Ccsp()->mMass_Mng.mCylAttr.SetR(220.0f);
dComIfG_Ccsp()->mMass_Mng.mCylAttr.SetH(140.0f);
mass->field_0x128 = 0x0B;
mass->mResultCamBit = 0x03;
#endif
dComIfG_Ccsp()->SetMassAttr(220.0f, 140.0f, 0x0B, 0x03);
f32 halfHeight = 70.0f;
for (s32 i = 0; i < g_env_light.mPoisonCount; i++) {
src/d/d_npc.cpp
+1 -1
View File
@@ -933,7 +933,7 @@ dCcD_SrcCyl dNpc_cyl_src = {
/* SrcObjAt SPrm */ 0,
/* SrcObjTg Type */ ~(AT_TYPE_BOOMERANG),
/* SrcObjTg SPrm */ TG_SPRM_SET | TG_SPRM_IS_ENEMY,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_UNK4 | CO_SPRM_VSGRP,
/* SrcObjCo SPrm */ CO_SPRM_SET | CO_SPRM_IS_UNK4 | CO_SPRM_VSGRP,
/* SrcGObjAt Se */ 0,
/* SrcGObjAt HitMark */ 0,
/* SrcGObjAt Spl */ 0,