mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-31 17:01:36 -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/JAudio2/JASBNKParser.cpp
+5 -5
View File
@@ -186,7 +186,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
TInst* tinst = header->mOffsets.mInstOffset[i].ptr(header);
if (tinst != NULL) {
JASBasicInst* instp = new (heap, 0) JASBasicInst();
JUT_ASSERT(368, instp != 0);
JUT_ASSERT(368, instp != NULL);
instp->setVolume(tinst->mVolume);
instp->setPitch(tinst->mPitch);
@@ -199,7 +199,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
instp->setOsc(osc_idx, osc);
} else {
osc = new (heap, 0) JASOscillator::Data();
JUT_ASSERT(386, osc != 0);
JUT_ASSERT(386, osc != NULL);
osc->mTarget = tosc->mTarget;
osc->_04 = tosc->field_0x4;
@@ -208,7 +208,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
const JASOscillator::Point* endPtr = getOscTableEndPtr(points);
int size = endPtr - points;
JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size];
JUT_ASSERT(396, table != 0);
JUT_ASSERT(396, table != NULL);
JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point));
osc->mTable = table;
} else {
@@ -220,7 +220,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
const JASOscillator::Point* endPtr = getOscTableEndPtr(points);
int size = endPtr - points;
JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size];
JUT_ASSERT(409, table != 0);
JUT_ASSERT(409, table != NULL);
JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point));
osc->_0C = table;
} else {
@@ -255,7 +255,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h
TPerc* tperc = header->mOffsets.mPercOffset[i].ptr(header);
if (tperc != NULL) {
JASDrumSet* setp = new (heap, 0) JASDrumSet();
JUT_ASSERT(509, setp != 0);
JUT_ASSERT(509, setp != NULL);
setp->newPercArray(0x80, heap);
for (int j = 0; j < 0x80; j++) {
src/JSystem/JAudio2/JASBasicWaveBank.cpp
+3 -3
View File
@@ -40,7 +40,7 @@ void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) {
delete[] mWaveGroupArray;
mGroupCount = param_0;
mWaveGroupArray = new(param_1, 0) TWaveGroup[param_0];
JUT_ASSERT(62, mWaveGroupArray != 0);
JUT_ASSERT(62, mWaveGroupArray != NULL);
for (int i = 0; i < mGroupCount; i++) {
mWaveGroupArray[i].mBank = this;
}
@@ -51,7 +51,7 @@ void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) {
void JASBasicWaveBank::setWaveTableSize(u32 param_0, JKRHeap* param_1) {
delete[] mWaveTable;
mWaveTable = new(param_1, 0) TWaveHandle[param_0];
JUT_ASSERT(92, mWaveTable != 0);
JUT_ASSERT(92, mWaveTable != NULL);
mHandleCount = param_0;
}
@@ -129,7 +129,7 @@ void JASBasicWaveBank::TWaveGroup::setWaveCount(u32 param_0, JKRHeap* param_1) {
delete[] mCtrlWaveArray;
mWaveCount = param_0;
mCtrlWaveArray = new(param_1, 0) TGroupWaveInfo[param_0];
JUT_ASSERT(255, mCtrlWaveArray != 0);
JUT_ASSERT(255, mCtrlWaveArray != NULL);
}
/* 80298B04-80298B2C 293444 0028+00 1/0 0/0 0/0 .text
src/JSystem/JAudio2/JASHeapCtrl.cpp
+3 -3
View File
@@ -32,7 +32,7 @@ void JASHeap::initRootHeap(void* param_0, u32 param_1) {
/* 8029021C-802903F4 28AB5C 01D8+00 0/0 2/2 0/0 .text alloc__7JASHeapFP7JASHeapUl */
bool JASHeap::alloc(JASHeap* mother, u32 param_1) {
JUT_ASSERT(120, mother != 0);
JUT_ASSERT(120, mother != NULL);
JASMutexLock lock(&mMutex);
if (isAllocated()) {
#ifdef DEBUG
@@ -147,8 +147,8 @@ bool JASHeap::free() {
* insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb */
// NONMATCHING regalloc
void JASHeap::insertChild(JASHeap* heap, JASHeap* next, void* param_2, u32 param_3, bool param_4) {
JUT_ASSERT(537, heap != 0);
JUT_ASSERT(538, next == 0 || &mTree == next->mTree.getParent());
JUT_ASSERT(537, heap != NULL);
JUT_ASSERT(538, next == NULL || &mTree == next->mTree.getParent());
JASMutexLock lock(&mMutex);
if (!param_4) {
JSUTreeIterator<JASHeap> it;
src/JSystem/JAudio2/JAUSectionHeap.cpp
+7 -7
View File
@@ -138,7 +138,7 @@ JAUSoundTable* JAUSection::newSoundTable(void const* bst, u32 param_1, bool para
JUT_ASSERT(286, isBuilding());
JUT_ASSERT(287, bst);
JUT_ASSERT(288, asSectionHeap() == this);
JUT_ASSERT(289, sectionHeap_->sectionHeapData_.soundTable == 0);
JUT_ASSERT(289, sectionHeap_->sectionHeapData_.soundTable == NULL);
{
TPushCurrentHeap push(getHeap_());
void const* bstDst = bst;
@@ -161,7 +161,7 @@ JAUSoundNameTable* JAUSection::newSoundNameTable(void const* bstn, u32 param_1,
JUT_ASSERT(316, isBuilding());
JUT_ASSERT(317, bstn);
JUT_ASSERT(318, asSectionHeap() == this);
JUT_ASSERT(319, sectionHeap_->sectionHeapData_.soundNameTable == 0);
JUT_ASSERT(319, sectionHeap_->sectionHeapData_.soundNameTable == NULL);
{
TPushCurrentHeap push(getHeap_());
void const* bstnDst = bstn;
@@ -183,7 +183,7 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param
JUT_ASSERT(345, asSectionHeap() == this);
JUT_ASSERT(346, isOpen());
JUT_ASSERT(347, isBuilding());
JUT_ASSERT(348, sectionHeap_->sectionHeapData_.streamDataMgr_ == 0);
JUT_ASSERT(348, sectionHeap_->sectionHeapData_.streamDataMgr_ == NULL);
{
TPushCurrentHeap push(getHeap_());
JAIStreamDataMgr* r28 = NULL;
@@ -207,7 +207,7 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param
/* 802A5500-802A5598 29FE40 0098+00 0/0 1/1 0/0 .text newSeSeqCollection__10JAUSectionFPCvUl */
JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) {
// JUT_ASSERT(398, asSectionHeap() == this);
JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == 0);
JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == NULL);
if (param_1) {
bsc = newCopy(bsc, param_1, 4);
}
@@ -340,7 +340,7 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) {
JUT_ASSERT(647, isOpen());
JUT_ASSERT(648, isBuilding());
JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_1);
JUT_ASSERT(650, waveBank != 0);
JUT_ASSERT(650, waveBank != NULL);
TPushCurrentHeap push(getHeap_());
u32 bank_no = JASBNKParser::getBankNumber(param_0);
s32 r25 = getHeap_()->getFreeSize();
@@ -368,7 +368,7 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
JUT_ASSERT(685, isOpen());
JUT_ASSERT(686, isBuilding());
JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_1);
JUT_ASSERT(688, waveBank != 0);
JUT_ASSERT(688, waveBank != NULL);
TPushCurrentHeap push(getHeap_());
JASBank* voiceBank = new JASVoiceBank();
JASVoiceBank* voiceBank2 = (JASVoiceBank*)voiceBank;
@@ -392,7 +392,7 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) {
bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) {
JUT_ASSERT(714, isOpen());
JUT_ASSERT(715, isBuilding());
JUT_ASSERT(716, buildingBankTable_ == 0);
JUT_ASSERT(716, buildingBankTable_ == NULL);
JAUBankTableLink* bankTableLink = NULL;
{
TPushCurrentHeap push(getHeap_());
src/JSystem/JFramework/JFWSystem.cpp
+1 -1
View File
@@ -66,7 +66,7 @@ u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC;
/* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */
void JFWSystem::firstInit() {
JUT_ASSERT(80, rootHeap == 0);
JUT_ASSERT(80, rootHeap == NULL);
OSInit();
DVDInit();
rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false);
src/JSystem/JHostIO/JORServer.cpp
+2 -2
View File
@@ -9,13 +9,13 @@
void JOREventCallbackListNode::JORAppend() {
JORServer* pServer = JORServer::getInstance();
JUT_ASSERT(51, pServer!=0);
JUT_ASSERT(51, pServer!=NULL);
pServer->appendEventCallbackListNode(this);
}
void JOREventCallbackListNode::JORRemove() {
JORServer* pServer = JORServer::getInstance();
JUT_ASSERT(57, pServer!=0);
JUT_ASSERT(57, pServer!=NULL);
pServer->removeEventCallbackListNode(this);
}
src/JSystem/JKernel/JKRAramArchive.cpp
+1 -1
View File
@@ -286,7 +286,7 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap*
case COMPRESSION_NONE:
{
buffer = (u8*)(JKRAllocFromHeap(pHeap, alignedLen, 0x20));
JUT_ASSERT(677, buffer != 0);
JUT_ASSERT(677, buffer != NULL);
JKRAramToMainRam(entryNum, buffer, alignedLen, EXPAND_SWITCH_UNKNOWN0, alignedLen, NULL, -1, NULL);
*out = buffer;
return length;
src/JSystem/JKernel/JKRArchivePub.cpp
+3 -3
View File
@@ -295,7 +295,7 @@ void JKRArchive::removeResourceAll() {
/* 802D603C-802D609C 2D097C 0060+00 1/0 2/0 0/0 .text removeResource__10JKRArchiveFPv */
bool JKRArchive::removeResource(void* resource) {
JUT_ASSERT(678, resource != 0);
JUT_ASSERT(678, resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
return false;
@@ -307,7 +307,7 @@ bool JKRArchive::removeResource(void* resource) {
/* 802D609C-802D60D8 2D09DC 003C+00 1/0 4/0 0/0 .text detachResource__10JKRArchiveFPv */
bool JKRArchive::detachResource(void* resource) {
JUT_ASSERT(707, resource != 0);
JUT_ASSERT(707, resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
return false;
@@ -318,7 +318,7 @@ bool JKRArchive::detachResource(void* resource) {
/* 802D60D8-802D610C 2D0A18 0034+00 1/0 4/0 0/0 .text getResSize__10JKRArchiveCFPCv */
u32 JKRArchive::getResSize(const void* resource) const {
JUT_ASSERT(732, resource != 0);
JUT_ASSERT(732, resource != NULL);
SDIFileEntry* fileEntry = findPtrResource(resource);
if (fileEntry == NULL)
return -1;
src/JSystem/JKernel/JKRDvdArchive.cpp
+1 -1
View File
@@ -290,7 +290,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size,
switch (fileCompression) {
case COMPRESSION_NONE:
buffer = (u8*)JKRAllocFromHeap(heap, alignedSize, sizeof(SArcHeader));
JUT_ASSERT(675, buffer != 0);
JUT_ASSERT(675, buffer != NULL);
JKRDvdToMainRam(entryNum, buffer, EXPAND_SWITCH_UNKNOWN0, alignedSize, NULL,
JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL, NULL);
src/JSystem/JKernel/JKRHeap.cpp
+1 -1
View File
@@ -492,7 +492,7 @@ void operator delete[](void* ptr) {
/* 802CED84-802CED88 2C96C4 0004+00 1/0 1/0 0/0 .text
* state_register__7JKRHeapCFPQ27JKRHeap6TStateUl */
void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(1213, p != 0);
JUT_ASSERT(1213, p != NULL);
JUT_ASSERT(1214, p->getHeap() == this);
}
src/JSystem/JKernel/JKRSolidHeap.cpp
+1 -1
View File
@@ -252,7 +252,7 @@ bool JKRSolidHeap::dump(void) {
/* 802D11FC-802D1258 2CBB3C 005C+00 1/0 0/0 0/0 .text
* state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl */
void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const {
JUT_ASSERT(604, p != 0);
JUT_ASSERT(604, p != NULL);
JUT_ASSERT(605, p->getHeap() == this);
getState_(p);
src/JSystem/JKernel/JKRThread.cpp
+1 -1
View File
@@ -141,7 +141,7 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) {
/* 802D1A14-802D1A70 2CC354 005C+00 0/0 1/1 0/0 .text createManager__15JKRThreadSwitchFP7JKRHeap
*/
JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) {
JUT_ASSERT(343, sManager == 0);
JUT_ASSERT(343, sManager == NULL);
if (!heap) {
heap = JKRGetCurrentHeap();
src/JSystem/JMessage/control.cpp
+3 -3
View File
@@ -67,14 +67,14 @@ void JMessage::TControl::render() {
/* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */
int JMessage::TControl::setMessageCode(u16 u16GroupID, u16 u16Index) {
TProcessor* pProcessor = getProcessor();
JUT_ASSERT(120, pProcessor!=0);
JUT_ASSERT(120, pProcessor!=NULL);
return setMessageCode_inReset_(pProcessor, u16GroupID, u16Index);
}
/* 802A78F4-802A7A20 2A2234 012C+00 0/0 6/6 0/0 .text setMessageID__Q28JMessage8TControlFUlUlPb */
int JMessage::TControl::setMessageID(u32 uMsgID, u32 param_1, bool* pbValid) {
TProcessor* pProcessor = getProcessor();
JUT_ASSERT(132, pProcessor!=0);
JUT_ASSERT(132, pProcessor!=NULL);
u32 uCode = pProcessor->toMessageCode_messageID(uMsgID, param_1, pbValid);
if (uCode == 0xFFFFFFFF) {
@@ -96,7 +96,7 @@ bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const*
uMessageID_ = u16Index;
pResourceCache_ = pProcessor->getResourceCache();
JUT_ASSERT(155, pResourceCache_!=0);
JUT_ASSERT(155, pResourceCache_!=NULL);
pMessageText_begin_ = pResourceCache_->getMessageText_messageEntry(pEntry_);
pMessageText_current_ = pMessageText_begin_;
src/JSystem/JMessage/processor.cpp
+21 -21
View File
@@ -101,9 +101,9 @@ void JMessage::TProcessor::on_select_begin(char const* (*pfn)(JMessage::TProcess
oProcess_.rData.pOffset = pOffset;
oProcess_.rData.uRest = uNumber;
JUT_ASSERT(205, pfn!=0);
JUT_ASSERT(205, pfn!=NULL);
const char* psz = pfn(this);
JUT_ASSERT(207, psz!=0);
JUT_ASSERT(207, psz!=NULL);
stack_pushCurrent_(psz);
do_select_begin(uNumber);
@@ -131,10 +131,10 @@ void JMessage::TProcessor::on_select_separate() {
JUT_ASSERT(237, rData.uRest>0);
const char* (*pfn)(TProcessor*) = rData.pfn;
JUT_ASSERT(240, pfn!=0);
JUT_ASSERT(240, pfn!=NULL);
const char* psz = pfn(this);
JUT_ASSERT(242, psz!=0);
JUT_ASSERT(242, psz!=NULL);
stack_pushCurrent_(psz);
do_select_separate();
@@ -175,7 +175,7 @@ void JMessage::TProcessor::do_select_separate() {}
void JMessage::TProcessor::on_tag_() {
u32 uSize;
char* psz = (char*)getCurrent();
JUT_ASSERT(292, psz!=0);
JUT_ASSERT(292, psz!=NULL);
JUT_ASSERT(293, psz[-1]==data::gcTagBegin);
uSize = *(u8*)psz;
@@ -254,7 +254,7 @@ void JMessage::TProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) {
/* 802A81EC-802A828C 2A2B2C 00A0+00 2/2 0/0 0/0 .text
* process_character___Q28JMessage10TProcessorFv */
bool JMessage::TProcessor::process_character_() {
JUT_ASSERT(397, pszCurrent_!=0);
JUT_ASSERT(397, pszCurrent_!=NULL);
int iCharacter = on_parseCharacter(&pszCurrent_);
switch (iCharacter) {
@@ -311,8 +311,8 @@ bool JMessage::TProcessor::process_onCharacterEnd_select_(JMessage::TProcessor*
const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor* pThis) {
TProcess_::rdata& rData = pThis->oProcess_.rData;
JUT_ASSERT(454, rData.pfn==&process_onSelect_limited_);
JUT_ASSERT(455, rData.pcBase!=0);
JUT_ASSERT(456, rData.pOffset!=0);
JUT_ASSERT(455, rData.pcBase!=NULL);
JUT_ASSERT(456, rData.pOffset!=NULL);
JUT_ASSERT(457, rData.uRest>0);
u16* puOffset = (u16*)rData.pOffset;
@@ -327,8 +327,8 @@ const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor
const char* JMessage::TProcessor::process_onSelect_(JMessage::TProcessor* pThis) {
TProcess_::rdata& rData = pThis->oProcess_.rData;
JUT_ASSERT(471, rData.pfn==&process_onSelect_);
JUT_ASSERT(472, rData.pcBase!=0);
JUT_ASSERT(473, rData.pOffset!=0);
JUT_ASSERT(472, rData.pcBase!=NULL);
JUT_ASSERT(473, rData.pOffset!=NULL);
JUT_ASSERT(474, rData.uRest>0);
u32* puOffset = (u32*)rData.pOffset;
@@ -358,7 +358,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
case STATUS_NORMAL:
break;
case STATUS_JUMP: {
JUT_ASSERT(549, pControl_!=0);
JUT_ASSERT(549, pControl_!=NULL);
if (!on_jump_isReady()) {
return pszCurrent_;
@@ -368,7 +368,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
TProcess_& process = oProcess2_;
TSequenceProcessor::jumpPfn pfn = process.process.jump_process.jumpFn;
JUT_ASSERT(556, pfn!=0);
JUT_ASSERT(556, pfn!=NULL);
const void* pEntry = pfn(this);
if (pEntry != NULL) {
@@ -377,7 +377,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
break;
}
case STATUS_BRANCH: {
JUT_ASSERT(567, pControl_!=0);
JUT_ASSERT(567, pControl_!=NULL);
u32 queryResult = on_branch_queryResult();
if (queryResult > 0x7FFFFFFF) {
@@ -398,7 +398,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) {
JGADGET_WARNMSG1(588, "unknown result : ", queryResult);
} else {
TSequenceProcessor::branchPfn pfn = process.process.branch_process.branchFn;
JUT_ASSERT(592, pfn!=0);
JUT_ASSERT(592, pfn!=NULL);
const void* pEntry = pfn(this, queryResult);
if (pEntry != NULL) {
@@ -456,8 +456,8 @@ void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszTe
on_resetStatus_(pszText);
JUT_ASSERT(658, eStatus_==STATUS_NORMAL);
JUT_ASSERT(659, pEntry!=0);
JUT_ASSERT(660, pszText!=0);
JUT_ASSERT(659, pEntry!=NULL);
JUT_ASSERT(660, pszText!=NULL);
do_jump(pEntry, pszText);
}
@@ -495,8 +495,8 @@ void JMessage::TSequenceProcessor::on_branch(void const* pEntry, char const* psz
on_resetStatus_(pszText);
JUT_ASSERT(717, eStatus_==STATUS_NORMAL);
JUT_ASSERT(718, pEntry!=0);
JUT_ASSERT(719, pszText!=0);
JUT_ASSERT(718, pEntry!=NULL);
JUT_ASSERT(719, pszText!=NULL);
do_branch(pEntry, pszText);
}
@@ -653,7 +653,7 @@ void* JMessage::TSequenceProcessor::process_setMessageCode_(JMessage::TSequenceP
}
TControl* pControl = pProcessor->getControl();
JUT_ASSERT(911, pControl!=0);
JUT_ASSERT(911, pControl!=NULL);
if (!pControl->setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) {
JGADGET_WARNMSG1(914, "message-code undefined : ", pControl->getMessageCode());
@@ -687,7 +687,7 @@ const void*
JMessage::TSequenceProcessor::process_onBranch_limited_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) {
const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process;
JUT_ASSERT(942, rData.pTarget!=0);
JUT_ASSERT(942, rData.pTarget!=NULL);
JUT_ASSERT(943, uTargetIndex<rData.uTarget);
u16 u16Index = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u16> >::parse(rData.pTarget, uTargetIndex);
@@ -700,7 +700,7 @@ const void*
JMessage::TSequenceProcessor::process_onBranch_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) {
const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process;
JUT_ASSERT(957, rData.pTarget!=0);
JUT_ASSERT(957, rData.pTarget!=NULL);
JUT_ASSERT(958, uTargetIndex<rData.uTarget);
u32 uCode = JGadget::binary::TParseValue<JGadget::binary::TParseValue_endian_big_<u32> >::parse(rData.pTarget, uTargetIndex);
src/JSystem/JMessage/resource.cpp
+10 -10
View File
@@ -66,7 +66,7 @@ u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, boo
int nMsgNumber = oParse_TBlock_messageID_.get_number();
const u32* pContent = oParse_TBlock_messageID_.getContent();
JUT_ASSERT(131, pContent!=0);
JUT_ASSERT(131, pContent!=NULL);
const u32* pFirst = pContent;
const u32* pLast = pFirst + nMsgNumber;
@@ -156,13 +156,13 @@ void JMessage::TResourceContainer::setEncoding(u8 e) {
void JMessage::TResourceContainer::setEncoding_(u8 e) {
encodingType_ = e;
pfnParseCharacter_ = JGadget::toValueFromIndex<JMessage::locale::parseCharacter_function>(e, sapfnParseCharacter_, 5, NULL);
JUT_ASSERT(299, pfnParseCharacter_!=0);
JUT_ASSERT(299, pfnParseCharacter_!=NULL);
}
/* 802A9130-802A9158 2A3A70 0028+00 0/0 2/2 0/0 .text
* __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer */
JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) {
JUT_ASSERT(324, pContainer!=0);
JUT_ASSERT(324, pContainer!=NULL);
pContainer_ = pContainer;
pResource_ = NULL;
}
@@ -174,17 +174,17 @@ JMessage::TParse::~TParse() {}
* parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */
// NONMATCHING regalloc, missing clrlwi
bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 param_2) {
JUT_ASSERT(343, ppData_inout!=0);
JUT_ASSERT(344, puBlock_out!=0);
JUT_ASSERT(343, ppData_inout!=NULL);
JUT_ASSERT(344, puBlock_out!=NULL);
const void* pData = *ppData_inout;
JUT_ASSERT(346, pData!=0);
JUT_ASSERT(346, pData!=NULL);
data::TParse_THeader oHeader(pData);
*ppData_inout = oHeader.getContent();
*puBlock_out = oHeader.get_blockNumber();
JUT_ASSERT(350, pContainer_!=0);
JUT_ASSERT(350, pContainer_!=NULL);
if (memcmp(oHeader.get_signature(), &data::ga4cSignature, sizeof(data::ga4cSignature)) != 0) {
JGADGET_WARNMSG(355, "unknown signature");
@@ -230,11 +230,11 @@ bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_
/* 802A92F4-802A9490 2A3C34 019C+00 1/0 0/0 0/0 .text
* parseBlock_next__Q28JMessage6TParseFPPCvPUlUl */
bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_out, u32 param_2) {
JUT_ASSERT(401, ppData_inout!=0);
JUT_ASSERT(402, puData_out!=0);
JUT_ASSERT(401, ppData_inout!=NULL);
JUT_ASSERT(402, puData_out!=NULL);
const void* pData = *ppData_inout;
JUT_ASSERT(404, pData!=0);
JUT_ASSERT(404, pData!=NULL);
data::TParse_TBlock oBlock(pData);
src/JSystem/JParticle/JPAEmitterManager.cpp
+2 -2
View File
@@ -55,7 +55,7 @@ JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(JGeometry::TVec3<f32> c
JPAParticleCallBack* ptclCB) {
JUT_ASSERT(88, group_id < gidMax);
JUT_ASSERT(89, res_mgr_id < ridMax);
JUT_ASSERT(90, pResMgrAry[res_mgr_id] != 0);
JUT_ASSERT(90, pResMgrAry[res_mgr_id] != NULL);
JPAResource* pRes = pResMgrAry[res_mgr_id]->getResource(resID);
if (pRes == NULL) {
@@ -160,7 +160,7 @@ void JPAEmitterManager::forceDeleteEmitter(JPABaseEmitter* emtr) {
/* 8027E344-8027E354 278C84 0010+00 0/0 2/2 0/0 .text
* entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc */
void JPAEmitterManager::entryResourceManager(JPAResourceManager* resMgr, u8 resMgrID) {
JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == 0,
JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == NULL,
"res_id %d res_id_max %d array[%d] = %x", resMgrID, ridMax, resMgrID,
pResMgrAry[resMgrID]);
pResMgrAry[resMgrID] = resMgr;
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 {
src/JSystem/JUtility/JUTConsole.cpp
+6 -6
View File
@@ -17,7 +17,7 @@ JUTConsoleManager* JUTConsoleManager::sManager;
*/
JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRHeap* pHeap) {
JUTConsoleManager* pManager = JUTConsoleManager::getManager();
JUT_ASSERT(33, pManager != 0);
JUT_ASSERT(33, pManager != NULL);
u8* buffer = (u8*)JKRAllocFromHeap(pHeap, getObjectSizeFromBufferSize(param_0, maxLines), 0);
@@ -32,7 +32,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRH
/* 802E73E4-802E746C 2E1D24 0088+00 0/0 1/1 0/0 .text create__10JUTConsoleFUiPvUl */
JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSize) {
JUTConsoleManager* pManager = JUTConsoleManager::getManager();
JUT_ASSERT(59, pManager != 0);
JUT_ASSERT(59, pManager != NULL);
JUT_ASSERT(62, ( (u32)buffer & 0x3 ) == 0);
u32 maxLines = getLineFromObjectSize(bufferSize, param_0);
@@ -262,7 +262,7 @@ void JUTConsole::print(char const* str) {
/* 802E7F30-802E7F7C 2E2870 004C+00 1/1 1/1 0/0 .text JUTConsole_print_f_va_ */
extern "C" void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_list args) {
JUT_ASSERT(563, console!=0);
JUT_ASSERT(563, console!=NULL);
char buf[1024];
vsnprintf(buf, sizeof(buf), fmt, args);
@@ -361,7 +361,7 @@ JUTConsoleManager::JUTConsoleManager() {
/* 802E81F4-802E8240 2E2B34 004C+00 0/0 1/1 0/0 .text createManager__17JUTConsoleManagerFP7JKRHeap
*/
JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
JUT_ASSERT(0x39c, sManager == 0);
JUT_ASSERT(0x39c, sManager == NULL);
if (pHeap == NULL) {
pHeap = JKRGetCurrentHeap();
@@ -375,7 +375,7 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) {
/* 802E8240-802E82B0 2E2B80 0070+00 3/3 0/0 0/0 .text
* appendConsole__17JUTConsoleManagerFP10JUTConsole */
void JUTConsoleManager::appendConsole(JUTConsole* console) {
JUT_ASSERT(961, sManager != 0 && console != 0);
JUT_ASSERT(961, sManager != NULL && console != NULL);
JUT_ASSERT(964, soLink_.Find( console ) == soLink_.end());
soLink_.Push_back(console);
@@ -388,7 +388,7 @@ void JUTConsoleManager::appendConsole(JUTConsole* console) {
/* 802E82B0-802E8384 2E2BF0 00D4+00 2/2 0/0 0/0 .text
* removeConsole__17JUTConsoleManagerFP10JUTConsole */
void JUTConsoleManager::removeConsole(JUTConsole* console) {
JUT_ASSERT(982, sManager != 0 && console != 0);
JUT_ASSERT(982, sManager != NULL && console != NULL);
JUT_ASSERT(985, soLink_.Find( console ) != soLink_.end());
if (mActiveConsole == console) {
src/JSystem/JUtility/JUTResFont.cpp
-2
View File
@@ -12,8 +12,6 @@
#include "JSystem/JUtility/JUTConsole.h"
#include "dolphin/gx.h"
#define suAboutEncoding_ 3
/* 802DEF48-802DEF94 2D9888 004C+00 0/0 1/1 0/0 .text __ct__10JUTResFontFv */
JUTResFont::JUTResFont() {
initialize_state();
src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h
+17 -1
View File
@@ -12,9 +12,14 @@
#define FP_NAN FP_QNAN
#define fpclassify(x) ((sizeof(x) == sizeof(float)) ? __fpclassifyf(x) : __fpclassifyd(x))
#define fpclassify(x) \
((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : \
(sizeof(x) == sizeof(double)) ? __fpclassifyd((double)(x)) : \
__fpclassifyl((long double)(x)) )
#define signbit(x) ((sizeof(x) == sizeof(float)) ? __signbitf(x) : __signbitd(x))
#define isfinite(x) ((fpclassify(x) > 2))
#define isnan(x) (fpclassify(x) == FP_NAN)
#define isinf(x) (fpclassify(x) == FP_INFINITE)
#define __signbitf(x) ((int)(__HI(x) & 0x80000000))
@@ -26,6 +31,10 @@ extern unsigned long __float_huge[];
extern unsigned long __float_max[];
extern unsigned long __float_epsilon[];
#ifdef __cplusplus
extern "C" {
#endif
inline int __fpclassifyf(float __value) {
unsigned long integer = *(unsigned long*)&__value;
@@ -66,6 +75,13 @@ inline int __fpclassifyd(double __value) {
return FP_NORMAL;
}
// Stripped function.
int __fpclassifyl(long double __value);
#ifdef __cplusplus
}; // extern "C"
#endif
#define FLT_MANT_DIG 24
#define FLT_DIG 6
#define FLT_MIN_EXP (-125)
src/SSystem/SComponent/c_cc_d.cpp
+3 -4
View File
@@ -6,7 +6,6 @@
#include "SSystem/SComponent/c_cc_d.h"
#include "JSystem/JUtility/JUTAssert.h"
#define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !(((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : __fpclassifyd((double)(x)) ) == 1));
#define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
/* 80430CB4-80430CC0 05D9D4 000C+00 1/1 2/2 0/0 .bss m_virtual_center__14cCcD_ShapeAttr
@@ -224,9 +223,9 @@ void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) {
m_cc_move.y += y;
m_cc_move.z += z;
CHECK_FLOAT_CLASS(422, m_cc_move.x);
CHECK_FLOAT_CLASS(423, m_cc_move.y);
CHECK_FLOAT_CLASS(424, m_cc_move.z);
JUT_ASSERT(422, !isnan(m_cc_move.x));
JUT_ASSERT(423, !isnan(m_cc_move.y));
JUT_ASSERT(424, !isnan(m_cc_move.z));
CHECK_FLOAT_RANGE(426, m_cc_move.x);
CHECK_FLOAT_RANGE(427, m_cc_move.y);
src/SSystem/SComponent/c_cc_s.cpp
+7 -9
View File
@@ -6,9 +6,7 @@
#include "SSystem/SComponent/c_cc_s.h"
#include "JSystem/JUtility/JUTAssert.h"
#define CHECK_FLOAT_CLASS(line, x) \
JUT_ASSERT(line, !(((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : \
__fpclassifyd((double)(x))) == 1));
#define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !isnan(x));
#define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f);
/* 80264A6C-80264A94 25F3AC 0028+00 0/0 1/1 0/0 .text __ct__4cCcSFv */
@@ -165,7 +163,7 @@ void cCcS::ChkAtTg() {
continue;
cCcD_ShapeAttr* pat_sa = (*pat_obj)->GetShapeAttr();
JUT_ASSERT(0, pat_sa != 0);
JUT_ASSERT(0, pat_sa != NULL);
for (cCcD_Obj** ptg_obj = mpObjTg; ptg_obj < objTgEnd; ++ptg_obj) {
if (*ptg_obj == NULL || !(*ptg_obj)->ChkTgSet())
@@ -176,7 +174,7 @@ void cCcS::ChkAtTg() {
continue;
cCcD_ShapeAttr* ptg_sa = (*ptg_obj)->GetShapeAttr();
JUT_ASSERT(0, ptg_sa != 0);
JUT_ASSERT(0, ptg_sa != NULL);
static cXyz cross;
bool didCross = pat_sa->CrossAtTg(*ptg_sa, &cross);
@@ -225,7 +223,7 @@ void cCcS::ChkCo() {
continue;
cCcD_ShapeAttr* pco1_sa = (*pco1_obj)->GetShapeAttr();
JUT_ASSERT(0, pco1_sa != 0);
JUT_ASSERT(0, pco1_sa != NULL);
for (cCcD_Obj** pco2_obj = pco1_obj + 1; pco2_obj < objCoEnd; ++pco2_obj) {
if (*pco2_obj == NULL || !(*pco2_obj)->ChkCoSet())
@@ -236,7 +234,7 @@ void cCcS::ChkCo() {
continue;
cCcD_ShapeAttr* pco2_sa = (*pco2_obj)->GetShapeAttr();
JUT_ASSERT(0, pco2_sa != 0);
JUT_ASSERT(0, pco2_sa != NULL);
f32 cross_len;
if (pco1_sa->CrossCo(*pco2_sa, &cross_len)) {
@@ -456,7 +454,7 @@ void cCcS::CalcArea() {
for (cCcD_Obj** pset_obj = mpObj; pset_obj < mpObj + mObjCount; ++pset_obj) {
if (*pset_obj != NULL) {
cCcD_ShapeAttr* pset_sa = (*pset_obj)->GetShapeAttr();
JUT_ASSERT(0, pset_sa != 0);
JUT_ASSERT(0, pset_sa != NULL);
pset_sa->CalcAabBox();
aab.SetMinMax(pset_sa->GetWorkAab());
@@ -467,7 +465,7 @@ void cCcS::CalcArea() {
for (cCcD_Obj** pset_obj = mpObj; pset_obj < mpObj + mObjCount; ++pset_obj) {
if (*pset_obj != NULL) {
const cCcD_ShapeAttr* pset_sa = (*pset_obj)->GetShapeAttr();
JUT_ASSERT(0, pset_sa != 0);
JUT_ASSERT(0, pset_sa != NULL);
cCcD_DivideInfo* divideInfo = &(*pset_obj)->GetDivideInfo();
mDivideArea.CalcDivideInfo(divideInfo, pset_sa->GetWorkAab(),
src/SSystem/SComponent/c_m3d_g_aab.cpp
+2 -2
View File
@@ -40,8 +40,8 @@ bool cM3dGAab::TopPlaneYUnder(f32 y) const {
/* 8026ECF8-8026ED1C 0024+00 s=0 e=6 z=0 None .text ClearForMinMax__8cM3dGAabFv */
void cM3dGAab::ClearForMinMax() {
mMin.x = mMin.y = mMin.z = 1000000000.0f;
mMax.x = mMax.y = mMax.z = -1000000000.0f;
mMin.x = mMin.y = mMin.z = G_CM3D_F_INF;
mMax.x = mMax.y = mMax.z = -G_CM3D_F_INF;
}
/* 8026ED1C-8026ED60 0044+00 s=1 e=3 z=0 None .text SetMinMax__8cM3dGAabFRC4cXyz */
src/SSystem/SComponent/c_xyz.cpp
+1 -1
View File
@@ -96,7 +96,7 @@ cXyz cXyz::normZC() const {
/* 80266EF4-80266F48 0054+00 s=0 e=13 z=17 None .text normalize__4cXyzFv */
cXyz cXyz::normalize() {
JUT_ASSERT(285, isNearZeroSquare() == 0);
JUT_ASSERT(285, isNearZeroSquare() == FALSE);
PSVECNormalize(this, this);
return *this;
}
src/Z2AudioLib/Z2SpeechMgr2.cpp
+1 -1
View File
@@ -486,7 +486,7 @@ void Z2SpeechMgr2::setString(u16 const* s, s16 i_textNum, u8 i_speaker, u16 i_mo
mText[i] = 0;
}
JUT_ASSERT(383, s != 0);
JUT_ASSERT(383, s != NULL);
if (i_textNum > 500) {
mTextNum = 500;
src/d/actor/d_a_L7demo_dr.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_L7demo_dr.h"
#include "d/actor/d_a_player.h"
@@ -326,7 +326,7 @@ static int daDr_Delete(daDr_c* i_this) {
/* 805AA084-805AA17C 000EC4 00F8+00 1/1 0/0 0/0 .text CreateHeap__6daDr_cFv */
int daDr_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
JUT_ASSERT(655, modelData != 0);
JUT_ASSERT(655, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x1E), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
src/d/actor/d_a_L7low_dr.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_L7low_dr.h"
#include "d/d_com_inf_game.h"
@@ -136,7 +136,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
/* 805AAC5C-805AAD58 0006DC 00FC+00 1/1 0/0 0/0 .text CreateHeap__11daL7lowDr_cFv */
int daL7lowDr_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L7lowDr", 10);
JUT_ASSERT(244, modelData != 0);
JUT_ASSERT(244, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 4), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
src/d/actor/d_a_L7op_demo_dr.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_L7op_demo_dr.h"
#include "d/actor/d_a_player.h"
@@ -775,7 +775,7 @@ static int daL7ODR_Delete(daL7ODR_c* i_this) {
/* 805AD90C-805ADA0C 0028EC 0100+00 1/1 0/0 0/0 .text CreateHeap__9daL7ODR_cFv */
int daL7ODR_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49);
JUT_ASSERT(1146, modelData != 0);
JUT_ASSERT(1146, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
field_0x890 = 0x2F;
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
src/d/actor/d_a_alink.cpp
+20 -20
View File
@@ -3,7 +3,7 @@
* Player (Link) Actor
*/
#include "d/dolzel.h"
#include "d/dolzel.h" // IWYU pragma: keep
#include "d/actor/d_a_alink.h"
#include "JSystem/J2DGraph/J2DAnmLoader.h"
@@ -3698,11 +3698,11 @@ void daAlink_c::footBgCheck() {
mLinkGndChk.SetPos(&sp44);
f32 temp_f1 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (-1000000000.0f != temp_f1) {
if (-G_CM3D_F_INF != temp_f1) {
dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp98);
}
if (-1000000000.0f != temp_f1 && cBgW_CheckBGround(sp98.mNormal.y) && sp44.y - temp_f1 < l_autoUpHeight - l_autoDownHeight) {
if (-G_CM3D_F_INF != temp_f1 && cBgW_CheckBGround(sp98.mNormal.y) && sp44.y - temp_f1 < l_autoUpHeight - l_autoDownHeight) {
*sp24 = temp_f1;
var_r29->field_0x0 = 1;
sp20[i] = getGroundAngle(&mLinkGndChk, shape_angle.y);
@@ -3820,7 +3820,7 @@ void daAlink_c::handBgCheck() {
mLinkGndChk.SetPos(&sp28);
f32 temp_f1 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (-1000000000.0f != temp_f1 && (sp28.y - temp_f1 < l_autoUpHeight - l_autoDownHeight)) {
if (-G_CM3D_F_INF != temp_f1 && (sp28.y - temp_f1 < l_autoUpHeight - l_autoDownHeight)) {
*var_r25 = temp_f1;
if (dComIfG_Bgsp().GetGroundCode(mLinkGndChk) != 8) {
@@ -4362,7 +4362,7 @@ void daAlink_c::playerInit() {
m_mSwordBrk->searchUpdateMaterialID(modelData2);
modelData2->entryTevRegAnimator(m_mSwordBrk);
f32 tmp = -1000000000.0f;
f32 tmp = -G_CM3D_F_INF;
mWaterY = tmp;
field_0x33b8 = tmp;
field_0x33bc = tmp;
@@ -4737,7 +4737,7 @@ int daAlink_c::create() {
mLinkAcch.CrrPos(dComIfG_Bgsp());
void* var_r24 = NULL;
if (mLinkAcch.GetGroundH() == -1000000000.0f ||
if (mLinkAcch.GetGroundH() == -G_CM3D_F_INF ||
(startMode == 14 && !dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) ||
(startPoint == -4 &&
!(var_r24 = fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchPortal, &current.pos))) ||
@@ -4917,7 +4917,7 @@ void daAlink_c::setShapeAngleOnGround() {
sp20.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
bool var_r29;
if (-1000000000.0f != sp20.y) {
if (-G_CM3D_F_INF != sp20.y) {
var_r29 = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp2C);
} else {
var_r29 = 0;
@@ -4934,7 +4934,7 @@ void daAlink_c::setShapeAngleOnGround() {
sp14.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
bool var_r29_2;
if (-1000000000.0f != sp14.y) {
if (-G_CM3D_F_INF != sp14.y) {
var_r29_2 = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp2C);
} else {
var_r29_2 = 0;
@@ -6782,7 +6782,7 @@ int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB,
if (checkWolf()) {
// "Player is Wolf, but setting Link animation\n"
OSReport("狼なのにリンクアニメ設定\n");
JUT_ASSERT(8591, 0);
JUT_ASSERT(8591, FALSE);
}
#endif
@@ -8602,13 +8602,13 @@ void daAlink_c::setFrontWallType() {
mLinkGndChk.SetPos(&chk_start_pos);
f32 sp38 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (-1000000000.0f != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) {
if (-G_CM3D_F_INF != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) {
found_gnd_tri = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &gndchk_tri);
}
if ((!checkModeFlg(0x40000) && sp38 < body_height) || !found_gnd_tri) {
return;
}
if (-1000000000.0f == sp38 || !cBgW_CheckBGround(gndchk_tri.mNormal.y)) {
if (-G_CM3D_F_INF == sp38 || !cBgW_CheckBGround(gndchk_tri.mNormal.y)) {
return;
}
@@ -8687,7 +8687,7 @@ void daAlink_c::setWaterY() {
} else {
offNoResetFlg0(FLG0_UNK_80);
field_0x2fbc = 16;
mWaterY = -1000000000.0f;
mWaterY = -G_CM3D_F_INF;
}
}
@@ -8737,7 +8737,7 @@ void daAlink_c::setHangWaterY() {
checkWaterInKandelaar(field_0x33b8);
}
} else {
field_0x33b8 = -1000000000.0f;
field_0x33b8 = -G_CM3D_F_INF;
field_0x2fc5 = 0x10;
field_0x2fc6 = 0;
}
@@ -13176,7 +13176,7 @@ void daAlink_c::autoGroundHit() {
}
BOOL var_r28;
if (-1000000000.0f != mLinkAcch.GetGroundH()) {
if (-G_CM3D_F_INF != mLinkAcch.GetGroundH()) {
dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &sp74);
var_r28 = cBgW_CheckBGround(sp74.mNormal.y);
} else {
@@ -13384,7 +13384,7 @@ BOOL daAlink_c::checkRestartRoom() {
return procCoLavaReturnInit(1);
} else if ((checkModeFlg(0x40000) || (checkNoResetFlg0(FLG0_UNK_80) && mWaterY - current.pos.y > daAlinkHIO_swim_c0::m.mInitHeight)) && fopAcM_GetRoomNo(this) == 0 && checkStageName("F_SP114")) {
return procCoSwimFreezeReturnInit();
} else if (!checkCargoCarry() && (field_0x3174 == 4 || field_0x3174 == 10 || (-1000000000.0f == mLinkAcch.GetGroundH() && !checkModeFlg(0x40000)))) {
} else if (!checkCargoCarry() && (field_0x3174 == 4 || field_0x3174 == 10 || (-G_CM3D_F_INF == mLinkAcch.GetGroundH() && !checkModeFlg(0x40000)))) {
BOOL temp_r28 = mWaterY > mLinkAcch.GetGroundH();
f32 var_f31;
@@ -13452,7 +13452,7 @@ BOOL daAlink_c::checkRestartRoom() {
return true;
}
} else if ((mLinkAcch.ChkGroundHit() && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x80)) || (checkWaterPolygonUnder() && checkNoResetFlg0(FLG0_UNK_80) && (dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x80)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && (field_0x2fc6 & 0x80)) || (field_0x2fbc == 6 && checkNoResetFlg0(FLG0_UNK_80) && checkWaterPolygonUnder() && mWaterY > (daAlinkHIO_basic_c0::m.mLavaDeathDepth + mLinkAcch.GetGroundH())) || (field_0x2fc5 == 6 && -1000000000.0f != field_0x33b8 && field_0x33bc < field_0x33b8 && checkModeFlg(0x40) && field_0x33b8 > (field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))) {
} else if ((mLinkAcch.ChkGroundHit() && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x80)) || (checkWaterPolygonUnder() && checkNoResetFlg0(FLG0_UNK_80) && (dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x80)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -G_CM3D_F_INF != field_0x33b8 && (field_0x2fc6 & 0x80)) || (field_0x2fbc == 6 && checkNoResetFlg0(FLG0_UNK_80) && checkWaterPolygonUnder() && mWaterY > (daAlinkHIO_basic_c0::m.mLavaDeathDepth + mLinkAcch.GetGroundH())) || (field_0x2fc5 == 6 && -G_CM3D_F_INF != field_0x33b8 && field_0x33bc < field_0x33b8 && checkModeFlg(0x40) && field_0x33b8 > (field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))) {
if (field_0x2fbc == 6 || (checkModeFlg(0x40) && field_0x2fc5 == 6)) {
return procCoLavaReturnInit(0);
}
@@ -17227,7 +17227,7 @@ int daAlink_c::procCoMetamorphoseInit() {
mLinkGndChk.SetPos(&pos);
f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (gnd_cross != -1000000000.0f) {
if (gnd_cross != -G_CM3D_F_INF) {
pos.y = gnd_cross;
cXyz sp14 = current.pos;
@@ -17624,7 +17624,7 @@ int daAlink_c::execute() {
}
}
} else if (mProcID != PROC_HOOKSHOT_FLY && !checkModeFlg(MODE_VINE_CLIMB | MODE_UNK_800) &&
mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -1000000000.0f &&
mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -G_CM3D_F_INF &&
dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) &&
dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd))
{
@@ -18013,7 +18013,7 @@ int daAlink_c::execute() {
speed.y = 0.0f;
if (field_0x3198 != 0) {
if (mLinkAcch.GetGroundH() != -1000000000.0f) {
if (mLinkAcch.GetGroundH() != -G_CM3D_F_INF) {
current.pos.y = mLinkAcch.GetGroundH();
}
}
@@ -18037,7 +18037,7 @@ int daAlink_c::execute() {
field_0x3178 = field_0x3174;
if (mLinkAcch.GetGroundH() != -1000000000.0f) {
if (mLinkAcch.GetGroundH() != -G_CM3D_F_INF) {
setRoomInfo();
if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO &&
src/d/actor/d_a_alink_bottle.inc
+2 -2
View File
@@ -70,14 +70,14 @@ void daAlink_c::setBottleModel(u16 i_itemNo) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E8, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31D, 0x1400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(142, 0);
JUT_ASSERT(142, FALSE);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_WORM) {
J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E9, 0xC00);
mpHookTipModel = initModel(loadAramBmd(0x31E, 0x2400), 0);
if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) {
JUT_ASSERT(151, 0);
JUT_ASSERT(151, FALSE);
}
mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f);
} else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) {
src/d/actor/d_a_alink_damage.inc
+1 -1
View File
@@ -308,7 +308,7 @@ int daAlink_c::checkPolyDamage() {
}
}
if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) {
if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -G_CM3D_F_INF != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) {
return 2;
}
src/d/actor/d_a_alink_demo.inc
+4 -4
View File
@@ -1297,7 +1297,7 @@ BOOL daAlink_c::checkDeadAction(int param_0) {
offCargoCarry();
int var_r29;
if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && -1000000000.0f != mLinkAcch.GetGroundH()) {
if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && -G_CM3D_F_INF != mLinkAcch.GetGroundH()) {
var_r29 = dComIfG_Bgsp().GetExitId(mLinkAcch.m_gnd);
} else {
var_r29 = 0x3F;
@@ -1605,7 +1605,7 @@ int daAlink_c::procCoToolDemo() {
}
}
} else if (sp1C == 1) {
JUT_ASSERT(2345, 0);
JUT_ASSERT(2345, FALSE);
} else if (sp1C == 2) {
if (sp18 == 1) {
if (sp14 == 2) {
@@ -2216,7 +2216,7 @@ int daAlink_c::procCoGetItem() {
// "Get Item is not an item!!! %d\n"
OSReport("ゲットするアイテムがアイテムじゃない！！！　%d\n",
fopAcM_GetName(item_partner_p));
JUT_ASSERT(3415, 0);
JUT_ASSERT(3415, FALSE);
}
#endif
@@ -3733,7 +3733,7 @@ int daAlink_c::procNotUseItem() {
// "Present Item is not this Item!!! %d\n"
OSReport("差し出すアイテムがアイテムじゃない！！！　%d\n",
fopAcM_GetName(item_partner_p));
JUT_ASSERT(5506, 0);
JUT_ASSERT(5506, FALSE);
}
#endif
if (item_partner_p != NULL) {
src/d/actor/d_a_alink_hang.inc
+2 -2
View File
@@ -354,7 +354,7 @@ int daAlink_c::procHangFallStartInit(cM3dGPla* param_0) {
f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
sp58.y = cross;
if (sp58.y != -1000000000.0f) {
if (sp58.y != -G_CM3D_F_INF) {
if (sp58.y < current.pos.y + l_autoDownHeight) {
return 0;
}
@@ -1986,7 +1986,7 @@ int daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) {
mLinkGndChk.SetPos(param_0);
f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (cross != -1000000000.0f && dBgS_CheckBGroundPoly(mLinkGndChk) &&
if (cross != -G_CM3D_F_INF && dBgS_CheckBGroundPoly(mLinkGndChk) &&
cross >= param_1 - 50.0f)
{
param_0->y = cross;
src/d/actor/d_a_alink_swindow.inc
+1 -1
View File
@@ -278,7 +278,7 @@ void daAlink_c::initStatusWindow() {
J3DAnmTransform* bck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0);
if (!m_sWindowBck->init(bck, 1, 2, 1.0f, 0, -1, false)) {
JUT_ASSERT(0x1B1, 0);
JUT_ASSERT(433, FALSE);
}
tmpBuffer = new (0x20) void*[0x100];
src/d/actor/d_a_alink_whistle.inc
+1 -1
View File
@@ -168,7 +168,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s
mLinkGndChk.SetPos(param_4);
f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (gnd_cross != -1000000000.0f) {
if (gnd_cross != -G_CM3D_F_INF) {
current.pos.set(param_4->x, gnd_cross, param_4->z);
}
src/d/actor/d_a_alink_wolf.inc
+8 -8
View File
@@ -1225,7 +1225,7 @@ int daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2,
if (!checkWolf()) {
// "Is Adult Link but setting Wolf animation\n"
OS_REPORT("リンクなのに狼アニメ設定\n");
JUT_ASSERT(0x82B, 0);
JUT_ASSERT(2091, FALSE);
}
J3DAnmTransform* var_r25 = getNowAnmPackUnder(UNDER_0);
@@ -1303,7 +1303,7 @@ int daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed,
if (!checkWolf()) {
// "Is Adult Link but setting Wolf animation\n"
OS_REPORT("リンクなのに狼アニメ設定\n");
JUT_ASSERT(0x82B, 0);
JUT_ASSERT(2091, FALSE);
}
J3DAnmTransform* var_r30 = getAnimeResource(&mUnderAnmHeap[0], m_wlAnmDataTable[i_anmID].field_0x0, 0x10800);
@@ -2036,7 +2036,7 @@ void daAlink_c::wolfFootBgCheck() {
temp_f31 = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
temp_f30 = var_r26->y - temp_f31;
if (-1000000000.0f != temp_f31 && temp_f30 < temp_f27 && temp_f30 > sp1C) {
if (-G_CM3D_F_INF != temp_f31 && temp_f30 < temp_f27 && temp_f30 > sp1C) {
*sp20 = temp_f31;
var_r28->field_0x0 = 1;
sp48[i][j] = getGroundAngle(&mLinkGndChk, shape_angle.y);
@@ -2144,11 +2144,11 @@ void daAlink_c::wolfFootBgCheck() {
}
int sp18;
if (-1000000000.0f != temp_f31) {
if (-G_CM3D_F_INF != temp_f31) {
sp18 = dComIfG_Bgsp().GetPolyAtt0(mLinkGndChk);
}
if (-1000000000.0f == temp_f31 || sp18 == 3 || sp18 == 0xD) {
if (-G_CM3D_F_INF == temp_f31 || sp18 == 3 || sp18 == 0xD) {
sp90.y += mSinkShapeOffset;
}
@@ -2161,11 +2161,11 @@ void daAlink_c::wolfFootBgCheck() {
sp84.y = current.pos.y;
}
if (-1000000000.0f != temp_f31) {
if (-G_CM3D_F_INF != temp_f31) {
sp18 = dComIfG_Bgsp().GetPolyAtt0(mLinkGndChk);
}
if (-1000000000.0f == temp_f31 || sp18 == 3 || sp18 == 0xD) {
if (-G_CM3D_F_INF == temp_f31 || sp18 == 3 || sp18 == 0xD) {
sp84.y += mSinkShapeOffset;
}
@@ -5695,7 +5695,7 @@ int daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) {
mLinkGndChk.SetPos(&gnd_chk_pos);
gnd_chk_pos.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk);
if (gnd_chk_pos.y != -1000000000.0f) {
if (gnd_chk_pos.y != -G_CM3D_F_INF) {
if (gnd_chk_pos.y < current.pos.y + l_autoDownHeight) {
return 0;
}
src/d/actor/d_a_alldie.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Activates a switch when all enemies are defeated
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_alldie.h"
#include "d/d_com_inf_game.h"
src/d/actor/d_a_andsw.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* AND - Switch
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_andsw.h"
#include "d/d_procname.h"
src/d/actor/d_a_andsw2.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_andsw2.h"
#include "d/d_com_inf_game.h"
src/d/actor/d_a_arrow.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_arrow.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
src/d/actor/d_a_b_bh.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_bh.h"
#include "d/actor/d_a_b_bq.h"
@@ -1462,7 +1462,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
void* modelData = dComIfG_getObjectRes("B_BH", BMDR_BH_KUKI);
JUT_ASSERT(2475, modelData != 0);
JUT_ASSERT(2475, modelData != NULL);
for (int i = 0; i < 17; i++) {
a_this->mpStemModels[i] = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
@@ -1474,7 +1474,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
modelData = dComIfG_getObjectRes("B_BH", BMDR_BH_LEAF);
JUT_ASSERT(2491, modelData != 0);
JUT_ASSERT(2491, modelData != NULL);
for (int i = 0; i < 17; i++) {
if ((i & 3) == 2) {
src/d/actor/d_a_b_bq.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
* Boss Baba (Diababa)
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_bq.h"
#include "d/d_com_inf_game.h"
@@ -2490,7 +2490,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_bq", BMDR_BQ_EYEBALL);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
a_this->mpEyeballModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (a_this->mpEyeballModel == NULL) {
src/d/actor/d_a_b_dr.cpp
+13 -13
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_dr.h"
#include "d/d_com_inf_game.h"
@@ -1115,7 +1115,7 @@ bool daB_DR_c::flapMove(bool param_0) {
}
}
if (-1000000000.0f == mAcch.GetGroundH()) {
if (-G_CM3D_F_INF == mAcch.GetGroundH()) {
target_y += home.pos.y;
} else {
target_y += mAcch.GetGroundH();
@@ -1195,7 +1195,7 @@ bool daB_DR_c::mPlayerHighCheck() {
gndchk.SetPos(&chk_pos);
field_0x734 = dComIfG_Bgsp().GroundCross(&gndchk);
if (-1000000000.0f == field_0x734 || field_0x734 < 0.0f) {
if (-G_CM3D_F_INF == field_0x734 || field_0x734 < 0.0f) {
field_0x734 = home.pos.y;
}
@@ -1217,7 +1217,7 @@ bool daB_DR_c::mBgFallGroundCheck() {
chkpos.y += 300.0f;
gndchk.SetPos(&chkpos);
chkpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (-1000000000.0f == chkpos.y) {
if (-G_CM3D_F_INF == chkpos.y) {
chkpos.y = home.pos.y;
}
if (chkpos.y < home.pos.y) {
@@ -2728,7 +2728,7 @@ void daB_DR_c::executeGliderAttack() {
field_0x7dc = 1;
}
if (-1000000000.0f != mAcch.GetGroundH()) {
if (-G_CM3D_F_INF != mAcch.GetGroundH()) {
if (mAnm == ANM_DR_WIND_ATTACKB) {
mCount[1]++;
if (mCount[1] > WREG_S(9)) {
@@ -2945,7 +2945,7 @@ void daB_DR_c::executePillarSearch() {
cLib_addCalcAngleS2(&current.angle.x, sp30.atan2sY_XZ(), 20, NREG_S(3) + 0x400);
cLib_addCalcAngleS2(&shape_angle.x, current.angle.x, NREG_S(2) + 20, NREG_S(3) + 0x400);
if (mPlayerHighCheck() && -1000000000.0f != mAcch.GetGroundH()) {
if (mPlayerHighCheck() && -G_CM3D_F_INF != mAcch.GetGroundH()) {
setActionMode(ACTION_BREATH_ATTACK, 0);
}
}
@@ -3571,7 +3571,7 @@ void daB_DR_c::action() {
if (abs(temp_r28) < 0x2000) {
field_0x74e = temp_r28;
}
if (mAnm == ANM_DR_WIND_ATTACKATOB || mAnm == ANM_DR_WIND_ATTACKB || -1000000000.0f != mAcch.GetGroundH() || mCount[3] == 0) {
if (mAnm == ANM_DR_WIND_ATTACKATOB || mAnm == ANM_DR_WIND_ATTACKB || -G_CM3D_F_INF != mAcch.GetGroundH() || mCount[3] == 0) {
field_0x74e = 0;
}
}
@@ -3632,7 +3632,7 @@ void daB_DR_c::mtx_set() {
sp28.SetPos(&sp1C);
f32 var_f31 = dComIfG_Bgsp().GroundCross(&sp28);
if (-1000000000.0f == var_f31 || var_f31 < 5250.0f + JREG_F(4)) {
if (-G_CM3D_F_INF == var_f31 || var_f31 < 5250.0f + JREG_F(4)) {
var_f31 = 5250.0f + JREG_F(4);
}
field_0x7a8.y = var_f31;
@@ -3648,7 +3648,7 @@ void daB_DR_c::mtx_set() {
}
}
if (mAnm == ANM_DR_WIND_ATTACKB && -1000000000.0f != mAcch.GetGroundH()) {
if (mAnm == ANM_DR_WIND_ATTACKB && -G_CM3D_F_INF != mAcch.GetGroundH()) {
cXyz sp10 = current.pos - home.pos;
if (sp10.abs() > 3000.0f || current.pos.y > 370.0f) {
if (field_0x7d8 == 0) {
@@ -3746,7 +3746,7 @@ void daB_DR_c::cc_set() {
mSound2.startCreatureSoundLevel(Z2SE_EN_DR_WIND_ATTACK, 0, -1);
}
if (mAnm == ANM_DR_WIND_ATTACKB && -1000000000.0f != mAcch.GetGroundH() && mCount[1] > WREG_S(9)) {
if (mAnm == ANM_DR_WIND_ATTACKB && -G_CM3D_F_INF != mAcch.GetGroundH() && mCount[1] > WREG_S(9)) {
var_r27 = 1;
}
@@ -4055,7 +4055,7 @@ int daB_DR_c::CreateHeap() {
if (arg0 == 0x14 || arg0 == 0x15) {
static int mPartDt[] = {74, 74, 75, 76, 77, 78};
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", mPartDt[mPartNo]);
JUT_ASSERT(6312, modelData != 0);
JUT_ASSERT(6312, modelData != NULL);
mpPartModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (mpPartModel == NULL) {
@@ -4066,7 +4066,7 @@ int daB_DR_c::CreateHeap() {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49);
JUT_ASSERT(6324, modelData != 0);
JUT_ASSERT(6324, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
@@ -4286,7 +4286,7 @@ int daB_DR_c::create() {
setActionMode(ACTION_GLIDER_ATTACK, 0);
mTargetHeight = 1500.0f + mAcch.GetGroundH();
if (-1000000000.0f == mAcch.GetGroundH()) {
if (-G_CM3D_F_INF == mAcch.GetGroundH()) {
mTargetHeight = 1500.0f + current.pos.y;
}
if (dComIfGs_isZoneSwitch(1, fopAcM_GetRoomNo(this))) {
src/d/actor/d_a_b_dre.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_dre.h"
#include "SSystem/SComponent/c_math.h"
@@ -18,7 +18,7 @@
int daB_DRE_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49);
JUT_ASSERT(0xB4, modelData != 0);
JUT_ASSERT(0xB4, modelData != NULL);
if (mAction == 0) {
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
src/d/actor/d_a_b_ds.cpp
+18 -18
View File
@@ -3,7 +3,7 @@
* Boss - Stallord
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_ds.h"
#include "d/actor/d_a_player.h"
@@ -441,7 +441,7 @@ void daB_DS_c::mSmokeSet() {
}
if (mAcch.ChkGroundHit()) {
if (field_0x84d == 0 && mAcch.GetGroundH() != -1000000000.0f) {
if (field_0x84d == 0 && mAcch.GetGroundH() != -G_CM3D_F_INF) {
cXyz particle_scale(1.0f, 1.0f, 1.0f);
cXyz particle_pos(current.pos);
csXyz particle_angle(shape_angle);
@@ -508,7 +508,7 @@ void daB_DS_c::handSPosSet(int i_hand) {
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y == -1000000000.0f) {
if (chk_pos.y == -G_CM3D_F_INF) {
chk_pos.y = mFingerPos[i_hand].y;
}
particle_pos = chk_pos - mHandPos[i_hand];
@@ -525,7 +525,7 @@ void daB_DS_c::handSPosSet(int i_hand) {
gnd_chk.SetPos(&particle_pos);
particle_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (particle_pos.y == -1000000000.0f) {
if (particle_pos.y == -G_CM3D_F_INF) {
particle_pos.y = mHandPos[i_hand].y;
}
chk_pos = particle_pos - mHandPos[i_hand];
@@ -600,7 +600,7 @@ void daB_DS_c::mZsMoveChk() {
zs_pos.y += 2000.0f;
gnd_chk.SetPos(&zs_pos);
if (zs_pos.y != -1000000000.0f) {
if (zs_pos.y != -G_CM3D_F_INF) {
zs_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
} else {
zs_pos.y = current.pos.y += 800.0f;
@@ -665,7 +665,7 @@ void daB_DS_c::mZsMoveChk_Guard() {
zs_pos.y += 2000.0f;
gnd_chk.SetPos(&zs_pos);
if (zs_pos.y != -1000000000.0f) {
if (zs_pos.y != -G_CM3D_F_INF) {
zs_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
} else {
zs_pos.y = current.pos.y += 800.0f;
@@ -1906,7 +1906,7 @@ void daB_DS_c::damageHitCamera() {
offset.y = 300.0f;
MtxPosition(&offset, &pos);
pos.x += current.pos.x;
if (mAcch.GetGroundH() != -1000000000.0f) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
pos.y += mAcch.GetGroundH();
}
pos.z += current.pos.z;
@@ -1916,7 +1916,7 @@ void daB_DS_c::damageHitCamera() {
offset.z = 700.0f;
MtxPosition(&offset, &pos);
pos.x += current.pos.x;
if (mAcch.GetGroundH() != -1000000000.0f) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
pos.y += mAcch.GetGroundH();
}
pos.z += current.pos.z;
@@ -2091,7 +2091,7 @@ void daB_DS_c::executeDamage() {
sp1BC.z = 1000.0f;
MtxPosition(&sp1BC, &sp1B0);
sp1B0 += current.pos;
if (mAcch.GetGroundH() != -1000000000.0f) {
if (mAcch.GetGroundH() != -G_CM3D_F_INF) {
sp1B0.y = mAcch.GetGroundH();
}
@@ -3329,7 +3329,7 @@ void daB_DS_c::executeBattle2Damage() {
chk_pos.y += 300.0f;
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y == -1000000000.0f) {
if (chk_pos.y == -G_CM3D_F_INF) {
chk_pos.y = current.pos.y - 200.0f;
}
@@ -5253,7 +5253,7 @@ int daB_DS_c::execute() {
chk_pos.y += 3000.0f;
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y == -1000000000.0f) {
if (chk_pos.y == -G_CM3D_F_INF) {
chk_pos.y = jnt_pos.y;
}
@@ -5276,7 +5276,7 @@ int daB_DS_c::execute() {
chk_pos.y += 3000.0f;
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y == -1000000000.0f) {
if (chk_pos.y == -G_CM3D_F_INF) {
chk_pos.y = jnt_pos.y;
}
@@ -5391,7 +5391,7 @@ int daB_DS_c::CreateHeap() {
anm_res = ANM_HEAD_FWAIT;
}
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", anm_res)),
@@ -5409,7 +5409,7 @@ int daB_DS_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpSwordMorf = new mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 63)), 0,
@@ -5431,7 +5431,7 @@ int daB_DS_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpZantMorf = new mDoExt_McaMorfSO(
modelData, NULL, NULL, static_cast<J3DAnmTransform*>(dComIfG_getObjectRes("B_DS", 66)), 2,
@@ -5441,7 +5441,7 @@ int daB_DS_c::CreateHeap() {
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("B_DS", 73));
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpOpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
if (mpOpPatternModel == NULL) {
@@ -5473,7 +5473,7 @@ int daB_DS_c::CreateHeap() {
}
modelData = static_cast<J3DModelData*>(dComIfG_getObjectRes("B_DS", 72));
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
if (mpPatternModel == NULL) {
@@ -5624,7 +5624,7 @@ cPhs__Step daB_DS_c::create() {
gnd_chk.SetPos(&chk_pos);
chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk);
if (chk_pos.y != -1000000000.0f) {
if (chk_pos.y != -G_CM3D_F_INF) {
current.pos.y = chk_pos.y;
}
}
src/d/actor/d_a_b_gg.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_gg.h"
#include "d/d_com_inf_game.h"
@@ -154,7 +154,7 @@ daB_GG_HIO_c::daB_GG_HIO_c() {
int daB_GG_c::CreateHeap() {
J3DModelData* modelData;
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gg", 0x23);
JUT_ASSERT(207, modelData != 0);
JUT_ASSERT(207, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gg", 0xE), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
@@ -4494,7 +4494,7 @@ int daB_GG_c::Create() {
SetAnm(BCK_GG_WAIT, 2, 5.0f, 1.0f);
fopAcM_OnStatus(this, 0x200000);
if (-1000000000.0f != mAcch.GetGroundH()) {
if (-G_CM3D_F_INF != mAcch.GetGroundH()) {
current.pos.y = mAcch.GetGroundH();
field_0x648 = mAcch.GetGroundH();
}
src/d/actor/d_a_b_gm.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_gm.h"
#include "d/actor/d_a_e_gm.h"
@@ -2086,7 +2086,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
J3DModelData* modelData;
for (int i = 0; i < 4; i++) {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gm", 0x22);
JUT_ASSERT(0xCE9, modelData != 0);
JUT_ASSERT(0xCE9, modelData != NULL);
a_this->mpSpotLightModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
if (a_this->mpSpotLightModel[i] == NULL) {
return 0;
src/d/actor/d_a_b_gnd.cpp
+6 -6
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_gnd.h"
#include "d/d_com_inf_game.h"
@@ -4088,7 +4088,7 @@ static int daB_GND_Execute(b_gnd_class* i_this) {
sp6C->setBaseTRMtx(mDoMtx_stack_c::get());
u32 sp68;
if (i_this->mAcch.GetGroundH() != -1000000000.0f) {
if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) {
if (i_this->mAcch.ChkWaterHit() && i_this->mAcch.m_wtr.GetHeight() > a_this->current.pos.y) {
sp68 = dKy_pol_sound_get(&i_this->mAcch.m_wtr);
} else if (i_this->mAcch.ChkGroundHit()) {
@@ -4692,7 +4692,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
J3DModelData* modelData;
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x62);
JUT_ASSERT(6612, modelData != 0);
JUT_ASSERT(6612, modelData != NULL);
i_this->mpSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mpSwordModel == NULL) {
return 0;
@@ -4702,7 +4702,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
i_this->mpSwordModel->setBaseTRMtx(mDoMtx_stack_c::get());
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x61);
JUT_ASSERT(6626, modelData != 0);
JUT_ASSERT(6626, modelData != NULL);
i_this->mpSheathModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mpSheathModel == NULL) {
return 0;
@@ -4713,7 +4713,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
for (int i = 0; i < 2; i++) {
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", blur_model[i]);
JUT_ASSERT(6647, modelData != 0);
JUT_ASSERT(6647, modelData != NULL);
i_this->mpSwordBlurModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (i_this->mpSwordBlurModel[i] == NULL) {
return 0;
@@ -4724,7 +4724,7 @@ static int useHeapInit(fopAc_ac_c* a_this) {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 99);
JUT_ASSERT(6670, modelData != 0);
JUT_ASSERT(6670, modelData != NULL);
for (int i = 0; i < 36; i++) {
i_this->mpMantShadowModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
src/d/actor/d_a_b_go.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_go.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_b_gos.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Combined Goron Child
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_gos.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_b_mgn.cpp
+13 -13
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_mgn.h"
#include "d/actor/d_a_obj_bhashi.h"
@@ -304,7 +304,7 @@ int daB_MGN_c::draw() {
dBgS_GndChk gndchk;
f32 gnd_height;
if (mAcch.GetGroundH() == -1000000000.0f) {
if (mAcch.GetGroundH() == -G_CM3D_F_INF) {
cXyz spC(current.pos);
gndchk.SetPos(&spC);
gnd_height = dComIfG_Bgsp().GroundCross(&gndchk);
@@ -406,7 +406,7 @@ void daB_MGN_c::setDashSmokeEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[var_r27], &field_0x2608[var_r27], &effpos, NULL, 3.0f, &tevStr, 1);
}
}
@@ -448,7 +448,7 @@ void daB_MGN_c::setBackJumpEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[var_r27], &field_0x2608[var_r27], &effpos, NULL, 3.0f, &tevStr, 1);
}
}
@@ -469,7 +469,7 @@ void daB_MGN_c::setSlideSmokeEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet2(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 3.0f, &tevStr);
}
}
@@ -496,7 +496,7 @@ void daB_MGN_c::setBodySlideEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet2(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 10.0f, &tevStr);
}
}
@@ -514,7 +514,7 @@ void daB_MGN_c::setOpeningEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[0], &field_0x2608[0], &effpos, NULL, 15.0f, &tevStr, 1);
}
@@ -524,7 +524,7 @@ void daB_MGN_c::setOpeningEffect() {
gndchk.SetPos(&effpos);
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[1], &field_0x2608[1], &effpos, NULL, 15.0f, &tevStr, 1);
}
}
@@ -546,7 +546,7 @@ void daB_MGN_c::setStepEffect() {
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 3.0f, &tevStr, 1);
}
}
@@ -573,7 +573,7 @@ void daB_MGN_c::setFallAttackEffect() {
effpos.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (effpos.y != -1000000000.0f) {
if (effpos.y != -G_CM3D_F_INF) {
fopAcM_effSmokeSet1(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 10.0f, &tevStr, 1);
}
}
@@ -3348,7 +3348,7 @@ static int daB_MGN_Delete(daB_MGN_c* i_this) {
/* 8060EAE0-8060F068 0094A0 0588+00 1/1 0/0 0/0 .text CreateHeap__9daB_MGN_cFv */
int daB_MGN_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN);
JUT_ASSERT(4010, modelData != 0);
JUT_ASSERT(4010, modelData != NULL);
mpMgnModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL,
(J3DAnmTransform*)dComIfG_getObjectRes("B_mgn", BCK_MGN_WAIT), 2,
1.0f, 0, -1, &mSound, 0x80000, 0x11000284);
@@ -3389,7 +3389,7 @@ int daB_MGN_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN_TAIEKI);
JUT_ASSERT(4068, modelData != 0);
JUT_ASSERT(4068, modelData != NULL);
for (int i = 0; i < 20; i++) {
mpMgnTaiekiModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -3399,7 +3399,7 @@ int daB_MGN_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgne", BMDR_EF_GDGATE);
JUT_ASSERT(4084, modelData != 0);
JUT_ASSERT(4084, modelData != NULL);
for (int i = 0; i < 4; i++) {
mpGdgateModelMorf[i] = new mDoExt_McaMorfSO(modelData, NULL, NULL,
src/d/actor/d_a_b_ob.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
// Translation Unit: d_a_b_ob
//
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_ob.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -3491,7 +3491,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
}
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_EF_OISUI);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
a_this->mpSuiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284);
if (a_this->mpSuiModel == NULL) {
src/d/actor/d_a_b_oh.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Morpheel Tentacle
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_ob.h"
#include "d/actor/d_a_b_oh.h"
src/d/actor/d_a_b_oh2.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Morpheel Tentacle
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_oh2.h"
#include "d/actor/d_a_b_ob.h"
src/d/actor/d_a_b_tn.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_tn.h"
#include <cmath.h>
src/d/actor/d_a_b_yo.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_yo.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_b_yo_ice.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_yo_ice.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
src/d/actor/d_a_b_zant.cpp
+6 -6
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_zant.h"
#include "d/actor/d_a_b_zant_mobile.h"
@@ -1240,7 +1240,7 @@ void daB_ZANT_c::executeWarp() {
gndchk.SetPos(&mFlyWarpPos);
f32 gnd_y = dComIfG_Bgsp().GroundCross(&gndchk);
if (gnd_y != -1000000000.0f) {
if (gnd_y != -G_CM3D_F_INF) {
mFlyWarpPos.y = gnd_y;
}
@@ -1784,7 +1784,7 @@ void daB_ZANT_c::executeFly() {
gndchk.SetPos(&sp9C);
{
f32 gnd_pos = dComIfG_Bgsp().GroundCross(&gndchk);
if (gnd_pos != -1000000000.0f && current.pos.y <= gnd_pos) {
if (gnd_pos != -G_CM3D_F_INF && current.pos.y <= gnd_pos) {
if (dComIfG_Bgsp().GetPolyAtt0(gndchk) == 11) {
speed.y = 50.0f;
speedF = 15.0f;
@@ -5483,7 +5483,7 @@ static int daB_ZANT_Delete(daB_ZANT_c* i_this) {
/* 8064DC04-8064E128 00FBE4 0524+00 1/1 0/0 0/0 .text CreateHeap__10daB_ZANT_cFv */
int daB_ZANT_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", BCK_ZAN_FLOAT_WAIT), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) {
return 0;
@@ -5550,14 +5550,14 @@ int daB_ZANT_c::CreateHeap() {
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_SWORD_L);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpSwordLModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpSwordLModel == NULL) {
return 0;
}
modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_SWORD_R);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpSwordRModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mpSwordRModel == NULL) {
return 0;
src/d/actor/d_a_b_zant_magic.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_zant_magic.h"
#include "d/actor/d_a_b_zant.h"
src/d/actor/d_a_b_zant_mobile.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_zant_mobile.h"
#include "d/actor/d_a_b_zant.h"
@@ -201,7 +201,7 @@ f32 daB_ZANTZ_c::getGroundPos() {
gndchk.SetPos(&sp88);
sp88.y = dComIfG_Bgsp().GroundCross(&gndchk);
if (sp88.y == -1000000000.0f) {
if (sp88.y == -G_CM3D_F_INF) {
break;
}
@@ -422,7 +422,7 @@ static int daB_ZANTZ_Delete(daB_ZANTZ_c* i_this) {
/* 80651DC4-80651FD0 001724 020C+00 1/1 0/0 0/0 .text CreateHeap__11daB_ZANTZ_cFv */
int daB_ZANTZ_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BMDR_ZZ);
JUT_ASSERT(0, modelData != 0);
JUT_ASSERT(0, modelData != NULL);
mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BCK_ZZ_OPEN), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084);
if (mpMorf == NULL) {
src/d/actor/d_a_b_zant_sima.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Boss Zant Lava Island
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_b_zant_sima.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_balloon_2D.cpp
+3 -3
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_balloon_2D.h"
#include "JSystem/J2DGraph/J2DGrafContext.h"
@@ -163,7 +163,7 @@ int daBalloon2D_c::createHeap() {
return 0;
}
dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName);
JUT_ASSERT(445, resInfo != 0);
JUT_ASSERT(445, resInfo != NULL);
JKRArchive* arc = resInfo->getArchive();
mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc);
dPaneClass_showNullPane(mScreen);
@@ -243,7 +243,7 @@ int daBalloon2D_c::create() {
if (!fopAcM_entrySolidHeap(this, daBalloon2D_createHeap, 0)) {
return cPhs_ERROR_e;
}
JUT_ASSERT(566, daBalloon2D_c::myclass == 0);
JUT_ASSERT(566, daBalloon2D_c::myclass == NULL);
myclass = this;
setHIO(true);
}
src/d/actor/d_a_bd.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bd.h"
#include "d/actor/d_a_cow.h"
src/d/actor/d_a_bg.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bg.h"
#include "d/d_com_inf_game.h"
@@ -515,7 +515,7 @@ int daBg_c::create() {
JKRExpHeap* room_heap = dStage_roomControl_c::getMemoryBlock(roomNo);
if (room_heap != NULL) {
this->heap = JKRCreateSolidHeap(-1, room_heap, false);
JUT_ASSERT(471, heap != 0);
JUT_ASSERT(471, heap != NULL);
JKRHeap* old = mDoExt_setCurrentHeap(this->heap);
int rt = createHeap();
src/d/actor/d_a_bg_obj.cpp
+6 -6
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bg_obj.h"
#include "JSystem/J3DGraphBase/J3DMaterial.h"
@@ -133,7 +133,7 @@ u8* daBgObj_c::spec_data_c::initFarInfoBlock(u8* i_dataPtr) {
*/
// NONMATCHING - close-ish
bool daBgObj_c::spec_data_c::Set(void* i_ptr) {
JUT_ASSERT(496, i_ptr != 0);
JUT_ASSERT(496, i_ptr != NULL);
u8* data = (u8*)i_ptr;
@@ -406,8 +406,8 @@ void daBgObj_c::settingCullSizeBoxForCo(int param_0) {
/* 80459F14-8045A0EC 000934 01D8+00 3/3 0/0 0/0 .text settingCullSizeBoxForCull__9daBgObj_cFi */
void daBgObj_c::settingCullSizeBoxForCull(int param_0) {
cXyz max(1000000000.0f, 1000000000.0f, 1000000000.0f);
cXyz min(-1000000000.0f, -1000000000.0f, -1000000000.0f);
cXyz max(G_CM3D_F_INF, G_CM3D_F_INF, G_CM3D_F_INF);
cXyz min(-G_CM3D_F_INF, -G_CM3D_F_INF, -G_CM3D_F_INF);
for (int i = 0; i < 2; i++) {
J3DModel* cur_model = field_0x5a8[param_0][i];
@@ -448,7 +448,7 @@ void daBgObj_c::settingCullSizeBoxForCull(int param_0) {
}
}
if (1000000000.0f != max.x) {
if (G_CM3D_F_INF != max.x) {
fopAcM_setCullSizeBox(this, max.x, max.y, max.z, min.x, min.y, min.z);
} else {
fopAcM_setCullSizeBox(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
@@ -974,7 +974,7 @@ void daBgObj_c::setParticle() {
switch (modelNumber) {
case 1:
bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd");
JUT_ASSERT(1683, bmd != 0);
JUT_ASSERT(1683, bmd != NULL);
scale.setall(KREG_F(29) + 0.9f);
break;
default:
src/d/actor/d_a_boomerang.cpp
+6 -6
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_boomerang.h"
#include "JSystem/J2DGraph/J2DAnmLoader.h"
@@ -663,7 +663,7 @@ void daBoomerang_c::setRoomInfo() {
mGroundY = dComIfG_Bgsp().GroundCross(&m_gndChk);
int roomNo;
if (mGroundY != -1000000000.0f) {
if (mGroundY != -G_CM3D_F_INF) {
roomNo = dComIfG_Bgsp().GetRoomId(m_gndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(m_gndChk);
} else {
@@ -1295,7 +1295,7 @@ int daBoomerang_c::execute() {
if (fopAcM_rc_c::roofCheck(&spC) && dComIfG_Bgsp().GetUnderwaterRoofCode(*fopAcM_rc_c::getRoofCheck()) == 0) {
roof_y = fopAcM_rc_c::getRoofY();
} else {
roof_y = 1000000000.0f;
roof_y = G_CM3D_F_INF;
}
if (roof_y > fopAcM_wt_c::getWaterY() && current.pos.y < fopAcM_wt_c::getWaterY() - 50.0f) {
@@ -1414,21 +1414,21 @@ int daBoomerang_c::createHeap() {
m_sight.initialize();
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x1F);
JUT_ASSERT(2882, modelData != 0);
JUT_ASSERT(2882, modelData != NULL);
mp_boomModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mp_boomModel == NULL) {
return 0;
}
modelData = (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x34);
JUT_ASSERT(2898, modelData != 0);
JUT_ASSERT(2898, modelData != NULL);
mp_shippuModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284);
if (mp_shippuModel == NULL) {
return 0;
}
J3DAnmTransform* transAnm = (J3DAnmTransform*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x13);
JUT_ASSERT(2911, transAnm != 0);
JUT_ASSERT(2911, transAnm != NULL);
if (m_shippuBck.init(transAnm, 0, 2, 1.0f, 0, -1, false) == 0) {
return 0;
}
src/d/actor/d_a_bullet.cpp
+4 -4
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_bullet.h"
#include "d/d_com_inf_game.h"
@@ -58,7 +58,7 @@ int daBullet_c::create() {
/* 80655E5C-80655EDC 0005FC 0080+00 1/1 0/0 0/0 .text CreateHeap__10daBullet_cFv */
BOOL daBullet_c::CreateHeap() {
void* mdlData_p = dComIfG_getObjectRes(getResName(), getBmdName());
JUT_ASSERT(273, 0 != mdlData_p);
JUT_ASSERT(273, NULL != mdlData_p);
mpModel = mDoExt_J3DModel__create((J3DModelData*)mdlData_p, 0x80000, 0x11000084);
return mpModel != NULL;
}
@@ -94,11 +94,11 @@ int daBullet_c::Execute() {
mGndChk = mAcch.m_gnd;
mGroundY = mAcch.GetGroundH();
} else {
mGroundY = -1000000000.0f;
mGroundY = -G_CM3D_F_INF;
}
int room_no;
if (mGroundY != -1000000000.0f) {
if (mGroundY != -G_CM3D_F_INF) {
room_no = dComIfG_Bgsp().GetRoomId(mGndChk);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk);
} else {
src/d/actor/d_a_canoe.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_canoe.h"
#include "d/d_com_inf_game.h"
@@ -199,7 +199,7 @@ static int daCanoe_Delete(daCanoe_c* i_this) {
/* 804DB008-804DB0B0 000BA8 00A8+00 1/1 0/0 0/0 .text setRoomInfo__9daCanoe_cFv */
void daCanoe_c::setRoomInfo() {
int room_no;
if (mAcch[0].GetGroundH() != -1000000000.0f) {
if (mAcch[0].GetGroundH() != -G_CM3D_F_INF) {
room_no = dComIfG_Bgsp().GetRoomId(mAcch[0].m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch[0].m_gnd);
} else {
src/d/actor/d_a_coach_2D.cpp
+2 -2
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_coach_2D.h"
#include "d/d_com_inf_game.h"
@@ -118,7 +118,7 @@ int daCoach2D_c::createHeap() {
}
dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName);
JUT_ASSERT(285, resInfo != 0);
JUT_ASSERT(285, resInfo != NULL);
JKRArchive* archive = resInfo->getArchive();
mpScrn->setPriority("zelda_game_image_fire_icon.blo", 0x20000, archive);
src/d/actor/d_a_coach_fire.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_coach_fire.h"
src/d/actor/d_a_cow.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_cow.h"
#include "SSystem/SComponent/c_lib.h"
src/d/actor/d_a_crod.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Dominion Rod Object
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_crod.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_cstaF.cpp
+4 -4
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_cstaF.h"
#include "d/actor/d_a_alink.h"
@@ -230,7 +230,7 @@ static int daCstaF_Delete(daCstaF_c* a_this) {
/* 804DE558-804DE5F0 000C78 0098+00 2/2 0/0 0/0 .text setRoomInfo__9daCstaF_cFv */
void daCstaF_c::setRoomInfo() {
int room_no;
if (m_acch.GetGroundH() != -1000000000.0f) {
if (m_acch.GetGroundH() != -G_CM3D_F_INF) {
room_no = dComIfG_Bgsp().GetRoomId(m_acch.m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(m_acch.m_gnd);
} else {
@@ -308,7 +308,7 @@ void daCstaF_c::posMove() {
m_cc_stts.ClrCcMove();
m_acch.CrrPos(dComIfG_Bgsp());
if (pre_gnd_hit && !m_acch.ChkGroundHit() && -1000000000.0f != m_acch.GetGroundH()) {
if (pre_gnd_hit && !m_acch.ChkGroundHit() && -G_CM3D_F_INF != m_acch.GetGroundH()) {
f32 ground_dist = m_acch.GetGroundH() - current.pos.y;
cM3dGPla tri;
dComIfG_Bgsp().GetTriPla(m_acch.m_gnd, &tri);
@@ -498,7 +498,7 @@ int daCstaF_c::Execute(Mtx** param_0) {
posMove();
int poly_sound;
if (m_acch.GetGroundH() != -1000000000.0f) {
if (m_acch.GetGroundH() != -G_CM3D_F_INF) {
poly_sound = dKy_pol_sound_get(&m_acch.m_gnd);
} else {
poly_sound = 0;
src/d/actor/d_a_cstatue.cpp
+5 -5
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_cstatue.h"
#include <Z2AudioLib/Z2Instances.h>
@@ -433,7 +433,7 @@ static int daCstatue_Delete(void* actor) {
/* 80664AA0-80664B38 0014E0 0098+00 2/2 0/0 0/0 .text setRoomInfo__11daCstatue_cFv */
void daCstatue_c::setRoomInfo() {
int roomId;
if (mStatueAcch.GetGroundH() != -1000000000.0f) {
if (mStatueAcch.GetGroundH() != -G_CM3D_F_INF) {
roomId = dComIfG_Bgsp().GetRoomId(mStatueAcch.m_gnd);
tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mStatueAcch.m_gnd);
} else {
@@ -475,7 +475,7 @@ void daCstatue_c::setMatrix() {
void daCstatue_c::posMove() {
if (checkStateFlg0(daCstatue_FLG0_8)) {
mStatueAcch.CrrPos(dComIfG_Bgsp());
if (mStatueAcch.GetGroundH() == -1000000000.0f) {
if (mStatueAcch.GetGroundH() == -G_CM3D_F_INF) {
return;
}
if (dComIfG_Bgsp().ChkMoveBG_NoDABg(mStatueAcch.m_gnd)) {
@@ -584,7 +584,7 @@ void daCstatue_c::posMove() {
current.pos += *mStts.GetCCMoveP();
mStts.ClrCcMove();
mStatueAcch.CrrPos(dComIfG_Bgsp());
if (groundHit && !mStatueAcch.ChkGroundHit() && mStatueAcch.GetGroundH() != -1000000000.0f)
if (groundHit && !mStatueAcch.ChkGroundHit() && mStatueAcch.GetGroundH() != -G_CM3D_F_INF)
{
f32 groundDistance = mStatueAcch.GetGroundH() - current.pos.y;
cM3dGPla plane;
@@ -1137,7 +1137,7 @@ int daCstatue_c::execute() {
}
}
u32 morf =
mStatueAcch.GetGroundH() != -1000000000.0f ? dKy_pol_sound_get(&mStatueAcch.m_gnd) : 0;
mStatueAcch.GetGroundH() != -G_CM3D_F_INF ? dKy_pol_sound_get(&mStatueAcch.m_gnd) : 0;
mpMorf->play(morf, mReverb);
if (!bossType && mCurrentAnim == CStatueAnimIndex_2 && link->checkCopyRodSwingMode()) {
if (mpMorf->getEndFrame() > link->getBaseAnimeFrame()) {
src/d/actor/d_a_demo00.cpp
+6 -6
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_demo00.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
@@ -110,7 +110,7 @@ void daDemo00_c::setBaseMtx() {
field_0x568 = current.pos;
if (mground2 != 0) {
if (sp38.y != -1000000000.0f) {
if (sp38.y != -G_CM3D_F_INF) {
bVar1 = dComIfG_Bgsp().GetTriPla(mBgc->mGndChk, &plane);
}
@@ -229,7 +229,7 @@ int daDemo00_c::createHeap() {
if (modelData == NULL) {
OS_REPORT("\ngetDemoArcName=[%s]", dStage_roomControl_c::getDemoArcName());
OS_REPORT("\nmModel.mID.mShapeID=[%d]\n", mModel.mID.mShapeID);
JUT_ASSERT(441, modelData != 0);
JUT_ASSERT(441, modelData != NULL);
}
s32 uVar1 = 0x11000084;
@@ -331,7 +331,7 @@ int daDemo00_c::createHeap() {
}
} else {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.mID.field_0x4);
JUT_ASSERT(580, anm != 0);
JUT_ASSERT(580, anm != NULL);
if (field_0x6a5 != 0) {
uVar1 |= 0x20000000;
@@ -387,7 +387,7 @@ int daDemo00_c::createHeap() {
if (mModel.mID.field_0x1c != -1) {
mDeformData = (J3DDeformData*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.mID.field_0x1c);
// Should be mModel.mDeformData
JUT_ASSERT(687, mDeformData != 0);
JUT_ASSERT(687, mDeformData != NULL);
if (mModel.mID.field_0x20 != -1) {
mpBlkAnm = new mDoExt_blkAnm();
@@ -559,7 +559,7 @@ int daDemo00_c::actPerformance(dDemo_actor_c* actor) {
if (mModel.mID.field_0x20 != mModel.field_0x0.field_0x20) {
// Should be mModel.mDeformData and mModel.mBlkAnm
JUT_ASSERT(1049, mDeformData != 0 && mpBlkAnm != 0);
JUT_ASSERT(1049, mDeformData != NULL && mpBlkAnm != NULL);
J3DAnmCluster* anmCluster = (J3DAnmCluster*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.field_0x0.field_0x20);
if (anmCluster == NULL) {
src/d/actor/d_a_demo_item.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_demo_item.h"
#include "d/d_com_inf_game.h"
src/d/actor/d_a_disappear.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Disappear death effect when an enemy is defeated
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_disappear.h"
#include "d/d_com_inf_game.h"
src/d/actor/d_a_dmidna.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Dying Midna Actor
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_dmidna.h"
#include "f_op/f_op_actor_mng.h"
src/d/actor/d_a_do.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
// Every function matches, but a Z2SoundObjSimple dtor is generated that should not exist
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "c/c_damagereaction.h"
#include "d/actor/d_a_canoe.h"
src/d/actor/d_a_door_boss.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Boss Door
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door_boss.h"
#include "d/d_com_inf_game.h"
src/d/actor/d_a_door_bossL1.cpp
+8 -8
View File
@@ -2,7 +2,7 @@
// Translation Unit: Boss Door L1
//
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door_bossL1.h"
#include "d/actor/d_a_obj_keyhole.h"
@@ -182,7 +182,7 @@ const char* daBdoorL1_c::getDzb() {
*/
J3DModelData* daBdoorL1_c::getDoorModelData() {
J3DModelData* door_model = static_cast<J3DModelData*>(dComIfG_getObjectRes(getArcName(), getBmd()));
JUT_ASSERT(256, door_model != 0)
JUT_ASSERT(256, door_model != NULL)
return door_model;
}
@@ -205,7 +205,7 @@ static u32 const l_heap_size[11] = {
int daBdoorL1_c::CreateHeap() {
int nowLevel = getNowLevel();
J3DModelData* modelData = getDoorModelData();
JUT_ASSERT(313, modelData != 0);
JUT_ASSERT(313, modelData != NULL);
u32 dlistFlag = 0x11000084;
if (nowLevel == 8) {
dlistFlag |= 0x200;
@@ -225,14 +225,14 @@ int daBdoorL1_c::CreateHeap() {
}
if (nowLevel == 8) {
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), "door_shutterBoss.btk");
JUT_ASSERT(341, pbtk != 0);
JUT_ASSERT(341, pbtk != NULL);
field_0x58c = new mDoExt_btkAnm();
if (field_0x58c == NULL || !field_0x58c->init(field_0x580->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) {
return 0;
}
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(354, anm != 0);
JUT_ASSERT(354, anm != NULL);
field_0x588 = new mDoExt_bckAnm();
if (field_0x588 == NULL || !field_0x588->init(anm, 1, 0, 1.0f, 0, -1,false)) {
return 0;
@@ -310,7 +310,7 @@ void daBdoorL1_c::calcMtx() {
MTXCopy(mDoMtx_stack_c::get(), field_0x7ec);
break;
default:
JUT_ASSERT(442, 0);
JUT_ASSERT(442, FALSE);
break;
}
}
@@ -560,7 +560,7 @@ int daBdoorL1_c::openInit() {
dComIfG_Bgsp().Release(field_0x590);
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(811, anm != 0);
JUT_ASSERT(811, anm != NULL);
int rt = field_0x588->init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(813, rt == 0);
if (field_0x59b != 0) {
@@ -665,7 +665,7 @@ int daBdoorL1_c::openEnd() {
/* 804E3850-804E3A2C 001B30 01DC+00 1/1 0/0 0/0 .text closeInit__11daBdoorL1_cFv */
int daBdoorL1_c::closeInit() {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm());
JUT_ASSERT(1020, anm != 0);
JUT_ASSERT(1020, anm != NULL);
int rt = field_0x588->init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(1022, rt == 0);
switch(getNowLevel()) {
src/d/actor/d_a_door_bossL5.cpp
+5 -5
View File
@@ -2,7 +2,7 @@
// Boss Door Level 5
//
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door_bossL5.h"
#include "d/actor/d_a_obj_keyhole.h"
@@ -88,14 +88,14 @@ static char* action_table[14] = {
/* 80670D10-80670EC0 000150 01B0+00 1/1 0/0 0/0 .text CreateHeap__11daBdoorL5_cFv */
int daBdoorL5_c::CreateHeap() {
J3DModelData* modelData = getDoorModelData();
JUT_ASSERT(313, modelData != 0);
JUT_ASSERT(313, modelData != NULL);
field_0x580 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (field_0x580 == NULL) {
return 0;
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(354, anm != 0);
JUT_ASSERT(354, anm != NULL);
field_0x584 = new mDoExt_bckAnm();
if (field_0x584 == NULL || !field_0x584->init(anm, 1, 0, 1.0f, 0, -1, false)) {
return 0;
@@ -265,7 +265,7 @@ void daBdoorL5_c::demoProc() {
int daBdoorL5_c::openInit() {
dComIfG_Bgsp().Release(field_0x588);
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(454, anm != 0);
JUT_ASSERT(454, anm != NULL);
int rt = field_0x584->init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(456, rt == 0);
return 1;
@@ -288,7 +288,7 @@ int daBdoorL5_c::openEnd() {
/* 80671720-806717FC 000B60 00DC+00 1/1 0/0 0/0 .text closeInit__11daBdoorL5_cFv */
int daBdoorL5_c::closeInit() {
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm());
JUT_ASSERT(511, anm != 0);
JUT_ASSERT(511, anm != NULL);
int rt = field_0x584->init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(513, rt == 0);
mDoAud_seStart(Z2SE_OBJ_LV3_SHTR_CL, &current.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
src/d/actor/d_a_door_dbdoor00.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
// d_a_door_dbdoor00
//
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door_dbdoor00.h"
#include "printf.h"
src/d/actor/d_a_door_knob00.cpp
+6 -6
View File
@@ -2,7 +2,7 @@
// Door Knob
//
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door_knob00.h"
#include "f_op/f_op_actor_mng.h"
@@ -84,7 +84,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
/* 8045E960-8045EBA0 000180 0240+00 1/1 0/0 0/0 .text CreateHeap__10daKnob20_cFv */
int daKnob20_c::CreateHeap() {
J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getAlwaysArcName(), getDummyBmd());
JUT_ASSERT(201, modelData != 0);
JUT_ASSERT(201, modelData != NULL);
mModel1 = mDoExt_J3DModel__create(modelData, 0, 0x11020203);
if (mModel1 == NULL) {
return 0;
@@ -95,14 +95,14 @@ int daKnob20_c::CreateHeap() {
mModel1->setBaseTRMtx(mDoMtx_stack_c::get());
J3DAnmTransform* anm =
(J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck");
JUT_ASSERT(222, anm != 0);
JUT_ASSERT(222, anm != NULL);
if (field_0x57c.init(anm, 1, 0, 1.0f, 0, -1, false) == 0) {
return 0;
}
mJoint = modelData->getJointName()->getIndex("FDoor");
JUT_ASSERT(227, mJoint >= 0);
modelData = getDoorModelData();
JUT_ASSERT(235, modelData != 0);
JUT_ASSERT(235, modelData != NULL);
mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
if (mModel2 == 0) {
return 0;
@@ -115,7 +115,7 @@ int daKnob20_c::CreateHeap() {
field_0x57c.entry(mModel1->getModelData());
mModel1->calc();
cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb());
JUT_ASSERT(261, bgd != 0);
JUT_ASSERT(261, bgd != NULL);
if (field_0x5a0->Set(bgd, 1, (Mtx*)mModel1->getAnmMtx(mJoint)) == 1) {
return 0;
} else {
@@ -503,7 +503,7 @@ static char* bck_table[4] = {
int daKnob20_c::openInit(int param_1) {
J3DAnmTransform* anm =
(J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), bck_table[param_1]);
JUT_ASSERT(937, anm != 0);
JUT_ASSERT(937, anm != NULL);
field_0x57c.init(anm, 1, 0, 1.0f, 0, -1, true);
onFlag(1);
if (param_1 >= 2) {
src/d/actor/d_a_door_mbossL1.cpp
+11 -11
View File
@@ -3,7 +3,7 @@
*
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door_mbossL1.h"
#include "d/actor/d_a_obj_stopper.h"
@@ -205,7 +205,7 @@ void dDoor_stop2_c::draw(fopAc_ac_c* param_1) {
f32 dDoor_stop2_c::getHeight() {
if (mModel != NULL) {
J3DJoint* root_jnt = mModel->getModelData()->getJointNodePointer(0);
JUT_ASSERT(360, root_jnt != 0);
JUT_ASSERT(360, root_jnt != NULL);
return root_jnt->getMax()->y;
}
return 300.0f;
@@ -325,7 +325,7 @@ J3DModelData* daMBdoorL1_c::getDoorModelData() {
int daMBdoorL1_c::CreateHeap() {
int level = getNowLevel(this);
J3DModelData* modelData = getDoorModelData();
JUT_ASSERT(579, modelData != 0);
JUT_ASSERT(579, modelData != NULL);
if (getDoorType() == DOOR_TYPE_2) {
for (int i = 0; i < 2; i++) {
mModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084);
@@ -334,7 +334,7 @@ int daMBdoorL1_c::CreateHeap() {
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(
getAlwaysArcName(), "FDoorA.bck");
JUT_ASSERT(597, anm != 0);
JUT_ASSERT(597, anm != NULL);
mBckAnms[i] = new mDoExt_bckAnm();
if (mBckAnms[i] == NULL || !mBckAnms[i]->init(anm, 1, 0, 1.0f, 0, -1, false)) {
return 0;
@@ -355,7 +355,7 @@ int daMBdoorL1_c::CreateHeap() {
}
J3DAnmTransform* anm =
(J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(628, anm != 0);
JUT_ASSERT(628, anm != NULL);
mBckAnms[0] = new mDoExt_bckAnm();
if (mBckAnms[0] == NULL || !mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, false)) {
return 0;
@@ -365,7 +365,7 @@ int daMBdoorL1_c::CreateHeap() {
}
if (level == 8) {
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk());
JUT_ASSERT(646, pbtk != 0);
JUT_ASSERT(646, pbtk != NULL);
field_0x594 = new mDoExt_btkAnm();
if (field_0x594 == NULL ||
!field_0x594->init(mModels[0]->getModelData(), pbtk, 1, 0, 1.0f, 0, -1))
@@ -375,7 +375,7 @@ int daMBdoorL1_c::CreateHeap() {
}
if (checkMakeStop()) {
J3DModelData* mdl = (J3DModelData*)dComIfG_getStageRes("door-stop.bmd");
JUT_ASSERT(671, mdl != 0);
JUT_ASSERT(671, mdl != NULL);
if (!mDoorStop.create(mdl)) {
return 0;
}
@@ -955,7 +955,7 @@ int daMBdoorL1_c::openInit() {
dComIfG_Bgsp().Release(field_0x598);
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm());
JUT_ASSERT(1550, anm != 0);
JUT_ASSERT(1550, anm != NULL);
int rt = mBckAnms[0]->init(anm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true);
JUT_ASSERT(1552, rt == 0);
int level = getNowLevel(this);
@@ -1068,7 +1068,7 @@ int daMBdoorL1_c::closeInit() {
smokeInit2();
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm());
JUT_ASSERT(1762, anm != 0);
JUT_ASSERT(1762, anm != NULL);
int rt = mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(1764, rt != 0);
return 1;
@@ -1120,7 +1120,7 @@ int daMBdoorL1_c::openInitKnob(int param_1) {
};
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(
getAlwaysArcName(), bck_table[param_1]);
JUT_ASSERT(1847, anm != 0);
JUT_ASSERT(1847, anm != NULL);
if ((field_0x5df == 0 && param_1 == 0) || (field_0x5df == 1 && param_1 == 2)) {
field_0x590 = mBckAnms[0];
} else if ((field_0x5df == 1 && param_1 == 0) || (field_0x5df == 0 && param_1 == 2)) {
@@ -1331,7 +1331,7 @@ void daMBdoorL1_c::setStart(f32 param_1, f32 param_2) {
static f32 dummy(f32 param_0) {
dBgS_ObjGndChk gnd_chk;
return param_0 + -1e9f + 50.0f;
return param_0 + -G_CM3D_F_INF + 50.0f;
}
/* 80676004-806760B4 003844 00B0+00 1/1 0/0 0/0 .text smokeInit2__12daMBdoorL1_cFv */
src/d/actor/d_a_door_push.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
* Door - Push
*/
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door_push.h"
#include "SSystem/SComponent/c_math.h"
src/d/actor/d_a_door_shutter.cpp
+12 -12
View File
@@ -2,7 +2,7 @@
// Door Shutter
//
#include "d/dolzel_rel.h"
#include "d/dolzel_rel.h" // IWYU pragma: keep
#include "d/actor/d_a_door_shutter.h"
#include "d/actor/d_a_obj_Lv5Key.h"
@@ -114,7 +114,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) {
int daDoor20_c::CreateHeap() {
int kind = door_param2_c::getKind(this);
J3DModelData* modelData = getModelData();
JUT_ASSERT(355, modelData != 0);
JUT_ASSERT(355, modelData != NULL);
int dListFlag = 0x11000084;
if (kind == 2) {
dListFlag |= 0x200;
@@ -136,7 +136,7 @@ int daDoor20_c::CreateHeap() {
return 0;
}
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck");
JUT_ASSERT(394, anm != 0);
JUT_ASSERT(394, anm != NULL);
if (!field_0x5a0.init(anm, 1, 0, 1.0f, 0, -1, false)) {
return 0;
}
@@ -159,7 +159,7 @@ int daDoor20_c::CreateHeap() {
break;
case 2:
J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk());
JUT_ASSERT(421, pbtk != 0);
JUT_ASSERT(421, pbtk != NULL);
field_0x5c0 = new mDoExt_btkAnm();
if (field_0x5c0 == NULL || !field_0x5c0->init(mModel1->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) {
return 0;
@@ -170,7 +170,7 @@ int daDoor20_c::CreateHeap() {
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpF.bck");
break;
}
JUT_ASSERT(375, anm != 0);
JUT_ASSERT(375, anm != NULL);
if (field_0x584.init(anm, 1, 0, 1.0f, 0, -1, false) == 0) {
return 0;
}
@@ -419,7 +419,7 @@ void daDoor20_c::openInit_0() {
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpD.bck");
}
}
JUT_ASSERT(832, anm != 0);
JUT_ASSERT(832, anm != NULL);
int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(835, rt == 0);
daPy_py_c* player = daPy_getPlayerActorClass();
@@ -451,7 +451,7 @@ void daDoor20_c::openInit_1() {
} else {
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpC.bck");
}
JUT_ASSERT(915, anm != 0);
JUT_ASSERT(915, anm != NULL);
int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(918, rt == 0);
u8 bVar5 = door_param2_c::getSwbit3(this);
@@ -600,7 +600,7 @@ void daDoor20_c::closeInit_0() {
} else {
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseD.bck");
}
JUT_ASSERT(1178, anm != 0);
JUT_ASSERT(1178, anm != NULL);
int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(1181, rt == 0);
cXyz acStack_40(home.pos.x, home.pos.y + 200.0f, home.pos.z);
@@ -629,7 +629,7 @@ void daDoor20_c::closeInit_0() {
void daDoor20_c::closeInit_1() {
J3DAnmTransform* anm =
(J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseC.bck");
JUT_ASSERT(1236, anm != 0);
JUT_ASSERT(1236, anm != NULL);
int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true);
JUT_ASSERT(1239, rt == 0);
mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLCLOSE, &current.pos, 0,
@@ -929,7 +929,7 @@ int daDoor20_c::demoProc() {
case 13:
J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(
getAlwaysArcName(), "FDoorB.bck");
JUT_ASSERT(1796, anm != 0);
JUT_ASSERT(1796, anm != NULL);
if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm,
1, 0, 1.0f, 0, -1, true))
{
@@ -941,7 +941,7 @@ int daDoor20_c::demoProc() {
case 12:
anm =
(J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck");
JUT_ASSERT(1809, anm != 0);
JUT_ASSERT(1809, anm != NULL);
if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm,
1, 0, 1.0f, 0, -1, true))
{
@@ -2201,7 +2201,7 @@ int dDoor_stop_c::openProc(daDoor20_c* i_this) {
/* 804664E8-80466538 005A28 0050+00 1/1 0/0 0/0 .text create__12dDoor_stop_cFP10daDoor20_c */
int dDoor_stop_c::create(daDoor20_c* i_this) {
J3DModelData* stopModelData = i_this->getStopModelData();
JUT_ASSERT(3923, stopModelData != 0);
JUT_ASSERT(3923, stopModelData != NULL);
field_0x0 = mDoExt_J3DModel__create(stopModelData, 0x80000, 0x11000084);
return field_0x0 != NULL ? 1 : 0;
}

Some files were not shown because too many files have changed in this diff Show More