diff --git a/libs/JSystem/src/J2DGraph/J2DMaterial.cpp b/libs/JSystem/src/J2DGraph/J2DMaterial.cpp index 2994c60572..dd67ba2dc1 100644 --- a/libs/JSystem/src/J2DGraph/J2DMaterial.cpp +++ b/libs/JSystem/src/J2DGraph/J2DMaterial.cpp @@ -57,15 +57,15 @@ J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) { } } else { if (block_type <= 1) { - block = JKR_NEW_ARGS (-4) J2DTevBlock1(); + block = JKR_NEW_ARGS (-4) J2DTevBlock1; } else if (block_type == 2) { - block = JKR_NEW_ARGS (-4) J2DTevBlock2(); + block = JKR_NEW_ARGS (-4) J2DTevBlock2; } else if (block_type <= 4) { - block = JKR_NEW_ARGS (-4) J2DTevBlock4(); + block = JKR_NEW_ARGS (-4) J2DTevBlock4; } else if (block_type <= 8) { - block = JKR_NEW_ARGS (-4) J2DTevBlock8(); + block = JKR_NEW_ARGS (-4) J2DTevBlock8; } else { - block = JKR_NEW_ARGS (-4) J2DTevBlock16(); + block = JKR_NEW_ARGS (-4) J2DTevBlock16; } } ASSERTMSGLINE(101, block, "Error : allocate memory."); @@ -84,9 +84,9 @@ J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) { } } else { if (block_type != 0) { - block = JKR_NEW_ARGS (-4) J2DIndBlockFull(); + block = JKR_NEW_ARGS (-4) J2DIndBlockFull; } else { - block = JKR_NEW_ARGS (-4) J2DIndBlockNull(); + block = JKR_NEW_ARGS (-4) J2DIndBlockNull; } } ASSERTMSGLINE(133, block, "Error : allocate memory."); diff --git a/libs/JSystem/src/JAudio2/JASBNKParser.cpp b/libs/JSystem/src/JAudio2/JASBNKParser.cpp index 08fa8c9577..b9f010ad60 100644 --- a/libs/JSystem/src/JAudio2/JASBNKParser.cpp +++ b/libs/JSystem/src/JAudio2/JASBNKParser.cpp @@ -56,7 +56,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h heap = JASDram; } - JASBasicBank* bank = JKR_NEW_ARGS (heap, 0) JASBasicBank(); + JASBasicBank* bank = JKR_NEW_ARGS (heap, 0) JASBasicBank; if (bank == NULL) { return NULL; } @@ -94,7 +94,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h BE(u32)* data = (BE(u32)*)((intptr_t)stream + list_chunk->mOffsets[i]); switch (*data++) { case 'Inst': { - JASBasicInst* instp = JKR_NEW_ARGS (heap, 0) JASBasicInst(); + JASBasicInst* instp = JKR_NEW_ARGS (heap, 0) JASBasicInst; JUT_ASSERT(187, instp != NULL); u32 count = *data++; for (int j = 0; j < count; j++) { @@ -126,7 +126,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h } case 'Perc': { - JASDrumSet* drump = JKR_NEW_ARGS (heap, 0) JASDrumSet(); + JASDrumSet* drump = JKR_NEW_ARGS (heap, 0) JASDrumSet; JUT_ASSERT(264, drump != NULL); u32 pmap_count = data[1]; JUT_ASSERT(268, pmap_count <= 128); @@ -135,7 +135,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h for (int j = 0; j < count; j++) { u32 offset = *data++; if (offset != 0) { - JASDrumSet::TPerc* percp = JKR_NEW_ARGS (heap, 0) JASDrumSet::TPerc(); + JASDrumSet::TPerc* percp = JKR_NEW_ARGS (heap, 0) JASDrumSet::TPerc; JUT_ASSERT(277, percp); u32 type = data[0]; JUT_ASSERT(282, type == 'Pmap'); @@ -177,7 +177,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h } THeader const* header = (THeader*)stream; - JASBasicBank* bank = JKR_NEW_ARGS (heap, 0) JASBasicBank(); + JASBasicBank* bank = JKR_NEW_ARGS (heap, 0) JASBasicBank; if (bank == NULL) { return NULL; } @@ -187,7 +187,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h for (int i = 0; i < 0x80; i++) { TInst* tinst = header->mOffsets.mInstOffset[i].ptr(header); if (tinst != NULL) { - JASBasicInst* instp = JKR_NEW_ARGS (heap, 0) JASBasicInst(); + JASBasicInst* instp = JKR_NEW_ARGS (heap, 0) JASBasicInst; JUT_ASSERT(368, instp != NULL); instp->setVolume(tinst->mVolume); instp->setPitch(tinst->mPitch); @@ -200,7 +200,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h if (osc != NULL) { instp->setOsc(osc_idx, osc); } else { - osc = JKR_NEW_ARGS (heap, 0) JASOscillator::Data(); + osc = JKR_NEW_ARGS (heap, 0) JASOscillator::Data; JUT_ASSERT(386, osc != NULL); osc->mTarget = tosc->mTarget; osc->_04 = tosc->field_0x4; @@ -256,14 +256,14 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h for (int i = 0; i < 12; i++) { TPerc* tperc = header->mOffsets.mPercOffset[i].ptr(header); if (tperc != NULL) { - JASDrumSet* setp = JKR_NEW_ARGS (heap, 0) JASDrumSet(); + JASDrumSet* setp = JKR_NEW_ARGS (heap, 0) JASDrumSet; JUT_ASSERT(509, setp != NULL); setp->newPercArray(0x80, heap); for (int j = 0; j < 0x80; j++) { TPmap* tpmap = tperc->mPmapOffset[j].ptr(header); if (tpmap != NULL) { - JASDrumSet::TPerc* percp = JKR_NEW_ARGS (heap, 0) JASDrumSet::TPerc(); + JASDrumSet::TPerc* percp = JKR_NEW_ARGS (heap, 0) JASDrumSet::TPerc; JUT_ASSERT(519, percp); percp->setVolume(tpmap->mVolume); percp->setPitch(tpmap->mPitch); diff --git a/libs/JSystem/src/JAudio2/JASHeapCtrl.cpp b/libs/JSystem/src/JAudio2/JASHeapCtrl.cpp index 45afaddfcb..45568cc29a 100644 --- a/libs/JSystem/src/JAudio2/JASHeapCtrl.cpp +++ b/libs/JSystem/src/JAudio2/JASHeapCtrl.cpp @@ -301,7 +301,7 @@ void JASKernel::setupRootHeap(JKRSolidHeap* heap, u32 size) { sSystemHeap = JKRExpHeap::create(size, heap, false); JKRHEAP_NAME(sSystemHeap, "JASKernel::sSystemHeap"); JUT_ASSERT(787, sSystemHeap); - sCommandHeap = JKR_NEW_ARGS (heap, 0) JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>(); + sCommandHeap = JKR_NEW_ARGS (heap, 0) JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>; JKRHEAP_NAME(sSystemHeap, "JASKernel::sCommandHeap"); JUT_ASSERT(790, sCommandHeap); JASDram = heap; diff --git a/libs/JSystem/src/JAudio2/JASWSParser.cpp b/libs/JSystem/src/JAudio2/JASWSParser.cpp index 112b9197e8..35ec9526ed 100644 --- a/libs/JSystem/src/JAudio2/JASWSParser.cpp +++ b/libs/JSystem/src/JAudio2/JASWSParser.cpp @@ -30,7 +30,7 @@ JASBasicWaveBank* JASWSParser::createBasicWaveBank(void const* stream, JKRHeap* u32 free_size = heap->getFreeSize(); THeader* header = (THeader*)stream; - JASBasicWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASBasicWaveBank(); + JASBasicWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASBasicWaveBank; if (wave_bank == NULL) { return NULL; } @@ -82,7 +82,7 @@ JASSimpleWaveBank* JASWSParser::createSimpleWaveBank(void const* stream, JKRHeap return NULL; } - JASSimpleWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASSimpleWaveBank(); + JASSimpleWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASSimpleWaveBank; if (wave_bank == NULL) { return NULL; } diff --git a/libs/JSystem/src/JKernel/JKRAramPiece.cpp b/libs/JSystem/src/JKernel/JKRAramPiece.cpp index 5069fa4638..f01b530cfe 100644 --- a/libs/JSystem/src/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/src/JKernel/JKRAramPiece.cpp @@ -9,7 +9,7 @@ JKRAMCommand* JKRAramPiece::prepareCommand(int direction, uintptr_t src, uintptr_t dst, u32 length, JKRAramBlock* block, JKRAMCommand::AsyncCallback callback) { - JKRAMCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRAMCommand(); + JKRAMCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRAMCommand; command->mTransferDirection = direction; command->mSrc = src; command->mDst = dst; @@ -40,7 +40,7 @@ JKRAMCommand* JKRAramPiece::orderAsync(int direction, uintptr_t source, uintptr_ } #endif - JKRAramCommand* message = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRAramCommand(); + JKRAramCommand* message = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRAramCommand; JKRAMCommand* command = JKRAramPiece::prepareCommand(direction, source, destination, length, block, callback); message->setting(1, command); diff --git a/libs/JSystem/src/JKernel/JKRAramStream.cpp b/libs/JSystem/src/JKernel/JKRAramStream.cpp index f4c1f6019a..a9dc570ae0 100644 --- a/libs/JSystem/src/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/src/JKernel/JKRAramStream.cpp @@ -141,7 +141,7 @@ JKRHeap* JKRAramStream::transHeap; JKRAramStreamCommand* JKRAramStream::write_StreamToAram_Async(JSUFileInputStream* stream, u32 addr, u32 size, u32 offset, u32* returnSize) { - JKRAramStreamCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRAramStreamCommand(); + JKRAramStreamCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRAramStreamCommand; command->mType = JKRAramStreamCommand::WRITE; command->mAddress = addr; command->mSize = size; diff --git a/libs/JSystem/src/JKernel/JKRDecomp.cpp b/libs/JSystem/src/JKernel/JKRDecomp.cpp index 221fe7e70f..3f01e60e15 100644 --- a/libs/JSystem/src/JKernel/JKRDecomp.cpp +++ b/libs/JSystem/src/JKernel/JKRDecomp.cpp @@ -62,7 +62,7 @@ void* JKRDecomp::run() { JKRDecompCommand* JKRDecomp::prepareCommand(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength, JKRDecompCommand::AsyncCallback callback) { - JKRDecompCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRDecompCommand(); + JKRDecompCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRDecompCommand; command->mSrcBuffer = srcBuffer; command->mDstBuffer = dstBuffer; command->mSrcLength = srcLength; diff --git a/libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp b/libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp index cb969614e0..9472539e24 100644 --- a/libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp +++ b/libs/JSystem/src/JKernel/JKRDvdAramRipper.cpp @@ -56,7 +56,7 @@ JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 addres JKRExpandSwitch expandSwitch, void (*callback)(u32), u32 param_4, u32 param_5, u32* param_6) { - JKRADCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRADCommand(); + JKRADCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRADCommand; command->mDvdFile = dvdFile; command->mAddress = address; command->mBlock = NULL; diff --git a/libs/JSystem/src/JParticle/JPAEmitterManager.cpp b/libs/JSystem/src/JParticle/JPAEmitterManager.cpp index 986e4b571f..5cefe85329 100644 --- a/libs/JSystem/src/JParticle/JPAEmitterManager.cpp +++ b/libs/JSystem/src/JParticle/JPAEmitterManager.cpp @@ -35,7 +35,7 @@ JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHea pResMgrAry[i] = NULL; } - pWd = JKR_NEW_ARGS (pHeap, 0) JPAEmitterWorkData(); + pWd = JKR_NEW_ARGS (pHeap, 0) JPAEmitterWorkData; JUT_ASSERT(67, pWd); } diff --git a/libs/JSystem/src/JParticle/JPAFieldBlock.cpp b/libs/JSystem/src/JParticle/JPAFieldBlock.cpp index 79e148393e..e1628d7b5f 100644 --- a/libs/JSystem/src/JParticle/JPAFieldBlock.cpp +++ b/libs/JSystem/src/JParticle/JPAFieldBlock.cpp @@ -224,31 +224,31 @@ void JPAFieldBlock::init(JKRHeap* heap) { switch (getType()) { case FIELD_GRAVITY: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldGravity(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldGravity; break; case FIELD_AIR: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldAir(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldAir; break; case FIELD_MAGNET: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldMagnet(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldMagnet; break; case FIELD_NEWTON: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldNewton(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldNewton; break; case FIELD_VORTEX: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldVortex(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldVortex; break; case FIELD_RANDOM: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldRandom(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldRandom; break; case FIELD_DRAG: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldDrag(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldDrag; break; case FIELD_CONVECTION: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldConvection(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldConvection; break; case FIELD_SPIN: - pFld = JKR_NEW_ARGS (heap, 0) JPAFieldSpin(); + pFld = JKR_NEW_ARGS (heap, 0) JPAFieldSpin; break; default: pFld = NULL; diff --git a/libs/JSystem/src/JParticle/JPAResourceLoader.cpp b/libs/JSystem/src/JParticle/JPAResourceLoader.cpp index 6e48e6dda1..4be5d36a63 100644 --- a/libs/JSystem/src/JParticle/JPAResourceLoader.cpp +++ b/libs/JSystem/src/JParticle/JPAResourceLoader.cpp @@ -61,7 +61,7 @@ void JPAResourceLoader::load_jpc(u8 const* data, JPAResourceManager* p_res_mgr) u32 offset = 0x10; for (int i = 0; i < *(BE(u16)*)(data + 8); i++) { JPAResourceHeader* header = (JPAResourceHeader*)(data + offset); - JPAResource* p_res = JKR_NEW_ARGS (heap, 0) JPAResource(); + JPAResource* p_res = JKR_NEW_ARGS (heap, 0) JPAResource; JUT_ASSERT(211, p_res != NULL); p_res->fldNum = header->mFieldBlockNum; p_res->ppFld = p_res->fldNum != 0 ? diff --git a/libs/JSystem/src/JUtility/JUTCacheFont.cpp b/libs/JSystem/src/JUtility/JUTCacheFont.cpp index 614fdca6f1..81b9f252f1 100644 --- a/libs/JSystem/src/JUtility/JUTCacheFont.cpp +++ b/libs/JSystem/src/JUtility/JUTCacheFont.cpp @@ -172,7 +172,7 @@ bool JUTCacheFont::internal_initiate(ResFONT const* p_fontRes, void* param_1, u3 } bool JUTCacheFont::allocArea(void* cacheBuffer, u32 param_1, JKRHeap* heap) { - mInf1Ptr = (ResFONT::INF1*)JKR_NEW_ARGS (heap, 0) ResFONT(); + mInf1Ptr = (ResFONT::INF1*)JKR_NEW_ARGS (heap, 0) ResFONT; if (mInf1Ptr == NULL) { return false; } diff --git a/libs/JSystem/src/JUtility/JUTConsole.cpp b/libs/JSystem/src/JUtility/JUTConsole.cpp index 38c7324ab4..b2d350f0d5 100644 --- a/libs/JSystem/src/JUtility/JUTConsole.cpp +++ b/libs/JSystem/src/JUtility/JUTConsole.cpp @@ -401,7 +401,7 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) { pHeap = JKRGetCurrentHeap(); } - sManager = JKR_NEW_ARGS (pHeap, 0) JUTConsoleManager(); + sManager = JKR_NEW_ARGS (pHeap, 0) JUTConsoleManager; return sManager; } diff --git a/src/Z2AudioCS/SpkSystem.cpp b/src/Z2AudioCS/SpkSystem.cpp index 1aa25eb0d1..ebe8c0a88c 100644 --- a/src/Z2AudioCS/SpkSystem.cpp +++ b/src/Z2AudioCS/SpkSystem.cpp @@ -23,7 +23,7 @@ SpkSystem::SpkSystem(JKRHeap* heap) : JASGlobalInstance(true) { mHeap = heap; mMixingBuffer = JKR_NEW_ARGS (heap, 0) SpkMixingBuffer(heap); JUT_ASSERT(35, mMixingBuffer); - mSoundHolder = JKR_NEW_ARGS (heap, 0) SpkSoundHolder(); + mSoundHolder = JKR_NEW_ARGS (heap, 0) SpkSoundHolder; JUT_ASSERT(38, mSoundHolder); SpkSpeakerCtrl::setup(); SpkSpeakerCtrl::setMixingBuffer(mMixingBuffer); diff --git a/src/Z2AudioLib/Z2DebugSys.cpp b/src/Z2AudioLib/Z2DebugSys.cpp index 2f88759d55..67d51d9b59 100644 --- a/src/Z2AudioLib/Z2DebugSys.cpp +++ b/src/Z2AudioLib/Z2DebugSys.cpp @@ -43,27 +43,27 @@ void Z2DebugSys::initJAW() { JKRSetCurrentHeap(heap); u32 local_50 = heap->getFreeSize(); soundPlayer = JKR_NEW_ARGS (heap, 0) Z2SoundPlayer("GC-Zelda2"); - sysMemView = JKR_NEW_ARGS (heap, 0) JAWSysMemView(); - bankView = JKR_NEW_ARGS (heap, 0) JAWBankView(); - chView = JKR_NEW_ARGS (heap, 0) JAWChView(); + sysMemView = JKR_NEW_ARGS (heap, 0) JAWSysMemView; + bankView = JKR_NEW_ARGS (heap, 0) JAWBankView; + chView = JKR_NEW_ARGS (heap, 0) JAWChView; trackView = JKR_NEW_ARGS (heap, 0) Z2TrackView(0, Z2TrackView::DISPMODE0); - reportView = JKR_NEW_ARGS (heap, 0) JAWReportView(); + reportView = JKR_NEW_ARGS (heap, 0) JAWReportView; JASReportInit(heap, 500); - hioBankEdit = JKR_NEW_ARGS (heap, 0) JAWHioBankEdit(); - waveArcLoader = JKR_NEW_ARGS (heap, 0) Z2WaveArcLoader(); + hioBankEdit = JKR_NEW_ARGS (heap, 0) JAWHioBankEdit; + waveArcLoader = JKR_NEW_ARGS (heap, 0) Z2WaveArcLoader; volume = JKR_NEW_ARGS (heap, 0) JAWVolume(90, 480); - playSeView = JKR_NEW_ARGS (heap, 0) Z2PlaySeView(); - audSettingView = JKR_NEW_ARGS (heap, 0) Z2AudSettingView(); - dspCheck = JKR_NEW_ARGS (heap, 0) Z2DSPCheck(); + playSeView = JKR_NEW_ARGS (heap, 0) Z2PlaySeView; + audSettingView = JKR_NEW_ARGS (heap, 0) Z2AudSettingView; + dspCheck = JKR_NEW_ARGS (heap, 0) Z2DSPCheck; JAWExtSystem::registWindow(1, soundPlayer, 10, 22); - entrySeView = JKR_NEW_ARGS (heap, 0) Z2EntrySeView(); + entrySeView = JKR_NEW_ARGS (heap, 0) Z2EntrySeView; JAWExtSystem::registWindow(2, entrySeView, 10, 22); JAWExtSystem::registWindow(3, playSeView, 10, 22); JAWExtSystem::registWindow(4, sysMemView, 10, 22); JAWExtSystem::registWindow(5, bankView, 10, 22); JAWExtSystem::registWindow(6, chView, 10, 22); JAWExtSystem::registWindow(7, trackView, 10, 22); - playerChView = JKR_NEW_ARGS (heap, 0) JAWPlayerChView(); + playerChView = JKR_NEW_ARGS (heap, 0) JAWPlayerChView; JAWExtSystem::registWindow(8, playerChView, 10, 22); JAWExtSystem::registWindow(11, reportView, 330, 0); JAWExtSystem::registWindow(12, hioBankEdit, 10, 0); @@ -85,16 +85,16 @@ void Z2DebugSys::initSoundHioNode() { JAHSingletonBase::getIns()->init_OnGame(); JAHSingletonBase::getIns()->appendRootNode(&mDoHIO_root, soundRoot); mDoHIO_createChild("サウンド", soundRoot); - JAHSoundPlayerNode* soundPlayerNode = JKR_NEW_ARGS (heap, 0) JAHSoundPlayerNode(); + JAHSoundPlayerNode* soundPlayerNode = JKR_NEW_ARGS (heap, 0) JAHSoundPlayerNode; JUT_ASSERT(258, soundPlayerNode); soundRoot->appendNode(soundPlayerNode, NULL); - Z2ParamNode* paramNode = JKR_NEW_ARGS (heap, 0) Z2ParamNode(); + Z2ParamNode* paramNode = JKR_NEW_ARGS (heap, 0) Z2ParamNode; JUT_ASSERT(262, paramNode); soundRoot->appendNode(paramNode, NULL); Z2FxLineEditNode* fxNode = JKR_NEW_ARGS (heap, 0) Z2FxLineEditNode(heap); JUT_ASSERT(267, fxNode); soundRoot->appendNode(fxNode, NULL); - Z2F1SwingTestNode* f1TestWin = JKR_NEW_ARGS (heap, 0) Z2F1SwingTestNode(); + Z2F1SwingTestNode* f1TestWin = JKR_NEW_ARGS (heap, 0) Z2F1SwingTestNode; JUT_ASSERT(284, f1TestWin); soundRoot->appendNode(f1TestWin, NULL); JAWExtSystem::registWindow(10, f1TestWin, 10, 22); @@ -111,7 +111,7 @@ JAISeqDataMgr* Z2DebugSys::initSeSeqDataMgr(const void* param_1) { JKRExpHeap* heap = mDoExt_getGameHeap(); JKRSetCurrentHeap(heap); s32 freeSize = heap->getFreeSize(); - JAWHioReceiver* receiver = JKR_NEW_ARGS (heap, 0) JAWHioReceiver(); + JAWHioReceiver* receiver = JKR_NEW_ARGS (heap, 0) JAWHioReceiver; JAWExtSystem::registWindow(0, receiver, 10, 22); seqDataMgr = JKR_NEW_ARGS (heap, 0) Z2HioSeSeqDataMgr(param_1, receiver); JKRSetCurrentHeap(oldHeap); diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 10a00a4441..7edc491b44 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -8,7 +8,7 @@ static const char l_arcName[] = "Always"; int dkWpillar_c::create() { - JKR_NEW_ARGS (this) dkWpillar_c(); + JKR_NEW_ARGS (this) dkWpillar_c; int roomNo; u8 envrOverride; diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index d4175c666e..019f30f101 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -1229,7 +1229,7 @@ void dKyr_housi_move() { void dKyr_snow_init() { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - g_env_light.mpSnowPacket = JKR_NEW_ARGS (32) dKankyo_snow_Packet(); + g_env_light.mpSnowPacket = JKR_NEW_ARGS (32) dKankyo_snow_Packet; if (g_env_light.mpSnowPacket == NULL) { return; @@ -1523,7 +1523,7 @@ void dKyr_snow_move() { void dKyr_star_init() { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - g_env_light.mpStarPacket = JKR_NEW_ARGS (32) dKankyo_star_Packet(); + g_env_light.mpStarPacket = JKR_NEW_ARGS (32) dKankyo_star_Packet; if (g_env_light.mpStarPacket == NULL) { return; diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index ad8a70abf1..00a3d6412d 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -433,8 +433,8 @@ static void wether_move_sun() { switch (g_env_light.mSunInitialized) { case FALSE: if (sunVisible && dKy_darkworld_check() != true) { - g_env_light.mpSunPacket = JKR_NEW_ARGS (0x20) dKankyo_sun_Packet(); - g_env_light.mpSunLenzPacket = JKR_NEW_ARGS (0x20) dKankyo_sunlenz_Packet(); + g_env_light.mpSunPacket = JKR_NEW_ARGS (0x20) dKankyo_sun_Packet; + g_env_light.mpSunLenzPacket = JKR_NEW_ARGS (0x20) dKankyo_sunlenz_Packet; if (g_env_light.mpSunPacket != NULL && g_env_light.mpSunLenzPacket != NULL) { g_env_light.mpSunPacket->mpResMoon = (u8*)dComIfG_getStageRes("F_moon.bti"); g_env_light.mpSunPacket->mpResMoon_A = (u8*)dComIfG_getStageRes("F_moon_A.bti"); @@ -516,7 +516,7 @@ static void wether_move_rain() { switch (g_env_light.mRainInitialized) { case FALSE: if (g_env_light.raincnt > 3) { - g_env_light.mpRainPacket = JKR_NEW_ARGS (32) dKankyo_rain_Packet(); + g_env_light.mpRainPacket = JKR_NEW_ARGS (32) dKankyo_rain_Packet; if (g_env_light.mpRainPacket != NULL) { dKyr_rain_init(); @@ -705,7 +705,7 @@ static void wether_move_housi() { switch (g_env_light.mHousiInitialized) { case FALSE: if (g_env_light.mHousiCount != 0) { - g_env_light.mpHousiPacket = JKR_NEW_ARGS (32) dKankyo_housi_Packet(); + g_env_light.mpHousiPacket = JKR_NEW_ARGS (32) dKankyo_housi_Packet; if (g_env_light.mpHousiPacket != NULL) { if (dKy_darkworld_check() == true) { @@ -764,7 +764,7 @@ static void wether_move_odour() { switch (g_env_light.mOdourData.mOdourPacketStatus) { case 0: if (g_env_light.mOdourData.field_0xf21 != 0) { - g_env_light.mOdourData.mpOdourPacket = JKR_NEW_ARGS (32) dKankyo_odour_Packet(); + g_env_light.mOdourData.mpOdourPacket = JKR_NEW_ARGS (32) dKankyo_odour_Packet; if (g_env_light.mOdourData.mpOdourPacket != NULL) { g_env_light.mOdourData.mpOdourPacket->mpResTex = (u8*)dComIfG_getObjectRes("Always", 0x53); @@ -798,7 +798,7 @@ static void wether_move_moya() { switch (g_env_light.mCloudInitialized) { case 0: if (g_env_light.mMoyaCount != 0) { - g_env_light.mpCloudPacket = JKR_NEW_ARGS (32) dKankyo_cloud_Packet(); + g_env_light.mpCloudPacket = JKR_NEW_ARGS (32) dKankyo_cloud_Packet; if (g_env_light.mpCloudPacket != NULL) { g_env_light.mpCloudPacket->mpResTex = (u8*)dComIfG_getObjectRes("Always", 0x53); @@ -884,7 +884,7 @@ static void wether_move_vrkumo() { switch (g_env_light.mVrkumoStatus) { case 0: if (g_env_light.mVrkumoCount != 0) { - g_env_light.mpVrkumoPacket = JKR_NEW_ARGS (0x20) dKankyo_vrkumo_Packet(); + g_env_light.mpVrkumoPacket = JKR_NEW_ARGS (0x20) dKankyo_vrkumo_Packet; if (g_env_light.mpVrkumoPacket == NULL) { return; } @@ -964,7 +964,7 @@ static void wether_move_mud() { switch (g_env_light.mMudInitialized) { case 0: if (g_env_light.field_0x1048 != 0) { - g_env_light.mpMudPacket = JKR_NEW_ARGS (32) dKankyo_mud_Packet(); + g_env_light.mpMudPacket = JKR_NEW_ARGS (32) dKankyo_mud_Packet; if (g_env_light.mpMudPacket != NULL) { dKyr_mud_init(); @@ -990,7 +990,7 @@ static void wether_move_evil() { switch (g_env_light.mEvilInitialized & 0xF) { case 0: if (g_env_light.field_0x1054 != 0) { - g_env_light.mpEvilPacket = JKR_NEW_ARGS (32) dKankyo_evil_Packet(); + g_env_light.mpEvilPacket = JKR_NEW_ARGS (32) dKankyo_evil_Packet; if (g_env_light.mpEvilPacket != NULL) { dKyr_evil_init(); diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 13112cac91..69c0d690ad 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -152,7 +152,7 @@ int dThunder_c::create() { f32 var_r28; f32 var_r27; - JKR_NEW_ARGS (this) dThunder_c(); + JKR_NEW_ARGS (this) dThunder_c; J3DModelData* modelData; if (cM_rndF(1.0f) < 0.5f) { diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp index e11bd1a609..fbbd9267e5 100644 --- a/src/d/d_menu_fmap_map.cpp +++ b/src/d/d_menu_fmap_map.cpp @@ -662,7 +662,7 @@ void dMenu_FmapMap_c::setTexture(u16 i_width, u16 i_height, u16 param_2, u16 par int size = GXGetTexBufferSize(i_width, i_height, GX_TF_C8, 0, 0); mMapImage_p = JKR_NEW_ARRAY_ARGS(u8, size, 0x20); init(mMapImage_p, i_width, i_height, param_2, param_3); - mResTIMG = JKR_NEW_ARGS (0x20) ResTIMG(); + mResTIMG = JKR_NEW_ARGS (0x20) ResTIMG; makeResTIMG(mResTIMG, i_width, i_height, mMapImage_p, (u8*)m_palette, 0x1b); } diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 4dbd84bd0f..093aaadddd 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -234,7 +234,7 @@ static int dOvlpFd2_Delete(dOvlpFd2_c* i_this) { } static int dOvlpFd2_Create(void* i_this) { - JKR_NEW_ARGS (i_this) dOvlpFd2_c(); + JKR_NEW_ARGS (i_this) dOvlpFd2_c; return cPhs_COMPLEATE_e; } diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index 3e565dff03..f5da4064a0 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -252,7 +252,7 @@ static int dOvlpFd3_Delete(dOvlpFd3_c* i_this) { } static int dOvlpFd3_Create(void* i_this) { - JKR_NEW_ARGS (i_this) dOvlpFd3_c(); + JKR_NEW_ARGS (i_this) dOvlpFd3_c; return cPhs_COMPLEATE_e; } diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 9ce746b35e..4923f93d65 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -1454,7 +1454,7 @@ void dScnLogo_c::dvdDataLoad() { static int dScnLogo_Create(scene_class* i_this) { DuskLog.debug("[DIAG] dScnLogo_Create: entry i_this={}", (void*)i_this); - return (JKR_NEW_ARGS (i_this) dScnLogo_c())->create(); + return (JKR_NEW_ARGS (i_this) dScnLogo_c)->create(); } static int dScnLogo_Execute(dScnLogo_c* i_this) { diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 76cb243937..4940d3d604 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -408,7 +408,7 @@ static int dScnName_Delete(dScnName_c* i_this) { } static int dScnName_Create(scene_class* i_this) { - JKR_NEW_ARGS (i_this) dScnName_c(); + JKR_NEW_ARGS (i_this) dScnName_c; return static_cast(i_this)->create(); } diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index 1c791b5466..526b5a255e 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -321,9 +321,9 @@ s32 mDoDvdThd_mountAramArchive_c::execute() { BOOL result = FALSE; if (!mArchive) { if (mMountDirection == 0) { - mArchive = JKR_NEW_ARGS (heap, 0x20) JKRAramArchive(); + mArchive = JKR_NEW_ARGS (heap, 0x20) JKRAramArchive; } else { - mArchive = JKR_NEW_ARGS (heap, -0x20) JKRAramArchive(); + mArchive = JKR_NEW_ARGS (heap, -0x20) JKRAramArchive; } #if DEBUG if (mDoDvdThd::verbose) {