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

Use NULL macro in asserts, fix NULL macro to match

Browse Source
This commit is contained in:
LagoLunatic
2024-06-22 11:07:16 -04:00
parent c836c5ca1f
commit f9d40ebad8
159 changed files with 462 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/d_cc_mass_s.cpp
+6 -6
View File
@@ -34,14 +34,14 @@ void dCcMassS_Mng::Prepare() {
cCcD_ShapeAttr* attr;
for (dCcMassS_Obj* mass = mMassObjs; mass < mMassObjs + mMassObjCount; mass++) {
cCcD_Obj* pobj = mass->GetObj();
JUT_ASSERT(61, pobj != 0);
JUT_ASSERT(61, pobj != NULL);
attr = pobj->GetShapeAttr();
attr->CalcAabBox();
area.SetMinMax(attr->GetWorkAab());
}
for (dCcMassS_Obj* mass = mMassAreas; mass < mMassAreas + mMassAreaCount; mass++) {
cCcD_Obj* parea = mass->GetObj();
JUT_ASSERT(73, parea != 0);
JUT_ASSERT(73, parea != NULL);
attr = parea->GetShapeAttr();
attr->CalcAabBox();
area.SetMinMax(attr->GetWorkAab());
@@ -54,14 +54,14 @@ void dCcMassS_Mng::Prepare() {
mDivideArea.SetArea(area);
for (dCcMassS_Obj* mass = mMassObjs; mass < mMassObjs + mMassObjCount; mass++) {
cCcD_Obj* pobj = mass->GetObj();
JUT_ASSERT(93, pobj != 0);
JUT_ASSERT(93, pobj != NULL);
cCcD_ShapeAttr* shape = pobj->GetShapeAttr();
cCcD_DivideInfo* divideInfo = mass->GetPDivideInfo();
mDivideArea.CalcDivideInfo(divideInfo, shape->GetWorkAab(), 0);
}
for (dCcMassS_Obj* mass = mMassAreas; mass < mMassAreas + mMassAreaCount; mass++) {
cCcD_Obj* parea = mass->GetObj();
JUT_ASSERT(104, parea != 0);
JUT_ASSERT(104, parea != NULL);
cCcD_ShapeAttr* shape = parea->GetShapeAttr();
cCcD_DivideInfo* divideInfo = mass->GetPDivideInfo();
mDivideArea.CalcDivideInfo(divideInfo, shape->GetWorkAab(), 0);
@@ -96,7 +96,7 @@ u32 dCcMassS_Mng::Chk(cXyz* r29, fopAc_ac_c** r30, dCcMassS_HitInf* r31) {
}
cCcD_Obj* pobj = mass->GetObj();
JUT_ASSERT(174, pobj != 0);
JUT_ASSERT(174, pobj != NULL);
cCcD_ShapeAttr* shape = pobj->GetShapeAttr();
f32 sp10;
@@ -121,7 +121,7 @@ u32 dCcMassS_Mng::Chk(cXyz* r29, fopAc_ac_c** r30, dCcMassS_HitInf* r31) {
cCcD_Obj* pobj = mass->GetObj();
dCcD_GObjInf* inf = (dCcD_GObjInf*)pobj->GetGObjInf();
JUT_ASSERT(214, pobj != 0);
JUT_ASSERT(214, pobj != NULL);
cCcD_ShapeAttr* shape = pobj->GetShapeAttr();
cXyz temp;
if (pobj->ChkAtSet() && !inf->ChkAtNoMass() &&