mirror
/
tww
mirror of https://github.com/zeldaret/tww
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dCcS::SetMass-related fakematches 

No longer necessary with the PCH for some reason.
This commit is contained in:
LagoLunatic 2025-11-24 18:51:42 -05:00
parent c076a8000f
commit 3393a348e1
13 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/d/d_com_inf_game.h
View File

@ -4029,14 +4029,6 @@ inline dCcS* dComIfG_Ccsp() {
return &g_dComIfG_gameInfo.play.mCcS;
}
// This should be dComIfG_Ccsp()->SetMass everywhere, but for some reason that combination of two
// inlines consistently breaks the match on retail. But for the demo, using the proper inlines is required to match.
#if VERSION == VERSION_DEMO
#define dComIfG_Ccsp_SetMass dComIfG_Ccsp()->SetMass
#else
#define dComIfG_Ccsp_SetMass dComIfG_Ccsp()->mMass_Mng.Set
#endif
inline void dComIfG_setTimerMode(int ms) { g_dComIfG_gameInfo.play.setTimerMode(ms); }
inline int dComIfG_getTimerMode() { return g_dComIfG_gameInfo.play.getTimerMode(); }

4
src/d/actor/d_a_arrow.cpp
View File

@ -298,7 +298,7 @@ void daArrow_c::arrowShooting() {
mAtCps.CalcAtVec();
dComIfG_Ccsp()->Set(&mAtCps);
dComIfG_Ccsp_SetMass(&mAtCps, 1);
dComIfG_Ccsp()->SetMass(&mAtCps, 1);
clrAtHitNormal();
setAtHitPosBuff(&end);
@ -872,7 +872,7 @@ BOOL daArrow_c::procMove() {
mAtCps.CalcAtVec();
dComIfG_Ccsp()->Set(&mAtCps);
dComIfG_Ccsp_SetMass(&mAtCps, 1);
dComIfG_Ccsp()->SetMass(&mAtCps, 1);
}
return TRUE;

6
src/d/actor/d_a_bk.cpp
View File

@ -2131,7 +2131,7 @@ static fopAc_ac_c* yari_hit_check(bk_class* i_this) {
i_this->m1040.MoveCAt(i_this->m11A8);
dComIfG_Ccsp()->Set(&i_this->m1040);
if (i_this->m02D5 != 0) {
dComIfG_Ccsp_SetMass(&i_this->m1040, 3);
dComIfG_Ccsp()->SetMass(&i_this->m1040, 3);
}
if (i_this->m1040.ChkAtHit()) {
i_this->m0B78 = 5;
@ -3329,7 +3329,7 @@ static void Bk_move(bk_class* i_this) {
i_this->m1040.OffAtVsPlayerBit();
i_this->m1040.SetAtSpl(dCcG_At_Spl_UNK1);
dComIfG_Ccsp()->Set(&i_this->m1040);
dComIfG_Ccsp_SetMass(&i_this->m1040, 3);
dComIfG_Ccsp()->SetMass(&i_this->m1040, 3);
if (i_this->m1040.ChkAtHit() && actor->speed.y < -50.0f) {
actor->speed.y = 0.0f;
@ -4415,7 +4415,7 @@ static BOOL daBk_Execute(bk_class* i_this) {
MtxPosition(&sp58, &sp4C);
i_this->m0B88.SetC(sp4C);
dComIfG_Ccsp()->Set(&i_this->m0B88);
dComIfG_Ccsp_SetMass(&i_this->m0B88, 3);
dComIfG_Ccsp()->SetMass(&i_this->m0B88, 3);
cXyz sp40 = i_this->m116C;
cXyz sp34 = i_this->current.pos;

4
src/d/actor/d_a_boko.cpp
View File

@ -784,9 +784,9 @@ BOOL daBoko_c::execute() {
mSph.SetC(m2D0);
dComIfG_Ccsp()->Set(&mSph);
if (getNowMode() == Mode_PLAYER_CARRY_e) {
dComIfG_Ccsp_SetMass(&mSph, 1);
dComIfG_Ccsp()->SetMass(&mSph, 1);
} else {
dComIfG_Ccsp_SetMass(&mSph, 4);
dComIfG_Ccsp()->SetMass(&mSph, 4);
}
}

2
src/d/actor/d_a_bomb2.cpp
View File

@ -476,7 +476,7 @@ namespace daBomb2 {
mSph.SetR(radius);
mSph.SetC(pos);
dComIfG_Ccsp()->Set(&mSph);
dComIfG_Ccsp_SetMass(&mSph, 3);
dComIfG_Ccsp()->SetMass(&mSph, 3);
}
}

8
src/d/actor/d_a_bomb3.inc
View File

@ -707,7 +707,7 @@ void daBomb_c::makeWaterEffect() {
mSph.SetC(current.pos);
if(mMassCounter != g_Counter.mCounter0) {
dComIfG_Ccsp()->Set(&mSph);
dComIfG_Ccsp_SetMass(&mSph, 3);
dComIfG_Ccsp()->SetMass(&mSph, 3);
mMassCounter = g_Counter.mCounter0;
field_0x782 = 1;
}
@ -867,7 +867,7 @@ BOOL daBomb_c::procExplode_init() {
mSph.SetC(current.pos);
if(mMassCounter != g_Counter.mCounter0) {
dComIfG_Ccsp()->Set(&mSph);
dComIfG_Ccsp_SetMass(&mSph, 3);
dComIfG_Ccsp()->SetMass(&mSph, 3);
field_0x782 = 1;
mMassCounter = g_Counter.mCounter0;
}
@ -933,7 +933,7 @@ bool daBomb_c::procExplode() {
mSph.SetC(current.pos);
if(mMassCounter != g_Counter.mCounter0) {
dComIfG_Ccsp()->Set(&mSph);
dComIfG_Ccsp_SetMass(&mSph, 3);
dComIfG_Ccsp()->SetMass(&mSph, 3);
mMassCounter = g_Counter.mCounter0;
field_0x782 = 1;
}
@ -1126,7 +1126,7 @@ BOOL daBomb_c::execute() {
mSph.SetR(scale.x * 30.0f);
if(mMassCounter != g_Counter.mCounter0) {
dComIfG_Ccsp()->Set(&mSph);
dComIfG_Ccsp_SetMass(&mSph, 3);
dComIfG_Ccsp()->SetMass(&mSph, 3);
mMassCounter = g_Counter.mCounter0;
}
}

4
src/d/actor/d_a_hookshot.cpp
View File

@ -195,7 +195,7 @@ BOOL daHookshot_c::procWait() {
mSightCps.SetR(5.0f);
mSightCps.CalcAtVec();
dComIfG_Ccsp()->Set(&mSightCps);
dComIfG_Ccsp_SetMass(&mSightCps, 1);
dComIfG_Ccsp()->SetMass(&mSightCps, 1);
m2A3 = false;
mCurrProcFunc = &daHookshot_c::procShot;
@ -311,7 +311,7 @@ BOOL daHookshot_c::procShot() {
mSightCps.SetR(5.0f);
mSightCps.CalcAtVec();
dComIfG_Ccsp()->Set(&mSightCps);
dComIfG_Ccsp_SetMass(&mSightCps, 1);
dComIfG_Ccsp()->SetMass(&mSightCps, 1);
current.pos = sp8C;
}

12
src/d/actor/d_a_player_main.cpp
View File

@ -9844,7 +9844,7 @@ void daPy_lk_c::setCollision() {
mCyl.OnTgSetBit();
}
dComIfG_Ccsp()->Set(&mCyl);
dComIfG_Ccsp_SetMass(&mCyl, 1);
dComIfG_Ccsp()->SetMass(&mCyl, 1);
mWindCyl.SetC(spD0);
mWindCyl.SetH(mCyl.GetH());
mWindCyl.SetR(mCyl.GetR());
@ -10098,12 +10098,12 @@ void daPy_lk_c::setCollision() {
}
}
dComIfG_Ccsp()->Set(&mAtCyl);
dComIfG_Ccsp_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);
dComIfG_Ccsp()->SetMass(pdVar21, 1);
}
} else {
if (mSwBlur.field_0x014 < 10) {
@ -10224,7 +10224,7 @@ void daPy_lk_c::setCollision() {
mFanWindCps.SetAtVec(spC4);
mFanWindCps.SetR(in_f31);
dComIfG_Ccsp()->Set(&mFanWindCps);
dComIfG_Ccsp_SetMass(&mFanWindCps, 1);
dComIfG_Ccsp()->SetMass(&mFanWindCps, 1);
} else {
mFanWindCps.ResetAtHit();
}
@ -10240,7 +10240,7 @@ void daPy_lk_c::setCollision() {
mFanWindSph.SetC(current.pos);
}
dComIfG_Ccsp()->Set(&mFanWindSph);
dComIfG_Ccsp_SetMass(&mFanWindSph, 1);
dComIfG_Ccsp()->SetMass(&mFanWindSph, 1);
m353A--;
} else {
mFanWindSph.ResetAtHit();
@ -10259,7 +10259,7 @@ void daPy_lk_c::setCollision() {
mFanLightCps.SetAtVec(local_118);
mFanLightCps.OnAtSetBit();
dComIfG_Ccsp()->Set(&mFanLightCps);
dComIfG_Ccsp_SetMass(&mFanLightCps, 1);
dComIfG_Ccsp()->SetMass(&mFanLightCps, 1);
} else {
mFanLightCps.ResetAtHit();
mFanLightCps.OffAtSetBit();

2
src/d/actor/d_a_stone.cpp
View File

@ -937,7 +937,7 @@ bool Act_c::_execute() {
mCyl.MoveCAtTg(current.pos);
dComIfG_Ccsp()->Set(&mCyl);
if (m674 == 2 || m674 == 3 || m67B != 0) {
dComIfG_Ccsp_SetMass(&mCyl, 3);
dComIfG_Ccsp()->SetMass(&mCyl, 3);
}
attention_info.position.x = current.pos.x;
attention_info.position.y = current.pos.y + data().m08;

2
src/d/actor/d_a_stone2.cpp
View File

@ -726,7 +726,7 @@ BOOL Act_c::Execute(Mtx** outMtx) {
mCyl.MoveCAtTg(current.pos);
dComIfG_Ccsp()->Set(&mCyl);
if (m648 == 2) {
dComIfG_Ccsp_SetMass(&mCyl, 3);
dComIfG_Ccsp()->SetMass(&mCyl, 3);
}
}

2
src/d/actor/d_a_tsubo.cpp
View File

@ -3554,7 +3554,7 @@ bool Act_c::_execute() {
}
if (m678 == 5 || m678 == 6 || m678 == 3 || m683 != 0) {
dComIfG_Ccsp_SetMass(&mCyl, 3);
dComIfG_Ccsp()->SetMass(&mCyl, 3);
}
attention_info.position.x = current.pos.x;

6
src/d/d_camera.cpp
View File

@ -1905,8 +1905,7 @@ bool dCamera_c::lineBGCheckBoth(cXyz* i_start, cXyz* i_end, dBgS_LinChk* i_linCh
u32 dCamera_c::lineCollisionCheckBush(cXyz* i_start, cXyz* i_end) {
u32 ret = 0;
// Fakematch
u32 result = g_dComIfG_gameInfo.play.mCcS.GetMassResultCam();
u32 result = dComIfG_Ccsp()->GetMassResultCam();
if (result & 2) {
ret |= 1;
}
@ -1919,8 +1918,7 @@ u32 dCamera_c::lineCollisionCheckBush(cXyz* i_start, cXyz* i_end) {
cM3dGCps cps;
cps.Set(*i_start, *i_end, 30.0f);
// Fakematch
g_dComIfG_gameInfo.play.mCcS.SetMassCam(cps);
dComIfG_Ccsp()->SetMassCam(cps);
return ret;
}

4
src/d/d_s_play.cpp
View File

@ -346,9 +346,7 @@ static BOOL dScnPly_Draw(dScnPly_ply_c* i_this) {
if (dComIfGp_getGrass() != NULL || dComIfGp_getTree() != NULL ||
dComIfGp_getWood() != NULL || dComIfGp_getFlower() != NULL || dKyr_poison_live_check())
{
// using the inline breaks the match
// dComIfG_Ccsp()->PrepareMass();
g_dComIfG_gameInfo.play.mCcS.PrepareMass();
dComIfG_Ccsp()->PrepareMass();
}
dComIfGp_executeGrass();