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

dComIfG_Ccsp_SetMass

Browse Source
This commit is contained in:
LagoLunatic
2025-05-29 19:40:36 -04:00
parent 7e37357f66
commit 22ba12593a
7 changed files with 26 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_player_main.cpp
+6 -14
View File
@@ -9817,10 +9817,7 @@ void daPy_lk_c::setCollision() {
mCyl.OnTgSetBit();
}
dComIfG_Ccsp()->Set(&mCyl);
// Using the dComIfG_Ccsp inline here (and everywhere else
// in this function) breaks the match.
// dComIfG_Ccsp()->SetMass(&mCyl, 1);
g_dComIfG_gameInfo.play.mCcS.SetMass(&mCyl, 1);
dComIfG_Ccsp_SetMass(&mCyl, 1);
mWindCyl.SetC(spD0);
mWindCyl.SetH(mCyl.GetH());
mWindCyl.SetR(mCyl.GetR());
@@ -10074,14 +10071,12 @@ void daPy_lk_c::setCollision() {
}
}
dComIfG_Ccsp()->Set(&mAtCyl);
// dComIfG_Ccsp()->SetMass(&mAtCyl, 1);
g_dComIfG_gameInfo.play.mCcS.SetMass(&mAtCyl, 1);
dComIfG_Ccsp_SetMass(&mAtCyl, 1);
int i;
dCcD_Cps* pdVar21 = &mAtCps[0];
for (i = 0; i < 3; i++, pdVar21++) {
dComIfG_Ccsp()->Set(pdVar21);
// dComIfG_Ccsp()->SetMass(&pdVar21, 1);
g_dComIfG_gameInfo.play.mCcS.SetMass(pdVar21, 1);
dComIfG_Ccsp_SetMass(pdVar21, 1);
}
} else {
if (mSwBlur.field_0x014 < 10) {
@@ -10200,8 +10195,7 @@ void daPy_lk_c::setCollision() {
mFanWindCps.SetAtVec(spC4);
mFanWindCps.SetR(in_f31);
dComIfG_Ccsp()->Set(&mFanWindCps);
// dComIfG_Ccsp()->SetMass(&mFanWindCps, 1);
g_dComIfG_gameInfo.play.mCcS.SetMass(&mFanWindCps, 1);
dComIfG_Ccsp_SetMass(&mFanWindCps, 1);
} else {
mFanWindCps.ResetAtHit();
}
@@ -10217,8 +10211,7 @@ void daPy_lk_c::setCollision() {
mFanWindSph.SetC(current.pos);
}
dComIfG_Ccsp()->Set(&mFanWindSph);
// dComIfG_Ccsp()->SetMass(&mFanWindSph, 1);
g_dComIfG_gameInfo.play.mCcS.SetMass(&mFanWindSph, 1);
dComIfG_Ccsp_SetMass(&mFanWindSph, 1);
m353A--;
} else {
mFanWindSph.ResetAtHit();
@@ -10237,8 +10230,7 @@ void daPy_lk_c::setCollision() {
mFanLightCps.SetAtVec(local_118);
mFanLightCps.OnAtSetBit();
dComIfG_Ccsp()->Set(&mFanLightCps);
// dComIfG_Ccsp()->SetMass(&mFanLightCps, 1);
g_dComIfG_gameInfo.play.mCcS.SetMass(&mFanLightCps, 1);
dComIfG_Ccsp_SetMass(&mFanLightCps, 1);
} else {
mFanLightCps.ResetAtHit();
mFanLightCps.OffAtSetBit();