mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-06-29 09:40:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix JUT_ASSERT and several other macros (#2711)

Browse Source 
* Fix JUT_ASSERT to be a nested define

* Switch names that appear in asserts to be constants instead of defines

* Replace `0` in asserts with `NULL` or `FALSE`

* Fix fpclassify

* Fix ARRAY_SIZE

* Use G_CM3D_F_INF

* More fixes for fpclassify

* Remove FLOAT_LABEL

* Remove incorrect FLAG_ON macro

* Remove UNK_BSS macro

* Silence clangd unused header warning for PCH
This commit is contained in:
LagoLunatic
2025-09-28 16:11:07 -04:00
committed by GitHub
parent 737250d7f5
commit 6ec6fce8cb
1008 changed files with 3172 additions and 3237 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JSystem/JStudio/JStudio/ctb.cpp
+7 -7
View File
@@ -111,10 +111,10 @@ JStudio::ctb::TParse::~TParse() {}
/* 802813DC-80281470 27BD1C 0094+00 1/0 0/0 0/0 .text
* parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl */
bool JStudio::ctb::TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 param_3) {
JUT_ASSERT(221, ppData_inout!=0);
JUT_ASSERT(222, puBlock_out!=0);
JUT_ASSERT(221, ppData_inout!=NULL);
JUT_ASSERT(222, puBlock_out!=NULL);
void const* pData = *ppData_inout;
JUT_ASSERT(224, pData!=0);
JUT_ASSERT(224, pData!=NULL);
data::TParse_THeader aTStack_478(pData);
*ppData_inout = aTStack_478.getContent();
*puBlock_out = aTStack_478.get_blockNumber();
@@ -134,15 +134,15 @@ bool JStudio::ctb::TParse::parseHeader_next(void const** ppData_inout, u32* puBl
/* 80281470-80281554 27BDB0 00E4+00 1/0 0/0 0/0 .text
* parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl */
bool JStudio::ctb::TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 param_3) {
JUT_ASSERT(260, ppData_inout!=0);
JUT_ASSERT(261, puData_out!=0);
JUT_ASSERT(260, ppData_inout!=NULL);
JUT_ASSERT(261, puData_out!=NULL);
void const* pData = *ppData_inout;
JUT_ASSERT(263, pData!=0);
JUT_ASSERT(263, pData!=NULL);
data::TParse_TBlock aTStack_260(pData);
*ppData_inout = aTStack_260.getNext();
*puData_out = aTStack_260.get_size();
JStudio::ctb::TControl* pControl = getControl();
JUT_ASSERT(269, pControl!=0);
JUT_ASSERT(269, pControl!=NULL);
if ((param_3 & 0x10) != 0) {
if (pControl->getObject(aTStack_260.get_ID(), aTStack_260.get_IDSize()) != NULL) {
return true;
src/JSystem/JStudio/JStudio/functionvalue.cpp
+7 -7
View File
@@ -301,7 +301,7 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer<TFunctionValue*> c
}
TFunctionValue** local_148 = (TFunctionValue**)param_1.begin();
TFunctionValue* pFront = *local_148;
JUT_ASSERT(599, pFront!=0);
JUT_ASSERT(599, pFront!=NULL);
f64 dVar4 = pFront->getValue(param_3);
s32 index = floor(dVar4);
u32 uVar2 = param_2.get_unsignedInteger();
@@ -397,7 +397,7 @@ f64 TFunctionValue_composite::composite_subtract(TVector_pointer<TFunctionValue*
TContainerEnumerator_const_TVector<TFunctionValue*> aTStack_18(param_1);
TFunctionValue* const* local_148 = *aTStack_18;
TFunctionValue* pFront = *local_148;
JUT_ASSERT(688, pFront!=0);
JUT_ASSERT(688, pFront!=NULL);
f64 dVar4 = pFront->getValue(param_3);
while (aTStack_18) {
TFunctionValue* const* ppiVar3 = *aTStack_18;
@@ -436,7 +436,7 @@ f64 TFunctionValue_composite::composite_divide(TVector_pointer<TFunctionValue*>
TContainerEnumerator_const_TVector<TFunctionValue*> aTStack_18(param_1);
TFunctionValue* const* local_148 = *aTStack_18;
TFunctionValue* pFront = *local_148;
JUT_ASSERT(724, pFront!=0);
JUT_ASSERT(724, pFront!=NULL);
f64 dVar4 = pFront->getValue(param_3);
while (aTStack_18) {
TFunctionValue* const* ppiVar3 = *aTStack_18;
@@ -624,7 +624,7 @@ f64 TFunctionValue_list::getValue(f64 param_1) {
}
local_178._8 = floor(local_178._0);
local_178._10 = local_178._8;
JUT_ASSERT(1063, pfnUpdate_!=0);
JUT_ASSERT(1063, pfnUpdate_!=NULL);
return pfnUpdate_(*this, local_178);
}
@@ -751,7 +751,7 @@ void TFunctionValue_list_parameter::prepare() {
* getValue__Q27JStudio29TFunctionValue_list_parameterFd */
f64 TFunctionValue_list_parameter::getValue(f64 param_0) {
param_0 = range_getParameter(param_0, data_getValue_front(), data_getValue_back());
JUT_ASSERT(1395, pfData_!=0)
JUT_ASSERT(1395, pfData_!=NULL)
dat3 = JGadget::findUpperBound_binary_current(dat1, dat2, dat3, param_0);
if (dat3 == dat1) {
@@ -764,7 +764,7 @@ f64 TFunctionValue_list_parameter::getValue(f64 param_0) {
const f32* pf = dat3.get();
JUT_ASSERT(1411, (pfData_<=pf-suData_size)&&(pf<pfData_+suData_size*uData_));
JUT_ASSERT(1412, pfnUpdate_!=0);
JUT_ASSERT(1412, pfnUpdate_!=NULL);
return pfnUpdate_(*this, param_0);
}
@@ -915,7 +915,7 @@ void TFunctionValue_hermite::prepare() {
* getValue__Q27JStudio22TFunctionValue_hermiteFd */
f64 TFunctionValue_hermite::getValue(f64 param_0) {
param_0 = range_getParameter(param_0, data_getValue_front(), data_getValue_back());
JUT_ASSERT(1716, pfData_!=0)
JUT_ASSERT(1716, pfData_!=NULL)
dat3 = JGadget::findUpperBound_binary_current(dat1, dat2, dat3, param_0);
src/JSystem/JStudio/JStudio/jstudio-control.cpp
+5 -5
View File
@@ -133,7 +133,7 @@ bool JStudio::TParse::parseHeader(JStudio::stb::data::TParse_THeader const& para
return false;
}
JStudio::TControl* pControl = getControl();
JUT_ASSERT(322, pControl!=0);
JUT_ASSERT(322, pControl!=NULL);
if ((param_1 & 0x100) == 0) {
Vec local_468 = {0.0f, 0.0f, 0.0f};
pControl->transform_setOrigin_TxyzRy(local_468, 0.0f);
@@ -161,9 +161,9 @@ bool JStudio::TParse::parseBlock_block(JStudio::stb::data::TParse_TBlock const&
bool JStudio::TParse::parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock const& param_0,
u32 param_1) {
TControl* pControl = getControl();
JUT_ASSERT(361, pControl!=0);
JUT_ASSERT(361, pControl!=NULL);
const void* pContent = param_0.getContent();
JUT_ASSERT(363, pContent!=0);
JUT_ASSERT(363, pContent!=NULL);
u32 uVar4 = param_1 & 0xf;
if ((param_1 & 0x10) != 0) {
uVar4 |= 0x10;
@@ -186,9 +186,9 @@ bool JStudio::TParse::parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock co
bool JStudio::TParse::parseBlock_block_ctb_(JStudio::stb::data::TParse_TBlock const& param_0,
u32 param_1) {
TControl* pControl = getControl();
JUT_ASSERT(386, pControl!=0);
JUT_ASSERT(386, pControl!=NULL);
const void* pContent = param_0.getContent();
JUT_ASSERT(388, pContent!=0);
JUT_ASSERT(388, pContent!=NULL);
u32 uVar4 = param_1 & 0xf;
if ((param_1 & 0x10) != 0) {
uVar4 |= 0x10;
src/JSystem/JStudio/JStudio/jstudio-object.cpp
+7 -7
View File
@@ -97,7 +97,7 @@ JStudio::TVariableValue::TOutput::~TOutput() {}
void JStudio::TVariableValue::update(f64 param_0, JStudio::TAdaptor* param_1) {
if (field_0x8) {
field_0x8(this, param_0);
JUT_ASSERT(200, pOutput_!=0);
JUT_ASSERT(200, pOutput_!=NULL);
(*pOutput_)(mValue, param_1);
}
}
@@ -175,7 +175,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u3
JStudio::data::TEOperationData param_3,
void const* param_4, u32 param_5) {
setVarFunc func;
JUT_ASSERT(304, pControl!=0);
JUT_ASSERT(304, pControl!=NULL);
switch (param_3) {
case JStudio::data::UNK_0x1:
func = &adaptor_setVariableValue_VOID_;
@@ -207,7 +207,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl,
u32 const* param_2, u32 param_3,
JStudio::data::TEOperationData param_4,
void const* param_5, u32 param_6) {
JUT_ASSERT(343, pControl!=0);
JUT_ASSERT(343, pControl!=NULL);
setVarFunc pcVar6;
u32 iVar7;
switch(param_4) {
@@ -254,7 +254,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue_immediate(
/* 80286204-80286274 280B44 0070+00 0/0 4/4 0/0 .text
* adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec */
void JStudio::TAdaptor::adaptor_setVariableValue_Vec(u32 const* puIndex, Vec const& param_2) {
JUT_ASSERT(400, puIndex!=0);
JUT_ASSERT(400, puIndex!=NULL);
adaptor_referVariableValue(puIndex[0])->setValue_immediate(param_2.x);
adaptor_referVariableValue(puIndex[1])->setValue_immediate(param_2.y);
adaptor_referVariableValue(puIndex[2])->setValue_immediate(param_2.z);
@@ -272,7 +272,7 @@ void JStudio::TAdaptor::adaptor_getVariableValue_Vec(Vec* param_1, u32 const* pa
* adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor */
void JStudio::TAdaptor::adaptor_setVariableValue_GXColor(u32 const* puIndex,
GXColor const& param_2) {
JUT_ASSERT(431, puIndex!=0);
JUT_ASSERT(431, puIndex!=NULL);
adaptor_referVariableValue(puIndex[0])->setValue_immediate(param_2.r);
adaptor_referVariableValue(puIndex[1])->setValue_immediate(param_2.g);
adaptor_referVariableValue(puIndex[2])->setValue_immediate(param_2.b);
@@ -292,7 +292,7 @@ void JStudio::TAdaptor::adaptor_getVariableValue_GXColor(GXColor* param_1,
/* 802864D8-8028656C 280E18 0094+00 1/1 0/0 0/0 .text
* adaptor_updateVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUl */
void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TControl* pControl, u32 param_2) {
JUT_ASSERT(479, pControl!=0);
JUT_ASSERT(479, pControl!=NULL);
f64 dVar3 = pControl->getSecondPerFrame();
JGadget::TEnumerator<JStudio::TVariableValue*> enumerator(pValue_, pValue_ + uvv_);
while (enumerator) {
@@ -1057,7 +1057,7 @@ void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u3
default:
return;
}
JUT_ASSERT(1161, pmfn_!=0);
JUT_ASSERT(1161, pmfn_!=NULL);
(((TAdaptor_message*)adaptor)->*pmfn_)(operation, param_2, param_3);
}
src/JSystem/JStudio/JStudio/stb-data-parse.cpp
+1 -1
View File
@@ -51,7 +51,7 @@ void TParse_TParagraph::getData(TData* pData) const {
}
void TParse_TParagraph_data::getData(TParse_TParagraph_data::TData* pData) const {
JUT_ASSERT(104, pData!=0);
JUT_ASSERT(104, pData!=NULL);
pData->entrySize = 0;
pData->entryCount = 0;
pData->content = NULL;
src/JSystem/JStudio/JStudio_JAudio2/control.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ JStudio_JAudio2::TCreateObject::~TCreateObject() {}
*/
bool JStudio_JAudio2::TCreateObject::create(
JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) {
JUT_ASSERT(40, ppObject!=0);
JUT_ASSERT(40, ppObject!=NULL);
CreateFunc func;
switch (param_2.get_type()) {
case 'JSND':
src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp
+17 -17
View File
@@ -56,7 +56,7 @@ JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject*
field_0x13c = NULL;
field_0x140 = 0xffffffff;
field_0x144 = 0;
JUT_ASSERT(112, pCreateObject_!=0);
JUT_ASSERT(112, pCreateObject_!=NULL);
}
/* 8028D8F4-8028D9A4 288234 00B0+00 1/0 0/0 0/0 .text __dt__Q215JStudio_JAudio214TAdaptor_soundFv
@@ -120,9 +120,9 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_end() {
* adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl */
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(194, pObject!=0);
JUT_ASSERT(194, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(196, pControl!=0);
JUT_ASSERT(196, pControl!=NULL);
JStudio::TControl::TTransform_position VStack_148;
JStudio::TControl::TTransform_position VStack_154;
JStudio::TControl::TTransform_position* pVVar2;
@@ -165,7 +165,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperatio
void const* pContent, u32 uSize) {
switch(param_1) {
case JStudio::data::UNK_0x19:
JUT_ASSERT(283, pContent!=0);
JUT_ASSERT(283, pContent!=NULL);
JUT_ASSERT(284, uSize==4);
field_0x124 = *(u32*)pContent;
prepareSound_();
@@ -192,7 +192,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(323, pContent!=0);
JUT_ASSERT(323, pContent!=NULL);
JUT_ASSERT(324, uSize==4);
beginSound_fadeIn_(*(f32*)pContent);
break;
@@ -218,7 +218,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(364, pContent!=0);
JUT_ASSERT(364, pContent!=NULL);
JUT_ASSERT(365, uSize==4);
endSound_fadeOut_(*(f32*)pContent);
break;
@@ -231,14 +231,14 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(387, pContent!=0);
JUT_ASSERT(387, pContent!=NULL);
JUT_ASSERT(388, uSize!=0);
field_0x13c = NULL;
JStage::TSystem* pJSGSystem = (JStage::TSystem*)pCreateObject_->get_pJSGSystem_();
JUT_ASSERT(396, pJSGSystem != 0);
JUT_ASSERT(396, pJSGSystem != NULL);
JStage::TObject* pJSGObject;
if (!pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED)) {
JUT_ASSERT(405, pJSGObject != 0);
JUT_ASSERT(405, pJSGObject != NULL);
field_0x13c = pJSGObject;
}
break;
@@ -253,7 +253,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp
switch (param_1) {
case JStudio::data::UNK_0x18:
if (field_0x13c != NULL) {
JUT_ASSERT(431, pContent!=0);
JUT_ASSERT(431, pContent!=NULL);
JUT_ASSERT(432, uSize==0);
field_0x140 = field_0x13c->JSGFindNodeID((char*)pContent);
if (field_0x140 == -1) {
@@ -263,7 +263,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(447, uSize==4);
JUT_ASSERT(448, pContent!=0);
JUT_ASSERT(448, pContent!=NULL);
field_0x140 = *(u32*)pContent;
break;
}
@@ -276,7 +276,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(468, uSize == 4);
JUT_ASSERT(469, pContent != 0);
JUT_ASSERT(469, pContent != NULL);
field_0x144 = *(u32*)pContent ? 1 : 0;
}
}
@@ -287,7 +287,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperati
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(490, uSize == 4);
JUT_ASSERT(491, pContent != 0);
JUT_ASSERT(491, pContent != NULL);
field_0x11e = *(u32*)pContent ? 1 : 0;
}
}
@@ -299,7 +299,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOpe
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(512, uSize == 4);
JUT_ASSERT(513, pContent != 0);
JUT_ASSERT(513, pContent != NULL);
field_0x11d = *(u32*)pContent ? 1 : 0;
}
}
@@ -309,7 +309,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOpe
void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData param_1,
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(534, pContent != 0);
JUT_ASSERT(534, pContent != NULL);
JUT_ASSERT(535, uSize == 4);
u32 val = *(u32*)pContent;
field_0x12c = NULL;
@@ -326,7 +326,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(512, uSize == 4);
JUT_ASSERT(513, pContent != 0);
JUT_ASSERT(513, pContent != NULL);
field_0x11f = *(u32*)pContent ? 1 : 0;
}
}
@@ -335,7 +335,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END(
* __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor */
void JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::operator()(f32 param_1,
JStudio::TAdaptor* param_2) const {
JUT_ASSERT(596, param_2 != 0);
JUT_ASSERT(596, param_2 != NULL);
if (((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_) {
JAISound* sound = ((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_.sound_;
field_0x08(sound, param_1);
src/JSystem/JStudio/JStudio_JParticle/control.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ JStudio_JParticle::TCreateObject::~TCreateObject() {}
bool
JStudio_JParticle::TCreateObject::create(JStudio::TObject** ppObject,
JStudio::stb::data::TParse_TBlock_object const& param_2) {
JUT_ASSERT(40, ppObject!=0);
JUT_ASSERT(40, ppObject!=NULL);
CreateFunc func;
switch (param_2.get_type()) {
case 'JPTC':
src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp
+18 -18
View File
@@ -27,7 +27,7 @@ JStudio_JParticle::TAdaptor_particle::TAdaptor_particle(
field_0x1d0 = NULL;
field_0x1d4 = -1;
field_0x1d8 = 0;
JUT_ASSERT(90, pCreateObject_!=0);
JUT_ASSERT(90, pCreateObject_!=NULL);
}
/* 8028E760-8028E850 2890A0 00F0+00 1/0 0/0 0/0 .text
@@ -80,12 +80,12 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_end() {
* adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl */
void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(179, pObject != 0);
JUT_ASSERT(179, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(181, pControl != 0);
JUT_ASSERT(181, pControl != NULL);
if (u32FadeTime_end != 0 && field_0x1c4 < u32FadeTime_end) {
JUT_ASSERT(187, state_isFade_());
JUT_ASSERT(188, pJPAEmitter_ != 0);
JUT_ASSERT(188, pJPAEmitter_ != NULL);
field_0x1c4 += param_1;
if (field_0x1c4 >= u32FadeTime_end) {
switch (field_0x1b8) {
@@ -116,7 +116,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x19) {
JUT_ASSERT(232, uSize==4);
JUT_ASSERT(233, pContent!=0);
JUT_ASSERT(233, pContent!=NULL);
field_0x1bc = *(u32*)pContent;
}
}
@@ -141,7 +141,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(272, pContent!=0);
JUT_ASSERT(272, pContent!=NULL);
JUT_ASSERT(273, uSize==4);
beginParticle_fadeIn_(*(f32*)pContent);
break;
@@ -165,7 +165,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(336, pContent!=0);
JUT_ASSERT(336, pContent!=NULL);
JUT_ASSERT(337, uSize==4);
endParticle_fadeOut_(*(f32*)pContent);
break;
@@ -179,14 +179,14 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT(
JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(313, pContent!=0);
JUT_ASSERT(313, pContent!=NULL);
JUT_ASSERT(314, uSize==4);
field_0x1d0 = NULL;
const JStage::TSystem* pJSGSystem = pCreateObject_->get_pJSGSystem_();
JUT_ASSERT(345, pJSGSystem!=0);
JUT_ASSERT(345, pJSGSystem!=NULL);
JStage::TObject* pJSGObject;
if (pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED) == 0) {
JUT_ASSERT(354, pJSGObject!=0);
JUT_ASSERT(354, pJSGObject!=NULL);
field_0x1d0 = pJSGObject;
}
break;
@@ -201,7 +201,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE(
switch (param_1) {
case JStudio::data::UNK_0x18:
if (field_0x1d0 != NULL) {
JUT_ASSERT(380, pContent!=0);
JUT_ASSERT(380, pContent!=NULL);
JUT_ASSERT(381, uSize==4);
field_0x1d4 = field_0x1d0->JSGFindNodeID((const char*)pContent);
if (field_0x1d4 == -1) {
@@ -211,7 +211,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE(
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(397, uSize==4);
JUT_ASSERT(396, pContent!=0);
JUT_ASSERT(396, pContent!=NULL);
field_0x1d4 = *(u32*)pContent;
break;
}
@@ -224,7 +224,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::dat
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(417, uSize==4);
JUT_ASSERT(418, pContent!=0);
JUT_ASSERT(418, pContent!=NULL);
field_0x1d8 = *(u32*)pContent ? 1 : 0;
}
}
@@ -236,7 +236,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::d
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(439, uSize==4);
JUT_ASSERT(439, pContent!=0);
JUT_ASSERT(439, pContent!=NULL);
field_0x1cc = *(u32*)pContent;
}
}
@@ -248,7 +248,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOp
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(460, uSize==4);
JUT_ASSERT(461, pContent!=0);
JUT_ASSERT(461, pContent!=NULL);
field_0x1b5 = *(u32*)pContent ? 1 : 0;
}
}
@@ -260,7 +260,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::d
const void* pContent, u32 uSize) {
if (param_1 == JStudio::data::UNK_0x2) {
JUT_ASSERT(460, uSize==4);
JUT_ASSERT(461, pContent!=0);
JUT_ASSERT(461, pContent!=NULL);
field_0x1b6 = *(u32*)pContent ? 1 : 0;
}
}
@@ -279,9 +279,9 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmit
return;
}
const JStudio::TObject* pObject = pThis_->adaptor_getObject();
JUT_ASSERT(534, pObject!=0);
JUT_ASSERT(534, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(536, pControl!=0);
JUT_ASSERT(536, pControl!=NULL);
TJPAEmitter_stopDrawParticle_ aTStack_21c(pJPAEmitter);
JStudio::TControl::TTransform_translation_rotation_scaling VStack_19c;
JStudio::TControl::TTransform_translation_rotation_scaling aTStack_1c0;
src/JSystem/JStudio/JStudio_JStage/control.cpp
+4 -4
View File
@@ -20,7 +20,7 @@ JStudio_JStage::TCreateObject::~TCreateObject() {}
*/
bool JStudio_JStage::TCreateObject::create(
JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& rParse) {
JUT_ASSERT(83, ppObject!=0);
JUT_ASSERT(83, ppObject!=NULL);
*ppObject = NULL;
ObjCreateFuncT pfnCreateObject;
JStage::TEObject eObject;
@@ -48,14 +48,14 @@ bool JStudio_JStage::TCreateObject::create(
default:
return NULL;
}
JUT_ASSERT(99, pfnCreateObject!=0);
JUT_ASSERT(99, pfnCreateObject!=NULL);
JUT_ASSERT(100, eObject!=JStage::OBJECT_UNDEFINED);
JUT_ASSERT(109, pJSGSystem_!=0);
JUT_ASSERT(109, pJSGSystem_!=NULL);
JStage::TObject* pJSGObject;
int pJVar2 = pJSGSystem_->JSGFindObject(&pJSGObject, (char const*)rParse.get_ID(), eObject);
switch(pJVar2) {
case 0:
JUT_ASSERT(115, pJSGObject!=0);
JUT_ASSERT(115, pJSGObject!=NULL);
*ppObject = pfnCreateObject(rParse, pJSGObject, pJSGSystem_);
return true;
case 2:
src/JSystem/JStudio/JStudio_JStage/object-actor.cpp
+15 -15
View File
@@ -52,9 +52,9 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() {
#ifdef DEBUG
{ // This block is needed to match the stack in debug
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(72, pObject!=0);
JUT_ASSERT(72, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(74, pControl!=0);
JUT_ASSERT(74, pControl!=NULL);
getJSG_SRT_(pControl);
}
#else
@@ -85,9 +85,9 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_end() {
* adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl */
void JStudio_JStage::TAdaptor_actor::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(104, pObject != 0);
JUT_ASSERT(104, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(106, pControl != 0);
JUT_ASSERT(106, pControl != NULL);
setJSG_SRT_(pControl);
pJSGObject_->JSGUpdate();
}
@@ -123,7 +123,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TE
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(153, uSize==4);
JUT_ASSERT(154, pContent!=0);
JUT_ASSERT(154, pContent!=NULL);
field_0x130 = *(u32*)pContent;
break;
}
@@ -145,7 +145,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE(
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(182, uSize==4);
JUT_ASSERT(183, pContent!=0);
JUT_ASSERT(183, pContent!=NULL);
field_0x134 = *(u32*)pContent;
break;
}
@@ -157,7 +157,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT(
JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
switch (operation) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(203, pContent!=0);
JUT_ASSERT(203, pContent!=NULL);
JUT_ASSERT(204, uSize!=0);
field_0x13c = adaptor_object_findJSGObject_((const char*)pContent);
break;
@@ -171,13 +171,13 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE(
JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
switch (operation) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(226, pContent!=0);
JUT_ASSERT(226, pContent!=NULL);
JUT_ASSERT(227, uSize!=0);
field_0x140 = adaptor_object_findJSGObjectNode_(field_0x13c, (const char*)pContent);
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(237, uSize==4);
JUT_ASSERT(238, pContent!=0);
JUT_ASSERT(238, pContent!=NULL);
field_0x140 = *(u32*)pContent;
break;
}
@@ -191,7 +191,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE(
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(257, uSize==4);
JUT_ASSERT(258, pContent!=0);
JUT_ASSERT(258, pContent!=NULL);
bool v0 = (*(u32*)pContent != 0);
if (field_0x144 != v0) {
field_0x144 = v0;
@@ -221,7 +221,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION(
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(303, uSize==4);
JUT_ASSERT(304, pContent!=0);
JUT_ASSERT(304, pContent!=NULL);
field_0x138 = *(u32*)pContent;
break;
}
@@ -233,7 +233,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION(
JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
switch (operation) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(324, pContent!=0);
JUT_ASSERT(324, pContent!=NULL);
JUT_ASSERT(325, uSize!=0);
field_0x148 = adaptor_object_findJSGObject_((const char*)pContent);
break;
@@ -247,13 +247,13 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE(
JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) {
switch (operation) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(347, pContent!=0);
JUT_ASSERT(347, pContent!=NULL);
JUT_ASSERT(348, uSize!=0);
field_0x14c = adaptor_object_findJSGObjectNode_(field_0x13c, (const char*)pContent);
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(358, uSize==4);
JUT_ASSERT(359, pContent!=0);
JUT_ASSERT(359, pContent!=NULL);
field_0x14c = *(u32*)pContent;
break;
}
@@ -267,7 +267,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE(
switch (operation) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(378, uSize==4);
JUT_ASSERT(379, pContent!=0);
JUT_ASSERT(379, pContent!=NULL);
pJSGObject_->JSGSetRelation(*(u32*)pContent, field_0x148, field_0x14c);
break;
}
src/JSystem/JStudio/JStudio_JStage/object-camera.cpp
+13 -13
View File
@@ -56,9 +56,9 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_begin() {
adaptor_object_begin_();
JStage::TCamera* pCamera = get_pJSG_();
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(70, pObject != 0);
JUT_ASSERT(70, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(72, pControl != 0);
JUT_ASSERT(72, pControl != NULL);
getJSG_position_(pControl);
getJSG_targetPosition_(pControl);
TVVOutput* pOutput = saoVVOutput_;
@@ -78,9 +78,9 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_end() {
* adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl */
void JStudio_JStage::TAdaptor_camera::adaptor_do_update(u32 param_1) {
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(98, pObject != 0);
JUT_ASSERT(98, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(100, pControl != 0);
JUT_ASSERT(100, pControl != NULL);
setJSG_position_(pControl);
setJSG_targetPosition_(pControl);
pJSGObject_->JSGUpdate();
@@ -99,7 +99,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperati
void const* pContent, u32 uSize) {
switch(param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(132, pContent!=0);
JUT_ASSERT(132, pContent!=NULL);
JUT_ASSERT(133, uSize!=0);
field_0x10c = adaptor_object_findJSGObject_((char*)pContent);
break;
@@ -113,13 +113,13 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOp
void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(155, pContent!=0);
JUT_ASSERT(155, pContent!=NULL);
JUT_ASSERT(156, uSize!=0);
field_0x110 = adaptor_object_findJSGObjectNode_(field_0x10c, (char*)pContent);
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(166, uSize==4);
JUT_ASSERT(167, pContent!=0);
JUT_ASSERT(167, pContent!=NULL);
field_0x110 = *(int*)pContent;
break;
}
@@ -134,7 +134,7 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOpera
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(185, uSize==4);
JUT_ASSERT(186, pContent!=0);
JUT_ASSERT(186, pContent!=NULL);
field_0x114 = *(u32*)pContent ? 1 : 0;
switch(field_0x108) {
case 1:
@@ -162,7 +162,7 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOpe
switch(param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(226, uSize==4);
JUT_ASSERT(227, pContent!=0);
JUT_ASSERT(227, pContent!=NULL);
field_0x108 = *(int*)pContent;
break;
}
@@ -175,7 +175,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch(param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(247, pContent!=0);
JUT_ASSERT(247, pContent!=NULL);
JUT_ASSERT(248, uSize!=0);
field_0x118 = adaptor_object_findJSGObject_((char*)pContent);
break;
@@ -189,13 +189,13 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE(
JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) {
switch (param_1) {
case JStudio::data::UNK_0x18:
JUT_ASSERT(270, pContent!=0);
JUT_ASSERT(270, pContent!=NULL);
JUT_ASSERT(271, uSize!=0);
field_0x11c = adaptor_object_findJSGObjectNode_(field_0x118, (char*)pContent);
break;
case JStudio::data::UNK_0x19:
JUT_ASSERT(282, uSize==4);
JUT_ASSERT(283, pContent!=0);
JUT_ASSERT(283, pContent!=NULL);
field_0x11c = *(int*)pContent;
break;
}
@@ -209,7 +209,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE(
switch(param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(301, uSize==4);
JUT_ASSERT(302, pContent!=0);
JUT_ASSERT(302, pContent!=NULL);
field_0x120 = *(int*)pContent ? 1 : 0;
break;
}
src/JSystem/JStudio/JStudio_JStage/object-light.cpp
+5 -5
View File
@@ -61,9 +61,9 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_begin() {
adaptor_object_begin_();
JStage::TLight* pLightObj = get_pJSG_();
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(60, pObject != 0);
JUT_ASSERT(60, pObject != NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(62, pControl != 0);
JUT_ASSERT(62, pControl != NULL);
GXColor lightColor = pLightObj->JSGGetColor();
adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, lightColor);
JStudio::TControl::TTransform_position_direction lightObjTransform;
@@ -98,9 +98,9 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_end() {
void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) {
JStage::TLight* lightObj = get_pJSG_();
const JStudio::TObject* pObject = adaptor_getObject();
JUT_ASSERT(118, pObject!=0);
JUT_ASSERT(118, pObject!=NULL);
const JStudio::TControl* pControl = pObject->getControl();
JUT_ASSERT(120, pControl!=0);
JUT_ASSERT(120, pControl!=NULL);
GXColor lightColor;
adaptor_getVariableValue_GXColor(&lightColor, sauVariableValue_4_COLOR_RGBA);
lightObj->JSGSetColor(lightColor);
@@ -145,7 +145,7 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_FACULTY(JStudio::data::TEOperati
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(198, uSize==4);
JUT_ASSERT(199, pContent!=0);
JUT_ASSERT(199, pContent!=NULL);
JStage::TELight lightType;
switch (*(u32*)pContent) {
case 0x301:
src/JSystem/JStudio/JStudio_JStage/object.cpp
+2 -2
View File
@@ -107,7 +107,7 @@ JStage::TObject*
JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObject_(char const* param_1) {
JStage::TObject* pJSGObject;
if (pJSGSystem_->JSGFindObject(&pJSGObject, param_1, JStage::OBJECT_UNDEFINED) == 0) {
JUT_ASSERT(122, pJSGObject != 0);
JUT_ASSERT(122, pJSGObject != NULL);
} else {
return NULL;
}
@@ -133,7 +133,7 @@ JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperat
switch (param_1) {
case JStudio::data::UNK_0x2:
JUT_ASSERT(157, uSize==4);
JUT_ASSERT(158, pContent!=0);
JUT_ASSERT(158, pContent!=NULL);
if (*(u32*)pContent != 0) {
pJSGObject_->JSGFEnableFlag(2);
} else {