From 038ef4216f9326b407a76df39c6db561fa84e71d Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Fri, 27 Feb 2026 23:11:59 +0100 Subject: [PATCH] Isolate JKRHeap operator overloads Fixes #25 This isolates the JKRHeap operator new/delete overloads. Every single new/delete site in the code has been replaced with a macro. Sadly for new[] and delete[] we have to keep global operators. The global new[] just allocates into malloc() however, and delete[] goes into free() if it's not in a JKRHeap. So that's fine. --- include/JSystem/J2DGraph/J2DAnimation.h | 9 +- include/JSystem/JAHostIO/JAHPubDefine.h | 3 +- include/JSystem/JAudio2/JASHeapCtrl.h | 32 ++- include/JSystem/JGadget/pointer.h | 6 +- include/JSystem/JGadget/std-memory.h | 5 +- include/JSystem/JHostIO/JOREntry.h | 6 +- include/JSystem/JKernel/JKRAramHeap.h | 6 +- include/JSystem/JKernel/JKRHeap.h | 44 ++- .../JSystem/JStudio/JStudio/jstudio-control.h | 2 +- .../JSystem/JStudio/JStudio/jstudio-object.h | 2 +- .../JSystem/JStudio/JStudio_JStage/control.h | 2 +- include/JSystem/JUtility/JUTGraphFifo.h | 10 +- include/d/actor/d_a_formation_mng.h | 4 +- include/d/actor/d_a_npc.h | 2 +- include/d/actor/d_a_npc_fairy.h | 2 +- include/d/actor/d_a_passer_mng.h | 2 +- include/d/d_file_select.h | 14 +- include/d/d_map_path_fmap.h | 6 +- include/f_ap/f_ap_game.h | 4 +- include/f_op/f_op_actor_mng.h | 2 +- include/m_Do/m_Do_dvd_thread.h | 6 +- src/JSystem/J2DGraph/J2DAnimation.cpp | 6 +- src/JSystem/J2DGraph/J2DAnmLoader.cpp | 20 +- src/JSystem/J2DGraph/J2DMatBlock.cpp | 200 +++++++------- src/JSystem/J2DGraph/J2DMaterial.cpp | 36 +-- src/JSystem/J2DGraph/J2DMaterialFactory.cpp | 2 +- src/JSystem/J2DGraph/J2DPane.cpp | 2 +- src/JSystem/J2DGraph/J2DPicture.cpp | 20 +- src/JSystem/J2DGraph/J2DPictureEx.cpp | 2 +- src/JSystem/J2DGraph/J2DPrint.cpp | 4 +- src/JSystem/J2DGraph/J2DScreen.cpp | 54 ++-- src/JSystem/J2DGraph/J2DTextBox.cpp | 24 +- src/JSystem/J2DGraph/J2DTextBoxEx.cpp | 4 +- src/JSystem/J2DGraph/J2DWindow.cpp | 34 +-- src/JSystem/J2DGraph/J2DWindowEx.cpp | 4 +- .../J3DGraphAnimator/J3DMaterialAttach.cpp | 5 +- src/JSystem/J3DGraphAnimator/J3DModel.cpp | 9 +- src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp | 22 +- .../J3DGraphAnimator/J3DSkinDeform.cpp | 18 +- src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp | 4 +- src/JSystem/J3DGraphBase/J3DMaterial.cpp | 39 +-- src/JSystem/J3DGraphBase/J3DPacket.cpp | 12 +- src/JSystem/J3DGraphBase/J3DShape.cpp | 3 +- src/JSystem/J3DGraphBase/J3DShapeDraw.cpp | 2 +- src/JSystem/J3DGraphBase/J3DTexture.cpp | 5 +- src/JSystem/J3DGraphBase/J3DVertex.cpp | 18 +- src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp | 28 +- .../J3DGraphLoader/J3DClusterLoader.cpp | 16 +- .../J3DGraphLoader/J3DJointFactory.cpp | 5 +- .../J3DGraphLoader/J3DMaterialFactory.cpp | 27 +- .../J3DGraphLoader/J3DMaterialFactory_v21.cpp | 9 +- src/JSystem/J3DGraphLoader/J3DModelLoader.cpp | 60 ++-- .../J3DGraphLoader/J3DShapeFactory.cpp | 22 +- src/JSystem/JAWExtSystem/JAWGraphContext.cpp | 4 +- src/JSystem/JAudio2/JAISeMgr.cpp | 4 +- src/JSystem/JAudio2/JAISeq.cpp | 14 +- src/JSystem/JAudio2/JAISeqMgr.cpp | 6 +- src/JSystem/JAudio2/JAIStream.cpp | 6 +- src/JSystem/JAudio2/JAIStreamMgr.cpp | 4 +- src/JSystem/JAudio2/JASAiCtrl.cpp | 6 +- src/JSystem/JAudio2/JASAramStream.cpp | 4 +- src/JSystem/JAudio2/JASAudioThread.cpp | 2 +- src/JSystem/JAudio2/JASBNKParser.cpp | 26 +- src/JSystem/JAudio2/JASBank.cpp | 4 +- src/JSystem/JAudio2/JASBasicBank.cpp | 2 +- src/JSystem/JAudio2/JASBasicInst.cpp | 6 +- src/JSystem/JAudio2/JASBasicWaveBank.cpp | 18 +- src/JSystem/JAudio2/JASChannel.cpp | 18 +- src/JSystem/JAudio2/JASDSPChannel.cpp | 2 +- src/JSystem/JAudio2/JASDSPInterface.cpp | 4 +- src/JSystem/JAudio2/JASDrumSet.cpp | 2 +- src/JSystem/JAudio2/JASDvdThread.cpp | 2 +- src/JSystem/JAudio2/JASHeapCtrl.cpp | 6 +- src/JSystem/JAudio2/JASReport.cpp | 2 +- src/JSystem/JAudio2/JASSimpleWaveBank.cpp | 6 +- src/JSystem/JAudio2/JASTrack.cpp | 20 +- src/JSystem/JAudio2/JASWSParser.cpp | 4 +- src/JSystem/JAudio2/JASWaveArcLoader.cpp | 4 +- src/JSystem/JAudio2/JAUAudioMgr.cpp | 2 +- src/JSystem/JAudio2/JAUSectionHeap.cpp | 34 +-- src/JSystem/JFramework/JFWDisplay.cpp | 5 +- src/JSystem/JFramework/JFWSystem.cpp | 4 +- src/JSystem/JHostIO/JHICommonMem.cpp | 2 +- src/JSystem/JHostIO/JHIMccBuf.cpp | 4 +- src/JSystem/JHostIO/JHIMemBuf.cpp | 4 +- src/JSystem/JHostIO/JHIRMcc.cpp | 8 +- src/JSystem/JHostIO/JHIhioASync.cpp | 4 +- src/JSystem/JHostIO/JOREntry.cpp | 8 +- src/JSystem/JHostIO/JORServer.cpp | 2 +- src/JSystem/JKernel/JKRAram.cpp | 8 +- src/JSystem/JKernel/JKRAramArchive.cpp | 8 +- src/JSystem/JKernel/JKRAramBlock.cpp | 4 +- src/JSystem/JKernel/JKRAramHeap.cpp | 4 +- src/JSystem/JKernel/JKRAramPiece.cpp | 10 +- src/JSystem/JKernel/JKRAramStream.cpp | 4 +- src/JSystem/JKernel/JKRArchivePub.cpp | 14 +- src/JSystem/JKernel/JKRAssertHeap.cpp | 2 +- src/JSystem/JKernel/JKRCompArchive.cpp | 6 +- src/JSystem/JKernel/JKRDecomp.cpp | 6 +- src/JSystem/JKernel/JKRDvdAramRipper.cpp | 20 +- src/JSystem/JKernel/JKRDvdArchive.cpp | 6 +- src/JSystem/JKernel/JKRExpHeap.cpp | 8 +- src/JSystem/JKernel/JKRFileCache.cpp | 14 +- src/JSystem/JKernel/JKRFileLoader.cpp | 5 +- src/JSystem/JKernel/JKRHeap.cpp | 25 +- src/JSystem/JKernel/JKRSolidHeap.cpp | 2 +- src/JSystem/JKernel/JKRThread.cpp | 6 +- src/JSystem/JMessage/resource.cpp | 6 +- src/JSystem/JParticle/JPAEmitterManager.cpp | 10 +- src/JSystem/JParticle/JPAFieldBlock.cpp | 18 +- src/JSystem/JParticle/JPAResourceLoader.cpp | 26 +- src/JSystem/JStudio/JStudio/ctb.cpp | 6 +- src/JSystem/JStudio/JStudio/fvb.cpp | 14 +- .../JStudio/JStudio/jstudio-object.cpp | 2 +- src/JSystem/JStudio/JStudio/stb.cpp | 2 +- .../JStudio/JStudio_JAudio2/control.cpp | 2 +- .../JStudio/JStudio_JParticle/control.cpp | 2 +- src/JSystem/JUtility/JUTCacheFont.cpp | 30 +- src/JSystem/JUtility/JUTConsole.cpp | 6 +- src/JSystem/JUtility/JUTDbPrint.cpp | 2 +- src/JSystem/JUtility/JUTDirectPrint.cpp | 5 +- src/JSystem/JUtility/JUTException.cpp | 6 +- src/JSystem/JUtility/JUTProcBar.cpp | 4 +- src/JSystem/JUtility/JUTResFont.cpp | 10 +- src/JSystem/JUtility/JUTTexture.cpp | 10 +- src/JSystem/JUtility/JUTVideo.cpp | 6 +- src/JSystem/JUtility/JUTXfb.cpp | 12 +- .../MSL/MSL_C++/MSL_Common/Include/memory | 2 +- src/Z2AudioLib/Z2Audience.cpp | 4 +- src/Z2AudioLib/Z2AudioArcLoader.cpp | 4 +- src/Z2AudioLib/Z2AudioMgr.cpp | 2 +- src/Z2AudioLib/Z2DebugSys.cpp | 42 +-- src/Z2AudioLib/Z2FxLineMgr.cpp | 10 +- src/Z2AudioLib/Z2SoundHandles.cpp | 6 +- src/c/c_dylink.cpp | 2 +- src/d/actor/d_a_L7demo_dr.cpp | 2 +- src/d/actor/d_a_L7low_dr.cpp | 2 +- src/d/actor/d_a_L7op_demo_dr.cpp | 2 +- src/d/actor/d_a_alink.cpp | 24 +- src/d/actor/d_a_alink_HIO.inc | 16 +- src/d/actor/d_a_alink_effect.inc | 2 +- src/d/actor/d_a_alink_hook.inc | 6 +- src/d/actor/d_a_alink_ironball.inc | 20 +- src/d/actor/d_a_alink_swindow.inc | 8 +- src/d/actor/d_a_alink_wolf.inc | 2 +- src/d/actor/d_a_b_bh.cpp | 2 +- src/d/actor/d_a_b_bq.cpp | 6 +- src/d/actor/d_a_b_dr.cpp | 4 +- src/d/actor/d_a_b_dre.cpp | 6 +- src/d/actor/d_a_b_ds.cpp | 16 +- src/d/actor/d_a_b_gg.cpp | 2 +- src/d/actor/d_a_b_gm.cpp | 10 +- src/d/actor/d_a_b_gnd.cpp | 16 +- src/d/actor/d_a_b_go.cpp | 2 +- src/d/actor/d_a_b_gos.cpp | 2 +- src/d/actor/d_a_b_mgn.cpp | 14 +- src/d/actor/d_a_b_ob.cpp | 16 +- src/d/actor/d_a_b_oh.cpp | 6 +- src/d/actor/d_a_b_oh2.cpp | 6 +- src/d/actor/d_a_b_tn.cpp | 8 +- src/d/actor/d_a_b_yo.cpp | 20 +- src/d/actor/d_a_b_zant.cpp | 12 +- src/d/actor/d_a_b_zant_mobile.cpp | 6 +- src/d/actor/d_a_b_zant_sima.cpp | 6 +- src/d/actor/d_a_balloon_2D.cpp | 30 +- src/d/actor/d_a_bd.cpp | 4 +- src/d/actor/d_a_bg.cpp | 16 +- src/d/actor/d_a_bg_obj.cpp | 10 +- src/d/actor/d_a_boomerang.cpp | 6 +- src/d/actor/d_a_coach_2D.cpp | 12 +- src/d/actor/d_a_cow.cpp | 4 +- src/d/actor/d_a_cstaF.cpp | 2 +- src/d/actor/d_a_cstatue.cpp | 10 +- src/d/actor/d_a_demo00.cpp | 22 +- src/d/actor/d_a_dmidna.cpp | 2 +- src/d/actor/d_a_do.cpp | 6 +- src/d/actor/d_a_door_boss.cpp | 6 +- src/d/actor/d_a_door_bossL1.cpp | 6 +- src/d/actor/d_a_door_bossL5.cpp | 4 +- src/d/actor/d_a_door_dbdoor00.cpp | 2 +- src/d/actor/d_a_door_knob00.cpp | 2 +- src/d/actor/d_a_door_mbossL1.cpp | 8 +- src/d/actor/d_a_door_push.cpp | 2 +- src/d/actor/d_a_door_shutter.cpp | 4 +- src/d/actor/d_a_door_spiral.cpp | 6 +- src/d/actor/d_a_e_ai.cpp | 4 +- src/d/actor/d_a_e_ba.cpp | 2 +- src/d/actor/d_a_e_bg.cpp | 4 +- src/d/actor/d_a_e_bi.cpp | 2 +- src/d/actor/d_a_e_bs.cpp | 4 +- src/d/actor/d_a_e_bu.cpp | 2 +- src/d/actor/d_a_e_cr.cpp | 2 +- src/d/actor/d_a_e_db.cpp | 2 +- src/d/actor/d_a_e_db_leaf.cpp | 2 +- src/d/actor/d_a_e_dd.cpp | 4 +- src/d/actor/d_a_e_df.cpp | 2 +- src/d/actor/d_a_e_dk.cpp | 8 +- src/d/actor/d_a_e_dn.cpp | 2 +- src/d/actor/d_a_e_dt.cpp | 2 +- src/d/actor/d_a_e_fb.cpp | 4 +- src/d/actor/d_a_e_fk.cpp | 2 +- src/d/actor/d_a_e_fm.cpp | 20 +- src/d/actor/d_a_e_fs.cpp | 2 +- src/d/actor/d_a_e_gb.cpp | 6 +- src/d/actor/d_a_e_ge.cpp | 2 +- src/d/actor/d_a_e_gi.cpp | 2 +- src/d/actor/d_a_e_gm.cpp | 4 +- src/d/actor/d_a_e_gob.cpp | 2 +- src/d/actor/d_a_e_gs.cpp | 2 +- src/d/actor/d_a_e_hb.cpp | 2 +- src/d/actor/d_a_e_hb_leaf.cpp | 2 +- src/d/actor/d_a_e_hm.cpp | 6 +- src/d/actor/d_a_e_hp.cpp | 4 +- src/d/actor/d_a_e_hz.cpp | 4 +- src/d/actor/d_a_e_hzelda.cpp | 6 +- src/d/actor/d_a_e_is.cpp | 2 +- src/d/actor/d_a_e_kg.cpp | 4 +- src/d/actor/d_a_e_kk.cpp | 4 +- src/d/actor/d_a_e_kr.cpp | 2 +- src/d/actor/d_a_e_mb.cpp | 8 +- src/d/actor/d_a_e_md.cpp | 6 +- src/d/actor/d_a_e_mf.cpp | 2 +- src/d/actor/d_a_e_mk.cpp | 6 +- src/d/actor/d_a_e_mk_bo.cpp | 4 +- src/d/actor/d_a_e_mm.cpp | 2 +- src/d/actor/d_a_e_ms.cpp | 2 +- src/d/actor/d_a_e_nz.cpp | 2 +- src/d/actor/d_a_e_oc.cpp | 2 +- src/d/actor/d_a_e_oct_bg.cpp | 4 +- src/d/actor/d_a_e_ot.cpp | 4 +- src/d/actor/d_a_e_ph.cpp | 2 +- src/d/actor/d_a_e_pm.cpp | 10 +- src/d/actor/d_a_e_po.cpp | 6 +- src/d/actor/d_a_e_pz.cpp | 14 +- src/d/actor/d_a_e_rb.cpp | 2 +- src/d/actor/d_a_e_rd.cpp | 8 +- src/d/actor/d_a_e_rdb.cpp | 2 +- src/d/actor/d_a_e_rdy.cpp | 4 +- src/d/actor/d_a_e_s1.cpp | 2 +- src/d/actor/d_a_e_sb.cpp | 2 +- src/d/actor/d_a_e_sf.cpp | 2 +- src/d/actor/d_a_e_sh.cpp | 2 +- src/d/actor/d_a_e_sm.cpp | 2 +- src/d/actor/d_a_e_sm2.cpp | 6 +- src/d/actor/d_a_e_st.cpp | 2 +- src/d/actor/d_a_e_sw.cpp | 2 +- src/d/actor/d_a_e_th.cpp | 2 +- src/d/actor/d_a_e_tk.cpp | 2 +- src/d/actor/d_a_e_tk2.cpp | 2 +- src/d/actor/d_a_e_tt.cpp | 2 +- src/d/actor/d_a_e_vt.cpp | 8 +- src/d/actor/d_a_e_warpappear.cpp | 6 +- src/d/actor/d_a_e_wb.cpp | 2 +- src/d/actor/d_a_e_ws.cpp | 2 +- src/d/actor/d_a_e_ww.cpp | 2 +- src/d/actor/d_a_e_yc.cpp | 2 +- src/d/actor/d_a_e_yd.cpp | 4 +- src/d/actor/d_a_e_yd_leaf.cpp | 2 +- src/d/actor/d_a_e_yg.cpp | 2 +- src/d/actor/d_a_e_yh.cpp | 4 +- src/d/actor/d_a_e_yk.cpp | 2 +- src/d/actor/d_a_e_ym.cpp | 10 +- src/d/actor/d_a_e_ymb.cpp | 6 +- src/d/actor/d_a_e_yr.cpp | 2 +- src/d/actor/d_a_e_zh.cpp | 4 +- src/d/actor/d_a_e_zm.cpp | 2 +- src/d/actor/d_a_e_zs.cpp | 2 +- src/d/actor/d_a_formation_mng.cpp | 8 +- src/d/actor/d_a_fr.cpp | 4 +- src/d/actor/d_a_grass.cpp | 8 +- src/d/actor/d_a_horse.cpp | 14 +- src/d/actor/d_a_hozelda.cpp | 12 +- src/d/actor/d_a_itembase.cpp | 10 +- src/d/actor/d_a_kago.cpp | 2 +- src/d/actor/d_a_mg_fish.cpp | 6 +- src/d/actor/d_a_mg_fshop.cpp | 6 +- src/d/actor/d_a_mg_rod.cpp | 2 +- src/d/actor/d_a_midna.cpp | 8 +- src/d/actor/d_a_myna.cpp | 2 +- src/d/actor/d_a_nbomb.cpp | 2 +- src/d/actor/d_a_ni.cpp | 4 +- src/d/actor/d_a_npc2.cpp | 2 +- src/d/actor/d_a_npc_aru.cpp | 4 +- src/d/actor/d_a_npc_ash.cpp | 4 +- src/d/actor/d_a_npc_ashB.cpp | 4 +- src/d/actor/d_a_npc_bans.cpp | 6 +- src/d/actor/d_a_npc_besu.cpp | 6 +- src/d/actor/d_a_npc_blue_ns.cpp | 2 +- src/d/actor/d_a_npc_bou.cpp | 4 +- src/d/actor/d_a_npc_bouS.cpp | 4 +- src/d/actor/d_a_npc_cd.cpp | 2 +- src/d/actor/d_a_npc_cd2.cpp | 4 +- src/d/actor/d_a_npc_chat.cpp | 2 +- src/d/actor/d_a_npc_chin.cpp | 4 +- src/d/actor/d_a_npc_clerka.cpp | 4 +- src/d/actor/d_a_npc_clerkb.cpp | 4 +- src/d/actor/d_a_npc_clerkt.cpp | 4 +- src/d/actor/d_a_npc_coach.cpp | 12 +- src/d/actor/d_a_npc_doc.cpp | 4 +- src/d/actor/d_a_npc_doorboy.cpp | 2 +- src/d/actor/d_a_npc_drainSol.cpp | 2 +- src/d/actor/d_a_npc_du.cpp | 4 +- src/d/actor/d_a_npc_fairy.cpp | 6 +- src/d/actor/d_a_npc_gnd.cpp | 4 +- src/d/actor/d_a_npc_gra.cpp | 2 +- src/d/actor/d_a_npc_grc.cpp | 2 +- src/d/actor/d_a_npc_grd.cpp | 4 +- src/d/actor/d_a_npc_grm.cpp | 2 +- src/d/actor/d_a_npc_grmc.cpp | 2 +- src/d/actor/d_a_npc_gro.cpp | 4 +- src/d/actor/d_a_npc_grr.cpp | 4 +- src/d/actor/d_a_npc_grs.cpp | 4 +- src/d/actor/d_a_npc_grz.cpp | 4 +- src/d/actor/d_a_npc_gwolf.cpp | 4 +- src/d/actor/d_a_npc_hanjo.cpp | 4 +- src/d/actor/d_a_npc_henna.cpp | 10 +- src/d/actor/d_a_npc_hoz.cpp | 4 +- src/d/actor/d_a_npc_impal.cpp | 4 +- src/d/actor/d_a_npc_inko.cpp | 2 +- src/d/actor/d_a_npc_ins.cpp | 4 +- src/d/actor/d_a_npc_jagar.cpp | 4 +- src/d/actor/d_a_npc_kakashi.cpp | 2 +- src/d/actor/d_a_npc_kasi_hana.cpp | 2 +- src/d/actor/d_a_npc_kasi_kyu.cpp | 2 +- src/d/actor/d_a_npc_kasi_mich.cpp | 2 +- src/d/actor/d_a_npc_kkri.cpp | 4 +- src/d/actor/d_a_npc_kn.cpp | 4 +- src/d/actor/d_a_npc_knj.cpp | 2 +- src/d/actor/d_a_npc_kolin.cpp | 4 +- src/d/actor/d_a_npc_kolinb.cpp | 4 +- src/d/actor/d_a_npc_ks.cpp | 6 +- src/d/actor/d_a_npc_kyury.cpp | 4 +- src/d/actor/d_a_npc_len.cpp | 4 +- src/d/actor/d_a_npc_lud.cpp | 6 +- src/d/actor/d_a_npc_maro.cpp | 4 +- src/d/actor/d_a_npc_midp.cpp | 4 +- src/d/actor/d_a_npc_moi.cpp | 4 +- src/d/actor/d_a_npc_moir.cpp | 4 +- src/d/actor/d_a_npc_myna2.cpp | 2 +- src/d/actor/d_a_npc_ne.cpp | 8 +- src/d/actor/d_a_npc_pachi_besu.cpp | 4 +- src/d/actor/d_a_npc_pachi_maro.cpp | 4 +- src/d/actor/d_a_npc_pachi_taro.cpp | 4 +- src/d/actor/d_a_npc_post.cpp | 6 +- src/d/actor/d_a_npc_pouya.cpp | 4 +- src/d/actor/d_a_npc_prayer.cpp | 2 +- src/d/actor/d_a_npc_raca.cpp | 4 +- src/d/actor/d_a_npc_rafrel.cpp | 4 +- src/d/actor/d_a_npc_saru.cpp | 2 +- src/d/actor/d_a_npc_seib.cpp | 2 +- src/d/actor/d_a_npc_seic.cpp | 2 +- src/d/actor/d_a_npc_seid.cpp | 2 +- src/d/actor/d_a_npc_seira.cpp | 6 +- src/d/actor/d_a_npc_seira2.cpp | 6 +- src/d/actor/d_a_npc_seirei.cpp | 2 +- src/d/actor/d_a_npc_shad.cpp | 4 +- src/d/actor/d_a_npc_shaman.cpp | 4 +- src/d/actor/d_a_npc_shoe.cpp | 2 +- src/d/actor/d_a_npc_shop0.cpp | 2 +- src/d/actor/d_a_npc_sola.cpp | 2 +- src/d/actor/d_a_npc_soldierA.cpp | 2 +- src/d/actor/d_a_npc_soldierB.cpp | 2 +- src/d/actor/d_a_npc_sq.cpp | 4 +- src/d/actor/d_a_npc_taro.cpp | 4 +- src/d/actor/d_a_npc_the.cpp | 4 +- src/d/actor/d_a_npc_theB.cpp | 4 +- src/d/actor/d_a_npc_tk.cpp | 2 +- src/d/actor/d_a_npc_tkc.cpp | 4 +- src/d/actor/d_a_npc_tkj.cpp | 4 +- src/d/actor/d_a_npc_tkj2.cpp | 6 +- src/d/actor/d_a_npc_tks.cpp | 6 +- src/d/actor/d_a_npc_toby.cpp | 4 +- src/d/actor/d_a_npc_uri.cpp | 4 +- src/d/actor/d_a_npc_wrestler.cpp | 4 +- src/d/actor/d_a_npc_yamid.cpp | 4 +- src/d/actor/d_a_npc_yamis.cpp | 4 +- src/d/actor/d_a_npc_yamit.cpp | 4 +- src/d/actor/d_a_npc_yelia.cpp | 4 +- src/d/actor/d_a_npc_ykm.cpp | 8 +- src/d/actor/d_a_npc_ykw.cpp | 4 +- src/d/actor/d_a_npc_zanb.cpp | 4 +- src/d/actor/d_a_npc_zant.cpp | 2 +- src/d/actor/d_a_npc_zelR.cpp | 4 +- src/d/actor/d_a_npc_zelRo.cpp | 4 +- src/d/actor/d_a_npc_zelda.cpp | 4 +- src/d/actor/d_a_npc_zra.cpp | 4 +- src/d/actor/d_a_npc_zrc.cpp | 4 +- src/d/actor/d_a_npc_zrz.cpp | 4 +- src/d/actor/d_a_obj_Turara.cpp | 2 +- src/d/actor/d_a_obj_ari.cpp | 6 +- src/d/actor/d_a_obj_automata.cpp | 2 +- src/d/actor/d_a_obj_avalanche.cpp | 4 +- src/d/actor/d_a_obj_batta.cpp | 6 +- src/d/actor/d_a_obj_bed.cpp | 2 +- src/d/actor/d_a_obj_bemos.cpp | 12 +- src/d/actor/d_a_obj_bk_leaf.cpp | 2 +- src/d/actor/d_a_obj_bky_rock.cpp | 2 +- src/d/actor/d_a_obj_bosswarp.cpp | 4 +- src/d/actor/d_a_obj_brakeeff.cpp | 4 +- src/d/actor/d_a_obj_brg.cpp | 2 +- src/d/actor/d_a_obj_cb.cpp | 2 +- src/d/actor/d_a_obj_cblock.cpp | 2 +- src/d/actor/d_a_obj_cho.cpp | 6 +- src/d/actor/d_a_obj_cwall.cpp | 2 +- src/d/actor/d_a_obj_dan.cpp | 8 +- src/d/actor/d_a_obj_dmelevator.cpp | 2 +- src/d/actor/d_a_obj_enemy_create.cpp | 4 +- src/d/actor/d_a_obj_fan.cpp | 2 +- src/d/actor/d_a_obj_firepillar2.cpp | 4 +- src/d/actor/d_a_obj_fmobj.cpp | 2 +- src/d/actor/d_a_obj_fw.cpp | 2 +- src/d/actor/d_a_obj_ganonwall.cpp | 2 +- src/d/actor/d_a_obj_ganonwall2.cpp | 2 +- src/d/actor/d_a_obj_gb.cpp | 6 +- src/d/actor/d_a_obj_gra2.cpp | 2 +- src/d/actor/d_a_obj_hakai_ftr.cpp | 2 +- src/d/actor/d_a_obj_iceblock.cpp | 2 +- src/d/actor/d_a_obj_iceleaf.cpp | 2 +- src/d/actor/d_a_obj_ihasi.cpp | 4 +- src/d/actor/d_a_obj_kabuto.cpp | 6 +- src/d/actor/d_a_obj_kag.cpp | 6 +- src/d/actor/d_a_obj_kamakiri.cpp | 6 +- src/d/actor/d_a_obj_katatsumuri.cpp | 6 +- src/d/actor/d_a_obj_kbox.cpp | 2 +- src/d/actor/d_a_obj_keyhole.cpp | 2 +- src/d/actor/d_a_obj_kgate.cpp | 2 +- src/d/actor/d_a_obj_ki.cpp | 4 +- src/d/actor/d_a_obj_kita.cpp | 2 +- src/d/actor/d_a_obj_klift00.cpp | 8 +- src/d/actor/d_a_obj_kshutter.cpp | 2 +- src/d/actor/d_a_obj_kuwagata.cpp | 6 +- src/d/actor/d_a_obj_kwheel01.cpp | 2 +- src/d/actor/d_a_obj_laundry.cpp | 2 +- src/d/actor/d_a_obj_lbox.cpp | 2 +- src/d/actor/d_a_obj_lv3WaterB.cpp | 6 +- src/d/actor/d_a_obj_lv3saka00.cpp | 2 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 12 +- src/d/actor/d_a_obj_lv4sand.cpp | 2 +- src/d/actor/d_a_obj_lv6SwGate.cpp | 2 +- src/d/actor/d_a_obj_lv6SzGate.cpp | 2 +- src/d/actor/d_a_obj_lv6Tenbin.cpp | 2 +- src/d/actor/d_a_obj_lv6bemos.cpp | 6 +- src/d/actor/d_a_obj_lv6bemos2.cpp | 10 +- src/d/actor/d_a_obj_lv7bridge.cpp | 4 +- src/d/actor/d_a_obj_magne_arm.cpp | 12 +- src/d/actor/d_a_obj_maki.cpp | 2 +- src/d/actor/d_a_obj_mhole.cpp | 6 +- src/d/actor/d_a_obj_mirror_6pole.cpp | 2 +- src/d/actor/d_a_obj_mirror_chain.cpp | 10 +- src/d/actor/d_a_obj_mirror_sand.cpp | 2 +- src/d/actor/d_a_obj_mirror_table.cpp | 10 +- src/d/actor/d_a_obj_movebox.cpp | 2 +- src/d/actor/d_a_obj_msima.cpp | 6 +- src/d/actor/d_a_obj_myogan.cpp | 6 +- src/d/actor/d_a_obj_nagaisu.cpp | 2 +- src/d/actor/d_a_obj_nan.cpp | 6 +- src/d/actor/d_a_obj_octhashi.cpp | 2 +- src/d/actor/d_a_obj_onsen.cpp | 2 +- src/d/actor/d_a_obj_ornament_cloth.cpp | 2 +- src/d/actor/d_a_obj_pdwall.cpp | 2 +- src/d/actor/d_a_obj_picture.cpp | 4 +- src/d/actor/d_a_obj_poTbox.cpp | 2 +- src/d/actor/d_a_obj_rgate.cpp | 2 +- src/d/actor/d_a_obj_rope_bridge.cpp | 4 +- src/d/actor/d_a_obj_rotBridge.cpp | 2 +- src/d/actor/d_a_obj_rotTrap.cpp | 2 +- src/d/actor/d_a_obj_rstair.cpp | 4 +- src/d/actor/d_a_obj_sakuita_rope.cpp | 8 +- src/d/actor/d_a_obj_scannon.cpp | 6 +- src/d/actor/d_a_obj_scannon_crs.cpp | 2 +- src/d/actor/d_a_obj_scannon_ten.cpp | 2 +- src/d/actor/d_a_obj_sekizoa.cpp | 6 +- src/d/actor/d_a_obj_smw_stone.cpp | 2 +- src/d/actor/d_a_obj_so.cpp | 2 +- src/d/actor/d_a_obj_ss_drink.cpp | 4 +- src/d/actor/d_a_obj_sw.cpp | 2 +- src/d/actor/d_a_obj_swBallA.cpp | 2 +- src/d/actor/d_a_obj_swBallB.cpp | 2 +- src/d/actor/d_a_obj_swBallC.cpp | 2 +- src/d/actor/d_a_obj_swchain.cpp | 2 +- src/d/actor/d_a_obj_swhang.cpp | 4 +- src/d/actor/d_a_obj_swpush.cpp | 2 +- src/d/actor/d_a_obj_swpush2.cpp | 12 +- src/d/actor/d_a_obj_swpush5.cpp | 2 +- src/d/actor/d_a_obj_swspinner.cpp | 2 +- src/d/actor/d_a_obj_syRock.cpp | 2 +- src/d/actor/d_a_obj_takaraDai.cpp | 2 +- src/d/actor/d_a_obj_ten.cpp | 6 +- src/d/actor/d_a_obj_thashi.cpp | 6 +- src/d/actor/d_a_obj_tks.cpp | 4 +- src/d/actor/d_a_obj_toaru_maki.cpp | 2 +- src/d/actor/d_a_obj_toby.cpp | 2 +- src/d/actor/d_a_obj_tobyhouse.cpp | 2 +- src/d/actor/d_a_obj_tombo.cpp | 6 +- src/d/actor/d_a_obj_tp.cpp | 10 +- src/d/actor/d_a_obj_udoor.cpp | 2 +- src/d/actor/d_a_obj_usaku.cpp | 2 +- src/d/actor/d_a_obj_vground.cpp | 4 +- src/d/actor/d_a_obj_volcbom.cpp | 10 +- src/d/actor/d_a_obj_warp_kbrg.cpp | 8 +- src/d/actor/d_a_obj_warp_obrg.cpp | 4 +- src/d/actor/d_a_obj_web0.cpp | 4 +- src/d/actor/d_a_obj_web1.cpp | 4 +- src/d/actor/d_a_obj_wflag.cpp | 6 +- src/d/actor/d_a_obj_wind_stone.cpp | 2 +- src/d/actor/d_a_obj_window.cpp | 2 +- src/d/actor/d_a_obj_yousei.cpp | 2 +- src/d/actor/d_a_obj_ystone.cpp | 6 +- src/d/actor/d_a_obj_zrTurara.cpp | 2 +- src/d/actor/d_a_passer_mng.cpp | 6 +- src/d/actor/d_a_peru.cpp | 4 +- src/d/actor/d_a_player.cpp | 12 +- src/d/actor/d_a_skip_2D.cpp | 2 +- src/d/actor/d_a_sq.cpp | 4 +- src/d/actor/d_a_tag_Lv6Gate.cpp | 4 +- src/d/actor/d_a_tag_Lv7Gate.cpp | 2 +- src/d/actor/d_a_tag_Lv8Gate.cpp | 2 +- src/d/actor/d_a_tag_TWgate.cpp | 2 +- src/d/actor/d_a_tag_csw.cpp | 10 +- src/d/actor/d_a_tag_msg.cpp | 2 +- src/d/actor/d_a_tag_statue_evt.cpp | 4 +- src/d/actor/d_a_tbox.cpp | 6 +- src/d/actor/d_a_tbox2.cpp | 4 +- src/d/actor/d_a_title.cpp | 10 +- src/d/actor/d_a_warp_bug.cpp | 4 +- src/d/d_attention.cpp | 2 +- src/d/d_bg_parts.cpp | 16 +- src/d/d_bg_s_movebg_actor.cpp | 2 +- src/d/d_bg_w.cpp | 14 +- src/d/d_bg_w_sv.cpp | 2 +- src/d/d_bright_check.cpp | 8 +- src/d/d_camera.cpp | 2 +- src/d/d_com_inf_game.cpp | 10 +- src/d/d_debug_camera.cpp | 2 +- src/d/d_debug_viewer.cpp | 28 +- src/d/d_demo.cpp | 58 ++-- src/d/d_drawlist.cpp | 10 +- src/d/d_file_sel_info.cpp | 12 +- src/d/d_file_sel_warning.cpp | 14 +- src/d/d_file_select.cpp | 246 ++++++++--------- src/d/d_gameover.cpp | 22 +- src/d/d_home_button.cpp | 2 +- src/d/d_jcam_editor.cpp | 20 +- src/d/d_jpreviewer.cpp | 20 +- src/d/d_k_wmark.cpp | 2 +- src/d/d_k_wpillar.cpp | 2 +- src/d/d_kankyo.cpp | 2 +- src/d/d_kankyo_rain.cpp | 4 +- src/d/d_kankyo_wether.cpp | 60 ++-- src/d/d_kantera_icon_meter.cpp | 16 +- src/d/d_ky_thunder.cpp | 2 +- src/d/d_map.cpp | 12 +- src/d/d_map_path.cpp | 8 +- src/d/d_map_path_dmap.cpp | 2 +- src/d/d_map_path_fmap.cpp | 4 +- src/d/d_menu_collect.cpp | 106 +++---- src/d/d_menu_dmap.cpp | 148 +++++----- src/d/d_menu_dmap_map.cpp | 8 +- src/d/d_menu_fishing.cpp | 50 ++-- src/d/d_menu_fmap.cpp | 36 +-- src/d/d_menu_fmap2D.cpp | 136 ++++----- src/d/d_menu_fmap_map.cpp | 8 +- src/d/d_menu_insect.cpp | 60 ++-- src/d/d_menu_item_explain.cpp | 66 ++--- src/d/d_menu_letter.cpp | 96 +++---- src/d/d_menu_map_common.cpp | 56 ++-- src/d/d_menu_option.cpp | 170 ++++++------ src/d/d_menu_quit.cpp | 4 +- src/d/d_menu_ring.cpp | 74 ++--- src/d/d_menu_save.cpp | 124 ++++----- src/d/d_menu_skill.cpp | 54 ++-- src/d/d_menu_window.cpp | 88 +++--- src/d/d_meter2.cpp | 44 +-- src/d/d_meter2_draw.cpp | 258 +++++++++--------- src/d/d_meter_HIO.cpp | 16 +- src/d/d_meter_button.cpp | 142 +++++----- src/d/d_meter_haihai.cpp | 14 +- src/d/d_meter_hakusha.cpp | 28 +- src/d/d_meter_map.cpp | 8 +- src/d/d_meter_string.cpp | 18 +- src/d/d_model.cpp | 4 +- src/d/d_msg_class.cpp | 4 +- src/d/d_msg_object.cpp | 54 ++-- src/d/d_msg_out_font.cpp | 8 +- src/d/d_msg_scrn_3select.cpp | 78 +++--- src/d/d_msg_scrn_arrow.cpp | 20 +- src/d/d_msg_scrn_boss.cpp | 20 +- src/d/d_msg_scrn_explain.cpp | 68 ++--- src/d/d_msg_scrn_howl.cpp | 56 ++-- src/d/d_msg_scrn_item.cpp | 72 ++--- src/d/d_msg_scrn_jimaku.cpp | 32 +-- src/d/d_msg_scrn_kanban.cpp | 32 +-- src/d/d_msg_scrn_light.cpp | 12 +- src/d/d_msg_scrn_place.cpp | 20 +- src/d/d_msg_scrn_staff.cpp | 12 +- src/d/d_msg_scrn_talk.cpp | 82 +++--- src/d/d_msg_scrn_tree.cpp | 34 +-- src/d/d_msg_string.cpp | 6 +- src/d/d_msg_string_base.cpp | 24 +- src/d/d_name.cpp | 28 +- src/d/d_ovlp_fade2.cpp | 2 +- src/d/d_ovlp_fade3.cpp | 2 +- src/d/d_particle.cpp | 12 +- src/d/d_resorce.cpp | 16 +- src/d/d_s_logo.cpp | 50 ++-- src/d/d_s_menu.cpp | 10 +- src/d/d_s_name.cpp | 10 +- src/d/d_s_play.cpp | 2 +- src/d/d_s_room.cpp | 2 +- src/d/d_scope.cpp | 20 +- src/d/d_select_cursor.cpp | 38 +-- src/d/d_shop_system.cpp | 8 +- src/d/d_stage.cpp | 4 +- src/d/d_timer.cpp | 54 ++-- src/d/d_tresure.cpp | 2 +- src/dolphin/os/OSMutex.cpp | 4 +- src/dolphin/os/OSThread.cpp | 4 +- src/f_ap/f_ap_game.cpp | 2 +- src/m_Do/m_Do_controller_pad.cpp | 10 +- src/m_Do/m_Do_dvd_thread.cpp | 24 +- src/m_Do/m_Do_ext.cpp | 56 ++-- src/m_Do/m_Do_ext2.cpp | 4 +- src/m_Do/m_Do_graphic.cpp | 2 +- src/m_Do/m_Do_machine.cpp | 2 +- src/revolution/homebuttonLib/HBMBase.cpp | 30 +- .../homebuttonLib/HBMGUIManager.cpp | 24 +- .../nw4hbm/lyt/lyt_animation.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_group.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_layout.cpp | 6 +- .../homebuttonLib/nw4hbm/lyt/lyt_picture.cpp | 2 +- .../homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp | 4 +- .../homebuttonLib/nw4hbm/lyt/lyt_window.cpp | 4 +- .../homebuttonLib/nw4hbm/snd/InstancePool.h | 2 +- .../nw4hbm/snd/SoundInstanceManager.h | 4 +- 634 files changed, 3451 insertions(+), 3350 deletions(-) diff --git a/include/JSystem/J2DGraph/J2DAnimation.h b/include/JSystem/J2DGraph/J2DAnimation.h index c1408a898d..9110144806 100644 --- a/include/JSystem/J2DGraph/J2DAnimation.h +++ b/include/JSystem/J2DGraph/J2DAnimation.h @@ -1,13 +1,14 @@ #ifndef J2DANIMATION_H #define J2DANIMATION_H -#include "JSystem/JMath/JMath.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JMath/JMath.h" +#include "JSystem/JUtility/JUTPalette.h" typedef struct _GXColor GXColor; typedef struct _GXColorS10 GXColorS10; class J2DScreen; -class JUTPalette; struct ResTIMG; enum J2DAnmKind { @@ -286,7 +287,7 @@ public: mPalette = NULL; } ~J2DAnmTexPatternTIMGPointer() { - delete mPalette; + JKR_DELETE(mPalette); } /* 0x0 */ ResTIMG* mRes; @@ -306,7 +307,7 @@ public: ResTIMG* getResTIMG(u16) const; JUTPalette* getPalette(u16) const; - virtual ~J2DAnmTexPattern() { delete[] mTIMGPtrArray; } + virtual ~J2DAnmTexPattern() { JKR_DELETE_ARRAY(mTIMGPtrArray); } virtual void searchUpdateMaterialID(J2DScreen*); u16 getUpdateMaterialNum() const { return mUpdateMaterialNum; } u16 getUpdateMaterialID(u16 i) const { diff --git a/include/JSystem/JAHostIO/JAHPubDefine.h b/include/JSystem/JAHostIO/JAHPubDefine.h index b67d462bc5..d2b0e6924a 100644 --- a/include/JSystem/JAHostIO/JAHPubDefine.h +++ b/include/JSystem/JAHostIO/JAHPubDefine.h @@ -1,6 +1,7 @@ #ifndef JAHPUBDEFINE_H #define JAHPUBDEFINE_H +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" template @@ -12,7 +13,7 @@ public: static T* newInstance() { JUT_ASSERT(82, sInstance==NULL); if (!sInstance) { - sInstance = new T(); + sInstance = JKR_NEW T(); } JUT_ASSERT(85, sInstance!=NULL); return sInstance; diff --git a/include/JSystem/JAudio2/JASHeapCtrl.h b/include/JSystem/JAudio2/JASHeapCtrl.h index 05a97838b9..91b4f221cb 100644 --- a/include/JSystem/JAudio2/JASHeapCtrl.h +++ b/include/JSystem/JAudio2/JASHeapCtrl.h @@ -209,12 +209,12 @@ public: return true; } MemoryChunk* pMVar4 = field_0x18; - field_0x18 = new (JASKernel::getSystemHeap(), 0) MemoryChunk(pMVar4); + field_0x18 = JKR_NEW_ARGS (JASKernel::getSystemHeap(), 0) MemoryChunk(pMVar4); if (field_0x18 != NULL) { return true; } JUT_WARN(428, "%s", "Not enough JASSystemHeap"); - field_0x18 = new (JKRHeap::getSystemHeap(), 0) MemoryChunk(pMVar4); + field_0x18 = JKR_NEW_ARGS (JKRHeap::getSystemHeap(), 0) MemoryChunk(pMVar4); if (field_0x18 != NULL) { return true; } @@ -246,7 +246,7 @@ public: bool r26 = false; if (chunk != field_0x18 && chunk->isEmpty()) { MemoryChunk* nextChunk = chunk->getNextChunk(); - delete chunk; + JKR_DELETE(chunk); prevChunk->setNextChunk(nextChunk); } return; @@ -283,6 +283,12 @@ namespace JASKernel { template class JASPoolAllocObject { public: +#if TARGET_PC + static void* operator new(size_t n, JKRHeapToken) { + return operator new(n); + } +#endif + static void* operator new(size_t n) { #if PLATFORM_GCN JASMemPool& memPool_ = getMemPool_(); @@ -292,6 +298,13 @@ public: static void* operator new(size_t n, void* ptr) { return ptr; } + +#if TARGET_PC + static void operator delete(void* ptr, size_t n, JKRHeapToken) { + operator delete(ptr, n); + } +#endif + static void operator delete(void* ptr, size_t n) { #if PLATFORM_GCN JASMemPool& memPool_ = getMemPool_(); @@ -362,6 +375,12 @@ public: template class JASPoolAllocObject_MultiThreaded { public: +#if TARGET_PC + static void* operator new(size_t n, JKRHeapToken) { + return operator new(n); + } +#endif + static void* operator new(size_t n) { #if PLATFORM_GCN JASMemPool_MultiThreaded& memPool_ = getMemPool(); @@ -371,6 +390,13 @@ public: static void* operator new(size_t n, void* ptr) { return ptr; } + +#if TARGET_PC + static void operator delete(void* ptr, size_t n, JKRHeapToken) { + return operator delete(ptr, n); + } +#endif + static void operator delete(void* ptr, size_t n) { #if PLATFORM_GCN JASMemPool_MultiThreaded& memPool_ = getMemPool(); diff --git a/include/JSystem/JGadget/pointer.h b/include/JSystem/JGadget/pointer.h index 9ea7c3af7d..6ed4fd57c2 100644 --- a/include/JSystem/JGadget/pointer.h +++ b/include/JSystem/JGadget/pointer.h @@ -1,6 +1,8 @@ #ifndef POINTER_H #define POINTER_H +#include "JSystem/JKernel/JKRHeap.h" + namespace JGadget { template @@ -18,12 +20,12 @@ public: #ifdef __MWERKS__ TPointer_delete(T* ptr) : TPointer(ptr) {} ~TPointer_delete() { - delete mPtr; + JKR_DELETE(mPtr); } #else TPointer_delete(T* ptr) : TPointer(ptr) {} ~TPointer_delete() { - delete this->mPtr; + JKR_DELETE(this->mPtr); } #endif }; diff --git a/include/JSystem/JGadget/std-memory.h b/include/JSystem/JGadget/std-memory.h index f9cccd9c7b..540f96d5a5 100644 --- a/include/JSystem/JGadget/std-memory.h +++ b/include/JSystem/JGadget/std-memory.h @@ -2,6 +2,7 @@ #define STD_MEMORY_H #include "JSystem/JUtility/JUTAssert.h" +#include "JSystem/JKernel/JKRHeap.h" namespace JGadget { template @@ -19,12 +20,12 @@ struct TAllocator { } void DeallocateRaw(void* mem) { - delete mem; + JKR_DELETE(mem); } void construct(T* p, const T& other) { JUT_ASSERT(67, p!=NULL); - new(p) T(other); + JKR_NEW_ARGS(p) T(other); } void destroy(T* p) { diff --git a/include/JSystem/JHostIO/JOREntry.h b/include/JSystem/JHostIO/JOREntry.h index da1ec2e68c..b28ef64ff5 100644 --- a/include/JSystem/JHostIO/JOREntry.h +++ b/include/JSystem/JHostIO/JOREntry.h @@ -4,7 +4,9 @@ #include "JSystem/JHostIO/JHIComm.h" #include -template +#include "JSystem/JKernel/JKRHeap.h" + +template class JHIpvector { public: JHIpvector() { m_size = 0; } @@ -89,7 +91,7 @@ public: static JHIComPortManager* create() { if (instance == NULL) { - instance = new JHIComPortManager(); + instance = JKR_NEW JHIComPortManager(); } return instance; diff --git a/include/JSystem/JKernel/JKRAramHeap.h b/include/JSystem/JKernel/JKRAramHeap.h index 034a90c3eb..403c4887d6 100644 --- a/include/JSystem/JKernel/JKRAramHeap.h +++ b/include/JSystem/JKernel/JKRAramHeap.h @@ -5,9 +5,11 @@ #include "JSystem/JKernel/JKRDisposer.h" #include +#include "JKRHeap.h" + /** * @ingroup jsystem-jkernel - * + * */ class JKRAramHeap : public JKRDisposer { public: @@ -30,7 +32,7 @@ public: u32 getUsedSize(u8); void dump(); void free(JKRAramBlock *block) { - delete block; + JKR_DELETE(block); } u8 getCurrentGroupID() const { return mGroupId; } diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h index 8faac9222c..1157ecb676 100644 --- a/include/JSystem/JKernel/JKRHeap.h +++ b/include/JSystem/JKernel/JKRHeap.h @@ -210,15 +210,45 @@ public: static JKRErrorHandler mErrorHandler; }; -void* operator new(size_t size); -void* operator new(size_t size, int alignment); -void* operator new(size_t size, JKRHeap* heap, int alignment); +#if TARGET_PC +enum class JKRHeapToken { + Dummy +}; -void* operator new[](size_t size); -void* operator new[](size_t size, int alignment); -void* operator new[](size_t size, JKRHeap* heap, int alignment); +inline void* operator new(size_t, JKRHeapToken, void* where) { + return where; +} -void operator delete(void* ptr); +template +void jkrDelete(T* ptr) { + ptr->~T(); + operator delete(ptr, JKRHeapToken::Dummy); +} + +#define JKR_NEW new (JKRHeapToken::Dummy) +#define JKR_NEW_ARGS(...) new (JKRHeapToken::Dummy, __VA_ARGS__ ) +#define JKR_DELETE(expr) jkrDelete(expr) +#define JKR_DELETE_ARRAY(expr) delete[] (expr) +#define JKR_HEAP_TOKEN , JKRHeapToken::Dummy +#define JKR_HEAP_TOKEN_PARAM , JKRHeapToken +#else +#define JKR_NEW new +#define JKR_NEW_ARGS(...) new (__VA_ARGS__ ) +#define JKR_DELETE(expr) delete (expr) +#define JKR_DELETE_ARRAY(expr) delete[] (expr) +#define JKR_HEAP_TOKEN +#define JKR_HEAP_TOKEN_PARAM +#endif + +void* operator new(size_t size JKR_HEAP_TOKEN_PARAM); +void* operator new(size_t size JKR_HEAP_TOKEN_PARAM, int alignment); +void* operator new(size_t size JKR_HEAP_TOKEN_PARAM, JKRHeap* heap, int alignment); + +void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM); +void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM, int alignment); +void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM, JKRHeap* heap, int alignment); + +void operator delete(void* ptr JKR_HEAP_TOKEN_PARAM); void operator delete[](void* ptr); void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment); diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h index a41df62dd3..c2a2a8164a 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -16,7 +16,7 @@ struct TCreateObject { template static typename AdaptorT::ObjectType* createFromAdaptor(JStudio::stb::data::TParse_TBlock_object const& param_1, AdaptorT* param_2) { - typename AdaptorT::ObjectType* rv = new typename AdaptorT::ObjectType(param_1, param_2); + typename AdaptorT::ObjectType* rv = JKR_NEW typename AdaptorT::ObjectType(param_1, param_2); if (rv == NULL) { return NULL; } diff --git a/include/JSystem/JStudio/JStudio/jstudio-object.h b/include/JSystem/JStudio/JStudio/jstudio-object.h index 9f743d6360..1f2f95fc0e 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-object.h +++ b/include/JSystem/JStudio/JStudio/jstudio-object.h @@ -133,7 +133,7 @@ public: template T* createFromAdaptor(const stb::data::TParse_TBlock_object& param_0, T* param_1) { - T* n = new T(param_0, param_1); + T* n = JKR_NEW T(param_0, param_1); if (n == NULL) { return NULL; diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h index 1b41039866..e9258277ea 100644 --- a/include/JSystem/JStudio/JStudio_JStage/control.h +++ b/include/JSystem/JStudio/JStudio_JStage/control.h @@ -321,7 +321,7 @@ template JStudio::TObject* createObject_JSG_(const JStudio::stb::data::TParse_TBlock_object& param_1, JStage::TObject* param_2, const JStage::TSystem* param_3) { ObjectT* objt = (ObjectT*)param_2; - AdaptorT* pAdaptor = new AdaptorT(param_3, objt); + AdaptorT* pAdaptor = JKR_NEW AdaptorT(param_3, objt); if (pAdaptor == NULL) { return NULL; } diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h index 8e550a4737..b35e432133 100644 --- a/include/JSystem/JUtility/JUTGraphFifo.h +++ b/include/JSystem/JUtility/JUTGraphFifo.h @@ -3,10 +3,12 @@ #include +#include "JSystem/JKernel/JKRHeap.h" + /** -* @ingroup jsystem-jutility -* -*/ + * @ingroup jsystem-jutility + * + */ class JUTGraphFifo { public: JUTGraphFifo(u32); @@ -36,6 +38,6 @@ private: /* 0x10 */ u8 field_0x10[0xC]; }; -inline JUTGraphFifo* JUTCreateFifo(u32 bufSize) { return new JUTGraphFifo(bufSize); } +inline JUTGraphFifo* JUTCreateFifo(u32 bufSize) { return JKR_NEW JUTGraphFifo(bufSize); } #endif /* JUTGRAPHFIFO_H */ diff --git a/include/d/actor/d_a_formation_mng.h b/include/d/actor/d_a_formation_mng.h index 6555baeaac..79163f9cec 100644 --- a/include/d/actor/d_a_formation_mng.h +++ b/include/d/actor/d_a_formation_mng.h @@ -146,8 +146,8 @@ struct daFmtMng_c : public fopAc_ac_c { for (int i = 0; i < mFormationLine * mFormationRow; i++, member++) { fopAcM_delete(member->mNpcId); } - delete [] mPos; - delete [] mMember; + JKR_DELETE_ARRAY(mPos); + JKR_DELETE_ARRAY(mMember); } int getTimeHour() { diff --git a/include/d/actor/d_a_npc.h b/include/d/actor/d_a_npc.h index 471ed5a72a..658d9a7a44 100644 --- a/include/d/actor/d_a_npc.h +++ b/include/d/actor/d_a_npc.h @@ -814,7 +814,7 @@ STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40); #define daNpcT_ct(ptr, ClassName, faceMotionAnmData, motionAnmData, faceMotionSequenceData, faceMotionStepNum, motionSequenceData, motionStepNum, evtData, arcNames) \ if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ - new (ptr) ClassName(faceMotionAnmData, motionAnmData, faceMotionSequenceData, faceMotionStepNum, motionSequenceData, motionStepNum, evtData, arcNames); \ + JKR_NEW_ARGS (ptr) ClassName(faceMotionAnmData, motionAnmData, faceMotionSequenceData, faceMotionStepNum, motionSequenceData, motionStepNum, evtData, arcNames); \ fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ } diff --git a/include/d/actor/d_a_npc_fairy.h b/include/d/actor/d_a_npc_fairy.h index 3ab5901281..139555950a 100644 --- a/include/d/actor/d_a_npc_fairy.h +++ b/include/d/actor/d_a_npc_fairy.h @@ -51,7 +51,7 @@ public: } ~_Fairy_Feather_c() { if (mpMorf != NULL) { - delete mpMorf; + JKR_DELETE(mpMorf); mpMorf = NULL; } } diff --git a/include/d/actor/d_a_passer_mng.h b/include/d/actor/d_a_passer_mng.h index f0ee36903f..0f40c13e67 100644 --- a/include/d/actor/d_a_passer_mng.h +++ b/include/d/actor/d_a_passer_mng.h @@ -22,7 +22,7 @@ public: int getLuggageParamHigh(u32); int create(); void create_init(); - ~daPasserMng_c() { delete [] childProcIds; } + ~daPasserMng_c() { JKR_DELETE_ARRAY(childProcIds); } u8 getDetailLevel() { return argument; } u8 getPathID() { return fopAcM_GetParam(this); } diff --git a/include/d/d_file_select.h b/include/d/d_file_select.h index db10b927e2..dc6b4074d5 100644 --- a/include/d/d_file_select.h +++ b/include/d/d_file_select.h @@ -15,8 +15,8 @@ class dDlst_FileSel_c : public dDlst_base_c { public: void draw(); virtual ~dDlst_FileSel_c() { - delete Scr; - delete mMessageString; + JKR_DELETE(Scr); + JKR_DELETE(mMessageString); } dDlst_FileSel_c() { @@ -26,7 +26,7 @@ public: font[1] = mDoExt_getSubFont(); JUT_ASSERT(107, font[1] != NULL); - mMessageString = new dMsgString_c(); + mMessageString = JKR_NEW dMsgString_c(); JUT_ASSERT(110, mMessageString != NULL); } @@ -78,7 +78,7 @@ public: class dDlst_FileSelYn_c : public dDlst_base_c { public: void draw(); - virtual ~dDlst_FileSelYn_c() { delete ScrYn; } + virtual ~dDlst_FileSelYn_c() { JKR_DELETE(ScrYn); } /* 0x04 */ J2DScreen* ScrYn; /* 0x08 */ u8 field_0x08[4]; @@ -87,7 +87,7 @@ public: class dDlst_FileSelDt_c : public dDlst_base_c { public: void draw(); - virtual ~dDlst_FileSelDt_c() { delete ScrDt; } + virtual ~dDlst_FileSelDt_c() { JKR_DELETE(ScrDt); } /* 0x04 */ J2DScreen* ScrDt; /* 0x08 */ J2DPane* mpPane; @@ -97,7 +97,7 @@ public: class dDlst_FileSelCp_c : public dDlst_base_c { public: void draw(); - virtual ~dDlst_FileSelCp_c() { delete Scr; } + virtual ~dDlst_FileSelCp_c() { JKR_DELETE(Scr); } /* 0x04 */ J2DScreen* Scr; /* 0x08 */ bool isShow; @@ -108,7 +108,7 @@ public: class dDlst_FileSel3m_c : public dDlst_base_c { public: void draw(); - virtual ~dDlst_FileSel3m_c() { delete Scr3m; } + virtual ~dDlst_FileSel3m_c() { JKR_DELETE(Scr3m); } /* 0x04 */ J2DScreen* Scr3m; }; diff --git a/include/d/d_map_path_fmap.h b/include/d/d_map_path_fmap.h index 8aab7b32d6..582e92dfcd 100644 --- a/include/d/d_map_path_fmap.h +++ b/include/d/d_map_path_fmap.h @@ -14,7 +14,7 @@ public: ~fmpTresTypeGroupData_c() { if (mpNext != NULL) { - delete mpNext; + JKR_DELETE(mpNext); } } @@ -34,7 +34,7 @@ public: void addTypeGroupData(u8, dTres_c::data_s const*); ~fmpTresTypeGroupDataList_c() { if (mpTypeGroupDataHead != NULL) { - delete mpTypeGroupDataHead; + JKR_DELETE(mpTypeGroupDataHead); } } fmpTresTypeGroupDataList_c() { @@ -106,7 +106,7 @@ public: ~dMenu_Fmap_room_data_c() { if (mp_fmpTresTypeGroupDataListAll != NULL) { - delete mp_fmpTresTypeGroupDataListAll; + JKR_DELETE(mp_fmpTresTypeGroupDataListAll); } } diff --git a/include/f_ap/f_ap_game.h b/include/f_ap/f_ap_game.h index 79bbb1b24f..f0f6ac7c97 100644 --- a/include/f_ap/f_ap_game.h +++ b/include/f_ap/f_ap_game.h @@ -8,6 +8,8 @@ #include "CaptureScreen.h" #include +#include "JSystem/JKernel/JKRHeap.h" + void fapGm_After(); void fapGm_Create(); void fapGm_Execute(); @@ -28,7 +30,7 @@ public: static void executeCaptureScreen() {} static void createCaptureScreen() { - mCaptureScreen = new CaptureScreen(JFWDisplay::getManager()); + mCaptureScreen = JKR_NEW CaptureScreen(JFWDisplay::getManager()); JUT_ASSERT(46, mCaptureScreen != NULL); } diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h index 868671d2d8..33bc72dee3 100644 --- a/include/f_op/f_op_actor_mng.h +++ b/include/f_op/f_op_actor_mng.h @@ -14,7 +14,7 @@ #define fopAcM_ct(ptr, ClassName) \ if (!fopAcM_CheckCondition(ptr, fopAcCnd_INIT_e)) { \ - new (ptr) ClassName(); \ + JKR_NEW_ARGS (ptr) ClassName(); \ fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \ } diff --git a/include/m_Do/m_Do_dvd_thread.h b/include/m_Do/m_Do_dvd_thread.h index ad053bd051..6703c3aa5a 100644 --- a/include/m_Do/m_Do_dvd_thread.h +++ b/include/m_Do/m_Do_dvd_thread.h @@ -1,9 +1,9 @@ #ifndef M_DO_M_DO_DVD_THREAD_H #define M_DO_M_DO_DVD_THREAD_H +#include #include "JSystem/JKernel/JKRArchive.h" -#include -#include +#include "JSystem/JKernel/JKRHeap.h" #include "f_pc/f_pc_node.h" #define mDoDvd_MOUNT_DIRECTION_HEAD 0 @@ -23,7 +23,7 @@ public: virtual ~mDoDvdThd_command_c(); mDoDvdThd_command_c(); inline s32 sync() { return mIsDone; } - inline void destroy() { delete this; } + inline void destroy() { JKR_DELETE(this); } virtual s32 execute() = 0; }; // Size = 0x14 diff --git a/src/JSystem/J2DGraph/J2DAnimation.cpp b/src/JSystem/J2DGraph/J2DAnimation.cpp index bf19ea1546..df91ec4fc8 100644 --- a/src/JSystem/J2DGraph/J2DAnimation.cpp +++ b/src/JSystem/J2DGraph/J2DAnimation.cpp @@ -584,8 +584,8 @@ void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) { mUpdateMaterialID[entry] = 0xFFFF; } } - delete[] mTIMGPtrArray; - mTIMGPtrArray = new J2DAnmTexPatternTIMGPointer[pScreen->mTexRes->mCount]; + JKR_DELETE_ARRAY(mTIMGPtrArray); + mTIMGPtrArray = JKR_NEW J2DAnmTexPatternTIMGPointer[pScreen->mTexRes->mCount]; if (mTIMGPtrArray != NULL) { JUTResReference resRef; for (u16 i = 0; i < pScreen->mTexRes->mCount; i++) { @@ -600,7 +600,7 @@ void J2DAnmTexPattern::searchUpdateMaterialID(J2DScreen* pScreen) { } mTIMGPtrArray[i].mRes = var2; if (var2 != NULL && var2->indexTexture) { - mTIMGPtrArray[i].mPalette = new JUTPalette( + mTIMGPtrArray[i].mPalette = JKR_NEW JUTPalette( GX_TLUT0, GXTlutFmt(var2->colorFormat), JUTTransparency(var2->alphaEnabled), diff --git a/src/JSystem/J2DGraph/J2DAnmLoader.cpp b/src/JSystem/J2DGraph/J2DAnmLoader.cpp index 46c6764684..249a31be44 100644 --- a/src/JSystem/J2DGraph/J2DAnmLoader.cpp +++ b/src/JSystem/J2DGraph/J2DAnmLoader.cpp @@ -17,13 +17,13 @@ J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) { switch (hdr->mType) { case 'bck1': { J2DAnmKeyLoader_v15 loader; - loader.mpResource = new J2DAnmTransformKey(); + loader.mpResource = JKR_NEW J2DAnmTransformKey(); return (J2DAnmBase*)loader.load(p_data); break; } case 'bpk1': { J2DAnmKeyLoader_v15 loader; - loader.mpResource = new J2DAnmColorKey(); + loader.mpResource = JKR_NEW J2DAnmColorKey(); return (J2DAnmBase*)loader.load(p_data); break; } @@ -32,42 +32,42 @@ J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) { return NULL; case 'btk1': { J2DAnmKeyLoader_v15 loader; - loader.mpResource = new J2DAnmTextureSRTKey(); + loader.mpResource = JKR_NEW J2DAnmTextureSRTKey(); return (J2DAnmBase*)loader.load(p_data); break; } case 'brk1': { J2DAnmKeyLoader_v15 loader; - loader.mpResource = new J2DAnmTevRegKey(); + loader.mpResource = JKR_NEW J2DAnmTevRegKey(); return (J2DAnmBase*)loader.load(p_data); break; } case 'bxk1': { J2DAnmKeyLoader_v15 loader; - loader.mpResource = new J2DAnmVtxColorKey(); + loader.mpResource = JKR_NEW J2DAnmVtxColorKey(); return (J2DAnmBase*)loader.load(p_data); break; } case 'bca1': { J2DAnmFullLoader_v15 loader; - loader.mpResource = new J2DAnmTransformFull(); + loader.mpResource = JKR_NEW J2DAnmTransformFull(); return (J2DAnmBase*)loader.load(p_data); break; } case 'bpa1': { J2DAnmFullLoader_v15 loader; - loader.mpResource = new J2DAnmColorFull(); + loader.mpResource = JKR_NEW J2DAnmColorFull(); return (J2DAnmBase*)loader.load(p_data); break; } case 'btp1': { J2DAnmFullLoader_v15 loader; - loader.mpResource = new J2DAnmTexPattern(); + loader.mpResource = JKR_NEW J2DAnmTexPattern(); return (J2DAnmBase*)loader.load(p_data); } case 'bva1': { J2DAnmFullLoader_v15 loader; - loader.mpResource = new J2DAnmVisibilityFull(); + loader.mpResource = JKR_NEW J2DAnmVisibilityFull(); return (J2DAnmBase*)loader.load(p_data); break; } @@ -76,7 +76,7 @@ J2DAnmBase* J2DAnmLoaderDataBase::load(void const* p_data) { return NULL; case 'bxa1': { J2DAnmFullLoader_v15 loader; - loader.mpResource = new J2DAnmVtxColorFull(); + loader.mpResource = JKR_NEW J2DAnmVtxColorFull(); return (J2DAnmBase*)loader.load(p_data); } default: diff --git a/src/JSystem/J2DGraph/J2DMatBlock.cpp b/src/JSystem/J2DGraph/J2DMatBlock.cpp index 9bb4f87572..d2d5132e96 100644 --- a/src/JSystem/J2DGraph/J2DMatBlock.cpp +++ b/src/JSystem/J2DGraph/J2DMatBlock.cpp @@ -7,6 +7,8 @@ #include "JSystem/JUtility/JUTTexture.h" #include +#include "JSystem/JKernel/JKRHeap.h" + void J2DColorBlock::initialize() { for (int i = 0; i < 2; i++) { mMatColor[i] = JUtility::TColor(j2dDefaultColInfo); @@ -56,7 +58,7 @@ void J2DTexGenBlock::setGX() { J2DTexGenBlock::~J2DTexGenBlock() { for (int i = 0; i < 8; i++) { - delete mTexMtx[i]; + JKR_DELETE(mTexMtx[i]); } } @@ -64,7 +66,7 @@ void J2DTexGenBlock::setTexMtx(u32 param_0, J2DTexMtx& param_1) { J3D_PANIC(103, param_0 < 8, "Error : range over."); if (!mTexMtx[param_0]) { - mTexMtx[param_0] = new J2DTexMtx(param_1.getTexMtxInfo()); + mTexMtx[param_0] = JKR_NEW J2DTexMtx(param_1.getTexMtxInfo()); if (!mTexMtx[param_0]) { return; } @@ -101,13 +103,13 @@ J2DTevBlock1::J2DTevBlock1() { J2DTevBlock1::~J2DTevBlock1() { if (mUndeleteFlag & 1) { - delete mTexture[0]; + JKR_DELETE(mTexture[0]); } - delete mPalette[0]; + JKR_DELETE(mPalette[0]); if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } } @@ -139,7 +141,7 @@ bool J2DTevBlock1::prepareTexture(u8 param_0) { } if (mTexture[0] == NULL) { - mTexture[0] = new JUTTexture(); + mTexture[0] = JKR_NEW JUTTexture(); if (mTexture[0] == NULL) { return false; @@ -166,7 +168,7 @@ bool J2DTevBlock1::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* } if (mTexture[0] == NULL) { - mTexture[0] = new JUTTexture(p_timg, 0); + mTexture[0] = JKR_NEW JUTTexture(p_timg, 0); if (mTexture[0] == NULL) { return false; @@ -197,7 +199,7 @@ bool J2DTevBlock1::insertTexture(u32 param_0, JUTTexture* p_tex) { } if (mUndeleteFlag & 1) { - delete mTexture[0]; + JKR_DELETE(mTexture[0]); } mTexture[0] = p_tex; @@ -214,7 +216,7 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) { if (mTexture[0] == NULL) { if (p_timg != NULL) { - mTexture[0] = new JUTTexture(p_timg, 0); + mTexture[0] = JKR_NEW JUTTexture(p_timg, 0); if (mTexture[0] == NULL) { return false; @@ -228,7 +230,7 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) { if (p_timg != NULL) { mTexture[0]->storeTIMG(p_timg, (u8)0); } else { - delete mTexture[0]; + JKR_DELETE(mTexture[0]); mTexture[0] = NULL; mUndeleteFlag &= 0x80; } @@ -236,7 +238,7 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) { mTexture[0] = NULL; if (p_timg != NULL) { - mTexture[0] = new JUTTexture(p_timg, 0); + mTexture[0] = JKR_NEW JUTTexture(p_timg, 0); if (mTexture[0] == NULL) { return false; @@ -246,7 +248,7 @@ bool J2DTevBlock1::setTexture(u32 param_0, ResTIMG const* p_timg) { } } - delete mPalette[0]; + JKR_DELETE(mPalette[0]); mPalette[0] = NULL; mTexNo[0] = -1; return true; @@ -258,12 +260,12 @@ bool J2DTevBlock1::setTexture(u32 param_0, JUTTexture* p_tex) { } if (mUndeleteFlag & 1) { - delete mTexture[0]; + JKR_DELETE(mTexture[0]); } mTexture[0] = p_tex; mUndeleteFlag &= 0x80; - delete mPalette[0]; + JKR_DELETE(mPalette[0]); mPalette[0] = NULL; mTexNo[0] = -1; return true; @@ -275,12 +277,12 @@ bool J2DTevBlock1::removeTexture(u32 param_0) { } if (mUndeleteFlag & 1) { - delete mTexture[0]; + JKR_DELETE(mTexture[0]); } mTexture[0] = NULL; mUndeleteFlag &= 0x80; - delete mPalette[0]; + JKR_DELETE(mPalette[0]); mTexNo[0] = -1; return true; } @@ -290,13 +292,13 @@ bool J2DTevBlock1::setFont(ResFONT* p_font) { return false; } - JUTResFont* resFont = new JUTResFont(p_font, NULL); + JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL); if (resFont == NULL) { return false; } if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } mFont = resFont; @@ -310,7 +312,7 @@ bool J2DTevBlock1::setFont(JUTFont* p_font) { } if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } mFont = (JUTResFont*)p_font; @@ -325,7 +327,7 @@ bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) { if (p_tlut != NULL) { if (mPalette[0] == NULL) { - mPalette[0] = new JUTPalette(GX_TLUT0, (ResTLUT*)p_tlut); + mPalette[0] = JKR_NEW JUTPalette(GX_TLUT0, (ResTLUT*)p_tlut); if (mPalette[0] == NULL) { return false; @@ -338,7 +340,7 @@ bool J2DTevBlock1::setPalette(u32 param_0, ResTLUT const* p_tlut) { mTexture[0]->attachPalette(mPalette[0]); } } else { - delete mPalette[0]; + JKR_DELETE(mPalette[0]); mPalette[0] = NULL; } @@ -403,18 +405,18 @@ J2DTevBlock2::J2DTevBlock2() { J2DTevBlock2::~J2DTevBlock2() { if (mUndeleteFlag & 1) { - delete mTexture[0]; + JKR_DELETE(mTexture[0]); } if (mUndeleteFlag & 2) { - delete mTexture[1]; + JKR_DELETE(mTexture[1]); } - delete mPalette[0]; - delete mPalette[1]; + JKR_DELETE(mPalette[0]); + JKR_DELETE(mPalette[1]); if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } } @@ -454,7 +456,7 @@ bool J2DTevBlock2::prepareTexture(u8 param_0) { } if (mTexture[i] == NULL) { - mTexture[i] = new JUTTexture(); + mTexture[i] = JKR_NEW JUTTexture(); if (mTexture[i] == NULL) { return false; @@ -499,7 +501,7 @@ bool J2DTevBlock2::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* JUTTexture* tex; if (mTexture[texNo] == NULL) { - tex = new JUTTexture(p_timg, tlutid); + tex = JKR_NEW JUTTexture(p_timg, tlutid); if (tex == NULL) { return false; @@ -575,7 +577,7 @@ bool J2DTevBlock2::insertTexture(u32 param_0, JUTTexture* p_tex) { if (mTexture[1] != NULL && mTexture[1]->getTexInfo() == NULL) { if (mUndeleteFlag & 2) { - delete mTexture[1]; + JKR_DELETE(mTexture[1]); } mUndeleteFlag &= ~2; @@ -617,7 +619,7 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) { if (mTexture[param_0] == NULL) { if (p_timg != NULL) { - mTexture[param_0] = new JUTTexture(p_timg, tlutid); + mTexture[param_0] = JKR_NEW JUTTexture(p_timg, tlutid); if (mTexture[param_0] == NULL) { return false; @@ -631,7 +633,7 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) { if (p_timg != NULL) { mTexture[param_0]->storeTIMG(p_timg, tlutid); } else { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); mTexture[param_0] = NULL; mUndeleteFlag &= ~(1 << param_0); } @@ -639,7 +641,7 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) { mTexture[param_0] = NULL; if (p_timg != NULL) { - mTexture[param_0] = new JUTTexture(p_timg, 0); + mTexture[param_0] = JKR_NEW JUTTexture(p_timg, 0); if (mTexture[param_0] == NULL) { return false; @@ -649,7 +651,7 @@ bool J2DTevBlock2::setTexture(u32 param_0, ResTIMG const* p_timg) { } } - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; mTexNo[param_0] = -1; return true; @@ -661,12 +663,12 @@ bool J2DTevBlock2::setTexture(u32 param_0, JUTTexture* p_tex) { } if (mUndeleteFlag & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } mTexture[param_0] = p_tex; mUndeleteFlag &= ~(1 << param_0); - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; mTexNo[param_0] = -1; return true; @@ -678,9 +680,9 @@ bool J2DTevBlock2::removeTexture(u32 param_0) { } if (mUndeleteFlag & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); if (param_0 == 0) { mTexture[0] = mTexture[1]; @@ -700,13 +702,13 @@ bool J2DTevBlock2::setFont(ResFONT* p_font) { return false; } - JUTResFont* resFont = new JUTResFont(p_font, NULL); + JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL); if (resFont == NULL) { return false; } if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } mFont = resFont; @@ -720,7 +722,7 @@ bool J2DTevBlock2::setFont(JUTFont* p_font) { } if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } mFont = (JUTResFont*)p_font; @@ -735,7 +737,7 @@ bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) { if (p_tlut != NULL) { if (mPalette[param_0] == NULL) { - mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); + mPalette[param_0] = JKR_NEW JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); if (mPalette[param_0] == NULL) { return false; @@ -748,7 +750,7 @@ bool J2DTevBlock2::setPalette(u32 param_0, ResTLUT const* p_tlut) { mTexture[param_0]->attachPalette(mPalette[param_0]); } } else { - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; } @@ -841,13 +843,13 @@ J2DTevBlock4::J2DTevBlock4() { J2DTevBlock4::~J2DTevBlock4() { for (int i = 0; i < 4; i++) { if (mUndeleteFlag & (1 << i)) { - delete mTexture[i]; + JKR_DELETE(mTexture[i]); } - delete mPalette[i]; + JKR_DELETE(mPalette[i]); } if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } } @@ -892,7 +894,7 @@ bool J2DTevBlock4::prepareTexture(u8 param_0) { } if (mTexture[i] == NULL) { - mTexture[i] = new JUTTexture(); + mTexture[i] = JKR_NEW JUTTexture(); if (mTexture[i] == NULL) { return false; @@ -949,7 +951,7 @@ bool J2DTevBlock4::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* } JUTTexture* texture; if (!mTexture[idx]) { - texture = new JUTTexture(p_timg, local_43); + texture = JKR_NEW JUTTexture(p_timg, local_43); if (!texture) { return false; } @@ -1017,7 +1019,7 @@ bool J2DTevBlock4::insertTexture(u32 param_0, JUTTexture* p_tex) { if (mTexture[3] != NULL && mTexture[3]->getTexInfo() == NULL) { if (mUndeleteFlag & 8) { - delete mTexture[3]; + JKR_DELETE(mTexture[3]); } mUndeleteFlag &= ~8; @@ -1069,7 +1071,7 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) { if (mTexture[param_0] == NULL) { if (p_timg != NULL) { - mTexture[param_0] = new JUTTexture(p_timg, tlutid); + mTexture[param_0] = JKR_NEW JUTTexture(p_timg, tlutid); if (mTexture[param_0] == NULL) { return false; @@ -1083,7 +1085,7 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) { if (p_timg != NULL) { mTexture[param_0]->storeTIMG(p_timg, tlutid); } else { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); mTexture[param_0] = NULL; mUndeleteFlag &= ~(1 << param_0); } @@ -1091,7 +1093,7 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) { mTexture[param_0] = NULL; if (p_timg != NULL) { - mTexture[param_0] = new JUTTexture(p_timg, 0); + mTexture[param_0] = JKR_NEW JUTTexture(p_timg, 0); if (mTexture[param_0] == NULL) { return false; @@ -1101,7 +1103,7 @@ bool J2DTevBlock4::setTexture(u32 param_0, ResTIMG const* p_timg) { } } - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; mTexNo[param_0] = -1; return true; @@ -1113,12 +1115,12 @@ bool J2DTevBlock4::setTexture(u32 param_0, JUTTexture* p_tex) { } if (mUndeleteFlag & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } mTexture[param_0] = p_tex; mUndeleteFlag &= ~(1 << param_0); - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; mTexNo[param_0] = -1; return true; @@ -1130,9 +1132,9 @@ bool J2DTevBlock4::removeTexture(u32 param_0) { } if (mUndeleteFlag & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); for (u32 i = param_0; i < 3; i++) { mTexture[i] = mTexture[i + 1]; @@ -1152,13 +1154,13 @@ bool J2DTevBlock4::setFont(ResFONT* p_font) { return false; } - JUTResFont* resFont = new JUTResFont(p_font, NULL); + JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL); if (resFont == NULL) { return false; } if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } mFont = resFont; @@ -1172,7 +1174,7 @@ bool J2DTevBlock4::setFont(JUTFont* p_font) { } if (mUndeleteFlag & 0x80) { - delete mFont; + JKR_DELETE(mFont); } mFont = (JUTResFont*)p_font; @@ -1187,7 +1189,7 @@ bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) { if (p_tlut != NULL) { if (mPalette[param_0] == NULL) { - mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); + mPalette[param_0] = JKR_NEW JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); if (mPalette[param_0] == NULL) { return false; @@ -1200,7 +1202,7 @@ bool J2DTevBlock4::setPalette(u32 param_0, ResTLUT const* p_tlut) { mTexture[param_0]->attachPalette(mPalette[param_0]); } } else { - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; } @@ -1285,13 +1287,13 @@ J2DTevBlock8::J2DTevBlock8() { J2DTevBlock8::~J2DTevBlock8() { for (int i = 0; i < 8; i++) { if (mUndeleteFlag & (1 << i)) { - delete mTexture[i]; + JKR_DELETE(mTexture[i]); } - delete mPalette[i]; + JKR_DELETE(mPalette[i]); } if (mFontUndeleteFlag) { - delete mFont; + JKR_DELETE(mFont); } } @@ -1337,7 +1339,7 @@ bool J2DTevBlock8::prepareTexture(u8 param_0) { } if (mTexture[i] == NULL) { - mTexture[i] = new JUTTexture(); + mTexture[i] = JKR_NEW JUTTexture(); if (mTexture[i] == NULL) { return false; @@ -1394,7 +1396,7 @@ bool J2DTevBlock8::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette* } JUTTexture* texture; if (!mTexture[idx]) { - texture = new JUTTexture(p_timg, local_43); + texture = JKR_NEW JUTTexture(p_timg, local_43); if (!texture) { return false; } @@ -1462,7 +1464,7 @@ bool J2DTevBlock8::insertTexture(u32 param_0, JUTTexture* p_tex) { if (mTexture[7] != NULL && mTexture[7]->getTexInfo() == NULL) { if (mUndeleteFlag & 0x80) { - delete mTexture[7]; + JKR_DELETE(mTexture[7]); } mUndeleteFlag &= ~0x80; @@ -1514,7 +1516,7 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) { if (mTexture[param_0] == NULL) { if (p_timg != NULL) { - mTexture[param_0] = new JUTTexture(p_timg, tlutid); + mTexture[param_0] = JKR_NEW JUTTexture(p_timg, tlutid); if (mTexture[param_0] == NULL) { return false; @@ -1528,7 +1530,7 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) { if (p_timg != NULL) { mTexture[param_0]->storeTIMG(p_timg, tlutid); } else { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); mTexture[param_0] = NULL; mUndeleteFlag &= ~(1 << param_0); } @@ -1536,7 +1538,7 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) { mTexture[param_0] = NULL; if (p_timg != NULL) { - mTexture[param_0] = new JUTTexture(p_timg, 0); + mTexture[param_0] = JKR_NEW JUTTexture(p_timg, 0); if (mTexture[param_0] == NULL) { return false; @@ -1546,7 +1548,7 @@ bool J2DTevBlock8::setTexture(u32 param_0, ResTIMG const* p_timg) { } } - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; mTexNo[param_0] = -1; return true; @@ -1558,12 +1560,12 @@ bool J2DTevBlock8::setTexture(u32 param_0, JUTTexture* p_tex) { } if (mUndeleteFlag & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } mTexture[param_0] = p_tex; mUndeleteFlag &= ~(1 << param_0); - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; mTexNo[param_0] = -1; return true; @@ -1575,9 +1577,9 @@ bool J2DTevBlock8::removeTexture(u32 param_0) { } if (mUndeleteFlag & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); for (u32 i = param_0; i < 7; i++) { mTexture[i] = mTexture[i + 1]; @@ -1597,13 +1599,13 @@ bool J2DTevBlock8::setFont(ResFONT* p_font) { return false; } - JUTResFont* resFont = new JUTResFont(p_font, NULL); + JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL); if (resFont == NULL) { return false; } if (mFontUndeleteFlag) { - delete mFont; + JKR_DELETE(mFont); } mFont = resFont; @@ -1617,7 +1619,7 @@ bool J2DTevBlock8::setFont(JUTFont* p_font) { } if (mFontUndeleteFlag) { - delete mFont; + JKR_DELETE(mFont); } mFont = (JUTResFont*)p_font; @@ -1632,7 +1634,7 @@ bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) { if (p_tlut != NULL) { if (mPalette[param_0] == NULL) { - mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); + mPalette[param_0] = JKR_NEW JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); if (mPalette[param_0] == NULL) { return false; @@ -1645,7 +1647,7 @@ bool J2DTevBlock8::setPalette(u32 param_0, ResTLUT const* p_tlut) { mTexture[param_0]->attachPalette(mPalette[param_0]); } } else { - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; } @@ -1725,13 +1727,13 @@ J2DTevBlock16::J2DTevBlock16() { J2DTevBlock16::~J2DTevBlock16() { for (int i = 0; i < 8; i++) { if (mUndeleteFlag & (1 << i)) { - delete mTexture[i]; + JKR_DELETE(mTexture[i]); } - delete mPalette[i]; + JKR_DELETE(mPalette[i]); } if (mFontUndeleteFlag) { - delete mFont; + JKR_DELETE(mFont); } } @@ -1777,7 +1779,7 @@ bool J2DTevBlock16::prepareTexture(u8 param_0) { } if (mTexture[i] == NULL) { - mTexture[i] = new JUTTexture(); + mTexture[i] = JKR_NEW JUTTexture(); if (mTexture[i] == NULL) { return false; @@ -1834,7 +1836,7 @@ bool J2DTevBlock16::insertTexture(u32 param_0, ResTIMG const* p_timg, JUTPalette } JUTTexture* texture; if (!mTexture[idx]) { - texture = new JUTTexture(p_timg, local_43); + texture = JKR_NEW JUTTexture(p_timg, local_43); if (!texture) { return false; } @@ -1902,7 +1904,7 @@ bool J2DTevBlock16::insertTexture(u32 param_0, JUTTexture* p_tex) { if (mTexture[7] != NULL && mTexture[7]->getTexInfo() == NULL) { if (mUndeleteFlag & 0x80) { - delete mTexture[7]; + JKR_DELETE(mTexture[7]); } mUndeleteFlag &= ~0x80; @@ -1954,7 +1956,7 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) { if (mTexture[param_0] == NULL) { if (p_timg != NULL) { - mTexture[param_0] = new JUTTexture(p_timg, tlutid); + mTexture[param_0] = JKR_NEW JUTTexture(p_timg, tlutid); if (mTexture[param_0] == NULL) { return false; @@ -1968,7 +1970,7 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) { if (p_timg != NULL) { mTexture[param_0]->storeTIMG(p_timg, tlutid); } else { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); mTexture[param_0] = NULL; mUndeleteFlag &= ~(1 << param_0); } @@ -1976,7 +1978,7 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) { mTexture[param_0] = NULL; if (p_timg != NULL) { - mTexture[param_0] = new JUTTexture(p_timg, 0); + mTexture[param_0] = JKR_NEW JUTTexture(p_timg, 0); if (mTexture[param_0] == NULL) { return false; @@ -1986,7 +1988,7 @@ bool J2DTevBlock16::setTexture(u32 param_0, ResTIMG const* p_timg) { } } - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; mTexNo[param_0] = -1; return true; @@ -1998,12 +2000,12 @@ bool J2DTevBlock16::setTexture(u32 param_0, JUTTexture* p_tex) { } if (mUndeleteFlag & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } mTexture[param_0] = p_tex; mUndeleteFlag &= ~(1 << param_0); - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; mTexNo[param_0] = -1; return true; @@ -2015,9 +2017,9 @@ bool J2DTevBlock16::removeTexture(u32 param_0) { } if (mUndeleteFlag & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); for (u32 i = param_0; i < 7; i++) { mTexture[i] = mTexture[i + 1]; @@ -2037,13 +2039,13 @@ bool J2DTevBlock16::setFont(ResFONT* p_font) { return false; } - JUTResFont* resFont = new JUTResFont(p_font, NULL); + JUTResFont* resFont = JKR_NEW JUTResFont(p_font, NULL); if (resFont == NULL) { return false; } if (mFontUndeleteFlag) { - delete mFont; + JKR_DELETE(mFont); } mFont = resFont; @@ -2057,7 +2059,7 @@ bool J2DTevBlock16::setFont(JUTFont* p_font) { } if (mFontUndeleteFlag) { - delete mFont; + JKR_DELETE(mFont); } mFont = (JUTResFont*)p_font; @@ -2072,7 +2074,7 @@ bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) { if (p_tlut != NULL) { if (mPalette[param_0] == NULL) { - mPalette[param_0] = new JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); + mPalette[param_0] = JKR_NEW JUTPalette((GXTlut)param_0, (ResTLUT*)p_tlut); if (mPalette[param_0] == NULL) { return false; @@ -2085,7 +2087,7 @@ bool J2DTevBlock16::setPalette(u32 param_0, ResTLUT const* p_tlut) { mTexture[param_0]->attachPalette(mPalette[param_0]); } } else { - delete mPalette[param_0]; + JKR_DELETE(mPalette[param_0]); mPalette[param_0] = NULL; } diff --git a/src/JSystem/J2DGraph/J2DMaterial.cpp b/src/JSystem/J2DGraph/J2DMaterial.cpp index 57cccf8255..785383d7cf 100644 --- a/src/JSystem/J2DGraph/J2DMaterial.cpp +++ b/src/JSystem/J2DGraph/J2DMaterial.cpp @@ -17,9 +17,9 @@ J2DMaterial::J2DMaterial() { } J2DMaterial::~J2DMaterial() { - delete mTevBlock; - delete mIndBlock; - delete mAnmPointer; + JKR_DELETE(mTevBlock); + JKR_DELETE(mIndBlock); + JKR_DELETE(mAnmPointer); } void J2DMaterial::setGX() { @@ -44,27 +44,27 @@ J2DTevBlock* J2DMaterial::createTevBlock(int block_type, bool noAlign) { if (noAlign) { if (block_type <= 1) { - block = new J2DTevBlock1(); + block = JKR_NEW J2DTevBlock1(); } else if (block_type == 2) { - block = new J2DTevBlock2(); + block = JKR_NEW J2DTevBlock2(); } else if (block_type <= 4) { - block = new J2DTevBlock4(); + block = JKR_NEW J2DTevBlock4(); } else if (block_type <= 8) { - block = new J2DTevBlock8(); + block = JKR_NEW J2DTevBlock8(); } else { - block = new J2DTevBlock16(); + block = JKR_NEW J2DTevBlock16(); } } else { if (block_type <= 1) { - block = new (-4) J2DTevBlock1(); + block = JKR_NEW_ARGS (-4) J2DTevBlock1(); } else if (block_type == 2) { - block = new (-4) J2DTevBlock2(); + block = JKR_NEW_ARGS (-4) J2DTevBlock2(); } else if (block_type <= 4) { - block = new (-4) J2DTevBlock4(); + block = JKR_NEW_ARGS (-4) J2DTevBlock4(); } else if (block_type <= 8) { - block = new (-4) J2DTevBlock8(); + block = JKR_NEW_ARGS (-4) J2DTevBlock8(); } else { - block = new (-4) J2DTevBlock16(); + block = JKR_NEW_ARGS (-4) J2DTevBlock16(); } } ASSERTMSGLINE(101, block, "Error : allocate memory."); @@ -77,15 +77,15 @@ J2DIndBlock* J2DMaterial::createIndBlock(int block_type, bool noAlign) { if (noAlign) { if (block_type != 0) { - block = new J2DIndBlockFull(); + block = JKR_NEW J2DIndBlockFull(); } else { - block = new J2DIndBlockNull(); + block = JKR_NEW J2DIndBlockNull(); } } else { if (block_type != 0) { - block = new (-4) J2DIndBlockFull(); + block = JKR_NEW_ARGS (-4) J2DIndBlockFull(); } else { - block = new (-4) J2DIndBlockNull(); + block = JKR_NEW_ARGS (-4) J2DIndBlockNull(); } } ASSERTMSGLINE(133, block, "Error : allocate memory."); @@ -121,7 +121,7 @@ void J2DMaterial::makeAnmPointer() { int r29; int r28; if (mAnmPointer == NULL) { - mAnmPointer = new J2DMaterialAnmPointer(); + mAnmPointer = JKR_NEW J2DMaterialAnmPointer(); r29 = 1; if (mAnmPointer == NULL) { OS_PANIC(171, "Error : allocate memory."); diff --git a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp index 1b22ce0243..f30fd543be 100644 --- a/src/JSystem/J2DGraph/J2DMaterialFactory.cpp +++ b/src/JSystem/J2DGraph/J2DMaterialFactory.cpp @@ -228,7 +228,7 @@ J2DTexMtx* J2DMaterialFactory::newTexMtx(int param_0, int param_1) const { J2DTexMtx* rv = NULL; J2DMaterialInitData* iVar2 = &field_0x4[field_0x8[param_0]]; if (iVar2->field_0x24[param_1] != 0xffff) { - rv = new J2DTexMtx(field_0x24[iVar2->field_0x24[param_1]]); + rv = JKR_NEW J2DTexMtx(field_0x24[iVar2->field_0x24[param_1]]); rv->calc(); } return rv; diff --git a/src/JSystem/J2DGraph/J2DPane.cpp b/src/JSystem/J2DGraph/J2DPane.cpp index 11cb5b1230..23e76b8f54 100644 --- a/src/JSystem/J2DGraph/J2DPane.cpp +++ b/src/JSystem/J2DGraph/J2DPane.cpp @@ -209,7 +209,7 @@ void J2DPane::changeUseTrans(J2DPane* p_pane) { J2DPane::~J2DPane() { JSUTreeIterator iterator = mPaneTree.getFirstChild(); for (; iterator != mPaneTree.getEndChild();) { - delete (iterator++).getObject(); + JKR_DELETE((iterator++).getObject()); } } diff --git a/src/JSystem/J2DGraph/J2DPicture.cpp b/src/JSystem/J2DGraph/J2DPicture.cpp index efeaca2ebf..484ea613f3 100644 --- a/src/JSystem/J2DGraph/J2DPicture.cpp +++ b/src/JSystem/J2DGraph/J2DPicture.cpp @@ -207,12 +207,12 @@ void J2DPicture::private_readStream(J2DPane* parent, JSURandomInputStream* strea field_0x109 = 1; if (img != NULL) { - mTexture[0] = new JUTTexture(img, 0); + mTexture[0] = JKR_NEW JUTTexture(img, 0); mTextureNum++; } if (lut != NULL) { - mPalette = new JUTPalette(GX_TLUT0, lut); + mPalette = JKR_NEW JUTPalette(GX_TLUT0, lut); mTexture[0]->attachPalette(mPalette); } @@ -236,7 +236,7 @@ void J2DPicture::private_initiate(const ResTIMG* timg, const ResTLUT* tlut) { if (timg != NULL) { if (mTexture[0] == NULL) { - mTexture[0] = new JUTTexture(timg, 0); + mTexture[0] = JKR_NEW JUTTexture(timg, 0); if (mTexture[0] != NULL) { mTextureNum++; field_0x109 = (field_0x109 & 2) | 1; @@ -250,7 +250,7 @@ void J2DPicture::private_initiate(const ResTIMG* timg, const ResTLUT* tlut) { mPalette = NULL; if (tlut && mPalette == NULL) { - mPalette = new JUTPalette(GX_TLUT0, const_cast(tlut)); + mPalette = JKR_NEW JUTPalette(GX_TLUT0, const_cast(tlut)); if (mTexture[0] != NULL) { mTexture[0]->attachPalette(mPalette); } @@ -271,11 +271,11 @@ void J2DPicture::initinfo() { J2DPicture::~J2DPicture() { for (int i = 0; i < 2; i++) { if ((int)(field_0x109 & 1 << i) != 0) { - delete mTexture[i]; + JKR_DELETE(mTexture[i]); } } - delete mPalette; + JKR_DELETE(mPalette); } bool J2DPicture::prepareTexture(u8 param_0) { @@ -285,7 +285,7 @@ bool J2DPicture::prepareTexture(u8 param_0) { } if (mTexture[i] == NULL) { - mTexture[i] = new JUTTexture(); + mTexture[i] = JKR_NEW JUTTexture(); if (mTexture[i] == NULL) { return 0; @@ -308,7 +308,7 @@ bool J2DPicture::insert(ResTIMG const* img, JUTPalette* palette, u8 param_2, f32 JUTTexture* var_r31; if (mTexture[mTextureNum] == NULL) { - var_r31 = new JUTTexture(img, var_r26); + var_r31 = JKR_NEW JUTTexture(img, var_r26); if (palette != NULL) { var_r31->storeTIMG(img, palette); @@ -380,7 +380,7 @@ bool J2DPicture::insert(JUTTexture* texture, u8 param_1, f32 param_2) { } if (mTexture[1] != NULL && field_0x109 & 2) { - delete mTexture[1]; + JKR_DELETE(mTexture[1]); field_0x109 &= 1; } @@ -416,7 +416,7 @@ bool J2DPicture::remove(u8 param_0) { } if (field_0x109 & (1 << param_0)) { - delete mTexture[param_0]; + JKR_DELETE(mTexture[param_0]); } for (u8 i = param_0; i < mTextureNum - 1; i++) { diff --git a/src/JSystem/J2DGraph/J2DPictureEx.cpp b/src/JSystem/J2DGraph/J2DPictureEx.cpp index 27cc68cc94..7ac8f45dfa 100644 --- a/src/JSystem/J2DGraph/J2DPictureEx.cpp +++ b/src/JSystem/J2DGraph/J2DPictureEx.cpp @@ -61,7 +61,7 @@ J2DPictureEx::J2DPictureEx(J2DPane* param_0, JSURandomInputStream* param_1, u32 J2DPictureEx::~J2DPictureEx() { if (field_0x190) { - delete mMaterial; + JKR_DELETE(mMaterial); } } diff --git a/src/JSystem/J2DGraph/J2DPrint.cpp b/src/JSystem/J2DGraph/J2DPrint.cpp index b6c8876aee..6f4ad373e3 100644 --- a/src/JSystem/J2DGraph/J2DPrint.cpp +++ b/src/JSystem/J2DGraph/J2DPrint.cpp @@ -89,10 +89,10 @@ u8* J2DPrint::setBuffer(size_t size) { u8* u8Buff = (u8*)mStrBuff; if (sStrBufInitialized) { - delete mStrBuff; + JKR_DELETE(mStrBuff); } - mStrBuff = new (JKRGetSystemHeap(), 0) char[size]; + mStrBuff = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) char[size]; mStrBuffSize = size; sStrBufInitialized = true; return u8Buff; diff --git a/src/JSystem/J2DGraph/J2DScreen.cpp b/src/JSystem/J2DGraph/J2DScreen.cpp index 37c9aef084..70fdfbe569 100644 --- a/src/JSystem/J2DGraph/J2DScreen.cpp +++ b/src/JSystem/J2DGraph/J2DScreen.cpp @@ -27,19 +27,19 @@ J2DScreen::~J2DScreen() { } void J2DScreen::clean() { - delete[] mMaterials; + JKR_DELETE_ARRAY(mMaterials); mMaterialNum = 0; mMaterials = NULL; - delete[] mTexRes; + JKR_DELETE_ARRAY(mTexRes); mTexRes = NULL; - delete[] mFontRes; + JKR_DELETE_ARRAY(mFontRes); mFontRes = NULL; if (mNameTable != NULL) { - delete[] mNameTable->getResNameTable(); - delete mNameTable; + JKR_DELETE_ARRAY(mNameTable->getResNameTable()); + JKR_DELETE(mNameTable); mNameTable = NULL; } } @@ -176,40 +176,40 @@ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputS switch (header.mTag) { case 'PAN1': - newPane = new J2DPane(p_basePane, p_stream, 0); + newPane = JKR_NEW J2DPane(p_basePane, p_stream, 0); break; case 'WIN1': - newPane = new J2DWindow(p_basePane, p_stream, p_archive); + newPane = JKR_NEW J2DWindow(p_basePane, p_stream, p_archive); break; case 'PIC1': - newPane = new J2DPicture(p_basePane, p_stream, p_archive); + newPane = JKR_NEW J2DPicture(p_basePane, p_stream, p_archive); break; case 'TBX1': - newPane = new J2DTextBox(p_basePane, p_stream, p_archive); + newPane = JKR_NEW J2DTextBox(p_basePane, p_stream, p_archive); break; case 'PAN2': - newPane = new J2DPane(p_basePane, p_stream, 1); + newPane = JKR_NEW J2DPane(p_basePane, p_stream, 1); break; case 'WIN2': if (param_3 & 0x1F0000) { - newPane = new J2DWindowEx(p_basePane, p_stream, param_3, mMaterials); + newPane = JKR_NEW J2DWindowEx(p_basePane, p_stream, param_3, mMaterials); break; } - newPane = new J2DWindow(p_basePane, p_stream, mMaterials); + newPane = JKR_NEW J2DWindow(p_basePane, p_stream, mMaterials); break; case 'PIC2': if (param_3 & 0x1F0000) { - newPane = new J2DPictureEx(p_basePane, p_stream, param_3, mMaterials); + newPane = JKR_NEW J2DPictureEx(p_basePane, p_stream, param_3, mMaterials); break; } - newPane = new J2DPicture(p_basePane, p_stream, mMaterials); + newPane = JKR_NEW J2DPicture(p_basePane, p_stream, mMaterials); break; case 'TBX2': if (param_3 & 0x1F0000) { - newPane = new J2DTextBoxEx(p_basePane, p_stream, param_3, mMaterials); + newPane = JKR_NEW J2DTextBoxEx(p_basePane, p_stream, param_3, mMaterials); break; } - newPane = new J2DTextBox(p_basePane, p_stream, param_3, mMaterials); + newPane = JKR_NEW J2DTextBox(p_basePane, p_stream, param_3, mMaterials); break; default: JUT_WARN(446, "%s", "unknown pane"); @@ -217,7 +217,7 @@ J2DPane* J2DScreen::createPane(J2DScrnBlockHeader const& header, JSURandomInputS s32 size = header.mSize; s32 start = size + position; - newPane = new J2DPane(p_basePane, p_stream, 0); + newPane = JKR_NEW J2DPane(p_basePane, p_stream, 0); p_stream->seek(start, JSUStreamSeekFrom_SET); break; } @@ -321,9 +321,9 @@ J2DResReference* J2DScreen::getResReference(JSURandomInputStream* p_stream, u32 char* buffer; if (param_1 & 0x1F0000) { - buffer = new char[size1]; + buffer = JKR_NEW char[size1]; } else { - buffer = new (-4) char[size1]; + buffer = JKR_NEW_ARGS (-4) char[size1]; } if (buffer != NULL) { @@ -343,12 +343,12 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA p_stream->skip(2); if (param_1 & 0x1F0000) { - mMaterials = new J2DMaterial[mMaterialNum]; + mMaterials = JKR_NEW J2DMaterial[mMaterialNum]; } else { - mMaterials = new (-4) J2DMaterial[mMaterialNum]; + mMaterials = JKR_NEW_ARGS (-4) J2DMaterial[mMaterialNum]; } - u8* buffer = new (-4) u8[header.mSize]; + u8* buffer = JKR_NEW_ARGS (-4) u8[header.mSize]; if (mMaterials != NULL && buffer != NULL) { J2DMaterialBlock* pBlock = (J2DMaterialBlock*)buffer; p_stream->seek(position, JSUStreamSeekFrom_SET); @@ -372,7 +372,7 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA } size++; - u8* nametab = new u8[size]; + u8* nametab = JKR_NEW u8[size]; if (nametab == NULL) { goto failure; } @@ -380,20 +380,20 @@ bool J2DScreen::createMaterial(JSURandomInputStream* p_stream, u32 param_1, JKRA nametab[i] = (buffer + offset)[i]; } - mNameTable = new JUTNameTab((ResNTAB*)nametab); + mNameTable = JKR_NEW JUTNameTab((ResNTAB*)nametab); if (mNameTable == NULL) { - delete[] nametab; + JKR_DELETE_ARRAY(nametab); goto failure; } } success: - delete[] buffer; + JKR_DELETE_ARRAY(buffer); return true; } failure: - delete[] buffer; + JKR_DELETE_ARRAY(buffer); clean(); return false; } diff --git a/src/JSystem/J2DGraph/J2DTextBox.cpp b/src/JSystem/J2DGraph/J2DTextBox.cpp index d82fd37586..936109f343 100644 --- a/src/JSystem/J2DGraph/J2DTextBox.cpp +++ b/src/JSystem/J2DGraph/J2DTextBox.cpp @@ -73,7 +73,7 @@ J2DTextBox::J2DTextBox(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 para mStringPtr = NULL; if (strLength != 0) { - mStringPtr = new char[strLength]; + mStringPtr = JKR_NEW char[strLength]; } if (mStringPtr != NULL) { @@ -120,7 +120,7 @@ J2DTextBox::J2DTextBox(u64 tag, JGeometry::TBox2 const& bounds, ResFONT con void J2DTextBox::initiate(ResFONT const* p_font, char const* string, s16 length, J2DTextBoxHBinding hBind, J2DTextBoxVBinding vBind) { if (p_font != NULL) { - mFont = new JUTResFont(p_font, NULL); + mFont = JKR_NEW JUTResFont(p_font, NULL); } mCharColor.set(0xFFFFFFFF); @@ -143,7 +143,7 @@ void J2DTextBox::initiate(ResFONT const* p_font, char const* string, s16 length, stringLen = len + 1; } - mStringPtr = new char[stringLen]; + mStringPtr = JKR_NEW char[stringLen]; if (stringLen != 0 && mStringPtr != NULL) { strncpy(mStringPtr, string, stringLen - 1); @@ -184,7 +184,7 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str ResFONT* fontPtr = (ResFONT*)getPointer(p_stream, 'FONT', p_archive); if (fontPtr != NULL) { - mFont = new JUTResFont(fontPtr, NULL); + mFont = JKR_NEW JUTResFont(fontPtr, NULL); } mCharColor.set(p_stream->read32b()); @@ -197,7 +197,7 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str mFontSizeY = p_stream->read16b(); s16 stringLen = p_stream->read16b(); - mStringPtr = new char[stringLen + 1]; + mStringPtr = JKR_NEW char[stringLen + 1]; if (mStringPtr != NULL) { p_stream->read(mStringPtr, stringLen); @@ -239,16 +239,16 @@ void J2DTextBox::private_readStream(J2DPane* p_pane, JSURandomInputStream* p_str J2DTextBox::~J2DTextBox() { if (mTextFontOwned) { - delete mFont; + JKR_DELETE(mFont); } - delete[] mStringPtr; + JKR_DELETE_ARRAY(mStringPtr); } void J2DTextBox::setFont(JUTFont* p_font) { if (p_font) { if (mTextFontOwned) { - delete mFont; + JKR_DELETE(mFont); } mFont = p_font; mTextFontOwned = false; @@ -316,7 +316,7 @@ s32 J2DTextBox::setString(char const* string, ...) { va_list args; va_start(args, string); - delete[] mStringPtr; + JKR_DELETE_ARRAY(mStringPtr); u32 len = strlen(string); @@ -325,7 +325,7 @@ s32 J2DTextBox::setString(char const* string, ...) { } mStringLength = 0; - mStringPtr = new char[len + 1]; + mStringPtr = JKR_NEW char[len + 1]; if (mStringPtr) { mStringLength = len + 1; @@ -340,7 +340,7 @@ s32 J2DTextBox::setString(s16 length, char const* string, ...) { va_list args; va_start(args, string); - delete[] mStringPtr; + JKR_DELETE_ARRAY(mStringPtr); mStringPtr = NULL; u32 len = strlen(string); @@ -356,7 +356,7 @@ s32 J2DTextBox::setString(s16 length, char const* string, ...) { mStringLength = 0; if (stringLen != 0) { - mStringPtr = new char[stringLen]; + mStringPtr = JKR_NEW char[stringLen]; } if (mStringPtr != NULL) { diff --git a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp b/src/JSystem/J2DGraph/J2DTextBoxEx.cpp index 637e7e972f..e84b31fb0c 100644 --- a/src/JSystem/J2DGraph/J2DTextBoxEx.cpp +++ b/src/JSystem/J2DGraph/J2DTextBoxEx.cpp @@ -65,7 +65,7 @@ J2DTextBoxEx::J2DTextBoxEx(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 mStringPtr = NULL; if (strLength != 0) { - mStringPtr = new char[strLength]; + mStringPtr = JKR_NEW char[strLength]; } if (mStringPtr != NULL) { @@ -88,7 +88,7 @@ J2DTextBoxEx::J2DTextBoxEx(J2DPane* p_pane, JSURandomInputStream* p_stream, u32 J2DTextBoxEx::~J2DTextBoxEx() { if (field_0x140 != 0) { - delete mMaterial; + JKR_DELETE(mMaterial); } } diff --git a/src/JSystem/J2DGraph/J2DWindow.cpp b/src/JSystem/J2DGraph/J2DWindow.cpp index 7907afc8c9..b1042ecc06 100644 --- a/src/JSystem/J2DGraph/J2DWindow.cpp +++ b/src/JSystem/J2DGraph/J2DWindow.cpp @@ -150,19 +150,19 @@ J2DWindow::J2DWindow(u64 param_0, const JGeometry::TBox2& param_1, const ch void J2DWindow::initiate(const ResTIMG* param_0, const ResTIMG* param_1, const ResTIMG* param_2, const ResTIMG* param_3, const ResTLUT* param_4, J2DWindowMirror param_5, const JGeometry::TBox2& param_6) { if (param_0) { - field_0x100 = new JUTTexture(param_0, 0); + field_0x100 = JKR_NEW JUTTexture(param_0, 0); } if (param_1) { - field_0x104 = new JUTTexture(param_1, 0); + field_0x104 = JKR_NEW JUTTexture(param_1, 0); } if (param_2) { - field_0x108 = new JUTTexture(param_2, 0); + field_0x108 = JKR_NEW JUTTexture(param_2, 0); } if (param_3) { - field_0x10c = new JUTTexture(param_3, 0); + field_0x10c = JKR_NEW JUTTexture(param_3, 0); } if (param_4) { - mPalette = new JUTPalette(GX_TLUT0, const_cast(param_4)); + mPalette = JKR_NEW JUTPalette(GX_TLUT0, const_cast(param_4)); } field_0x144 = param_5; if (field_0x100 && field_0x104 && field_0x108 && field_0x10c) { @@ -189,23 +189,23 @@ void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param field_0x114.set(f31, f30, f29, f28); ResTIMG* timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2); if (timg) { - field_0x100 = new JUTTexture(timg, 0); + field_0x100 = JKR_NEW JUTTexture(timg, 0); } timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2); if (timg) { - field_0x104 = new JUTTexture(timg, 0); + field_0x104 = JKR_NEW JUTTexture(timg, 0); } timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2); if (timg) { - field_0x108 = new JUTTexture(timg, 0); + field_0x108 = JKR_NEW JUTTexture(timg, 0); } timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2); if (timg) { - field_0x10c = new JUTTexture(timg, 0); + field_0x10c = JKR_NEW JUTTexture(timg, 0); } ResTLUT* tlut = (ResTLUT*)getPointer(param_1, 'TLUT', param_2); if (tlut) { - mPalette = new JUTPalette(GX_TLUT0, tlut); + mPalette = JKR_NEW JUTPalette(GX_TLUT0, tlut); } field_0x144 = param_1->read8b(); field_0x128.set(param_1->read32b()); @@ -218,7 +218,7 @@ void J2DWindow::private_readStream(J2DPane* param_0, JSURandomInputStream* param int unused; timg = (ResTIMG*)getPointer(param_1, 'TIMG', param_2); if (timg) { - field_0x110 = new JUTTexture(timg, 0); + field_0x110 = JKR_NEW JUTTexture(timg, 0); } r27--; } @@ -288,12 +288,12 @@ J2DWindowMirror J2DWindow::convertMirror(J2DTextureBase texBase) { } J2DWindow::~J2DWindow() { - delete field_0x100; - delete field_0x104; - delete field_0x108; - delete field_0x10c; - delete mPalette; - delete field_0x110; + JKR_DELETE(field_0x100); + JKR_DELETE(field_0x104); + JKR_DELETE(field_0x108); + JKR_DELETE(field_0x10c); + JKR_DELETE(mPalette); + JKR_DELETE(field_0x110); } void J2DWindow::draw(JGeometry::TBox2 const& param_0) { diff --git a/src/JSystem/J2DGraph/J2DWindowEx.cpp b/src/JSystem/J2DGraph/J2DWindowEx.cpp index 6b1b6748d2..784b9f4f5e 100644 --- a/src/JSystem/J2DGraph/J2DWindowEx.cpp +++ b/src/JSystem/J2DGraph/J2DWindowEx.cpp @@ -111,12 +111,12 @@ void J2DWindowEx::setMinSize() { J2DWindowEx::~J2DWindowEx() { for (u8 i = 0; i < 4; i++) { if (field_0x170 & (1 << i)) { - delete mFrameMaterial[i]; + JKR_DELETE(mFrameMaterial[i]); } } if (field_0x170 & 0x10) { - delete mContentsMaterial; + JKR_DELETE(mContentsMaterial); } } diff --git a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp b/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp index ee148288a1..6004d366e5 100644 --- a/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DMaterialAttach.cpp @@ -1,8 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/J3DGraphAnimator/J3DMaterialAttach.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" void J3DMaterialTable::clear() { @@ -153,7 +154,7 @@ int J3DMaterialTable::createTexMtxForAnimator(J3DAnmTextureSRTKey* pTexSRTKey) { rv = 1; } else { if (texMtx != 0xff && material->getTexMtx(texMtx) == NULL) { - J3DTexMtx* mtx = new J3DTexMtx(); + J3DTexMtx* mtx = JKR_NEW J3DTexMtx(); rv = 4; material->setTexMtx(texMtx, mtx); JUT_WARN(420, "matNo<%d> : texMtx%d nothing !\n", matNo, texMtx); diff --git a/src/JSystem/J3DGraphAnimator/J3DModel.cpp b/src/JSystem/J3DGraphAnimator/J3DModel.cpp index f423f1db2f..9db93d78cd 100644 --- a/src/JSystem/J3DGraphAnimator/J3DModel.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DModel.cpp @@ -1,12 +1,13 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphAnimator/J3DJoint.h" #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h" +#include "JSystem/J3DGraphAnimator/J3DModel.h" #include "JSystem/J3DGraphAnimator/J3DShapeTable.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DShapeMtx.h" #include "JSystem/J3DGraphBase/J3DSys.h" +#include "JSystem/JKernel/JKRHeap.h" #define J3D_ASSERTMSG(LINE, COND, MSG) JUT_ASSERT_MSG(LINE, (COND) != 0, MSG) #define J3D_WARN1(LINE, MSG, ARG1) JUT_WARN(LINE, MSG, ARG1) @@ -41,7 +42,7 @@ s32 J3DModel::entryModelData(J3DModelData* pModelData, u32 mdlFlags, u32 mtxNum) int ret = kJ3DError_Success; mModelData = pModelData; - mMtxBuffer = new J3DMtxBuffer(); + mMtxBuffer = JKR_NEW J3DMtxBuffer(); if (mMtxBuffer == NULL) { return kJ3DError_Alloc; @@ -99,7 +100,7 @@ s32 J3DModel::createShapePacket(J3DModelData* pModelData) { J3D_ASSERTMSG(173, pModelData != NULL, "Error : null pointer."); if (pModelData->getShapeNum() != 0) { - mShapePacket = new J3DShapePacket[pModelData->getShapeNum()]; + mShapePacket = JKR_NEW J3DShapePacket[pModelData->getShapeNum()]; if (mShapePacket == NULL) { return kJ3DError_Alloc; @@ -119,7 +120,7 @@ s32 J3DModel::createMatPacket(J3DModelData* pModelData, u32 mdlFlags) { s32 ret = 0; if (pModelData->getMaterialNum() != 0) { - mMatPacket = new J3DMatPacket[pModelData->getMaterialNum()]; + mMatPacket = JKR_NEW J3DMatPacket[pModelData->getMaterialNum()]; if (mMatPacket == NULL) { return kJ3DError_Alloc; diff --git a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp index 8b881d27d0..afb5226359 100644 --- a/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DMtxBuffer.cpp @@ -93,8 +93,8 @@ s32 J3DMtxBuffer::create(J3DModelData* pModelData, u32 mtxNum) { J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) { if (pModelData->getJointNum() != 0) { - mpScaleFlagArr = new u8[pModelData->getJointNum()]; - mpAnmMtx = new Mtx[pModelData->getJointNum()]; + mpScaleFlagArr = JKR_NEW u8[pModelData->getJointNum()]; + mpAnmMtx = JKR_NEW Mtx[pModelData->getJointNum()]; mpUserAnmMtx = mpAnmMtx; } @@ -110,8 +110,8 @@ J3DError J3DMtxBuffer::createAnmMtx(J3DModelData* pModelData) { s32 J3DMtxBuffer::createWeightEnvelopeMtx(J3DModelData* pModelData) { if (pModelData->getWEvlpMtxNum() != 0) { - mpEvlpScaleFlagArr = new u8[pModelData->getWEvlpMtxNum()]; - mpWeightEvlpMtx = new Mtx[pModelData->getWEvlpMtxNum()]; + mpEvlpScaleFlagArr = JKR_NEW u8[pModelData->getWEvlpMtxNum()]; + mpWeightEvlpMtx = JKR_NEW Mtx[pModelData->getWEvlpMtxNum()]; } if (pModelData->getWEvlpMtxNum() != 0 && mpEvlpScaleFlagArr == NULL) @@ -132,8 +132,8 @@ s32 J3DMtxBuffer::setNoUseDrawMtx() { s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) { if (mtxNum != 0) { for (s32 i = 0; i < 2; i++) { - mpDrawMtxArr[i] = new Mtx*[mtxNum]; - mpNrmMtxArr[i] = new Mtx33*[mtxNum]; + mpDrawMtxArr[i] = JKR_NEW Mtx*[mtxNum]; + mpNrmMtxArr[i] = JKR_NEW Mtx33*[mtxNum]; mpBumpMtxArr[i] = NULL; } } @@ -150,8 +150,8 @@ s32 J3DMtxBuffer::createDoubleDrawMtx(J3DModelData* pModelData, u32 mtxNum) { for (s32 i = 0; i < 2; i++) { for (u32 j = 0; j < mtxNum; j++) { if (pModelData->getDrawMtxNum() != 0) { - mpDrawMtxArr[i][j] = new (0x20) Mtx[pModelData->getDrawMtxNum()]; - mpNrmMtxArr[i][j] = new (0x20) Mtx33[pModelData->getDrawMtxNum()]; + mpDrawMtxArr[i][j] = JKR_NEW_ARGS (0x20) Mtx[pModelData->getDrawMtxNum()]; + mpNrmMtxArr[i][j] = JKR_NEW_ARGS (0x20) Mtx33[pModelData->getDrawMtxNum()]; } } } @@ -187,7 +187,7 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) { if (bumpMtxNum != 0 && mtxNum != 0) { for (int i = 0; i < 2; i++) { - mpBumpMtxArr[i] = new Mtx33**[(u16)materialCount]; + mpBumpMtxArr[i] = JKR_NEW Mtx33**[(u16)materialCount]; if (mpBumpMtxArr[i] == NULL) { return kJ3DError_Alloc; } @@ -200,7 +200,7 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) { for (u16 j = 0; j < materialNum; j++) { J3DMaterial* material = i_modelData->getMaterialNodePointer(j); if (material->getNBTScale()->mbHasScale == true) { - mpBumpMtxArr[i][offset] = new Mtx33*[mtxNum]; + mpBumpMtxArr[i][offset] = JKR_NEW Mtx33*[mtxNum]; if (mpBumpMtxArr[i][offset] == NULL) { return kJ3DError_Alloc; } @@ -217,7 +217,7 @@ s32 J3DMtxBuffer::createBumpMtxArray(J3DModelData* i_modelData, u32 mtxNum) { J3DMaterial* material = i_modelData->getMaterialNodePointer((u16)j); if (material->getNBTScale()->mbHasScale == true) { for (int k = 0; k < mtxNum; k++) { - mpBumpMtxArr[i][offset][k] = new (0x20) Mtx33[i_modelData->getDrawMtxNum()]; + mpBumpMtxArr[i][offset][k] = JKR_NEW_ARGS (0x20) Mtx33[i_modelData->getDrawMtxNum()]; if (mpBumpMtxArr[i][offset][k] == NULL) { return kJ3DError_Alloc; } diff --git a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp index ff464a3642..4b97043474 100644 --- a/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp +++ b/src/JSystem/J3DGraphAnimator/J3DSkinDeform.cpp @@ -99,7 +99,7 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) { } if (pModelData->getJointNum() != 0) { - mSkinNList = new J3DSkinNList[pModelData->getJointNum()]; + mSkinNList = JKR_NEW J3DSkinNList[pModelData->getJointNum()]; } for (int i = 0; i < pModelData->getVtxNum(); i++) { @@ -138,13 +138,13 @@ void J3DSkinDeform::initSkinInfo(J3DModelData* pModelData) { for (u16 i = 0; i < pModelData->getJointNum(); i++) { if (mSkinNList[i].field_0x10) { - mSkinNList[i].field_0x0 = new u16[mSkinNList[i].field_0x10]; - mSkinNList[i].field_0x8 = new f32[mSkinNList[i].field_0x10]; + mSkinNList[i].field_0x0 = JKR_NEW u16[mSkinNList[i].field_0x10]; + mSkinNList[i].field_0x8 = JKR_NEW f32[mSkinNList[i].field_0x10]; mSkinNList[i].field_0x10 = 0; } if (mSkinNList[i].field_0x12) { - mSkinNList[i].field_0x4 = new u16[mSkinNList[i].field_0x12]; - mSkinNList[i].field_0xc = new f32[mSkinNList[i].field_0x12]; + mSkinNList[i].field_0x4 = JKR_NEW u16[mSkinNList[i].field_0x12]; + mSkinNList[i].field_0xc = JKR_NEW f32[mSkinNList[i].field_0x12]; mSkinNList[i].field_0x12 = 0; } } @@ -202,7 +202,7 @@ int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) { return kJ3DError_Success; } - mPosData = new u16[pModelData->getVtxNum()]; + mPosData = JKR_NEW u16[pModelData->getVtxNum()]; if (mPosData == NULL) { return kJ3DError_Alloc; } @@ -212,7 +212,7 @@ int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) { } if (pModelData->getNrmNum()) { - mNrmData = new u16[pModelData->getNrmNum()]; + mNrmData = JKR_NEW u16[pModelData->getNrmNum()]; if (mNrmData == NULL) { return kJ3DError_Alloc; } @@ -223,8 +223,8 @@ int J3DSkinDeform::initMtxIndexArray(J3DModelData* pModelData) { mNrmData = NULL; } - mPosMtx = new Mtx[pModelData->getJointNum()]; - mNrmMtx = new (32) Mtx33[pModelData->getDrawMtxNum()]; + mPosMtx = JKR_NEW Mtx[pModelData->getJointNum()]; + mNrmMtx = JKR_NEW_ARGS (32) Mtx33[pModelData->getDrawMtxNum()]; if (mPosMtx == NULL) { return kJ3DError_Alloc; } diff --git a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp index 03aa07bdd2..fab11a0999 100644 --- a/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp +++ b/src/JSystem/J3DGraphBase/J3DDrawBuffer.cpp @@ -25,7 +25,7 @@ void J3DDrawBuffer::initialize() { } int J3DDrawBuffer::allocBuffer(u32 size) { - mpBuffer = new (0x20) J3DPacket*[size]; + mpBuffer = JKR_NEW_ARGS (0x20) J3DPacket*[size]; if (mpBuffer == NULL) return kJ3DError_Alloc; @@ -39,7 +39,7 @@ int J3DDrawBuffer::allocBuffer(u32 size) { J3DDrawBuffer::~J3DDrawBuffer() { frameInit(); - delete[] mpBuffer; + JKR_DELETE_ARRAY(mpBuffer); mpBuffer = NULL; } diff --git a/src/JSystem/J3DGraphBase/J3DMaterial.cpp b/src/JSystem/J3DGraphBase/J3DMaterial.cpp index 4f577f9045..da9e0395a1 100644 --- a/src/JSystem/J3DGraphBase/J3DMaterial.cpp +++ b/src/JSystem/J3DGraphBase/J3DMaterial.cpp @@ -1,19 +1,20 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/J3DGraphBase/J3DGD.h" +#include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/JKernel/JKRHeap.h" J3DColorBlock* J3DMaterial::createColorBlock(u32 flags) { J3DColorBlock* rv = NULL; switch (flags) { case 0: - rv = new J3DColorBlockLightOff(); + rv = JKR_NEW J3DColorBlockLightOff(); break; case 0x40000000: - rv = new J3DColorBlockLightOn(); + rv = JKR_NEW J3DColorBlockLightOn(); break; case 0x80000000: - rv = new J3DColorBlockAmbientOn(); + rv = JKR_NEW J3DColorBlockAmbientOn(); break; } @@ -25,11 +26,11 @@ J3DTexGenBlock* J3DMaterial::createTexGenBlock(u32 flags) { J3DTexGenBlock* rv = NULL; switch (flags) { case 0x8000000: - rv = new J3DTexGenBlock4(); + rv = JKR_NEW J3DTexGenBlock4(); break; case 0: default: - rv = new J3DTexGenBlockBasic(); + rv = JKR_NEW J3DTexGenBlockBasic(); } J3D_ASSERT_ALLOCMEM(83, rv != NULL); @@ -39,13 +40,13 @@ J3DTexGenBlock* J3DMaterial::createTexGenBlock(u32 flags) { J3DTevBlock* J3DMaterial::createTevBlock(int tevStageNum) { J3DTevBlock* rv = NULL; if (tevStageNum <= 1) { - rv = new J3DTevBlock1(); + rv = JKR_NEW J3DTevBlock1(); } else if (tevStageNum == 2) { - rv = new J3DTevBlock2(); + rv = JKR_NEW J3DTevBlock2(); } else if (tevStageNum <= 4) { - rv = new J3DTevBlock4(); + rv = JKR_NEW J3DTevBlock4(); } else if (tevStageNum <= 16) { - rv = new J3DTevBlock16(); + rv = JKR_NEW J3DTevBlock16(); } J3D_ASSERT_ALLOCMEM(116, rv != NULL); @@ -55,9 +56,9 @@ J3DTevBlock* J3DMaterial::createTevBlock(int tevStageNum) { J3DIndBlock* J3DMaterial::createIndBlock(int flags) { J3DIndBlock* rv = NULL; if (flags != 0) { - rv = new J3DIndBlockFull(); + rv = JKR_NEW J3DIndBlockFull(); } else { - rv = new J3DIndBlockNull(); + rv = JKR_NEW J3DIndBlockNull(); } J3D_ASSERT_ALLOCMEM(139, rv != NULL); @@ -68,24 +69,24 @@ J3DPEBlock* J3DMaterial::createPEBlock(u32 flags, u32 materialMode) { J3DPEBlock* rv = NULL; if (flags == 0) { if (materialMode & 1) { - rv = new J3DPEBlockOpa(); + rv = JKR_NEW J3DPEBlockOpa(); J3D_ASSERT_ALLOCMEM(166, rv != NULL); return rv; } else if (materialMode & 2) { - rv = new J3DPEBlockTexEdge(); + rv = JKR_NEW J3DPEBlockTexEdge(); J3D_ASSERT_ALLOCMEM(172, rv != NULL); return rv; } else if (materialMode & 4) { - rv = new J3DPEBlockXlu(); + rv = JKR_NEW J3DPEBlockXlu(); J3D_ASSERT_ALLOCMEM(178, rv != NULL); return rv; } } if (flags == 0x10000000) { - rv = new J3DPEBlockFull(); + rv = JKR_NEW J3DPEBlockFull(); } else if (flags == 0x20000000) { - rv = new J3DPEBlockFogOff(); + rv = JKR_NEW J3DPEBlockFogOff(); } J3D_ASSERT_ALLOCMEM(188, rv != NULL); @@ -334,7 +335,7 @@ void J3DMaterial::change() { s32 J3DMaterial::newSharedDisplayList(u32 dlSize) { if (mSharedDLObj == NULL) { - mSharedDLObj = new J3DDisplayListObj(); + mSharedDLObj = JKR_NEW J3DDisplayListObj(); if (mSharedDLObj == NULL) { return kJ3DError_Alloc; } @@ -350,7 +351,7 @@ s32 J3DMaterial::newSharedDisplayList(u32 dlSize) { s32 J3DMaterial::newSingleSharedDisplayList(u32 dlSize) { if (mSharedDLObj == NULL) { - mSharedDLObj = new J3DDisplayListObj(); + mSharedDLObj = JKR_NEW J3DDisplayListObj(); if (mSharedDLObj == NULL) { return kJ3DError_Alloc; } diff --git a/src/JSystem/J3DGraphBase/J3DPacket.cpp b/src/JSystem/J3DGraphBase/J3DPacket.cpp index 173061882c..34478ad6d5 100644 --- a/src/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/src/JSystem/J3DGraphBase/J3DPacket.cpp @@ -12,8 +12,8 @@ J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) { mMaxSize = ALIGN_NEXT(maxSize, 0x20); - mpDisplayList[0] = new (0x20) char[mMaxSize]; - mpDisplayList[1] = new (0x20) char[mMaxSize]; + mpDisplayList[0] = JKR_NEW_ARGS (0x20) char[mMaxSize]; + mpDisplayList[1] = JKR_NEW_ARGS (0x20) char[mMaxSize]; mSize = 0; if (mpDisplayList[0] == NULL || mpDisplayList[1] == NULL) @@ -24,7 +24,7 @@ J3DError J3DDisplayListObj::newDisplayList(u32 maxSize) { J3DError J3DDisplayListObj::newSingleDisplayList(u32 maxSize) { mMaxSize = ALIGN_NEXT(maxSize, 0x20); - mpDisplayList[0] = new (0x20) char[mMaxSize]; + mpDisplayList[0] = JKR_NEW_ARGS (0x20) char[mMaxSize]; mpDisplayList[1] = mpDisplayList[0]; mSize = 0; @@ -36,7 +36,7 @@ J3DError J3DDisplayListObj::newSingleDisplayList(u32 maxSize) { int J3DDisplayListObj::single_To_Double() { if (mpDisplayList[0] == mpDisplayList[1]) { - mpDisplayList[1] = new (0x20) char[mMaxSize]; + mpDisplayList[1] = JKR_NEW_ARGS (0x20) char[mMaxSize]; if (mpDisplayList[1] == NULL) return kJ3DError_Alloc; @@ -144,7 +144,7 @@ J3DDrawPacket::J3DDrawPacket() { J3DDrawPacket::~J3DDrawPacket() {} J3DError J3DDrawPacket::newDisplayList(u32 size) { - mpDisplayListObj = new J3DDisplayListObj(); + mpDisplayListObj = JKR_NEW J3DDisplayListObj(); if (mpDisplayListObj == NULL) return kJ3DError_Alloc; @@ -157,7 +157,7 @@ J3DError J3DDrawPacket::newDisplayList(u32 size) { } J3DError J3DDrawPacket::newSingleDisplayList(u32 size) { - mpDisplayListObj = new J3DDisplayListObj(); + mpDisplayListObj = JKR_NEW J3DDisplayListObj(); if (mpDisplayListObj == NULL) return kJ3DError_Alloc; diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp index 1839aa08e3..de9655b6cd 100644 --- a/src/JSystem/J3DGraphBase/J3DShape.cpp +++ b/src/JSystem/J3DGraphBase/J3DShape.cpp @@ -8,6 +8,7 @@ #include "JSystem/J3DGraphBase/J3DFifo.h" #include "JSystem/J3DGraphBase/J3DPacket.h" #include "JSystem/J3DGraphBase/J3DVertex.h" +#include "JSystem/JKernel/JKRHeap.h" void J3DGDSetVtxAttrFmtv(_GXVtxFmt, GXVtxAttrFmtList const*, bool); void J3DFifoLoadPosMtxImm(Mtx, u32); @@ -85,7 +86,7 @@ void J3DShape::addTexMtxIndexInVcd(GXAttr attr) { if (attrIdx == -1) return; - GXVtxDescList* newVtxDesc = new GXVtxDescList[attrCount + 2]; + GXVtxDescList* newVtxDesc = JKR_NEW GXVtxDescList[attrCount + 2]; bool inserted = false; vtxDesc = getVtxDesc(); diff --git a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp index e001a8a8b9..65af40c8d1 100644 --- a/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp +++ b/src/JSystem/J3DGraphBase/J3DShapeDraw.cpp @@ -28,7 +28,7 @@ void J3DShapeDraw::addTexMtxIndexInDL(u32 stride, u32 attrOffs, u32 valueBase) { u32 byteNum = countVertex(stride); u32 oldSize = mDisplayListSize; u32 newSize = ALIGN_NEXT(oldSize + byteNum, 0x20); - u8* newDLStart = new (0x20) u8[newSize]; + u8* newDLStart = JKR_NEW_ARGS (0x20) u8[newSize]; u8* oldDLStart = (u8*)mDisplayList; u8* oldDL = oldDLStart; u8* newDL = newDLStart; diff --git a/src/JSystem/J3DGraphBase/J3DTexture.cpp b/src/JSystem/J3DGraphBase/J3DTexture.cpp index 70d9a69031..7affa168d3 100644 --- a/src/JSystem/J3DGraphBase/J3DTexture.cpp +++ b/src/JSystem/J3DGraphBase/J3DTexture.cpp @@ -1,7 +1,8 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include "JSystem/J3DGraphBase/J3DTexture.h" #include "JSystem/J3DAssert.h" +#include "JSystem/J3DGraphBase/J3DTexture.h" +#include "JSystem/JKernel/JKRHeap.h" void J3DTexture::loadGX(u16 idx, GXTexMapID texMapID) const { J3D_ASSERT_RANGE(29, idx < mNum); @@ -36,7 +37,7 @@ void J3DTexture::entryNum(u16 num) { J3D_ASSERT_NONZEROARG(79, num != 0); mNum = num; - mpRes = new ResTIMG[num]; + mpRes = JKR_NEW ResTIMG[num]; J3D_ASSERT_ALLOCMEM(83, mpRes != NULL); for (int i = 0; i < mNum; i++) { diff --git a/src/JSystem/J3DGraphBase/J3DVertex.cpp b/src/JSystem/J3DGraphBase/J3DVertex.cpp index d455f27c8c..ab84762657 100644 --- a/src/JSystem/J3DGraphBase/J3DVertex.cpp +++ b/src/JSystem/J3DGraphBase/J3DVertex.cpp @@ -76,7 +76,7 @@ void J3DVertexBuffer::setArray() const { s32 J3DVertexBuffer::copyLocalVtxPosArray(u32 flag) { if (flag & 1) { for (int i = 0; i < 2; i++) { - mVtxPosArray[i] = new (0x20) char[mVtxData->getVtxNum() * 3 * 4]; + mVtxPosArray[i] = JKR_NEW_ARGS (0x20) char[mVtxData->getVtxNum() * 3 * 4]; if (mVtxPosArray[i] == NULL) { return kJ3DError_Alloc; } @@ -88,7 +88,7 @@ s32 J3DVertexBuffer::copyLocalVtxPosArray(u32 flag) { mVtxPosArray[0] = mVtxData->getVtxPosArray(); if (mVtxPosArray[1] == NULL) { - mVtxPosArray[1] = new (0x20) char[mVtxData->getVtxNum() * 3 * 4]; + mVtxPosArray[1] = JKR_NEW_ARGS (0x20) char[mVtxData->getVtxNum() * 3 * 4]; if (mVtxPosArray[1] == NULL) { return kJ3DError_Alloc; } @@ -104,7 +104,7 @@ s32 J3DVertexBuffer::copyLocalVtxPosArray(u32 flag) { s32 J3DVertexBuffer::copyLocalVtxNrmArray(u32 flag) { if (flag & 1) { for (int i = 0; i < 2; i++) { - mVtxNrmArray[i] = new (0x20) char[mVtxData->getNrmNum() * 3 * 4]; + mVtxNrmArray[i] = JKR_NEW_ARGS (0x20) char[mVtxData->getNrmNum() * 3 * 4]; if (mVtxNrmArray[i] == NULL) { return kJ3DError_Alloc; } @@ -116,7 +116,7 @@ s32 J3DVertexBuffer::copyLocalVtxNrmArray(u32 flag) { mVtxNrmArray[0] = mVtxData->getVtxNrmArray(); if (mVtxNrmArray[1] == NULL) { - mVtxNrmArray[1] = new (0x20) char[mVtxData->getNrmNum() * 3 * 4]; + mVtxNrmArray[1] = JKR_NEW_ARGS (0x20) char[mVtxData->getNrmNum() * 3 * 4]; if (mVtxNrmArray[1] == NULL) { return kJ3DError_Alloc; } @@ -142,7 +142,7 @@ s32 J3DVertexBuffer::copyLocalVtxArray(u32 flag) { for (int i = 0; i < 2; i++) { if (oldPosArray[i] != mVtxPosArray[i]) { if (mVtxPosArray[i] != mVtxData->getVtxPosArray()) - delete mVtxPosArray[i]; + JKR_DELETE(mVtxPosArray[i]); mVtxPosArray[i] = oldPosArray[i]; } } @@ -161,13 +161,13 @@ s32 J3DVertexBuffer::copyLocalVtxArray(u32 flag) { for (int i = 0; i < 2; i++) { if (oldPosArray[i] != mVtxPosArray[i]) { if (mVtxPosArray[i] != mVtxData->getVtxPosArray()) - delete mVtxPosArray[i]; + JKR_DELETE(mVtxPosArray[i]); mVtxPosArray[i] = oldPosArray[i]; } if (oldNrmArray[i] != mVtxNrmArray[i]) { if (mVtxNrmArray[i] != mVtxData->getVtxNrmArray()) - delete mVtxNrmArray[i]; + JKR_DELETE(mVtxNrmArray[i]); mVtxNrmArray[i] = oldNrmArray[i]; } } @@ -186,7 +186,7 @@ s32 J3DVertexBuffer::allocTransformedVtxPosArray() { for (int i = 0; i < 2; i++) { if (i == 0 || mTransformedVtxPosArray[i] == NULL) { - mTransformedVtxPosArray[i] = new (0x20) char[mVtxData->getVtxNum() * 3 * 4]; + mTransformedVtxPosArray[i] = JKR_NEW_ARGS (0x20) char[mVtxData->getVtxNum() * 3 * 4]; if (mTransformedVtxPosArray[i] == NULL) return kJ3DError_Alloc; } @@ -201,7 +201,7 @@ s32 J3DVertexBuffer::allocTransformedVtxNrmArray() { for (int i = 0; i < 2; i++) { if (i == 0 || mTransformedVtxNrmArray[i] == NULL) { - mTransformedVtxNrmArray[i] = new (0x20) char[mVtxData->getNrmNum() * 3 * 4]; + mTransformedVtxNrmArray[i] = JKR_NEW_ARGS (0x20) char[mVtxData->getNrmNum() * 3 * 4]; if (mTransformedVtxNrmArray[i] == NULL) return kJ3DError_Alloc; } diff --git a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp index a1170e64c0..0663df261a 100644 --- a/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DAnmLoader.cpp @@ -9,6 +9,8 @@ #include "JSystem/JSupport/JSupport.h" #include +#include "JSystem/JKernel/JKRHeap.h" + J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseFlag flag) { const JUTDataFileHeader* header = (const JUTDataFileHeader*)i_data; J3D_ASSERT_NULLPTR(48, i_data); @@ -19,68 +21,68 @@ J3DAnmBase* J3DAnmLoaderDataBase::load(const void* i_data, J3DAnmLoaderDataBaseF switch (header->mType) { case 'bck1': { J3DAnmKeyLoader_v15 loader; - loader.mAnm = new J3DAnmTransformKey(); + loader.mAnm = JKR_NEW J3DAnmTransformKey(); return loader.load(i_data); } case 'bpk1': { J3DAnmKeyLoader_v15 loader; - loader.mAnm = new J3DAnmColorKey(); + loader.mAnm = JKR_NEW J3DAnmColorKey(); return loader.load(i_data); } case 'blk1': { J3DAnmKeyLoader_v15 loader; - loader.mAnm = new J3DAnmClusterKey(); + loader.mAnm = JKR_NEW J3DAnmClusterKey(); return loader.load(i_data); } case 'btk1': { J3DAnmKeyLoader_v15 loader; - loader.mAnm = new J3DAnmTextureSRTKey(); + loader.mAnm = JKR_NEW J3DAnmTextureSRTKey(); return loader.load(i_data); } case 'brk1': { J3DAnmKeyLoader_v15 loader; - loader.mAnm = new J3DAnmTevRegKey(); + loader.mAnm = JKR_NEW J3DAnmTevRegKey(); return loader.load(i_data); } case 'bxk1': { J3DAnmKeyLoader_v15 loader; - loader.mAnm = new J3DAnmVtxColorKey(); + loader.mAnm = JKR_NEW J3DAnmVtxColorKey(); return loader.load(i_data); } case 'bca1': { J3DAnmFullLoader_v15 loader; if (flag & J3DLOADER_UNK_FLAG1) { - loader.mAnm = new J3DAnmTransformFullWithLerp(); + loader.mAnm = JKR_NEW J3DAnmTransformFullWithLerp(); } else { - loader.mAnm = new J3DAnmTransformFull(); + loader.mAnm = JKR_NEW J3DAnmTransformFull(); } return loader.load(i_data); } case 'bpa1': { J3DAnmFullLoader_v15 loader; - loader.mAnm = new J3DAnmColorFull(); + loader.mAnm = JKR_NEW J3DAnmColorFull(); return loader.load(i_data); } case 'btp1': { J3DAnmFullLoader_v15 loader; - loader.mAnm = new J3DAnmTexPattern(); + loader.mAnm = JKR_NEW J3DAnmTexPattern(); return loader.load(i_data); } case 'bva1': { J3DAnmFullLoader_v15 loader; - loader.mAnm = new J3DAnmVisibilityFull(); + loader.mAnm = JKR_NEW J3DAnmVisibilityFull(); return loader.load(i_data); } case 'bla1': { J3DAnmFullLoader_v15 loader; - loader.mAnm = new J3DAnmClusterFull(); + loader.mAnm = JKR_NEW J3DAnmClusterFull(); return loader.load(i_data); } case 'bxa1': { J3DAnmFullLoader_v15 loader; - loader.mAnm = new J3DAnmVtxColorFull(); + loader.mAnm = JKR_NEW J3DAnmVtxColorFull(); return loader.load(i_data); } default: diff --git a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp index 42fa13bc5a..e6fc064c74 100644 --- a/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DClusterLoader.cpp @@ -29,7 +29,7 @@ J3DClusterLoader_v15::~J3DClusterLoader_v15() {} void* J3DClusterLoader_v15::load(const void* i_data) { J3D_ASSERT_NULLPTR(98, i_data); - mpDeformData = new J3DDeformData(); + mpDeformData = JKR_NEW J3DDeformData(); const JUTDataFileHeader* fileHeader = (JUTDataFileHeader*)i_data; const JUTDataBlockHeader* block = &fileHeader->mFirstBlock; @@ -58,13 +58,13 @@ void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) { if (block->mClusterName != NULL) { mpDeformData->mClusterName = - new JUTNameTab(JSUConvertOffsetToPtr(block, block->mClusterName)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(block, block->mClusterName)); } else { mpDeformData->mClusterName = NULL; } if (block->mClusterKeyName != NULL) { mpDeformData->mClusterKeyName = - new JUTNameTab(JSUConvertOffsetToPtr(block, block->mClusterKeyName)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(block, block->mClusterKeyName)); } else { mpDeformData->mClusterKeyName = NULL; } @@ -76,14 +76,14 @@ void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) { int clusterKeyPointerSize = (intptr_t)block->mClusterKeyPointer - (intptr_t)block->mClusterPointer; int clusterVertexPointerSize = (intptr_t)block->mClusterVertex - (intptr_t)block->mClusterPointer; int vtxPosSize = (intptr_t)block->mVtxPos - (intptr_t)block->mClusterPointer; - u8* arr = new (0x20) u8[vtxPosSize]; + u8* arr = JKR_NEW_ARGS (0x20) u8[vtxPosSize]; memcpy(arr, JSUConvertOffsetToPtr(block, block->mClusterPointer), vtxPosSize); mpDeformData->mClusterPointer = (J3DCluster*)arr; mpDeformData->mClusterKeyPointer = (J3DClusterKey*)&arr[clusterKeyPointerSize]; mpDeformData->mClusterVertex = (J3DClusterVertex*)&arr[clusterVertexPointerSize]; #if TARGET_PC - mpDeformData->mDeformers = new J3DDeformer*[mpDeformData->getClusterNum()]; + mpDeformData->mDeformers = JKR_NEW J3DDeformer*[mpDeformData->getClusterNum()]; #endif for (int i = 0; i < mpDeformData->getClusterNum(); i++) { @@ -94,14 +94,14 @@ void J3DClusterLoader_v15::readCluster(const J3DClusterBlock* block) { cluster->mClusterVertex = JSUConvertOffsetToPtr(arr - (intptr_t)clusterPointer, cluster->mClusterVertex); #endif - J3DDeformer* deformer = new J3DDeformer(mpDeformData); + J3DDeformer* deformer = JKR_NEW J3DDeformer(mpDeformData); if (cluster->field_0x14 != 0) { - deformer->field_0xc = new f32[cluster->field_0x14 * 3]; + deformer->field_0xc = JKR_NEW f32[cluster->field_0x14 * 3]; } else { deformer->field_0xc = NULL; } deformer->mFlags = cluster->mFlags; - deformer->field_0x8 = new f32[cluster->mKeyNum]; + deformer->field_0x8 = JKR_NEW f32[cluster->mKeyNum]; #if TARGET_PC deformer->mArrayBase = arr - clusterPointer; deformer->mBlockBase = block; diff --git a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp index dafc4ce417..cf466d589f 100644 --- a/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DJointFactory.cpp @@ -1,8 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep +#include "JSystem/J3DGraphAnimator/J3DJoint.h" #include "JSystem/J3DGraphLoader/J3DJointFactory.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" -#include "JSystem/J3DGraphAnimator/J3DJoint.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JSupport/JSupport.h" J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) { @@ -11,7 +12,7 @@ J3DJointFactory::J3DJointFactory(J3DJointBlock const& block) { } J3DJoint* J3DJointFactory::create(int no) { - J3DJoint* joint = new J3DJoint(); + J3DJoint* joint = JKR_NEW J3DJoint(); J3D_ASSERT_ALLOCMEM(50, joint); joint->mJntNo = no; joint->mKind = getKind(no); diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp index b700190099..b67b9b2527 100644 --- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory.cpp @@ -5,6 +5,7 @@ #include #include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JMath/JMath.h" #include "JSystem/JSupport/JSupport.h" #include "JSystem/JUtility/JUTAssert.h" @@ -135,7 +136,7 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i u32 pe_flag = getMdlDataFlag_PEFlag(i_flags); BOOL ind_flag = (i_flags & 0x1000000) ? TRUE : FALSE; if (i_material == NULL) { - i_material = new J3DMaterial(); + i_material = JKR_NEW J3DMaterial(); J3D_ASSERT_ALLOCMEM(269, i_material); } i_material->mColorBlock = J3DMaterial::createColorBlock(color_flag); @@ -235,14 +236,14 @@ J3DMaterial* J3DMaterialFactory::createNormalMaterial(J3DMaterial* i_material, i J3DMaterial* J3DMaterialFactory::createPatchedMaterial(J3DMaterial* i_material, int i_idx, u32 i_flags) const { if (i_material == NULL) { - i_material = new J3DPatchedMaterial(); + i_material = JKR_NEW J3DPatchedMaterial(); J3D_ASSERT_ALLOCMEM(430, i_material); } bool bVar1 = i_flags & 0x3000000 ? true : false; i_material->mColorBlock = J3DMaterial::createColorBlock(0x40000000); - i_material->mTexGenBlock = new J3DTexGenBlockPatched(); + i_material->mTexGenBlock = JKR_NEW J3DTexGenBlockPatched(); J3D_ASSERT_ALLOCMEM(440, i_material->mTexGenBlock); - i_material->mTevBlock = new J3DTevBlockPatched(); + i_material->mTevBlock = JKR_NEW J3DTevBlockPatched(); J3D_ASSERT_ALLOCMEM(442, i_material->mTevBlock); i_material->mIndBlock = J3DMaterial::createIndBlock(bVar1); i_material->mPEBlock = J3DMaterial::createPEBlock(0x10000000, getMaterialMode(i_idx)); @@ -346,17 +347,17 @@ void J3DMaterialFactory::modifyPatchedCurrentMtx(J3DMaterial* i_material, int i_ J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, int i_idx, u32 i_flags) const { if (i_material == NULL) { - i_material = new J3DLockedMaterial(); + i_material = JKR_NEW J3DLockedMaterial(); J3D_ASSERT_ALLOCMEM(629, i_material); - i_material->mColorBlock = new J3DColorBlockNull(); + i_material->mColorBlock = JKR_NEW J3DColorBlockNull(); J3D_ASSERT_ALLOCMEM(634, i_material->mColorBlock); - i_material->mTexGenBlock = new J3DTexGenBlockNull(); + i_material->mTexGenBlock = JKR_NEW J3DTexGenBlockNull(); J3D_ASSERT_ALLOCMEM(636, i_material->mTexGenBlock); - i_material->mTevBlock = new J3DTevBlockNull(); + i_material->mTevBlock = JKR_NEW J3DTevBlockNull(); J3D_ASSERT_ALLOCMEM(638, i_material->mTevBlock); - i_material->mIndBlock = new J3DIndBlockNull(); + i_material->mIndBlock = JKR_NEW J3DIndBlockNull(); J3D_ASSERT_ALLOCMEM(640, i_material->mIndBlock); - i_material->mPEBlock = new J3DPEBlockNull(); + i_material->mPEBlock = JKR_NEW J3DPEBlockNull(); J3D_ASSERT_ALLOCMEM(642, i_material->mPEBlock); i_material->mIndex = i_idx; i_material->mMaterialMode = mpMaterialMode[i_idx]; @@ -370,7 +371,7 @@ J3DMaterial* J3DMaterialFactory::createLockedMaterial(J3DMaterial* i_material, i i_material->getTevBlock()->setTevRegOffset(mpPatchingInfo[i_idx].mTevRegOffset); i_material->getPEBlock()->setFogOffset(mpPatchingInfo[i_idx].mFogOffset); if (i_material->mSharedDLObj == NULL) { - i_material->mSharedDLObj = new J3DDisplayListObj(); + i_material->mSharedDLObj = JKR_NEW J3DDisplayListObj(); J3D_ASSERT_ALLOCMEM(673, i_material->mSharedDLObj); i_material->mSharedDLObj->setSingleDisplayList((void*)( mpDisplayListInit[i_idx].mOffset + (uintptr_t)&mpDisplayListInit[i_idx]), @@ -544,9 +545,9 @@ J3DTexMtx* J3DMaterialFactory::newTexMtx(int i_idx, int i_no) const { be_swap(tex_mtx_info.mSRT.mRotation); be_swap(tex_mtx_info.mSRT.mTranslationX); be_swap(tex_mtx_info.mSRT.mTranslationY); - tex_mtx = new J3DTexMtx(tex_mtx_info); + tex_mtx = JKR_NEW J3DTexMtx(tex_mtx_info); #else - tex_mtx = new J3DTexMtx(mpTexMtxInfo[mtl_init_data->mTexMtxIdx[i_no]]); + tex_mtx = JKR_NEW J3DTexMtx(mpTexMtxInfo[mtl_init_data->mTexMtxIdx[i_no]]); #endif } return tex_mtx; diff --git a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp b/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp index b00b08ff68..229309545a 100644 --- a/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp +++ b/src/JSystem/J3DGraphLoader/J3DMaterialFactory_v21.cpp @@ -1,8 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h" -#include "JSystem/J3DGraphLoader/J3DMaterialFactory.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" +#include "JSystem/J3DGraphLoader/J3DMaterialFactory.h" +#include "JSystem/J3DGraphLoader/J3DMaterialFactory_v21.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JMath/JMath.h" #include "JSystem/JSupport/JSupport.h" @@ -89,7 +90,7 @@ J3DMaterial* J3DMaterialFactory_v21::create(J3DMaterial* i_material, int i_idx, u32 pe_flag = getMdlDataFlag_PEFlag(i_flags); BOOL ind_flag = (i_flags & 0x1000000) ? TRUE : FALSE; if (i_material == NULL) { - i_material = new J3DMaterial(); + i_material = JKR_NEW J3DMaterial(); } i_material->mColorBlock = J3DMaterial::createColorBlock(color_flag); i_material->mTexGenBlock = J3DMaterial::createTexGenBlock(texgen_flag); @@ -221,7 +222,7 @@ J3DTexMtx* J3DMaterialFactory_v21::newTexMtx(int i_idx, int i_no) const { J3DTexMtx* tex_mtx = NULL; J3DMaterialInitData_v21* mtl_init_data = &mpMaterialInitData[mpMaterialID[i_idx]]; if (mtl_init_data->mTexMtxIdx[i_no] != 0xffff) { - tex_mtx = new J3DTexMtx(mpTexMtxInfo[mtl_init_data->mTexMtxIdx[i_no]]); + tex_mtx = JKR_NEW J3DTexMtx(mpTexMtxInfo[mtl_init_data->mTexMtxIdx[i_no]]); } return tex_mtx; } diff --git a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp index 75f24fc801..cdcd41d1e7 100644 --- a/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp +++ b/src/JSystem/J3DGraphLoader/J3DModelLoader.cpp @@ -64,7 +64,7 @@ J3DModelData* J3DModelLoaderDataBase::loadBinaryDisplayList(const void* i_data, J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) { s32 freeSize = JKRGetCurrentHeap()->getTotalFreeSize(); - mpModelData = new J3DModelData(); + mpModelData = JKR_NEW J3DModelData(); J3D_ASSERT_ALLOCMEM(177, mpModelData); mpModelData->clear(); mpModelData->mpRawData = i_data; @@ -123,7 +123,7 @@ J3DModelData* J3DModelLoader::load(void const* i_data, u32 i_flags) { J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) { int flags = 0x51100000; - mpMaterialTable = new J3DMaterialTable(); + mpMaterialTable = JKR_NEW J3DMaterialTable(); J3D_ASSERT_ALLOCMEM(279, mpMaterialTable); mpMaterialTable->clear(); J3DModelFileData const* data = (J3DModelFileData*)i_data; @@ -146,7 +146,7 @@ J3DMaterialTable* J3DModelLoader::loadMaterialTable(void const* i_data) { block = (J3DModelBlock*)((uintptr_t)block + block->mBlockSize); } if (mpMaterialTable->mTexture == NULL) { - mpMaterialTable->mTexture = new J3DTexture(0, NULL); + mpMaterialTable->mTexture = JKR_NEW J3DTexture(0, NULL); J3D_ASSERT_ALLOCMEM(319, mpMaterialTable->mTexture); } return mpMaterialTable; @@ -157,7 +157,7 @@ inline u32 getBdlFlag_MaterialType(u32 flags) { } J3DModelData* J3DModelLoader::loadBinaryDisplayList(void const* i_data, u32 i_flags) { - mpModelData = new J3DModelData(); + mpModelData = JKR_NEW J3DModelData(); J3D_ASSERT_ALLOCMEM(338, mpModelData); mpModelData->clear(); mpModelData->mpRawData = i_data; @@ -262,13 +262,13 @@ void J3DModelLoader::readInformation(J3DModelInfoBlock const* i_block, u32 i_fla J3DMtxCalc* mtx_calc = NULL; switch (mpModelData->mFlags & 0xf) { case 0: - mtx_calc = new J3DMtxCalcNoAnm(); + mtx_calc = JKR_NEW J3DMtxCalcNoAnm(); break; case 1: - mtx_calc = new J3DMtxCalcNoAnm(); + mtx_calc = JKR_NEW J3DMtxCalcNoAnm(); break; case 2: - mtx_calc = new J3DMtxCalcNoAnm(); + mtx_calc = JKR_NEW J3DMtxCalcNoAnm(); break; default: JUT_PANIC(529, "Error : Invalid MtxCalcType."); @@ -398,7 +398,7 @@ void J3DModelLoader::readDraw(J3DDrawBlock const* i_block) { } } drawMtxData->mDrawFullWgtMtxNum = i; - mpModelData->getJointTree().mWEvlpImportantMtxIdx = new u16[drawMtxData->mEntryNum]; + mpModelData->getJointTree().mWEvlpImportantMtxIdx = JKR_NEW u16[drawMtxData->mEntryNum]; J3D_ASSERT_ALLOCMEM(767, mpModelData->getJointTree().mWEvlpImportantMtxIdx); } @@ -408,13 +408,13 @@ void J3DModelLoader::readJoint(J3DJointBlock const* i_block) { mpModelData->getJointTree().mJointNum = i_block->mJointNum; if (i_block->mpNameTable != NULL) { mpModelData->getJointTree().mJointName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(791, mpModelData->getJointTree().mJointName); } else { mpModelData->getJointTree().mJointName = NULL; } mpModelData->getJointTree().mJointNodePointer = - new J3DJoint*[mpModelData->getJointTree().mJointNum]; + JKR_NEW J3DJoint*[mpModelData->getJointTree().mJointNum]; J3D_ASSERT_ALLOCMEM(797, mpModelData->getJointTree().mJointNodePointer); for (u16 i = 0; i < mpModelData->getJointNum(); i++) { mpModelData->getJointTree().mJointNodePointer[i] = factory.create(i); @@ -428,15 +428,15 @@ void J3DModelLoader_v26::readMaterial(J3DMaterialBlock const* i_block, u32 i_fla mpMaterialTable->mUniqueMatNum = factory.countUniqueMaterials(); if (i_block->mpNameTable != NULL) { mpMaterialTable->mMaterialName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(832, mpMaterialTable->mMaterialName); } else { mpMaterialTable->mMaterialName = NULL; } - mpMaterialTable->mMaterialNodePointer = new J3DMaterial*[mpMaterialTable->mMaterialNum]; + mpMaterialTable->mMaterialNodePointer = JKR_NEW J3DMaterial*[mpMaterialTable->mMaterialNum]; J3D_ASSERT_ALLOCMEM(841, mpMaterialTable->mMaterialNodePointer); if (i_flags & 0x200000) { - mpMaterialTable->field_0x10 = new (0x20) J3DMaterial[mpMaterialTable->mUniqueMatNum]; + mpMaterialTable->field_0x10 = JKR_NEW_ARGS (0x20) J3DMaterial[mpMaterialTable->mUniqueMatNum]; J3D_ASSERT_ALLOCMEM(846, mpMaterialTable->field_0x10); } else { mpMaterialTable->field_0x10 = NULL; @@ -474,15 +474,15 @@ void J3DModelLoader_v21::readMaterial_v21(J3DMaterialBlock_v21 const* i_block, u mpMaterialTable->mUniqueMatNum = factory.countUniqueMaterials(); if (i_block->mpNameTable != NULL) { mpMaterialTable->mMaterialName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(930, mpMaterialTable->mMaterialName); } else { mpMaterialTable->mMaterialName = NULL; } - mpMaterialTable->mMaterialNodePointer = new J3DMaterial*[mpMaterialTable->mMaterialNum]; + mpMaterialTable->mMaterialNodePointer = JKR_NEW J3DMaterial*[mpMaterialTable->mMaterialNum]; J3D_ASSERT_ALLOCMEM(940, mpMaterialTable->mMaterialNodePointer); if (i_flags & 0x200000) { - mpMaterialTable->field_0x10 = new (0x20) J3DMaterial[mpMaterialTable->mUniqueMatNum]; + mpMaterialTable->field_0x10 = JKR_NEW_ARGS (0x20) J3DMaterial[mpMaterialTable->mUniqueMatNum]; J3D_ASSERT_ALLOCMEM(945, mpMaterialTable->field_0x10); } else { mpMaterialTable->field_0x10 = NULL; @@ -518,12 +518,12 @@ void J3DModelLoader::readShape(J3DShapeBlock const* i_block, u32 i_flags) { shape_table->mShapeNum = i_block->mShapeNum; if (i_block->mpNameTable != NULL) { shape_table->mShapeName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(1026, shape_table->mShapeName); } else { shape_table->mShapeName = NULL; } - shape_table->mShapeNodePointer = new J3DShape*[shape_table->mShapeNum]; + shape_table->mShapeNodePointer = JKR_NEW J3DShape*[shape_table->mShapeNum]; J3D_ASSERT_ALLOCMEM(1034, shape_table->mShapeNodePointer); factory.allocVcdVatCmdBuffer(shape_table->mShapeNum); J3DModelHierarchy const* hierarchy_entry = mpModelData->getHierarchy(); @@ -543,12 +543,12 @@ void J3DModelLoader::readTexture(J3DTextureBlock const* i_block) { ResTIMG* texture_res = JSUConvertOffsetToPtr(i_block, i_block->mpTextureRes); if (i_block->mpNameTable != NULL) { mpMaterialTable->mTextureName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(1077, mpMaterialTable->mTextureName); } else { mpMaterialTable->mTextureName = NULL; } - mpMaterialTable->mTexture = new J3DTexture(texture_num, texture_res); + mpMaterialTable->mTexture = JKR_NEW J3DTexture(texture_num, texture_res); J3D_ASSERT_ALLOCMEM(1084, mpMaterialTable->mTexture); } @@ -558,12 +558,12 @@ void J3DModelLoader_v26::readMaterialTable(J3DMaterialBlock const* i_block, u32 mpMaterialTable->mMaterialNum = i_block->mMaterialNum; if (i_block->mpNameTable != NULL) { mpMaterialTable->mMaterialName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(1114, mpMaterialTable->mMaterialName); } else { mpMaterialTable->mMaterialName = NULL; } - mpMaterialTable->mMaterialNodePointer = new J3DMaterial*[mpMaterialTable->mMaterialNum]; + mpMaterialTable->mMaterialNodePointer = JKR_NEW J3DMaterial*[mpMaterialTable->mMaterialNum]; J3D_ASSERT_ALLOCMEM(1121, mpMaterialTable->mMaterialNodePointer); for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) { mpMaterialTable->mMaterialNodePointer[i] = @@ -581,12 +581,12 @@ void J3DModelLoader_v21::readMaterialTable_v21(J3DMaterialBlock_v21 const* i_blo mpMaterialTable->mMaterialNum = i_block->mMaterialNum; if (i_block->mpNameTable != NULL) { mpMaterialTable->mMaterialName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(1165, mpMaterialTable->mMaterialName); } else { mpMaterialTable->mMaterialName = NULL; } - mpMaterialTable->mMaterialNodePointer = new J3DMaterial*[mpMaterialTable->mMaterialNum]; + mpMaterialTable->mMaterialNodePointer = JKR_NEW J3DMaterial*[mpMaterialTable->mMaterialNum]; J3D_ASSERT_ALLOCMEM(1172, mpMaterialTable->mMaterialNodePointer); for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) { mpMaterialTable->mMaterialNodePointer[i] = @@ -604,12 +604,12 @@ void J3DModelLoader::readTextureTable(J3DTextureBlock const* i_block) { ResTIMG* texture_res = JSUConvertOffsetToPtr(i_block, i_block->mpTextureRes); if (i_block->mpNameTable != NULL) { mpMaterialTable->mTextureName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(1211, mpMaterialTable->mTextureName); } else { mpMaterialTable->mTextureName = NULL; } - mpMaterialTable->mTexture = new J3DTexture(texture_num, texture_res); + mpMaterialTable->mTexture = JKR_NEW J3DTexture(texture_num, texture_res); J3D_ASSERT_ALLOCMEM(1218, mpMaterialTable->mTexture); } @@ -620,12 +620,12 @@ void J3DModelLoader::readPatchedMaterial(J3DMaterialBlock const* i_block, u32 i_ mpMaterialTable->mUniqueMatNum = factory.countUniqueMaterials(); if (i_block->mpNameTable != NULL) { mpMaterialTable->mMaterialName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(1251, mpMaterialTable->mMaterialName); } else { mpMaterialTable->mMaterialName = NULL; } - mpMaterialTable->mMaterialNodePointer = new J3DMaterial*[mpMaterialTable->mMaterialNum]; + mpMaterialTable->mMaterialNodePointer = JKR_NEW J3DMaterial*[mpMaterialTable->mMaterialNum]; J3D_ASSERT_ALLOCMEM(1260, mpMaterialTable->mMaterialNodePointer); mpMaterialTable->field_0x10 = NULL; for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) { @@ -646,12 +646,12 @@ void J3DModelLoader::readMaterialDL(J3DMaterialDLBlock const* i_block, u32 i_fla mpMaterialTable->mUniqueMatNum = i_block->mMaterialNum; if (i_block->mpNameTable != NULL) { mpMaterialTable->mMaterialName = - new JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); + JKR_NEW JUTNameTab(JSUConvertOffsetToPtr(i_block, i_block->mpNameTable)); J3D_ASSERT_ALLOCMEM(1312, mpMaterialTable->mMaterialName); } else { mpMaterialTable->mMaterialName = NULL; } - mpMaterialTable->mMaterialNodePointer = new J3DMaterial*[mpMaterialTable->mMaterialNum]; + mpMaterialTable->mMaterialNodePointer = JKR_NEW J3DMaterial*[mpMaterialTable->mMaterialNum]; J3D_ASSERT_ALLOCMEM(1320, mpMaterialTable->mMaterialNodePointer); mpMaterialTable->field_0x10 = NULL; for (u16 i = 0; i < mpMaterialTable->mMaterialNum; i++) { diff --git a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp index 8e679daf7a..8fc51add4a 100644 --- a/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp +++ b/src/JSystem/J3DGraphLoader/J3DShapeFactory.cpp @@ -41,14 +41,14 @@ J3DShapeFactory::J3DShapeFactory(J3DShapeBlock const& block) { } J3DShape* J3DShapeFactory::create(int no, u32 flag, GXVtxDescList* vtxDesc) { - J3DShape* shape = new J3DShape; + J3DShape* shape = JKR_NEW J3DShape; J3D_ASSERT_ALLOCMEM(67, shape); shape->mMtxGroupNum = getMtxGroupNum(no); shape->mRadius = getRadius(no); shape->mVtxDesc = getVtxDescList(no); - shape->mShapeMtx = new J3DShapeMtx*[shape->mMtxGroupNum]; + shape->mShapeMtx = JKR_NEW J3DShapeMtx*[shape->mMtxGroupNum]; J3D_ASSERT_ALLOCMEM(74, shape->mShapeMtx); - shape->mShapeDraw = new J3DShapeDraw*[shape->mMtxGroupNum]; + shape->mShapeDraw = JKR_NEW J3DShapeDraw*[shape->mMtxGroupNum]; J3D_ASSERT_ALLOCMEM(76, shape->mShapeDraw); shape->mMin = getMin(no); shape->mMax = getMax(no); @@ -85,16 +85,16 @@ J3DShapeMtx* J3DShapeFactory::newShapeMtx(u32 flag, int shapeNo, int mtxGroupNo) case J3DMdlDataFlag_ConcatView: switch (shapeInitData.mShapeMtxType) { case J3DShapeMtxType_Mtx: - ret = new J3DShapeMtxConcatView(mtxInitData.mUseMtxIndex); + ret = JKR_NEW J3DShapeMtxConcatView(mtxInitData.mUseMtxIndex); break; case J3DShapeMtxType_BBoard: - ret = new J3DShapeMtxBBoardConcatView(mtxInitData.mUseMtxIndex); + ret = JKR_NEW J3DShapeMtxBBoardConcatView(mtxInitData.mUseMtxIndex); break; case J3DShapeMtxType_YBBoard: - ret = new J3DShapeMtxYBBoardConcatView(mtxInitData.mUseMtxIndex); + ret = JKR_NEW J3DShapeMtxYBBoardConcatView(mtxInitData.mUseMtxIndex); break; case J3DShapeMtxType_Multi: - ret = new J3DShapeMtxMultiConcatView(mtxInitData.mUseMtxIndex, mtxInitData.mUseMtxCount, + ret = JKR_NEW J3DShapeMtxMultiConcatView(mtxInitData.mUseMtxIndex, mtxInitData.mUseMtxCount, &mMtxTable[mtxInitData.mFirstUseMtxIndex]); break; default: @@ -109,10 +109,10 @@ J3DShapeMtx* J3DShapeFactory::newShapeMtx(u32 flag, int shapeNo, int mtxGroupNo) case J3DShapeMtxType_Mtx: case J3DShapeMtxType_BBoard: case J3DShapeMtxType_YBBoard: - ret = new J3DShapeMtx(mtxInitData.mUseMtxIndex); + ret = JKR_NEW J3DShapeMtx(mtxInitData.mUseMtxIndex); break; case J3DShapeMtxType_Multi: - ret = new J3DShapeMtxMulti(mtxInitData.mUseMtxIndex, mtxInitData.mUseMtxCount, + ret = JKR_NEW J3DShapeMtxMulti(mtxInitData.mUseMtxIndex, mtxInitData.mUseMtxCount, &mMtxTable[mtxInitData.mFirstUseMtxIndex]); break; default: @@ -132,13 +132,13 @@ J3DShapeDraw* J3DShapeFactory::newShapeDraw(int shapeNo, int mtxGroupNo) const { const J3DShapeInitData& shapeInitData = mShapeInitData[mIndexTable[shapeNo]]; const J3DShapeDrawInitData& drawInitData = (&mDrawInitData[shapeInitData.mDrawInitDataIndex])[mtxGroupNo]; - shapeDraw = new J3DShapeDraw(&mDisplayListData[drawInitData.mDisplayListIndex], drawInitData.mDisplayListSize); + shapeDraw = JKR_NEW J3DShapeDraw(&mDisplayListData[drawInitData.mDisplayListIndex], drawInitData.mDisplayListSize); J3D_ASSERT_ALLOCMEM(193, shapeDraw); return shapeDraw; } void J3DShapeFactory::allocVcdVatCmdBuffer(u32 count) { - mVcdVatCmdBuffer = new (0x20) u8[J3DShape::kVcdVatDLSize * count]; + mVcdVatCmdBuffer = JKR_NEW_ARGS (0x20) u8[J3DShape::kVcdVatDLSize * count]; J3D_ASSERT_ALLOCMEM(211, mVcdVatCmdBuffer); for (u32 i = 0; i < (J3DShape::kVcdVatDLSize * count) / 4; i++) ((u32*)mVcdVatCmdBuffer)[i] = 0; diff --git a/src/JSystem/JAWExtSystem/JAWGraphContext.cpp b/src/JSystem/JAWExtSystem/JAWGraphContext.cpp index 66d5605362..59cd421af4 100644 --- a/src/JSystem/JAWExtSystem/JAWGraphContext.cpp +++ b/src/JSystem/JAWExtSystem/JAWGraphContext.cpp @@ -18,9 +18,9 @@ JAWGraphContext::JAWGraphContext() : field_0x16 = 6; field_0x18 = 0; if (!sFont) { - sFont = new JUTResFont((ResFONT*)JUTResFONT_Ascfont_fix12, NULL); + sFont = JKR_NEW JUTResFont((ResFONT*)JUTResFONT_Ascfont_fix12, NULL); } - field_0x0 = new J2DPrint(sFont, JUtility::TColor(255, 255, 255, 255), JUtility::TColor(255, 255, 255, 255)); + field_0x0 = JKR_NEW J2DPrint(sFont, JUtility::TColor(255, 255, 255, 255), JUtility::TColor(255, 255, 255, 255)); field_0x0->initiate(); locate(0, 0); } diff --git a/src/JSystem/JAudio2/JAISeMgr.cpp b/src/JSystem/JAudio2/JAISeMgr.cpp index 82885d1db4..0809ede5c6 100644 --- a/src/JSystem/JAudio2/JAISeMgr.cpp +++ b/src/JSystem/JAudio2/JAISeMgr.cpp @@ -49,7 +49,7 @@ void JAISeCategoryMgr::JAISeMgr_freeDeadSe_() { if (i->getObject()->status_.isDead()) { JUT_ASSERT(71, ! i->getObject() ->isHandleAttached()); mSeList.remove(i); - delete i->getObject(); + JKR_DELETE(i->getObject()); } i = link_next; } @@ -258,7 +258,7 @@ JAISe* JAISeMgr::newSe_(int category, u32 priority) { return NULL; } - JAISe* se = new JAISe(this, mStrategyMgr, priority); + JAISe* se = JKR_NEW JAISe(this, mStrategyMgr, priority); if (se == NULL) { JUT_WARN(410, "%s", "JASPoolAllocObject::::operator new failed .\n") return NULL; diff --git a/src/JSystem/JAudio2/JAISeq.cpp b/src/JSystem/JAudio2/JAISeq.cpp index 7f9f9132d1..038ce5989c 100644 --- a/src/JSystem/JAudio2/JAISeq.cpp +++ b/src/JSystem/JAudio2/JAISeq.cpp @@ -56,7 +56,7 @@ void JAISeq::reserveChildTracks_(int param_0) { JUT_ASSERT(92, inner_.outputTrack.getStatus() == JASTrack::STATUS_FREE); for (int i = 0; i < 2; i++) { - JASTrack* track = new JASTrack(); + JASTrack* track = JKR_NEW JASTrack(); if (track) { track->setAutoDelete(true); inner_.outputTrack.connectChild(i, track); @@ -67,7 +67,7 @@ void JAISeq::reserveChildTracks_(int param_0) { continue; } - JASTrack* track2 = new JASTrack(); + JASTrack* track2 = JKR_NEW JASTrack(); if (track2) { track2->setAutoDelete(true); track->connectChild(j, track2); @@ -90,10 +90,10 @@ void JAISeq::releaseChildTracks_() { for (u32 j = 0; j < 16; j++) { JASTrack* track2 = track->getChild(j); if (track2) { - delete track2; + JKR_DELETE(track2); } } - delete track; + JKR_DELETE(track); } } } @@ -176,7 +176,7 @@ void JAISeq::die_() { for (int i = 0; i < 32; i++) { if (inner_.mSoundChild[i]) { - delete inner_.mSoundChild[i]; + JKR_DELETE(inner_.mSoundChild[i]); inner_.mSoundChild[i] = NULL; } } @@ -257,7 +257,7 @@ JAISoundChild* JAISeq::getChild(int index) { return inner_.mSoundChild[index]; } - inner_.mSoundChild[index] = new JAISoundChild(); + inner_.mSoundChild[index] = JKR_NEW JAISoundChild(); if (!inner_.mSoundChild[index]) { JUT_WARN(379, "%s", "JASPoolAllocObject::::operator new failed .\n"); return NULL; @@ -273,7 +273,7 @@ void JAISeq::releaseChild(int index) { if (track) { track->assignExtBuffer(0, NULL); } - delete inner_.mSoundChild[index]; + JKR_DELETE(inner_.mSoundChild[index]); inner_.mSoundChild[index] = NULL; } } diff --git a/src/JSystem/JAudio2/JAISeqMgr.cpp b/src/JSystem/JAudio2/JAISeqMgr.cpp index a077de9434..a1f3554815 100644 --- a/src/JSystem/JAudio2/JAISeqMgr.cpp +++ b/src/JSystem/JAudio2/JAISeqMgr.cpp @@ -43,7 +43,7 @@ void JAISeqMgr::freeDeadSeq_() { JSULink* next = i->getNext(); if (seq->status_.isDead()) { mSeqList.remove(i); - delete seq; + JKR_DELETE(seq); } i = next; } @@ -120,7 +120,7 @@ void JAISeqMgr::mixOut() { } JAISeq* JAISeqMgr::beginStartSeq_() { - JAISeq* seq = new JAISeq(this, field_0x10); + JAISeq* seq = JKR_NEW JAISeq(this, field_0x10); if (seq == NULL) { JUT_WARN(273, "%s", "JASPoolAllocObject::::operator new failed .\n"); } @@ -137,7 +137,7 @@ bool JAISeqMgr::endStartSeq_(JAISeq* seq, JAISoundHandle* handle) { } return true; } - delete sound; + JKR_DELETE(sound); } return false; } diff --git a/src/JSystem/JAudio2/JAIStream.cpp b/src/JSystem/JAudio2/JAIStream.cpp index 7a254547a5..72f37ec248 100644 --- a/src/JSystem/JAudio2/JAIStream.cpp +++ b/src/JSystem/JAudio2/JAIStream.cpp @@ -188,7 +188,7 @@ void JAIStream::die_JAIStream_() { for (int i = 0; i < NUM_CHILDREN; i++) { if (children_[i] != NULL) { - delete children_[i]; + JKR_DELETE(children_[i]); children_[i] = NULL; } } @@ -249,7 +249,7 @@ s32 JAIStream::getNumChild() const { JAISoundChild* JAIStream::getChild(int index) { if (children_[index] == NULL) { - children_[index] = new JAISoundChild(); + children_[index] = JKR_NEW JAISoundChild(); if (children_[index] == NULL) { JUT_WARN(370, "%s", "JASPoolAllocObject::::operator new failed .\n") } @@ -259,7 +259,7 @@ JAISoundChild* JAIStream::getChild(int index) { void JAIStream::releaseChild(int index) { if (children_[index] != NULL) { - delete children_[index]; + JKR_DELETE(children_[index]); children_[index] = NULL; } } diff --git a/src/JSystem/JAudio2/JAIStreamMgr.cpp b/src/JSystem/JAudio2/JAIStreamMgr.cpp index a66f0952a5..2baafdf24a 100644 --- a/src/JSystem/JAudio2/JAIStreamMgr.cpp +++ b/src/JSystem/JAudio2/JAIStreamMgr.cpp @@ -63,7 +63,7 @@ void JAIStreamMgr::freeDeadStream_() { JUT_ASSERT(105, result); } - delete stream; + JKR_DELETE(stream); } i = next; } @@ -114,7 +114,7 @@ JAIStream* JAIStreamMgr::newStream_() { return NULL; } - JAIStream* stream = new JAIStream(this, field_0x6c); + JAIStream* stream = JKR_NEW JAIStream(this, field_0x6c); if (stream == NULL) { JUT_WARN(235, "%s", "JASPoolAllocObject::::operator new failed .\n"); return NULL; diff --git a/src/JSystem/JAudio2/JASAiCtrl.cpp b/src/JSystem/JAudio2/JASAiCtrl.cpp index f9f9ee97be..cc4501e0b8 100644 --- a/src/JSystem/JAudio2/JASAiCtrl.cpp +++ b/src/JSystem/JAudio2/JASAiCtrl.cpp @@ -51,15 +51,15 @@ void JASDriver::initAI(void (*param_0)(void)) { u32 dacSize = getDacSize(); const u32 size = dacSize * 2; for (int i = 0; i < 3; i++) { - sDmaDacBuffer[i] = new(JASDram, 0x20) s16[dacSize]; + sDmaDacBuffer[i] = JKR_NEW_ARGS(JASDram, 0x20) s16[dacSize]; JUT_ASSERT(102, sDmaDacBuffer[i]) JASCalc::bzero(sDmaDacBuffer[i], size); DCStoreRange(sDmaDacBuffer[i], size); } - sDspDacBuffer = new(JASDram, 0) s16*[data_804507A8]; + sDspDacBuffer = JKR_NEW_ARGS(JASDram, 0) s16*[data_804507A8]; JUT_ASSERT(113, sDspDacBuffer); for (int i = 0; i < data_804507A8; i++) { - sDspDacBuffer[i] = new(JASDram, 0x20) s16[getDacSize()]; + sDspDacBuffer[i] = JKR_NEW_ARGS(JASDram, 0x20) s16[getDacSize()]; JUT_ASSERT(119, sDspDacBuffer[i]); JASCalc::bzero(sDspDacBuffer[i], size); DCStoreRange(sDspDacBuffer[i], size); diff --git a/src/JSystem/JAudio2/JASAramStream.cpp b/src/JSystem/JAudio2/JASAramStream.cpp index 61b00f2163..821fc45a7b 100644 --- a/src/JSystem/JAudio2/JASAramStream.cpp +++ b/src/JSystem/JAudio2/JASAramStream.cpp @@ -33,7 +33,7 @@ void JASAramStream::initSystem(u32 block_size, u32 channel_max) { if (sLoadThread == NULL) { sLoadThread = JASDvd::getThreadPointer(); } - sReadBuffer = new (JASDram, 0x20) u8[(block_size + 0x20) * channel_max]; + sReadBuffer = JKR_NEW_ARGS (JASDram, 0x20) u8[(block_size + 0x20) * channel_max]; JUT_ASSERT(79, sReadBuffer); sBlockSize = block_size; sChannelMax = channel_max; @@ -667,7 +667,7 @@ void JASAramStream::channelStart() { // probably a fake match, this should be set in the JASWaveInfo constructor static u32 const one = 1; wave_info.field_0x20 = &one; - JASChannel* jc = new JASChannel(channelCallback, this); + JASChannel* jc = JKR_NEW JASChannel(channelCallback, this); JUT_ASSERT(963, jc); jc->setPriority(0x7f7f); for (u32 j = 0; j < 6; j++) { diff --git a/src/JSystem/JAudio2/JASAudioThread.cpp b/src/JSystem/JAudio2/JASAudioThread.cpp index 0277f00804..c59a703ac1 100644 --- a/src/JSystem/JAudio2/JASAudioThread.cpp +++ b/src/JSystem/JAudio2/JASAudioThread.cpp @@ -27,7 +27,7 @@ void JASAudioThread::create(s32 threadPriority) { #else const int size = 0x2800; #endif - JASAudioThread* pAudioThread = new (JASDram, 0) JASAudioThread(threadPriority, 0x10, size); + JASAudioThread* pAudioThread = JKR_NEW_ARGS (JASDram, 0) JASAudioThread(threadPriority, 0x10, size); JUT_ASSERT(46, pAudioThread); JKRHeap* pCurrentHeap = JKRGetSystemHeap(); JUT_ASSERT(48, pCurrentHeap); diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp index c19daf5fe1..122ffc05b6 100644 --- a/src/JSystem/JAudio2/JASBNKParser.cpp +++ b/src/JSystem/JAudio2/JASBNKParser.cpp @@ -56,7 +56,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h heap = JASDram; } - JASBasicBank* bank = new (heap, 0) JASBasicBank(); + JASBasicBank* bank = JKR_NEW_ARGS (heap, 0) JASBasicBank(); if (bank == NULL) { return NULL; } @@ -68,12 +68,12 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h TListChunk* list_chunk = (TListChunk*)findChunk(stream, 'LIST'); JUT_ASSERT(145, list_chunk); - u8* envt = new (heap, 2) u8[envt_chunk->mSize]; + u8* envt = JKR_NEW_ARGS (heap, 2) u8[envt_chunk->mSize]; JASCalc::bcopy(envt_chunk->mData, envt, envt_chunk->mSize); u32* ptr = &osc_chunk->mCount; u32 count = *ptr++; - JASOscillator::Data* osc_data = new (heap, 0) JASOscillator::Data[count]; + JASOscillator::Data* osc_data = JKR_NEW_ARGS (heap, 0) JASOscillator::Data[count]; for (int i = 0; i < count; i++, ptr += sizeof(TOsc) >> 2) { TOsc* op = (TOsc*)ptr; JUT_ASSERT(155, op->id == 'Osci'); @@ -94,7 +94,7 @@ JASBasicBank* JASBNKParser::Ver1::createBasicBank(void const* stream, JKRHeap* h u32* data = (u32*)((intptr_t)stream + list_chunk->mOffsets[i]); switch (*data++) { case 'Inst': { - JASBasicInst* instp = new (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 = new (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 = new (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 = new (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 = new (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 = new (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; @@ -209,7 +209,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h if (points != NULL) { const JASOscillator::Point* endPtr = getOscTableEndPtr(points); int size = endPtr - points; - JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size]; + JASOscillator::Point* table = JKR_NEW_ARGS (heap, 0) JASOscillator::Point[size]; JUT_ASSERT(396, table != NULL); JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point)); osc->mTable = table; @@ -221,7 +221,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h if (points != NULL) { const JASOscillator::Point* endPtr = getOscTableEndPtr(points); int size = endPtr - points; - JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size]; + JASOscillator::Point* table = JKR_NEW_ARGS (heap, 0) JASOscillator::Point[size]; JUT_ASSERT(409, table != NULL); JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point)); osc->rel_table = table; @@ -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 = new (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 = new (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/src/JSystem/JAudio2/JASBank.cpp b/src/JSystem/JAudio2/JASBank.cpp index b307619694..e656b5b4d0 100644 --- a/src/JSystem/JAudio2/JASBank.cpp +++ b/src/JSystem/JAudio2/JASBank.cpp @@ -37,7 +37,7 @@ JASChannel* JASBank::noteOn(JASBank const* param_0, int param_1, u8 param_2, u8 return NULL; } - JASChannel* channel = new JASChannel(param_5, param_6); + JASChannel* channel = JKR_NEW JASChannel(param_5, param_6); if (!channel) { return NULL; } @@ -74,7 +74,7 @@ JASChannel* JASBank::noteOnOsc(int param_0, u8 param_1, u8 param_2, u16 param_3, {0x000F, 0x0000, 0x0000}, }; static const JASOscillator::Data OSC_ENV = {0, 1.0f, NULL, OSC_RELEASE_TABLE, 1.0f, 0.0f}; - JASChannel* channel = new JASChannel(param_4, param_5); + JASChannel* channel = JKR_NEW JASChannel(param_4, param_5); if (!channel) { return NULL; } diff --git a/src/JSystem/JAudio2/JASBasicBank.cpp b/src/JSystem/JAudio2/JASBasicBank.cpp index 510d7a718d..277691d66c 100644 --- a/src/JSystem/JAudio2/JASBasicBank.cpp +++ b/src/JSystem/JAudio2/JASBasicBank.cpp @@ -12,7 +12,7 @@ void JASBasicBank::newInstTable(u8 num, JKRHeap* heap) { if (num != 0) { JUT_ASSERT(31, num <= JASBank::PRG_OSC); mInstNumMax = num; - mInstTable = new (heap, 0) JASInst*[mInstNumMax]; + mInstTable = JKR_NEW_ARGS (heap, 0) JASInst*[mInstNumMax]; JASCalc::bzero(mInstTable, mInstNumMax * 4); } } diff --git a/src/JSystem/JAudio2/JASBasicInst.cpp b/src/JSystem/JAudio2/JASBasicInst.cpp index 4cd85278f6..eaf9222f65 100644 --- a/src/JSystem/JAudio2/JASBasicInst.cpp +++ b/src/JSystem/JAudio2/JASBasicInst.cpp @@ -17,7 +17,7 @@ JASBasicInst::JASBasicInst() { } JASBasicInst::~JASBasicInst() { - delete[] mKeymap; + JKR_DELETE_ARRAY(mKeymap); } bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) const { @@ -48,8 +48,8 @@ bool JASBasicInst::getParam(int param_0, int param_1, JASInstParam* param_2) con } void JASBasicInst::setKeyRegionCount(u32 count, JKRHeap* param_1) { - delete [] mKeymap; - mKeymap = new (param_1, 0) TKeymap[count]; + JKR_DELETE_ARRAY(mKeymap); + mKeymap = JKR_NEW_ARGS (param_1, 0) TKeymap[count]; JUT_ASSERT(114, mKeymap != NULL); mKeymapCount = count; } diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/src/JSystem/JAudio2/JASBasicWaveBank.cpp index a6134046be..1024d203fd 100644 --- a/src/JSystem/JAudio2/JASBasicWaveBank.cpp +++ b/src/JSystem/JAudio2/JASBasicWaveBank.cpp @@ -15,8 +15,8 @@ JASBasicWaveBank::JASBasicWaveBank() { } JASBasicWaveBank::~JASBasicWaveBank() { - delete[] mWaveTable; - delete[] mWaveGroupArray; + JKR_DELETE_ARRAY(mWaveTable); + JKR_DELETE_ARRAY(mWaveGroupArray); } JASBasicWaveBank::TWaveGroup* JASBasicWaveBank::getWaveGroup(u32 param_0) { @@ -27,9 +27,9 @@ JASBasicWaveBank::TWaveGroup* JASBasicWaveBank::getWaveGroup(u32 param_0) { } void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) { - delete[] mWaveGroupArray; + JKR_DELETE_ARRAY(mWaveGroupArray); mGroupCount = param_0; - mWaveGroupArray = new(param_1, 0) TWaveGroup[param_0]; + mWaveGroupArray = JKR_NEW_ARGS(param_1, 0) TWaveGroup[param_0]; JUT_ASSERT(62, mWaveGroupArray != NULL); for (int i = 0; i < mGroupCount; i++) { mWaveGroupArray[i].mBank = this; @@ -37,8 +37,8 @@ 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]; + JKR_DELETE_ARRAY(mWaveTable); + mWaveTable = JKR_NEW_ARGS(param_1, 0) TWaveHandle[param_0]; JUT_ASSERT(92, mWaveTable != NULL); mHandleCount = param_0; } @@ -98,13 +98,13 @@ JASBasicWaveBank::TWaveGroup::TWaveGroup() { } JASBasicWaveBank::TWaveGroup::~TWaveGroup() { - delete[] mCtrlWaveArray; + JKR_DELETE_ARRAY(mCtrlWaveArray); } void JASBasicWaveBank::TWaveGroup::setWaveCount(u32 param_0, JKRHeap* param_1) { - delete[] mCtrlWaveArray; + JKR_DELETE_ARRAY(mCtrlWaveArray); mWaveCount = param_0; - mCtrlWaveArray = new(param_1, 0) TGroupWaveInfo[param_0]; + mCtrlWaveArray = JKR_NEW_ARGS(param_1, 0) TGroupWaveInfo[param_0]; JUT_ASSERT(255, mCtrlWaveArray != NULL); } diff --git a/src/JSystem/JAudio2/JASChannel.cpp b/src/JSystem/JAudio2/JASChannel.cpp index 0979b38b8d..8e81ef3e86 100644 --- a/src/JSystem/JAudio2/JASChannel.cpp +++ b/src/JSystem/JAudio2/JASChannel.cpp @@ -57,7 +57,7 @@ JASChannel::~JASChannel() { int JASChannel::play() { JASDSPChannel* channel = JASDSPChannel::alloc(JSULoByte(mPriority), dspUpdateCallback, this); if (channel == NULL) { - delete this; + JKR_DELETE(this); return 0; } mDspCh = channel; @@ -70,7 +70,7 @@ int JASChannel::playForce() { JASDSPChannel* channel = JASDSPChannel::allocForce(JSULoByte(mPriority), dspUpdateCallback, this); if (channel == NULL) { - delete this; + JKR_DELETE(this); return 0; } mDspCh = channel; @@ -212,7 +212,7 @@ s32 JASChannel::dspUpdateCallback(u32 i_type, JASDsp::TChannel* i_channel, void* case JASDSPChannel::CB_DROP: _this->mDspCh->free(); _this->mDspCh = NULL; - delete _this; + JKR_DELETE(_this); return -1; default: JUT_WARN(323, "Unexpected JASDSPChannel::UpdateStatus %d", i_type); @@ -233,7 +233,7 @@ s32 JASChannel::initialUpdateDSPChannel(JASDsp::TChannel* i_channel) { JUT_WARN_DEVICE(346, 2, "%s", "Lost wave data while playing"); mDspCh->free(); mDspCh = NULL; - delete this; + JKR_DELETE(this); return -1; } @@ -241,7 +241,7 @@ s32 JASChannel::initialUpdateDSPChannel(JASDsp::TChannel* i_channel) { JUT_WARN_DEVICE(357, 2, "%s","Lost bank data while playing"); mDspCh->free(); mDspCh = NULL; - delete this; + JKR_DELETE(this); return -1; } @@ -311,7 +311,7 @@ s32 JASChannel::updateDSPChannel(JASDsp::TChannel* i_channel) { JUT_WARN_DEVICE(456, 2, "%s","Lost wave data while playing"); mDspCh->free(); mDspCh = NULL; - delete this; + JKR_DELETE(this); return -1; } @@ -319,7 +319,7 @@ s32 JASChannel::updateDSPChannel(JASDsp::TChannel* i_channel) { JUT_WARN_DEVICE(467, 2, "%s", "Lost bank data while playing"); mDspCh->free(); mDspCh = NULL; - delete this; + JKR_DELETE(this); return -1; } @@ -329,7 +329,7 @@ s32 JASChannel::updateDSPChannel(JASDsp::TChannel* i_channel) { if (mOscillators[0].isRelease()) { mDspCh->free(); mDspCh = NULL; - delete this; + JKR_DELETE(this); return -1; } } else { @@ -350,7 +350,7 @@ s32 JASChannel::updateDSPChannel(JASDsp::TChannel* i_channel) { if (i == 0 && mOscillators[i].isStop()) { mDspCh->free(); mDspCh = NULL; - delete this; + JKR_DELETE(this); return -1; } } diff --git a/src/JSystem/JAudio2/JASDSPChannel.cpp b/src/JSystem/JAudio2/JASDSPChannel.cpp index 268c80a779..98d0c115e8 100644 --- a/src/JSystem/JAudio2/JASDSPChannel.cpp +++ b/src/JSystem/JAudio2/JASDSPChannel.cpp @@ -42,7 +42,7 @@ void JASDSPChannel::drop() { } void JASDSPChannel::initAll() { - sDspChannels = new (JASDram, 0x20) JASDSPChannel[0x40]; + sDspChannels = JKR_NEW_ARGS (JASDram, 0x20) JASDSPChannel[0x40]; JUT_ASSERT(102, sDspChannels); for (int i = 0; i < 0x40; i++) { sDspChannels[i].mChannel = JASDsp::getDSPHandle(i); diff --git a/src/JSystem/JAudio2/JASDSPInterface.cpp b/src/JSystem/JAudio2/JASDSPInterface.cpp index d033e8b0de..948b00bcd5 100644 --- a/src/JSystem/JAudio2/JASDSPInterface.cpp +++ b/src/JSystem/JAudio2/JASDSPInterface.cpp @@ -426,9 +426,9 @@ u32 const ATTRIBUTE_ALIGN(32) JASDsp::DSPRES_FILTER[320] = { }; void JASDsp::initBuffer() { - CH_BUF = new(JASDram, 0x20) TChannel[64]; + CH_BUF = JKR_NEW_ARGS(JASDram, 0x20) TChannel[64]; JUT_ASSERT(354, CH_BUF); - FX_BUF = new(JASDram, 0x20) FxBuf[4]; + FX_BUF = JKR_NEW_ARGS(JASDram, 0x20) FxBuf[4]; JUT_ASSERT(356, FX_BUF); JASCalc::bzero(CH_BUF, 0x6000); JASCalc::bzero(FX_BUF, sizeof(FxBuf) * 4); diff --git a/src/JSystem/JAudio2/JASDrumSet.cpp b/src/JSystem/JAudio2/JASDrumSet.cpp index 0262e63c36..ebee34cf21 100644 --- a/src/JSystem/JAudio2/JASDrumSet.cpp +++ b/src/JSystem/JAudio2/JASDrumSet.cpp @@ -17,7 +17,7 @@ void JASDrumSet::newPercArray(u8 num, JKRHeap* heap) { if (num) { JUT_ASSERT(39, num <= 128); mPercNumMax = num; - mPercArray = new (heap, 0) TPerc*[mPercNumMax]; + mPercArray = JKR_NEW_ARGS (heap, 0) TPerc*[mPercNumMax]; JASCalc::bzero(mPercArray, mPercNumMax * sizeof(TPerc*)); } } diff --git a/src/JSystem/JAudio2/JASDvdThread.cpp b/src/JSystem/JAudio2/JASDvdThread.cpp index df118c07a0..31a313a8b1 100644 --- a/src/JSystem/JAudio2/JASDvdThread.cpp +++ b/src/JSystem/JAudio2/JASDvdThread.cpp @@ -16,7 +16,7 @@ bool JASDvd::createThread(s32 priority, int msgCount, u32 stackSize) { return false; } - sThread = new (JASDram, 0) JASTaskThread(priority, msgCount, stackSize); + sThread = JKR_NEW_ARGS (JASDram, 0) JASTaskThread(priority, msgCount, stackSize); JUT_ASSERT(36, sThread); JKRHeap* pCurrentHeap = JKRGetSystemHeap(); diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index e23ae3909f..4fae793504 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -237,7 +237,7 @@ JASGenericMemPool::~JASGenericMemPool() { void* chunk = field_0x0; while (chunk != NULL) { void* next_chunk = *(void**)chunk; - delete[] chunk; + JKR_DELETE_ARRAY(chunk); chunk = next_chunk; } } @@ -253,7 +253,7 @@ void JASGenericMemPool::newMemPool(u32 n, int param_1) { JUT_ASSERT(734, n >= sizeof(TNextOnFreeList)); void* runner; for (int i = 0; i < param_1; i++) { - runner = new (JASDram, 0) u8[n]; + runner = JKR_NEW_ARGS (JASDram, 0) u8[n]; JUT_ASSERT(739, runner); *(void**)runner = field_0x0; field_0x0 = runner; @@ -295,7 +295,7 @@ void JASKernel::setupRootHeap(JKRSolidHeap* heap, u32 size) { JUT_ASSERT(784, heap); sSystemHeap = JKRExpHeap::create(size, heap, false); JUT_ASSERT(787, sSystemHeap); - sCommandHeap = new (heap, 0) JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>(); + sCommandHeap = JKR_NEW_ARGS (heap, 0) JASMemChunkPool<1024, JASThreadingModel::ObjectLevelLockable>(); JUT_ASSERT(790, sCommandHeap); JASDram = heap; } diff --git a/src/JSystem/JAudio2/JASReport.cpp b/src/JSystem/JAudio2/JASReport.cpp index 7afbe68684..00c9925036 100644 --- a/src/JSystem/JAudio2/JASReport.cpp +++ b/src/JSystem/JAudio2/JASReport.cpp @@ -28,7 +28,7 @@ void JASReportInit(JKRHeap* heap, int lineMax) { JUT_ASSERT(35, heap != NULL); OSInitMutex(&sMutex); sLineMax = lineMax; - sBuffer = new (heap, 0) char[sLineMax * 64]; + sBuffer = JKR_NEW_ARGS (heap, 0) char[sLineMax * 64]; JUT_ASSERT(41, sBuffer); } diff --git a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp index 9bc0bbf31d..c6a40bafe5 100644 --- a/src/JSystem/JAudio2/JASSimpleWaveBank.cpp +++ b/src/JSystem/JAudio2/JASSimpleWaveBank.cpp @@ -9,12 +9,12 @@ JASSimpleWaveBank::JASSimpleWaveBank() { } JASSimpleWaveBank::~JASSimpleWaveBank() { - delete[] mWaveTable; + JKR_DELETE_ARRAY(mWaveTable); } void JASSimpleWaveBank::setWaveTableSize(u32 size, JKRHeap* heap) { - delete[] mWaveTable; - mWaveTable = new (heap, 0) TWaveHandle[size]; + JKR_DELETE_ARRAY(mWaveTable); + mWaveTable = JKR_NEW_ARGS (heap, 0) TWaveHandle[size]; JUT_ASSERT(29, mWaveTable != NULL); mWaveTableSize = size; } diff --git a/src/JSystem/JAudio2/JASTrack.cpp b/src/JSystem/JAudio2/JASTrack.cpp index eec0ebd644..de070adde3 100644 --- a/src/JSystem/JAudio2/JASTrack.cpp +++ b/src/JSystem/JAudio2/JASTrack.cpp @@ -23,7 +23,7 @@ JASTrack::TList JASTrack::sTrackList; JASTrack::~JASTrack() { JUT_ASSERT(70, mStatus != STATUS_RUN); for (int i = 1; i < 4; i++) { - delete mChannelMgrs[i]; + JKR_DELETE(mChannelMgrs[i]); } } @@ -34,7 +34,7 @@ void JASTrack::setChannelMgrCount(u32 count) { mChannelMgrCount = 1; for (int i = 1; i < count; i++) { if (mChannelMgrs[i] == NULL) { - mChannelMgrs[i] = new TChannelMgr(this); + mChannelMgrs[i] = JKR_NEW TChannelMgr(this); if (mChannelMgrs[i] == NULL) { JUT_WARN(87, "%s", "Not enough JASTrackChannelMgr\n"); return; @@ -44,7 +44,7 @@ void JASTrack::setChannelMgrCount(u32 count) { } for (u32 i = mChannelMgrCount; i < 4; i++) { if (mChannelMgrs[i] != NULL) { - delete mChannelMgrs[i]; + JKR_DELETE(mChannelMgrs[i]); mChannelMgrs[i] = NULL; } } @@ -81,7 +81,7 @@ void JASTrack::init() { mChannelMgrCount = 1; for (int i = 1; i < 4; i++) { if (mChannelMgrs[i] != NULL) { - delete mChannelMgrs[i]; + JKR_DELETE(mChannelMgrs[i]); mChannelMgrs[i] = NULL; } } @@ -201,7 +201,7 @@ void JASTrack::close() { if (child != NULL) { child->close(); if (child->mFlags.autoDelete) { - delete child; + JKR_DELETE(child); mChildren[i] = NULL; } } @@ -232,7 +232,7 @@ void JASTrack::closeChild(u32 track_no) { getRootTrack()->updateSeq(false, 1.0f); child->close(); if (child->mFlags.autoDelete) { - delete child; + JKR_DELETE(child); mChildren[track_no] = NULL; } } @@ -259,7 +259,7 @@ JASTrack* JASTrack::openChild(u32 trk_no) { break; } } else { - child = new JASTrack(); + child = JKR_NEW JASTrack(); if (child == NULL) { JUT_WARN(388, "%s", "Not enough JASTrack\n"); return NULL; @@ -736,7 +736,7 @@ int JASTrack::tickProc() { getRootTrack()->updateSeq(false, 1.0f); child->close(); if (child->mFlags.autoDelete) { - delete child; + JKR_DELETE(child); mChildren[i] = NULL; } } @@ -794,7 +794,7 @@ void JASTrack::TList::seqMain() { if (seqMainRes < 0) { Remove(&*it); if (it->mFlags.autoDelete) { - delete &*it; + JKR_DELETE(&*it); } } } @@ -811,7 +811,7 @@ void JASTrack::TList::seqMain() { if (seqMainRes < 0) { Remove(&*it); if (it->mFlags.autoDelete) { - delete &*it; + JKR_DELETE(&*it); } } it = it2; diff --git a/src/JSystem/JAudio2/JASWSParser.cpp b/src/JSystem/JAudio2/JASWSParser.cpp index a03f73f35e..112b9197e8 100644 --- a/src/JSystem/JAudio2/JASWSParser.cpp +++ b/src/JSystem/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 = new (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 = new (heap, 0) JASSimpleWaveBank(); + JASSimpleWaveBank* wave_bank = JKR_NEW_ARGS (heap, 0) JASSimpleWaveBank(); if (wave_bank == NULL) { return NULL; } diff --git a/src/JSystem/JAudio2/JASWaveArcLoader.cpp b/src/JSystem/JAudio2/JASWaveArcLoader.cpp index c2b7400444..a082169ccb 100644 --- a/src/JSystem/JAudio2/JASWaveArcLoader.cpp +++ b/src/JSystem/JAudio2/JASWaveArcLoader.cpp @@ -168,13 +168,13 @@ void JASWaveArc::setFileName(char const* fileName) { char* currentDir = JASWaveArcLoader::getCurrentDir(); size_t length = strlen(currentDir); length = length + strlen(fileName); - char* path = new (JASKernel::getSystemHeap(), -4) char[length + 1]; + char* path = JKR_NEW_ARGS (JASKernel::getSystemHeap(), -4) char[length + 1]; JUT_ASSERT(322, path); strcpy(path, currentDir); strcat(path, fileName); path[length] = '\0'; int entryNum = DVDConvertPathToEntrynum(path); - delete[] path; + JKR_DELETE_ARRAY(path); if (entryNum < 0) { return; } diff --git a/src/JSystem/JAudio2/JAUAudioMgr.cpp b/src/JSystem/JAudio2/JAUAudioMgr.cpp index 4e92d1667f..2623707979 100644 --- a/src/JSystem/JAudio2/JAUAudioMgr.cpp +++ b/src/JSystem/JAudio2/JAUAudioMgr.cpp @@ -14,7 +14,7 @@ void dummyDefCtor() { //TODO: ShieldD needs the weak functions this pulls in, but in retail it breaks weak function // placement #if VERSION == VERSION_SHIELD_DEBUG - JAUStreamStaticAramMgr_<1>* streamStaticAramMgr = new(NULL, 0) JAUStreamStaticAramMgr_<1>(); + JAUStreamStaticAramMgr_<1>* streamStaticAramMgr = JKR_NEW_ARGS(NULL, 0) JAUStreamStaticAramMgr_<1>(); streamStaticAramMgr->reserveAram(NULL, 0, 0x14); #endif } diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp index ad2b5beb95..692f61abc2 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp @@ -37,7 +37,7 @@ namespace { return; } field_0x4 = stack_14.getNumFiles(); - field_0x8 = new s32[field_0x4]; + field_0x8 = JKR_NEW s32[field_0x4]; if (!field_0x8) { field_0x4 = NULL; return; @@ -138,7 +138,7 @@ JAUSoundTable* JAUSection::newSoundTable(void const* bst, u32 param_1, bool para bstDst = newCopy(bst, param_1, 4); JUT_ASSERT(296, bstDst); } - JAUSoundTable* soundTable = new JAUSoundTable(param_2); + JAUSoundTable* soundTable = JKR_NEW JAUSoundTable(param_2); JUT_ASSERT(299, soundTable); soundTable->init(bstDst); sectionHeap_->sectionHeapData_.soundTable = soundTable; @@ -160,7 +160,7 @@ JAUSoundNameTable* JAUSection::newSoundNameTable(void const* bstn, u32 param_1, bstnDst = newCopy(bstn, param_1, 4); JUT_ASSERT(326, bstnDst); } - JAUSoundNameTable* soundNameTable = new JAUSoundNameTable(param_2); + JAUSoundNameTable* soundNameTable = JKR_NEW JAUSoundNameTable(param_2); JUT_ASSERT(329, soundNameTable); soundNameTable->init(bstnDst); sectionHeap_->sectionHeapData_.soundNameTable = soundNameTable; @@ -178,12 +178,12 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param TPushCurrentHeap push(getHeap_()); JAIStreamDataMgr* r28 = NULL; if (param_1) { - TStreamDataMgr* r26 = new TStreamDataMgr(param_0); + TStreamDataMgr* r26 = JKR_NEW TStreamDataMgr(param_0); if (r26->isValid()) { r28 = r26; } } else { - JAUStreamDataMgr_StreamFileTable* r25 = new JAUStreamDataMgr_StreamFileTable(); + JAUStreamDataMgr_StreamFileTable* r25 = JKR_NEW JAUStreamDataMgr_StreamFileTable(); r25->init(param_0); if (r25->isValid()) { r28 = r25; @@ -203,7 +203,7 @@ JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) { JUT_ASSERT(405, bsc); { TPushCurrentHeap push(getHeap_()); - JAUSeqDataMgr_SeqCollection* seSeqDataMgr = new JAUSeqDataMgr_SeqCollection(); + JAUSeqDataMgr_SeqCollection* seSeqDataMgr = JKR_NEW JAUSeqDataMgr_SeqCollection(); JUT_ASSERT(409, seSeqDataMgr); seSeqDataMgr->init(bsc); sectionHeap_->sectionHeapData_.seSeqDataMgr_ = seSeqDataMgr; @@ -218,16 +218,16 @@ u8* JAUSection::newStaticSeqDataBlock_(JAISoundID param_0, u32 size) { JUT_ASSERT(421, size); { TPushCurrentHeap push(getHeap_()); - JAUSeqDataBlock* seqDataBlock = new JAUSeqDataBlock(); + JAUSeqDataBlock* seqDataBlock = JKR_NEW JAUSeqDataBlock(); if (!seqDataBlock) { return NULL; } - JSULink* link = new JSULink(seqDataBlock); + JSULink* link = JKR_NEW JSULink(seqDataBlock); if (!link) { JUT_WARN(432, "%s", "created UNUSED object in Heap\n"); return NULL; } - u8* r28 = new(0x20) u8[size]; + u8* r28 = JKR_NEW_ARGS(0x20) u8[size]; if (!r28) { JUT_WARN(438, "%s", "created UNUSED object in Heap\n"); return NULL; @@ -276,7 +276,7 @@ bool JAUSection::newStaticSeqData(JAISoundID param_0) { void* JAUSection::newCopy(void const* param_0, u32 param_1, s32 param_2) { JUT_ASSERT(516, isOpen()); JUT_ASSERT(517, isBuilding()); - u8* r31 = new(getHeap_(), param_2) u8[param_1]; + u8* r31 = JKR_NEW_ARGS(getHeap_(), param_2) u8[param_1]; if (r31) { memcpy(r31, param_0, param_1); } @@ -357,7 +357,7 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) { JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_1); JUT_ASSERT(688, waveBank != NULL); TPushCurrentHeap push(getHeap_()); - JASBank* voiceBank = new JASVoiceBank(); + JASBank* voiceBank = JKR_NEW JASVoiceBank(); if (voiceBank) { if (buildingBankTable_) { JUT_ASSERT(696, buildingBankTable_->getBank( bank_no ) == NULL); @@ -381,9 +381,9 @@ bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) { JAUBankTableLink* bankTableLink = NULL; { TPushCurrentHeap push(getHeap_()); - JASBank** r26 = new JASBank*[param_1]; + JASBank** r26 = JKR_NEW JASBank*[param_1]; if (r26) { - bankTableLink = new JAUBankTableLink(param_0, r26, param_1); + bankTableLink = JKR_NEW JAUBankTableLink(param_0, r26, param_1); if (bankTableLink) { buildingBankTable_ = bankTableLink; } else { @@ -434,7 +434,7 @@ static JAUSectionHeap* JAUNewSectionHeap(JKRSolidHeap* heap, bool param_1) { JUT_ASSERT(809, JKRSolidHeap_isEmpty( heap )); TPushCurrentHeap push(heap); s32 r29 = heap->getFreeSize(); - JAUSectionHeap* sectionHeap = new JAUSectionHeap(heap, param_1, r29); + JAUSectionHeap* sectionHeap = JKR_NEW JAUSectionHeap(heap, param_1, r29); return sectionHeap; } @@ -479,16 +479,16 @@ bool JAUSectionHeap::newDynamicSeqBlock(u32 size) { JUT_ASSERT(939, sectionHeap_ == this); { TPushCurrentHeap push(getHeap_()); - JAUSeqDataBlock * seqDataBlock = new JAUSeqDataBlock(); + JAUSeqDataBlock * seqDataBlock = JKR_NEW JAUSeqDataBlock(); if (!seqDataBlock) { return false; } - JSULink * link = new JSULink(seqDataBlock); + JSULink * link = JKR_NEW JSULink(seqDataBlock); if (!link) { JUT_WARN(950, "%s", "created UNUSED object in Heap\n"); return false; } - u8* r25 = new(0x20) u8[size]; + u8* r25 = JKR_NEW_ARGS(0x20) u8[size]; if (!r25) { JUT_WARN(956, "%s", "created UNUSED object in Heap\n"); return false; diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp index 652474d15d..85271d6500 100644 --- a/src/JSystem/JFramework/JFWDisplay.cpp +++ b/src/JSystem/JFramework/JFWDisplay.cpp @@ -5,12 +5,13 @@ #include #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/JFramework/JFWDisplay.h" +#include "JSystem/JKernel/JKRHeap.h" #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JUtility/JUTConsole.h" #include "JSystem/JUtility/JUTDbPrint.h" #include "JSystem/JUtility/JUTProcBar.h" -#include "global.h" #include "aurora/aurora.h" +#include "global.h" void JFWDisplay::ctor_subroutine(bool enableAlpha) { mEnableAlpha = enableAlpha; @@ -61,7 +62,7 @@ JFWDisplay* JFWDisplay::createManager(_GXRenderModeObj const* p_rObj, JKRHeap* p } if (sManager == NULL) { - sManager = new JFWDisplay(p_heap, xfb_num, enableAlpha); + sManager = JKR_NEW JFWDisplay(p_heap, xfb_num, enableAlpha); } return sManager; diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index c41f7ffc8f..2352cb6d95 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -71,7 +71,7 @@ void JFWSystem::init() { JKRAram::create(CSetUpParam::aramAudioBufSize, CSetUpParam::aramGraphBufSize, CSetUpParam::streamPriority, CSetUpParam::decompPriority, CSetUpParam::aPiecePriority); - mainThread = new JKRThread(OSGetCurrentThread(), 4); + mainThread = JKR_NEW JKRThread(OSGetCurrentThread(), 4); JUTVideo::createManager(CSetUpParam::renderMode); JUTCreateFifo(CSetUpParam::fifoBufSize); @@ -84,7 +84,7 @@ void JFWSystem::init() { JUTException::create(dbPrint); - systemFont = new JUTResFont(CSetUpParam::systemFontRes, NULL); + systemFont = JKR_NEW JUTResFont(CSetUpParam::systemFontRes, NULL); debugPrint = JUTDbPrint::start(NULL, NULL); debugPrint->changeFont(systemFont); diff --git a/src/JSystem/JHostIO/JHICommonMem.cpp b/src/JSystem/JHostIO/JHICommonMem.cpp index 3d2f59fc49..cf27e3e6fa 100644 --- a/src/JSystem/JHostIO/JHICommonMem.cpp +++ b/src/JSystem/JHostIO/JHICommonMem.cpp @@ -6,7 +6,7 @@ JHIMemBuf* JHICommonMem::instance; JHIMemBuf* JHICommonMem::Instance() { if (instance == NULL) { - instance = new JHIMemBuf(); + instance = JKR_NEW JHIMemBuf(); } return instance; diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/src/JSystem/JHostIO/JHIMccBuf.cpp index f71f9fc0fa..f6c7c3d30b 100644 --- a/src/JSystem/JHostIO/JHIMccBuf.cpp +++ b/src/JSystem/JHostIO/JHIMccBuf.cpp @@ -36,7 +36,7 @@ void JHIMccBuf::init() { if (mTempBuf != NULL) { initBuf(); } else { - mTempBuf = new (32) u8[0x18000]; + mTempBuf = JKR_NEW_ARGS (32) u8[0x18000]; if (mTempBuf == NULL) { JHIHalt("ERROR: JHIMccBuf cannot alloc temp buf.\n"); } else { @@ -64,7 +64,7 @@ void JHIMccBuf::initBuf() { JHIMccBuf::~JHIMccBuf() { mRefCount--; if (mRefCount == 0) { - delete[] mTempBuf; + JKR_DELETE_ARRAY(mTempBuf); } } diff --git a/src/JSystem/JHostIO/JHIMemBuf.cpp b/src/JSystem/JHostIO/JHIMemBuf.cpp index 7f02ca32b8..f98b485c80 100644 --- a/src/JSystem/JHostIO/JHIMemBuf.cpp +++ b/src/JSystem/JHostIO/JHIMemBuf.cpp @@ -7,7 +7,7 @@ int JHIMemBuf::create() { int rt = 1; if (mp_buffer == NULL) { - mp_buffer = new (32) u8[0x20000]; + mp_buffer = JKR_NEW_ARGS (32) u8[0x20000]; if (mp_buffer == NULL) { rt = 0; @@ -26,7 +26,7 @@ int JHIMemBuf::open() { void JHIMemBuf::close() { if (mp_buffer != NULL) { - delete[] mp_buffer; + JKR_DELETE_ARRAY(mp_buffer); } } diff --git a/src/JSystem/JHostIO/JHIRMcc.cpp b/src/JSystem/JHostIO/JHIRMcc.cpp index b22a19d365..efc10a5ecd 100644 --- a/src/JSystem/JHostIO/JHIRMcc.cpp +++ b/src/JSystem/JHostIO/JHIRMcc.cpp @@ -61,11 +61,11 @@ bool JHINegotiateInterface(u32) { JHIMccContext JHIGetHiSpeedContext() { if (tContext_new.mp_reader == NULL) { - tContext_new.mp_reader = new JHIMccBufReader(1, 0x18, 0x6000); + tContext_new.mp_reader = JKR_NEW JHIMccBufReader(1, 0x18, 0x6000); } if (tContext_new.mp_writer == NULL) { - tContext_new.mp_writer = new JHIMccBufWriter(1, 0x18, 0x6000); + tContext_new.mp_writer = JKR_NEW JHIMccBufWriter(1, 0x18, 0x6000); } return tContext_new; @@ -73,11 +73,11 @@ JHIMccContext JHIGetHiSpeedContext() { JHIMccContext JHIGetLowSpeedContext() { if (tContext_old.mp_reader == NULL) { - tContext_old.mp_reader = new JHIMccBufReader(1, 2, 0); + tContext_old.mp_reader = JKR_NEW JHIMccBufReader(1, 2, 0); } if (tContext_old.mp_writer == NULL) { - tContext_old.mp_writer = new JHIMccBufWriter(1, 2, 0); + tContext_old.mp_writer = JKR_NEW JHIMccBufWriter(1, 2, 0); } return tContext_old; diff --git a/src/JSystem/JHostIO/JHIhioASync.cpp b/src/JSystem/JHostIO/JHIhioASync.cpp index 0dc75b4e76..b0bcef712a 100644 --- a/src/JSystem/JHostIO/JHIhioASync.cpp +++ b/src/JSystem/JHostIO/JHIhioASync.cpp @@ -31,8 +31,8 @@ BOOL JHIInit(u32 enabled) { OS_REPORT("INFO: *** Disable JHostIO ***\n"); } - gsReadBuf = new (32) u8[0xC000]; - gsWriteBuf = new (32) u8[0xC000]; + gsReadBuf = JKR_NEW_ARGS (32) u8[0xC000]; + gsWriteBuf = JKR_NEW_ARGS (32) u8[0xC000]; if (gsReadBuf == NULL || gsWriteBuf == NULL) { gsEnableInterface = FALSE; diff --git a/src/JSystem/JHostIO/JOREntry.cpp b/src/JSystem/JHostIO/JOREntry.cpp index 0a6b0271c3..5cf9b528a9 100644 --- a/src/JSystem/JHostIO/JOREntry.cpp +++ b/src/JSystem/JHostIO/JOREntry.cpp @@ -7,12 +7,12 @@ void JORInit() { JHIInit(TRUE); - JHICommBufWriter* pComWriter = new JHICommBufWriter(0x10000, 0x10000, 4); - JHICommBufReader* pComReader = new JHICommBufReader(0, 0x10000, 4); + JHICommBufWriter* pComWriter = JKR_NEW JHICommBufWriter(0x10000, 0x10000, 4); + JHICommBufReader* pComReader = JKR_NEW JHICommBufReader(0, 0x10000, 4); JHIContext ctx; - ctx.mp_reader = new JHICommBufReader(0x10000, 0x10000, 4); - ctx.mp_writer = new JHICommBufWriter(0, 0x10000, 4); + ctx.mp_reader = JKR_NEW JHICommBufReader(0x10000, 0x10000, 4); + ctx.mp_writer = JKR_NEW JHICommBufWriter(0, 0x10000, 4); JHIComPortManager* pPortMng = JHIComPortManager::create(); pPortMng->getRefPort().setBuf(pComReader, pComWriter); diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp index f6423ffebd..bbd41d7fc8 100644 --- a/src/JSystem/JHostIO/JORServer.cpp +++ b/src/JSystem/JHostIO/JORServer.cpp @@ -117,7 +117,7 @@ JORServer* JORServer::instance; JORServer* JORServer::create() { if (instance == NULL) { - instance = new JORServer(); + instance = JKR_NEW JORServer(); } return instance; diff --git a/src/JSystem/JKernel/JKRAram.cpp b/src/JSystem/JKernel/JKRAram.cpp index a69ac99fba..10a5bd62b3 100644 --- a/src/JSystem/JKernel/JKRAram.cpp +++ b/src/JSystem/JKernel/JKRAram.cpp @@ -27,7 +27,7 @@ JKRAram* JKRAram::sAramObject; JKRAram* JKRAram::create(u32 aram_audio_buffer_size, u32 aram_audio_graph_size, s32 stream_priority, s32 decomp_priority, s32 piece_priority) { if (!sAramObject) { - sAramObject = new (JKRGetSystemHeap(), 0) + sAramObject = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRAram(aram_audio_buffer_size, aram_audio_graph_size, piece_priority); } @@ -76,13 +76,13 @@ JKRAram::JKRAram(u32 audio_buffer_size, u32 audio_graph_size, s32 priority) OS_REPORT("ARAM graph area %08x: %08x\n", mGraphMemoryPtr, mGraphMemorySize); OS_REPORT("ARAM user area %08x: %08x\n", mAramMemoryPtr, mAramMemorySize); - mAramHeap = new (JKRGetSystemHeap(), 0) JKRAramHeap(mGraphMemoryPtr, mGraphMemorySize); + mAramHeap = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRAramHeap(mGraphMemoryPtr, mGraphMemorySize); } JKRAram::~JKRAram() { sAramObject = NULL; if (mAramHeap) - delete mAramHeap; + JKR_DELETE(mAramHeap); } void* JKRAram::run(void) { @@ -93,7 +93,7 @@ void* JKRAram::run(void) { JKRAramCommand* message = (JKRAramCommand*)msg; int result = message->field_0x00; JKRAMCommand* command = (JKRAMCommand*)message->command; - delete message; + JKR_DELETE(message); switch (result) { case 1: diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index fe7c9bbb84..b5a960fe0e 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -47,11 +47,11 @@ JKRAramArchive::~JKRAramArchive() { } if (mDvdFile != NULL) { - delete mDvdFile; + JKR_DELETE(mDvdFile); } if (mBlock != NULL) { - delete mBlock; + JKR_DELETE(mBlock); } JKRFileLoader::sVolumeList.remove(&mFileLoaderLink); @@ -104,7 +104,7 @@ bool JKRAramArchive::open(s32 entryNum) { mStringTable = NULL; mBlock = NULL; - mDvdFile = new (JKRGetSystemHeap(), mMountDirection == MOUNT_DIRECTION_HEAD ? 4 : -4) + mDvdFile = JKR_NEW_ARGS (JKRGetSystemHeap(), mMountDirection == MOUNT_DIRECTION_HEAD ? 4 : -4) JKRDvdFile(entryNum); if (mDvdFile == NULL) { mMountMode = 0; @@ -186,7 +186,7 @@ cleanup: if (mMountMode == 0) { OS_REPORT(":::[%s: %d] Cannot alloc memory\n", __FILE__, 415); if (mDvdFile != NULL) { - delete mDvdFile; + JKR_DELETE(mDvdFile); } return false; } diff --git a/src/JSystem/JKernel/JKRAramBlock.cpp b/src/JSystem/JKernel/JKRAramBlock.cpp index a7a1fcf96d..63b4b3cf67 100644 --- a/src/JSystem/JKernel/JKRAramBlock.cpp +++ b/src/JSystem/JKernel/JKRAramBlock.cpp @@ -30,7 +30,7 @@ JKRAramBlock* JKRAramBlock::allocHead(u32 size, u8 groupId, JKRAramHeap* aramHea u32 nextAddress = mAddress + mSize; u32 nextFreeSize = mFreeSize - size; - JKRAramBlock* block = new (aramHeap->getMgrHeap(), 0) + JKRAramBlock* block = JKR_NEW_ARGS (aramHeap->getMgrHeap(), 0) JKRAramBlock(nextAddress, size, nextFreeSize, groupId, false); mFreeSize = 0; @@ -42,7 +42,7 @@ JKRAramBlock* JKRAramBlock::allocTail(u32 size, u8 groupId, JKRAramHeap* aramHea u32 tailAddress = mAddress + mSize + mFreeSize - size; JKRAramBlock* block = - new (aramHeap->getMgrHeap(), 0) JKRAramBlock(tailAddress, size, 0, groupId, true); + JKR_NEW_ARGS (aramHeap->getMgrHeap(), 0) JKRAramBlock(tailAddress, size, 0, groupId, true); mFreeSize -= size; mBlockLink.getSupervisor()->insert(mBlockLink.getNext(), &block->mBlockLink); diff --git a/src/JSystem/JKernel/JKRAramHeap.cpp b/src/JSystem/JKernel/JKRAramHeap.cpp index a1ea01f816..648a6b372e 100644 --- a/src/JSystem/JKernel/JKRAramHeap.cpp +++ b/src/JSystem/JKernel/JKRAramHeap.cpp @@ -16,12 +16,12 @@ JKRAramHeap::JKRAramHeap(u32 startAddress, u32 size) { mTailAddress = mHeadAddress + mSize; mGroupId = -1; - JKRAramBlock* block = new (mHeap, 0) JKRAramBlock(mHeadAddress, 0, mSize, -1, false); + JKRAramBlock* block = JKR_NEW_ARGS (mHeap, 0) JKRAramBlock(mHeadAddress, 0, mSize, -1, false); sAramList.append(&block->mBlockLink); } JKRAramHeap::~JKRAramHeap() { - for (JSUListIterator iterator = sAramList.getFirst(); iterator != sAramList.getEnd(); delete (iterator++).getObject()) {} + for (JSUListIterator iterator = sAramList.getFirst(); iterator != sAramList.getEnd(); JKR_DELETE((iterator++).getObject())) {} } JKRAramBlock* JKRAramHeap::alloc(u32 size, JKRAramHeap::EAllocMode allocationMode) { diff --git a/src/JSystem/JKernel/JKRAramPiece.cpp b/src/JSystem/JKernel/JKRAramPiece.cpp index d0b55ba07b..16e2a1ca06 100644 --- a/src/JSystem/JKernel/JKRAramPiece.cpp +++ b/src/JSystem/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 = new (JKRGetSystemHeap(), -4) JKRAMCommand(); + JKRAMCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRAMCommand(); command->mTransferDirection = direction; command->mSrc = src; command->mDst = dst; @@ -38,7 +38,7 @@ JKRAMCommand* JKRAramPiece::orderAsync(int direction, uintptr_t source, uintptr_ JUTException::panic(__FILE__, 108, "illegal address. abort."); } - JKRAramCommand* message = new (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); @@ -80,7 +80,7 @@ BOOL JKRAramPiece::orderSync(int direction, uintptr_t source, uintptr_t destinat JKRAMCommand* command = JKRAramPiece::orderAsync(direction, source, destination, length, block, NULL); BOOL result = JKRAramPiece::sync(command, 0); - delete command; + JKR_DELETE(command); unlock(); return result; @@ -132,9 +132,9 @@ JKRAMCommand::JKRAMCommand() : mPieceLink(this), field_0x30(this) { JKRAMCommand::~JKRAMCommand() { if (field_0x8C) - delete field_0x8C; + JKR_DELETE(field_0x8C); if (field_0x90) - delete field_0x90; + JKR_DELETE(field_0x90); if (field_0x94) JKRFree(field_0x94); diff --git a/src/JSystem/JKernel/JKRAramStream.cpp b/src/JSystem/JKernel/JKRAramStream.cpp index 94b9ca91fc..14be57a78e 100644 --- a/src/JSystem/JKernel/JKRAramStream.cpp +++ b/src/JSystem/JKernel/JKRAramStream.cpp @@ -16,7 +16,7 @@ JKRAramStream* JKRAramStream::sAramStreamObject; JKRAramStream* JKRAramStream::create(s32 priority) { if (!sAramStreamObject) { - sAramStreamObject = new (JKRGetSystemHeap(), 0) JKRAramStream(priority); + sAramStreamObject = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRAramStream(priority); JKRResetAramTransferBuffer(); } @@ -141,7 +141,7 @@ JKRHeap* JKRAramStream::transHeap; JKRAramStreamCommand* JKRAramStream::write_StreamToAram_Async(JSUFileInputStream* stream, u32 addr, u32 size, u32 offset, u32* returnSize) { - JKRAramStreamCommand* command = new (JKRGetSystemHeap(), -4) JKRAramStreamCommand(); + JKRAramStreamCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRAramStreamCommand(); command->mType = JKRAramStreamCommand::WRITE; command->mAddress = addr; command->mSize = size; diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/JSystem/JKernel/JKRArchivePub.cpp index 0dbbb407ed..159bce69aa 100644 --- a/src/JSystem/JKernel/JKRArchivePub.cpp +++ b/src/JSystem/JKernel/JKRArchivePub.cpp @@ -45,7 +45,7 @@ JKRArchive* JKRArchive::mount(void* ptr, JKRHeap* heap, int alignment = mountDirection == MOUNT_DIRECTION_HEAD ? 4 : -4; - JKRArchive* newArchive = new (heap, alignment) JKRMemArchive(ptr, 0xFFFF, JKRMEMBREAK_FLAG_UNKNOWN0); + JKRArchive* newArchive = JKR_NEW_ARGS (heap, alignment) JKRMemArchive(ptr, 0xFFFF, JKRMEMBREAK_FLAG_UNKNOWN0); return newArchive; } @@ -60,21 +60,21 @@ JKRArchive* JKRArchive::mount(s32 entryNum, JKRArchive::EMountMode mountMode, JK JKRArchive* newArchive; switch (mountMode) { case JKRArchive::MOUNT_MEM: - newArchive = new (heap, alignment) JKRMemArchive(entryNum, mountDirection); + newArchive = JKR_NEW_ARGS (heap, alignment) JKRMemArchive(entryNum, mountDirection); break; case JKRArchive::MOUNT_ARAM: - newArchive = new (heap, alignment) JKRAramArchive(entryNum, mountDirection); + newArchive = JKR_NEW_ARGS (heap, alignment) JKRAramArchive(entryNum, mountDirection); break; case JKRArchive::MOUNT_DVD: - newArchive = new (heap, alignment) JKRDvdArchive(entryNum, mountDirection); + newArchive = JKR_NEW_ARGS (heap, alignment) JKRDvdArchive(entryNum, mountDirection); break; case JKRArchive::MOUNT_COMP: - newArchive = new (heap, alignment) JKRCompArchive(entryNum, mountDirection); + newArchive = JKR_NEW_ARGS (heap, alignment) JKRCompArchive(entryNum, mountDirection); break; } if (newArchive && newArchive->mMountMode == JKRArchive::UNKNOWN_MOUNT_MODE) { - delete newArchive; + JKR_DELETE(newArchive); newArchive = NULL; } @@ -330,7 +330,7 @@ JKRFileFinder* JKRArchive::getFirstFile(const char* path) const { if (dirEntry) { // don't know what is correct here... for now we're casting away const - return new (JKRGetSystemHeap(), 0) + return JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRArcFinder((JKRArchive*)this, dirEntry->first_file_index, (u32)dirEntry->num_entries); } diff --git a/src/JSystem/JKernel/JKRAssertHeap.cpp b/src/JSystem/JKernel/JKRAssertHeap.cpp index 34e936405e..d72ca62b58 100644 --- a/src/JSystem/JKernel/JKRAssertHeap.cpp +++ b/src/JSystem/JKernel/JKRAssertHeap.cpp @@ -23,7 +23,7 @@ JKRAssertHeap* JKRAssertHeap::create(JKRHeap* parent) { if (!ptr) return NULL; - JKRAssertHeap* heap = new (ptr) JKRAssertHeap(NULL, 0, parent, false); + JKRAssertHeap* heap = JKR_NEW_ARGS (ptr) JKRAssertHeap(NULL, 0, parent, false); return heap; } diff --git a/src/JSystem/JKernel/JKRCompArchive.cpp b/src/JSystem/JKernel/JKRCompArchive.cpp index 7c5217684b..360eec0b56 100644 --- a/src/JSystem/JKernel/JKRCompArchive.cpp +++ b/src/JSystem/JKernel/JKRCompArchive.cpp @@ -54,7 +54,7 @@ JKRCompArchive::~JKRCompArchive() { } if (mDvdFile != NULL) { - delete mDvdFile; + JKR_DELETE(mDvdFile); } sVolumeList.remove(&mFileLoaderLink); @@ -73,7 +73,7 @@ bool JKRCompArchive::open(s32 entryNum) { mFiles = NULL; mStringTable = NULL; - mDvdFile = new (JKRGetSystemHeap(), 0) JKRDvdFile(entryNum); + mDvdFile = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRDvdFile(entryNum); if(mDvdFile == NULL) { mMountMode = 0; return 0; @@ -216,7 +216,7 @@ bool JKRCompArchive::open(s32 entryNum) { if (mMountMode == 0) { OS_REPORT(":::[%s: %d] Cannot alloc memory in mounting CompArchive\n", __FILE__, 567); if(mDvdFile != NULL) { - delete mDvdFile; + JKR_DELETE(mDvdFile); } return false; } diff --git a/src/JSystem/JKernel/JKRDecomp.cpp b/src/JSystem/JKernel/JKRDecomp.cpp index 31509666be..221fe7e70f 100644 --- a/src/JSystem/JKernel/JKRDecomp.cpp +++ b/src/JSystem/JKernel/JKRDecomp.cpp @@ -14,7 +14,7 @@ JKRDecomp* JKRDecomp::sDecompObject; JKRDecomp* JKRDecomp::create(s32 priority) { if (!sDecompObject) { - sDecompObject = new (JKRGetSystemHeap(), 0) JKRDecomp(priority); + sDecompObject = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRDecomp(priority); } return sDecompObject; @@ -62,7 +62,7 @@ void* JKRDecomp::run() { JKRDecompCommand* JKRDecomp::prepareCommand(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength, JKRDecompCommand::AsyncCallback callback) { - JKRDecompCommand* command = new (JKRGetSystemHeap(), -4) JKRDecompCommand(); + JKRDecompCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRDecompCommand(); command->mSrcBuffer = srcBuffer; command->mDstBuffer = dstBuffer; command->mSrcLength = srcLength; @@ -102,7 +102,7 @@ bool JKRDecomp::sync(JKRDecompCommand* command, int isNonBlocking) { bool JKRDecomp::orderSync(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength) { JKRDecompCommand* command = orderAsync(srcBuffer, dstBuffer, srcLength, dstLength, NULL); bool result = sync(command, JKRDECOMP_SYNC_BLOCKING); - delete command; + JKR_DELETE(command); return result; } diff --git a/src/JSystem/JKernel/JKRDvdAramRipper.cpp b/src/JSystem/JKernel/JKRDvdAramRipper.cpp index 714ad8aae8..7919f99797 100644 --- a/src/JSystem/JKernel/JKRDvdAramRipper.cpp +++ b/src/JSystem/JKernel/JKRDvdAramRipper.cpp @@ -38,17 +38,17 @@ JKRAramBlock* JKRDvdAramRipper::loadToAram(JKRDvdFile* dvdFile, u32 address, syncAram(command, 0); if (command->field_0x48 < 0) { - delete command; + JKR_DELETE(command); return NULL; } if (address) { - delete command; + JKR_DELETE(command); return (JKRAramBlock*)-1; } JKRAramBlock* result = command->mBlock; - delete command; + JKR_DELETE(command); return result; } @@ -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 = new (JKRGetSystemHeap(), -4) JKRADCommand(); + JKRADCommand* command = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JKRADCommand(); command->mDvdFile = dvdFile; command->mAddress = address; command->mBlock = NULL; @@ -68,7 +68,7 @@ JKRADCommand* JKRDvdAramRipper::loadToAram_Async(JKRDvdFile* dvdFile, u32 addres JKRADCommand* cmd2 = callCommand_Async(command); if (!cmd2) { - delete command; + JKR_DELETE(command); return NULL; } @@ -94,7 +94,7 @@ JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) { bVar1 = false; } else { dvdFile->field_0x50 = OSGetCurrentThread(); - JSUFileInputStream* stream = new (JKRGetSystemHeap(), -4) JSUFileInputStream(dvdFile); + JSUFileInputStream* stream = JKR_NEW_ARGS (JKRGetSystemHeap(), -4) JSUFileInputStream(dvdFile); dvdFile->mFileStream = stream; u32 fileSize = dvdFile->getFileSize(); if (command->field_0x40 && fileSize > command->field_0x40) { @@ -111,7 +111,7 @@ JKRADCommand* JKRDvdAramRipper::callCommand_Async(JKRADCommand* command) { } if (JKRDvdAramRipper::errorRetry == 0) { - delete stream; + JKR_DELETE(stream); return NULL; } @@ -206,10 +206,10 @@ bool JKRDvdAramRipper::syncAram(JKRADCommand* command, int param_1) { (*((JSUList*)&sDvdAramAsyncList)).remove(&command->mLink); if (command->mStreamCommand) { - delete command->mStreamCommand; + JKR_DELETE(command->mStreamCommand); } - delete dvdFile->mFileStream; + JKR_DELETE(dvdFile->mFileStream); dvdFile->field_0x50 = NULL; OSUnlockMutex(&dvdFile->mMutex2); return true; @@ -222,7 +222,7 @@ JKRADCommand::JKRADCommand() : mLink(this) { JKRADCommand::~JKRADCommand() { if (field_0x4c == 1) { - delete mDvdFile; + JKR_DELETE(mDvdFile); } } diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index dd4d504868..18925c20ad 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -45,7 +45,7 @@ JKRDvdArchive::~JKRDvdArchive() { } if (mDvdFile) { - delete mDvdFile; + JKR_DELETE(mDvdFile); } sVolumeList.remove(&mFileLoaderLink); @@ -60,7 +60,7 @@ bool JKRDvdArchive::open(s32 entryNum) { mFiles = NULL; mStringTable = NULL; - mDvdFile = new (JKRGetSystemHeap(), 0) JKRDvdFile(entryNum); + mDvdFile = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRDvdFile(entryNum); if (!mDvdFile) { mMountMode = UNKNOWN_MOUNT_MODE; return false; @@ -136,7 +136,7 @@ cleanup: if (mMountMode == UNKNOWN_MOUNT_MODE) { OS_REPORT(":::Cannot alloc memory [%s][%d]\n", __FILE__, 397); if (mDvdFile) { - delete mDvdFile; + JKR_DELETE(mDvdFile); } return false; } diff --git a/src/JSystem/JKernel/JKRExpHeap.cpp b/src/JSystem/JKernel/JKRExpHeap.cpp index a4f2bbad8c..283445b0a2 100644 --- a/src/JSystem/JKernel/JKRExpHeap.cpp +++ b/src/JSystem/JKernel/JKRExpHeap.cpp @@ -30,7 +30,7 @@ JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) { } } #endif - JKRExpHeap* heap2 = new (mem2) JKRExpHeap(local_20, local_24, NULL, errorFlag); + JKRExpHeap* heap2 = JKR_NEW_ARGS (mem2) JKRExpHeap(local_20, local_24, NULL, errorFlag); sRootHeap2 = heap2; heap2->field_0x6e = true; #endif @@ -49,7 +49,7 @@ JKRExpHeap* JKRExpHeap::createRoot(int maxHeaps, bool errorFlag) { } } #endif - heap = new (mem1) JKRExpHeap(start1, alignedSize, NULL, errorFlag); + heap = JKR_NEW_ARGS (mem1) JKRExpHeap(start1, alignedSize, NULL, errorFlag); sRootHeap = heap; } heap->field_0x6e = true; @@ -79,7 +79,7 @@ JKRExpHeap* JKRExpHeap::create(u32 size, JKRHeap* parent, bool errorFlag) { return NULL; } - newHeap = new (memory) JKRExpHeap(dataPtr, alignedSize - expHeapSize, parent, errorFlag); + newHeap = JKR_NEW_ARGS (memory) JKRExpHeap(dataPtr, alignedSize - expHeapSize, parent, errorFlag); if (newHeap == NULL) { JKRFree(memory); @@ -117,7 +117,7 @@ JKRExpHeap* JKRExpHeap::create(void* ptr, u32 size, JKRHeap* parent, bool errorF u8* dataPtr = r28 + expHeapSize; u32 alignedSize = ALIGN_PREV((uintptr_t)ptr + size - (uintptr_t)dataPtr, 0x10); if (r28) { - newHeap = new (r28) JKRExpHeap(dataPtr, alignedSize, parent2, errorFlag); + newHeap = JKR_NEW_ARGS (r28) JKRExpHeap(dataPtr, alignedSize, parent2, errorFlag); } #if DEBUG if (newHeap) { diff --git a/src/JSystem/JKernel/JKRFileCache.cpp b/src/JSystem/JKernel/JKRFileCache.cpp index 1dc3a719ef..fed5e0335e 100644 --- a/src/JSystem/JKernel/JKRFileCache.cpp +++ b/src/JSystem/JKernel/JKRFileCache.cpp @@ -33,7 +33,7 @@ JKRFileCache* JKRFileCache::mount(const char* path, JKRHeap* heap, const char* p } - JKRFileCache* fileCache = new (heap, 0) JKRFileCache(path, param_3); + JKRFileCache* fileCache = JKR_NEW_ARGS (heap, 0) JKRFileCache(path, param_3); return fileCache; } @@ -123,7 +123,7 @@ void* JKRFileCache::getResource(const char* path) { if (buffer) { dvdFile.read(buffer, alignedSize, 0); - cacheBlock = new (JKRGetSystemHeap(), 0) + cacheBlock = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) CCacheBlock(dvdFile.getFileID(), dvdFile.getFileInfo()->length, buffer); mCacheBlockList.append(&cacheBlock->mCacheBlockLink); } @@ -202,7 +202,7 @@ void JKRFileCache::removeResourceAll(void) { while (iterator != mCacheBlockList.getEnd()) { JKRFreeToHeap(mParentHeap, iterator->mMemoryPtr); mCacheBlockList.remove(&iterator.getObject()->mCacheBlockLink); - delete (iterator++).getObject(); + JKR_DELETE((iterator++).getObject()); } } @@ -216,7 +216,7 @@ bool JKRFileCache::removeResource(void* resource) { if (--cacheBlock->mReferenceCount == 0) { JKRFreeToHeap(mParentHeap, resource); mCacheBlockList.remove(&cacheBlock->mCacheBlockLink); - delete cacheBlock; + JKR_DELETE(cacheBlock); } return true; @@ -230,7 +230,7 @@ bool JKRFileCache::detachResource(void* resource) { return false; mCacheBlockList.remove(&cacheBlock->mCacheBlockLink); - delete cacheBlock; + JKR_DELETE(cacheBlock); return true; } @@ -262,11 +262,11 @@ u32 JKRFileCache::countFile(const char* path) const { JKRFileFinder* JKRFileCache::getFirstFile(const char* path) const { char* name = getDvdPathName(path); - JKRDvdFinder* finder = new (JKRGetSystemHeap(), 0) JKRDvdFinder(name); + JKRDvdFinder* finder = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JKRDvdFinder(name); JKRFreeToSysHeap(name); if (finder->isAvailable() != true) { - delete finder; + JKR_DELETE(finder); return NULL; } diff --git a/src/JSystem/JKernel/JKRFileLoader.cpp b/src/JSystem/JKernel/JKRFileLoader.cpp index 26790f87b6..a599cd99c4 100644 --- a/src/JSystem/JKernel/JKRFileLoader.cpp +++ b/src/JSystem/JKernel/JKRFileLoader.cpp @@ -4,8 +4,9 @@ #define MSL_USE_INLINES 1 // needed to inline tolower call. not inlined elsewhere in the repo -#include #include +#include +#include "JSystem/JKernel/JKRHeap.h" #include "global.h" JKRFileLoader* JKRFileLoader::sCurrentVolume; @@ -23,7 +24,7 @@ JKRFileLoader::~JKRFileLoader() { void JKRFileLoader::unmount(void) { if (mMountCount != 0) { if (--mMountCount == 0) { - delete this; + JKR_DELETE(this); } } } diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index 6b9ec1e685..9e4acd18f7 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -503,7 +503,7 @@ void* operator new(size_t size) { return JKRHeap::alloc(size, 4, NULL); } #else -void* operator new(size_t size) { +void* operator new(size_t size JKR_HEAP_TOKEN_PARAM) { if (sCurrentHeap == NULL) { return malloc(size); } @@ -521,7 +521,7 @@ void* operator new(size_t size, int alignment) { return JKRHeap::alloc(size, alignment, NULL); } #else -void* operator new(size_t size, int alignment) { +void* operator new(size_t size JKR_HEAP_TOKEN_PARAM, int alignment) { if (sCurrentHeap == nullptr) #if !_WIN32 return aligned_alloc(alignment, size); @@ -541,7 +541,7 @@ void* operator new(size_t size, int alignment) { } #endif -void* operator new(size_t size, JKRHeap* heap, int alignment) { +void* operator new(size_t size JKR_HEAP_TOKEN_PARAM, JKRHeap* heap, int alignment) { return JKRHeap::alloc(size, alignment, heap); } @@ -551,8 +551,13 @@ void* operator new[](size_t size) { } #else void* operator new[](size_t size) { + return malloc(size); +} + +void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM) { if (sCurrentHeap == NULL) return malloc(size); + void* mem = JKRHeap::alloc(size, alignof(max_align_t), NULL); if (mem == NULL) { mem = malloc(size); @@ -566,7 +571,7 @@ void* operator new[](size_t size, int alignment) { return JKRHeap::alloc(size, alignment, NULL); } #else -void* operator new[](size_t size, int alignment) { +void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM, int alignment) { if (sCurrentHeap == nullptr) #if !_WIN32 return aligned_alloc(alignment, size); @@ -584,16 +589,16 @@ void* operator new[](size_t size, int alignment) { } #endif -void* operator new[](size_t size, JKRHeap* heap, int alignment) { +void* operator new[](size_t size JKR_HEAP_TOKEN_PARAM, JKRHeap* heap, int alignment) { return JKRHeap::alloc(size, alignment, heap); } #if !TARGET_PC -void operator delete(void* ptr) { +void operator JKR_DELETE(void* ptr) { JKRHeap::free(ptr, NULL); } #else -void operator delete(void* ptr) { +void operator delete(void* ptr JKR_HEAP_TOKEN_PARAM) { if (ptr == NULL) return; JKRHeap* heap = JKRHeap::findFromRoot(ptr); @@ -601,12 +606,12 @@ void operator delete(void* ptr) { free(ptr); return; } - JKRHeap::free(ptr, NULL); + JKRHeap::free(ptr, heap); } #endif #if !TARGET_PC -void operator delete[](void* ptr) { +void operator JKR_DELETE[](void* ptr) { JKRHeap::free(ptr, NULL); } #else @@ -618,7 +623,7 @@ void operator delete[](void* ptr) { free(ptr); return; } - JKRHeap::free(ptr, NULL); + JKRHeap::free(ptr, heap); } #endif diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index a12cb8835a..ab2c301db0 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -27,7 +27,7 @@ JKRSolidHeap* JKRSolidHeap::create(u32 size, JKRHeap* heap, bool useErrorHandler if (!mem) return NULL; - return new (mem) JKRSolidHeap(dataPtr, alignedSize - solidHeapSize, heap, useErrorHandler); + return JKR_NEW_ARGS (mem) JKRSolidHeap(dataPtr, alignedSize - solidHeapSize, heap, useErrorHandler); } void JKRSolidHeap::do_destroy(void) { diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index 918f1012fc..2b956c918c 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -127,7 +127,7 @@ JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) { heap = JKRGetCurrentHeap(); } - sManager = new (heap, 0) JKRThreadSwitch(heap); + sManager = JKR_NEW_ARGS (heap, 0) JKRThreadSwitch(heap); return sManager; } @@ -282,7 +282,7 @@ void JKRThreadSwitch::draw(JKRThreadName_* thread_name_list, JUTConsole* console static void dummy4(JKRTask* thread, JSULink* link) { thread->getStack(); - delete link; + JKR_DELETE(link); } JKRTask::~JKRTask() { @@ -322,7 +322,7 @@ int JKRTask::check() { #if !PLATFORM_GCN static void dummy(JKRIdleThread* thread) { thread->run(); - delete thread; + JKR_DELETE(thread); thread->destroy(); } #endif diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp index 04387050c2..cbee592c14 100644 --- a/src/JSystem/JMessage/resource.cpp +++ b/src/JSystem/JMessage/resource.cpp @@ -6,6 +6,8 @@ #include #include +#include "JSystem/JKernel/JKRHeap.h" + u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, bool* pbValid) const { if (!oParse_TBlock_messageID_.getRaw()) { return 0xFFFF; @@ -112,12 +114,12 @@ JMessage::TResource* JMessage::TResourceContainer::TCResource::Get_groupID(u16 u } JMessage::TResource* JMessage::TResourceContainer::TCResource::Do_create() { - return new TResource(); + return JKR_NEW TResource(); } void JMessage::TResourceContainer::TCResource::Do_destroy(JMessage::TResource* pResource) { #if DEBUG - delete pResource; + JKR_DELETE(pResource); #else operator delete(pResource); #endif diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp index 40f8411134..7fe1867902 100644 --- a/src/JSystem/JParticle/JPAEmitterManager.cpp +++ b/src/JSystem/JParticle/JPAEmitterManager.cpp @@ -17,25 +17,25 @@ JPAEmitterManager::JPAEmitterManager(u32 i_ptclNum, u32 i_emtrNum, JKRHeap* pHea JUT_ASSERT(40, emtrNum && ptclNum && gidMax && ridMax); - JPABaseEmitter* p_emtr_link = new (pHeap, 0) JPABaseEmitter[emtrNum]; + JPABaseEmitter* p_emtr_link = JKR_NEW_ARGS (pHeap, 0) JPABaseEmitter[emtrNum]; JUT_ASSERT(44, p_emtr_link); for (u32 i = 0; i < emtrNum; i++) mFreeEmtrList.prepend(&p_emtr_link[i].mLink); - JPANode* p_ptcl_node = new (pHeap, 0) JPANode[ptclNum]; + JPANode* p_ptcl_node = JKR_NEW_ARGS (pHeap, 0) JPANode[ptclNum]; JUT_ASSERT(51, p_ptcl_node); for (u32 i = 0; i < ptclNum; i++) mPtclPool.push_back(&p_ptcl_node[i]); - pEmtrUseList = new (pHeap, 0) JSUList[gidMax]; + pEmtrUseList = JKR_NEW_ARGS (pHeap, 0) JSUList[gidMax]; JUT_ASSERT(58, pEmtrUseList); - pResMgrAry = new (pHeap, 0) JPAResourceManager*[ridMax]; + pResMgrAry = JKR_NEW_ARGS (pHeap, 0) JPAResourceManager*[ridMax]; JUT_ASSERT(62, pResMgrAry) for (int i = 0; i < ridMax; i++) { pResMgrAry[i] = NULL; } - pWd = new (pHeap, 0) JPAEmitterWorkData(); + pWd = JKR_NEW_ARGS (pHeap, 0) JPAEmitterWorkData(); JUT_ASSERT(67, pWd); } diff --git a/src/JSystem/JParticle/JPAFieldBlock.cpp b/src/JSystem/JParticle/JPAFieldBlock.cpp index 34397601e5..428375cee6 100644 --- a/src/JSystem/JParticle/JPAFieldBlock.cpp +++ b/src/JSystem/JParticle/JPAFieldBlock.cpp @@ -224,31 +224,31 @@ void JPAFieldBlock::init(JKRHeap* heap) { switch (getType()) { case FIELD_GRAVITY: - mpField = new (heap, 0) JPAFieldGravity(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldGravity(); break; case FIELD_AIR: - mpField = new (heap, 0) JPAFieldAir(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldAir(); break; case FIELD_MAGNET: - mpField = new (heap, 0) JPAFieldMagnet(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldMagnet(); break; case FIELD_NEWTON: - mpField = new (heap, 0) JPAFieldNewton(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldNewton(); break; case FIELD_VORTEX: - mpField = new (heap, 0) JPAFieldVortex(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldVortex(); break; case FIELD_RANDOM: - mpField = new (heap, 0) JPAFieldRandom(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldRandom(); break; case FIELD_DRAG: - mpField = new (heap, 0) JPAFieldDrag(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldDrag(); break; case FIELD_CONVECTION: - mpField = new (heap, 0) JPAFieldConvection(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldConvection(); break; case FIELD_SPIN: - mpField = new (heap, 0) JPAFieldSpin(); + mpField = JKR_NEW_ARGS (heap, 0) JPAFieldSpin(); break; default: mpField = NULL; diff --git a/src/JSystem/JParticle/JPAResourceLoader.cpp b/src/JSystem/JParticle/JPAResourceLoader.cpp index e065ee72b3..76b3969e2b 100644 --- a/src/JSystem/JParticle/JPAResourceLoader.cpp +++ b/src/JSystem/JParticle/JPAResourceLoader.cpp @@ -30,19 +30,19 @@ void JPAResourceLoader::load_jpc(u8 const* data, JPAResourceManager* mgr) { JKRHeap* heap = mgr->mpHeap; mgr->mResMax = *(u16*)(data + 8); mgr->mTexMax = *(u16*)(data + 0xA); - mgr->mpResArr = new (heap, 0) JPAResource*[mgr->mResMax]; - mgr->mpTexArr = new (heap, 0) JPATexture*[mgr->mTexMax]; + mgr->mpResArr = JKR_NEW_ARGS (heap, 0) JPAResource*[mgr->mResMax]; + mgr->mpTexArr = JKR_NEW_ARGS (heap, 0) JPATexture*[mgr->mTexMax]; u32 offset = 0x10; for (int i = 0; i < *(u16*)(data + 8); i++) { JPAResourceHeader* header = (JPAResourceHeader*)(data + offset); - JPAResource* res = new (heap, 0) JPAResource(); + JPAResource* res = JKR_NEW_ARGS (heap, 0) JPAResource(); res->mFieldBlockNum = header->mFieldBlockNum; res->mpFieldBlocks = res->mFieldBlockNum != 0 ? - new (heap, 0) JPAFieldBlock*[res->mFieldBlockNum] : NULL; + JKR_NEW_ARGS (heap, 0) JPAFieldBlock*[res->mFieldBlockNum] : NULL; res->mKeyBlockNum = header->mKeyBlockNum; res->mpKeyBlocks = res->mKeyBlockNum != 0 ? - new (heap, 0) JPAKeyBlock*[res->mKeyBlockNum] : NULL; + JKR_NEW_ARGS (heap, 0) JPAKeyBlock*[res->mKeyBlockNum] : NULL; res->mTDB1Num = header->mTDB1Num; res->mpTDB1 = NULL; res->mUsrIdx = header->mUsrIdx; @@ -56,27 +56,27 @@ void JPAResourceLoader::load_jpc(u8 const* data, JPAResourceManager* mgr) { u32 size = *(u32*)(data + offset + 4); switch (magic) { case 'FLD1': - res->mpFieldBlocks[field_idx] = new (heap, 0) JPAFieldBlock(data + offset, heap); + res->mpFieldBlocks[field_idx] = JKR_NEW_ARGS (heap, 0) JPAFieldBlock(data + offset, heap); field_idx++; break; case 'KFA1': - res->mpKeyBlocks[key_idx] = new (heap, 0) JPAKeyBlock(data + offset); + res->mpKeyBlocks[key_idx] = JKR_NEW_ARGS (heap, 0) JPAKeyBlock(data + offset); key_idx++; break; case 'BEM1': - res->mpDynamicsBlock = new (heap, 0) JPADynamicsBlock(data + offset); + res->mpDynamicsBlock = JKR_NEW_ARGS (heap, 0) JPADynamicsBlock(data + offset); break; case 'BSP1': - res->mpBaseShape = new (heap, 0) JPABaseShape(data + offset, heap); + res->mpBaseShape = JKR_NEW_ARGS (heap, 0) JPABaseShape(data + offset, heap); break; case 'ESP1': - res->mpExtraShape = new (heap, 0) JPAExtraShape(data + offset); + res->mpExtraShape = JKR_NEW_ARGS (heap, 0) JPAExtraShape(data + offset); break; case 'SSP1': - res->mpChildShape = new (heap, 0) JPAChildShape(data + offset); + res->mpChildShape = JKR_NEW_ARGS (heap, 0) JPAChildShape(data + offset); break; case 'ETX1': - res->mpExTexShape = new (heap, 0) JPAExTexShape(data + offset); + res->mpExTexShape = JKR_NEW_ARGS (heap, 0) JPAExTexShape(data + offset); break; case 'TDB1': res->mpTDB1 = (const u16*)(data + offset + 8); @@ -92,7 +92,7 @@ void JPAResourceLoader::load_jpc(u8 const* data, JPAResourceManager* mgr) { offset = *(u32*)(data + 0xC); for (int i = 0; i < *(u16*)(data + 0xA); i++) { u32 size = *(u32*)(data + offset + 4); - JPATexture* tex = new (heap, 0) JPATexture(data + offset); + JPATexture* tex = JKR_NEW_ARGS (heap, 0) JPATexture(data + offset); mgr->registTex(tex); offset += size; } diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/src/JSystem/JStudio/JStudio/ctb.cpp index a28752af7a..312c14dde8 100644 --- a/src/JSystem/JStudio/JStudio/ctb.cpp +++ b/src/JSystem/JStudio/JStudio/ctb.cpp @@ -5,6 +5,8 @@ #include #include +#include "JSystem/JKernel/JKRHeap.h" + JStudio::ctb::TObject::~TObject() {} JStudio::ctb::TObject_TxyzRy::TObject_TxyzRy(JStudio::ctb::data::TParse_TBlock const& param_0) @@ -68,14 +70,14 @@ JStudio::ctb::TFactory::~TFactory() {} JStudio::ctb::TObject* JStudio::ctb::TFactory::create(JStudio::ctb::data::TParse_TBlock const& param_0) { switch(param_0.get_scheme()) { case 1: - return new TObject_TxyzRy(param_0); + return JKR_NEW TObject_TxyzRy(param_0); default: return NULL; } } void JStudio::ctb::TFactory::destroy(JStudio::ctb::TObject* param_0) { - delete param_0; + JKR_DELETE(param_0); } // NONMATCHING TParse_header_block vtable location diff --git a/src/JSystem/JStudio/JStudio/fvb.cpp b/src/JSystem/JStudio/JStudio/fvb.cpp index 94721909c4..4c4655eb20 100644 --- a/src/JSystem/JStudio/JStudio/fvb.cpp +++ b/src/JSystem/JStudio/JStudio/fvb.cpp @@ -351,17 +351,17 @@ TFactory::~TFactory() {} TObject* TFactory::create(data::TParse_TBlock const& rBlock) { switch (rBlock.get_type()) { case 1: - return new TObject_composite(rBlock); + return JKR_NEW TObject_composite(rBlock); case 2: - return new TObject_constant(rBlock); + return JKR_NEW TObject_constant(rBlock); case 3: - return new TObject_transition(rBlock); + return JKR_NEW TObject_transition(rBlock); case 4: - return new TObject_list(rBlock); + return JKR_NEW TObject_list(rBlock); case 5: - return new TObject_list_parameter(rBlock); + return JKR_NEW TObject_list_parameter(rBlock); case 6: - return new TObject_hermite(rBlock); + return JKR_NEW TObject_hermite(rBlock); default: JUTWarn w; w << "unknown type : "; @@ -370,7 +370,7 @@ TObject* TFactory::create(data::TParse_TBlock const& rBlock) { } void TFactory::destroy(TObject* pObject) { - delete pObject; + JKR_DELETE(pObject); } TParse::TParse(TControl* pControl) : pControl_(pControl) { diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/src/JSystem/JStudio/JStudio/jstudio-object.cpp index 8e23477cc8..888f2d6986 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-object.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-object.cpp @@ -271,7 +271,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue_FVR_INDEX_(JStudio::TAdaptor* p } JStudio::TObject::~TObject() { - delete mpAdaptor; + JKR_DELETE(mpAdaptor); } void JStudio::TObject::forward_value(u32 param_0) { diff --git a/src/JSystem/JStudio/JStudio/stb.cpp b/src/JSystem/JStudio/JStudio/stb.cpp index b2dbddbd6d..d31d5cd95e 100644 --- a/src/JSystem/JStudio/JStudio/stb.cpp +++ b/src/JSystem/JStudio/JStudio/stb.cpp @@ -373,7 +373,7 @@ JStudio::TObject* TFactory::create(data::TParse_TBlock_object const& param_0) { } void TFactory::destroy(TObject* p) { - delete p; + JKR_DELETE(p); } TParse::TParse(TControl* pControl) : pControl(pControl) {} diff --git a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp index 6fc661ddcd..f49d4ba6bd 100644 --- a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp +++ b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp @@ -27,7 +27,7 @@ bool JStudio_JAudio2::TCreateObject::create( JStudio::TObject* JStudio_JAudio2::TCreateObject::createObject_JAI_SOUND_( JStudio::stb::data::TParse_TBlock_object const& param_1, JStudio_JAudio2::TCreateObject* param_2) { - JStudio_JAudio2::TAdaptor_sound* adaptor = new JStudio_JAudio2::TAdaptor_sound(param_2); + JStudio_JAudio2::TAdaptor_sound* adaptor = JKR_NEW JStudio_JAudio2::TAdaptor_sound(param_2); if (adaptor == NULL) { return NULL; } diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/src/JSystem/JStudio/JStudio_JParticle/control.cpp index 1f25f43f66..cbaf5da404 100644 --- a/src/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/src/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -41,7 +41,7 @@ void JStudio_JParticle::TCreateObject::emitter_destroy(JPABaseEmitter* pEmitter) JStudio::TObject* JStudio_JParticle::TCreateObject::createObject_JPA_PARTICLE_( JStudio::stb::data::TParse_TBlock_object const& param_1, JStudio_JParticle::TCreateObject* param_2) { - JStudio_JParticle::TAdaptor_particle* adaptor = new JStudio_JParticle::TAdaptor_particle(param_2); + JStudio_JParticle::TAdaptor_particle* adaptor = JKR_NEW JStudio_JParticle::TAdaptor_particle(param_2); if (adaptor == NULL) { return NULL; } diff --git a/src/JSystem/JUtility/JUTCacheFont.cpp b/src/JSystem/JUtility/JUTCacheFont.cpp index 214d2c4a7f..7b815b2ccc 100644 --- a/src/JSystem/JUtility/JUTCacheFont.cpp +++ b/src/JSystem/JUtility/JUTCacheFont.cpp @@ -26,15 +26,15 @@ JUTCacheFont::~JUTCacheFont() { void JUTCacheFont::deleteMemBlocks_CacheFont() { if (field_0xb0 != 0) { - delete[] mCacheBuffer; + JKR_DELETE_ARRAY(mCacheBuffer); } JKRFreeToAram(field_0xac); - delete mInf1Ptr; - delete mMemBlocks; - delete field_0x7c; - delete field_0x80; - delete field_0x84; + JKR_DELETE(mInf1Ptr); + JKR_DELETE(mMemBlocks); + JKR_DELETE(field_0x7c); + JKR_DELETE(field_0x80); + JKR_DELETE(field_0x84); } void JUTCacheFont::initialize_state() { @@ -172,20 +172,20 @@ 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*)new (heap, 0) ResFONT(); + mInf1Ptr = (ResFONT::INF1*)JKR_NEW_ARGS (heap, 0) ResFONT(); if (mInf1Ptr == NULL) { return false; } if (mTotalWidSize != 0) { - field_0x7c = new (heap, 0) u8[mTotalWidSize]; + field_0x7c = JKR_NEW_ARGS (heap, 0) u8[mTotalWidSize]; if (field_0x7c == NULL) { return false; } } if (mGly1BlockNum != 0) { - field_0x80 = new (heap, 0) ResFONT::GLY1[mGly1BlockNum]; + field_0x80 = JKR_NEW_ARGS (heap, 0) ResFONT::GLY1[mGly1BlockNum]; if (field_0x80 == NULL) { return false; } @@ -197,7 +197,7 @@ bool JUTCacheFont::allocArea(void* cacheBuffer, u32 param_1, JKRHeap* heap) { } if (mTotalMapSize != 0) { - field_0x84 = new (heap, 0) u8[mTotalMapSize]; + field_0x84 = JKR_NEW_ARGS (heap, 0) u8[mTotalMapSize]; if (field_0x84 == NULL) { return false; } @@ -215,7 +215,7 @@ bool JUTCacheFont::allocArea(void* cacheBuffer, u32 param_1, JKRHeap* heap) { mCacheBuffer = cacheBuffer; field_0xb0 = 0; } else { - mCacheBuffer = new (heap, 0x20) u8[v1]; + mCacheBuffer = JKR_NEW_ARGS (heap, 0x20) u8[v1]; if (mCacheBuffer == NULL) { return false; } @@ -227,25 +227,25 @@ bool JUTCacheFont::allocArea(void* cacheBuffer, u32 param_1, JKRHeap* heap) { } bool JUTCacheFont::allocArray(JKRHeap* param_0) { - mMemBlocks = (void**)new (param_0, 0) u32[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum]; + mMemBlocks = (void**)JKR_NEW_ARGS (param_0, 0) u32[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum]; if (mMemBlocks == NULL) { return false; } void** blocks = mMemBlocks; if (mWid1BlockNum) { - mpWidthBlocks = new (blocks) ResFONT::WID1*[mWid1BlockNum]; + mpWidthBlocks = JKR_NEW_ARGS (blocks) ResFONT::WID1*[mWid1BlockNum]; blocks = blocks + mWid1BlockNum; } if (mGly1BlockNum) { - mpGlyphBlocks = new (blocks) ResFONT::GLY1*[mGly1BlockNum]; + mpGlyphBlocks = JKR_NEW_ARGS (blocks) ResFONT::GLY1*[mGly1BlockNum]; blocks = blocks + mGly1BlockNum; for (int i = 0; i < mGly1BlockNum; i++) { mpGlyphBlocks[i] = (ResFONT::GLY1*)((u8*)mCacheBuffer + (field_0x94 * i)); } } if (mMap1BlockNum) { - mpMapBlocks = new (blocks) ResFONT::MAP1*[mMap1BlockNum]; + mpMapBlocks = JKR_NEW_ARGS (blocks) ResFONT::MAP1*[mMap1BlockNum]; } return true; } diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index e5d4c4b6ae..2347d87b17 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -18,7 +18,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRH u8* buffer = (u8*)JKRAllocFromHeap(pHeap, getObjectSizeFromBufferSize(param_0, maxLines), 0); - JUTConsole* console = new (buffer) JUTConsole(param_0, maxLines, true); + JUTConsole* console = JKR_NEW_ARGS (buffer) JUTConsole(param_0, maxLines, true); console->mBuf = buffer + sizeof(JUTConsole); console->clear(); @@ -33,7 +33,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSiz JUT_ASSERT(62, ( (uintptr_t)buffer & 0x3 ) == 0); u32 maxLines = getLineFromObjectSize(bufferSize, param_0); - JUTConsole* console = new (buffer) JUTConsole(param_0, maxLines, false); + JUTConsole* console = JKR_NEW_ARGS (buffer) JUTConsole(param_0, maxLines, false); console->mBuf = (u8*)buffer + sizeof(JUTConsole); console->clear(); @@ -349,7 +349,7 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) { pHeap = JKRGetCurrentHeap(); } - sManager = new (pHeap, 0) JUTConsoleManager(); + sManager = JKR_NEW_ARGS (pHeap, 0) JUTConsoleManager(); return sManager; } diff --git a/src/JSystem/JUtility/JUTDbPrint.cpp b/src/JSystem/JUtility/JUTDbPrint.cpp index 5fec646ae6..e6211958dd 100644 --- a/src/JSystem/JUtility/JUTDbPrint.cpp +++ b/src/JSystem/JUtility/JUTDbPrint.cpp @@ -33,7 +33,7 @@ JUTDbPrint* JUTDbPrint::start(JUTFont* pFont, JKRHeap* pHeap) { if (pHeap == NULL) { pHeap = JKRGetCurrentHeap(); } - sDebugPrint = new JUTDbPrint(pFont, pHeap); + sDebugPrint = JKR_NEW JUTDbPrint(pFont, pHeap); } return sDebugPrint; diff --git a/src/JSystem/JUtility/JUTDirectPrint.cpp b/src/JSystem/JUtility/JUTDirectPrint.cpp index b317f18efe..9f4a9ebaa5 100644 --- a/src/JSystem/JUtility/JUTDirectPrint.cpp +++ b/src/JSystem/JUtility/JUTDirectPrint.cpp @@ -1,8 +1,9 @@ #include "JSystem/JSystem.h" // IWYU pragma: keep -#include "JSystem/JUtility/JUTDirectPrint.h" #include #include +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/JUTDirectPrint.h" #include "global.h" JUTDirectPrint* JUTDirectPrint::sDirectPrint; @@ -14,7 +15,7 @@ JUTDirectPrint::JUTDirectPrint() { JUTDirectPrint* JUTDirectPrint::start() { if (!sDirectPrint) { - sDirectPrint = new JUTDirectPrint(); + sDirectPrint = JKR_NEW JUTDirectPrint(); } return sDirectPrint; diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp index d8930a478d..224c9a313e 100644 --- a/src/JSystem/JUtility/JUTException.cpp +++ b/src/JSystem/JUtility/JUTException.cpp @@ -84,7 +84,7 @@ JUTException::JUTException(JUTDirectPrint* directPrint) JUTException* JUTException::create(JUTDirectPrint* directPrint) { if (!sErrorManager) { - sErrorManager = new (JKRGetSystemHeap(), 0) JUTException(directPrint); + sErrorManager = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) JUTException(directPrint); sErrorManager->resume(); } @@ -766,7 +766,7 @@ void JUTException::createFB() { void* begin = (void*)ALIGN_PREV((uintptr_t)end - size, 32); void* object = (void*)ALIGN_PREV((intptr_t)begin - sizeof(JUTExternalFB), 32); - new (object) JUTExternalFB(renderMode, GX_GM_1_7, begin, size); + JKR_NEW_ARGS (object) JUTExternalFB(renderMode, GX_GM_1_7, begin, size); mDirectPrint->changeFrameBuffer(begin, renderMode->fbWidth, renderMode->efbHeight); VIConfigure(renderMode); @@ -807,7 +807,7 @@ void JUTException::appendMapFile(char const* path) { } } - JUTExMapFile* mapFile = new JUTExMapFile((char*)path); + JUTExMapFile* mapFile = JKR_NEW JUTExMapFile((char*)path); sMapFileList.append(&mapFile->mLink); } diff --git a/src/JSystem/JUtility/JUTProcBar.cpp b/src/JSystem/JUtility/JUTProcBar.cpp index 20fb99c827..232d500fd5 100644 --- a/src/JSystem/JUtility/JUTProcBar.cpp +++ b/src/JSystem/JUtility/JUTProcBar.cpp @@ -35,14 +35,14 @@ JUTProcBar::~JUTProcBar() { JUTProcBar* JUTProcBar::create() { if (!sManager) { - sManager = new JUTProcBar(); + sManager = JKR_NEW JUTProcBar(); } return sManager; } void JUTProcBar::destroy() { if (sManager) { - delete sManager; + JKR_DELETE(sManager); } sManager = NULL; } diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp index 6b6a52f524..e1e2197be6 100644 --- a/src/JSystem/JUtility/JUTResFont.cpp +++ b/src/JSystem/JUtility/JUTResFont.cpp @@ -26,7 +26,7 @@ JUTResFont::~JUTResFont() { } void JUTResFont::deleteMemBlocks_ResFont() { - delete[] mMemBlocks; + JKR_DELETE_ARRAY(mMemBlocks); } void JUTResFont::initialize_state() { @@ -62,22 +62,22 @@ bool JUTResFont::protected_initiate(const ResFONT* pFont, JKRHeap* pHeap) { mValid = true; countBlock(); - mMemBlocks = new (pHeap, 0) void*[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum]; + mMemBlocks = JKR_NEW_ARGS (pHeap, 0) void*[mWid1BlockNum + mGly1BlockNum + mMap1BlockNum]; if (!mMemBlocks) { return false; } p = mMemBlocks; if (mWid1BlockNum != 0) { - mpWidthBlocks = new (p) ResFONT::WID1*[mWid1BlockNum]; + mpWidthBlocks = JKR_NEW_ARGS (p) ResFONT::WID1*[mWid1BlockNum]; p += mWid1BlockNum; } if (mGly1BlockNum != 0) { - mpGlyphBlocks = new (p) ResFONT::GLY1*[mGly1BlockNum]; + mpGlyphBlocks = JKR_NEW_ARGS (p) ResFONT::GLY1*[mGly1BlockNum]; p += mGly1BlockNum; } if (mMap1BlockNum != 0) { - mpMapBlocks = new (p) ResFONT::MAP1*[mMap1BlockNum]; + mpMapBlocks = JKR_NEW_ARGS (p) ResFONT::MAP1*[mMap1BlockNum]; } setBlock(); return true; diff --git a/src/JSystem/JUtility/JUTTexture.cpp b/src/JSystem/JUtility/JUTTexture.cpp index e048ad101a..80e66360d0 100644 --- a/src/JSystem/JUtility/JUTTexture.cpp +++ b/src/JSystem/JUtility/JUTTexture.cpp @@ -4,12 +4,14 @@ #include "JSystem/JUtility/JUTPalette.h" #include +#include "JSystem/JKernel/JKRHeap.h" + JUTTexture::~JUTTexture() { if (getCaptureFlag()) { - delete[] field_0x3c; + JKR_DELETE_ARRAY(field_0x3c); } if (getEmbPaletteDelFlag()) { - delete mEmbPalette; + JKR_DELETE(mEmbPalette); } } @@ -48,7 +50,7 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, u8 param_1) { u32 palOffset = RES_U32(mTexInfo->paletteOffset); if (mEmbPalette == NULL || !getEmbPaletteDelFlag()) { - mEmbPalette = new JUTPalette(tlut, (GXTlutFmt)mTexInfo->colorFormat, + mEmbPalette = JKR_NEW JUTPalette(tlut, (GXTlutFmt)mTexInfo->colorFormat, (JUTTransparency)mTexInfo->alphaEnabled, numColors, (void*)((intptr_t)mTexInfo + palOffset)); @@ -87,7 +89,7 @@ void JUTTexture::storeTIMG(ResTIMG const* param_0, JUTPalette* param_1, GXTlut p mTexData = ((u8*)mTexInfo) + sizeof(ResTIMG); } if (getEmbPaletteDelFlag()) { - delete mEmbPalette; + JKR_DELETE(mEmbPalette); } mEmbPalette = param_1; setEmbPaletteDelFlag(false); diff --git a/src/JSystem/JUtility/JUTVideo.cpp b/src/JSystem/JUtility/JUTVideo.cpp index 823402eff4..ac3355f656 100644 --- a/src/JSystem/JUtility/JUTVideo.cpp +++ b/src/JSystem/JUtility/JUTVideo.cpp @@ -6,6 +6,8 @@ #include #include +#include "JSystem/JKernel/JKRHeap.h" + JUTVideo* JUTVideo::sManager; OSTick JUTVideo::sVideoLastTick; @@ -16,14 +18,14 @@ static bool data_80451544; JUTVideo* JUTVideo::createManager(_GXRenderModeObj const* param_0) { if (sManager == NULL) { - sManager = new JUTVideo(param_0); + sManager = JKR_NEW JUTVideo(param_0); } return sManager; } void JUTVideo::destroyManager() { if (sManager != NULL) { - delete sManager; + JKR_DELETE(sManager); sManager = NULL; } } diff --git a/src/JSystem/JUtility/JUTXfb.cpp b/src/JSystem/JUtility/JUTXfb.cpp index 8e2f0a9173..1c44f33b6c 100644 --- a/src/JSystem/JUtility/JUTXfb.cpp +++ b/src/JSystem/JUtility/JUTXfb.cpp @@ -44,21 +44,21 @@ JUTXfb::~JUTXfb() { void JUTXfb::delXfb(int xfbIdx) { if (mXfbAllocated[xfbIdx] && mBuffer[xfbIdx]) { - delete mBuffer[xfbIdx]; + JKR_DELETE(mBuffer[xfbIdx]); } } JUTXfb* JUTXfb::createManager(JKRHeap* pHeap, JUTXfb::EXfbNumber xfbNum) { JUT_CONFIRM(273, sManager == NULL); if (sManager == NULL) { - sManager = new JUTXfb(NULL, pHeap, xfbNum); + sManager = JKR_NEW JUTXfb(NULL, pHeap, xfbNum); } return sManager; } void JUTXfb::destroyManager() { JUT_CONFIRM(344, sManager); - delete sManager; + JKR_DELETE(sManager); sManager = NULL; } @@ -69,11 +69,11 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber int size = (u16)((u16)width + 0xf & ~0xf) * height * 2; - mBuffer[0] = new (pHeap, 0x20) u8[size]; + mBuffer[0] = JKR_NEW_ARGS (pHeap, 0x20) u8[size]; mXfbAllocated[0] = true; if (xfbNum >= 2) { - mBuffer[1] = new (pHeap, 0x20) u8[size]; + mBuffer[1] = JKR_NEW_ARGS (pHeap, 0x20) u8[size]; mXfbAllocated[1] = true; } else { mBuffer[1] = NULL; @@ -81,7 +81,7 @@ void JUTXfb::initiate(u16 width, u16 height, JKRHeap* pHeap, JUTXfb::EXfbNumber } if (xfbNum >= 3) { - mBuffer[2] = new (pHeap, 0x20) u8[size]; + mBuffer[2] = JKR_NEW_ARGS (pHeap, 0x20) u8[size]; mXfbAllocated[2] = true; } else { mBuffer[2] = NULL; diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory index 58a22ef4d7..1bed557cfa 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory +++ b/src/PowerPC_EABI_Support/MSL/MSL_C++/MSL_Common/Include/memory @@ -9,7 +9,7 @@ template inline void uninitialized_fill_n(ForwardIt first, Size count, const T& value) { ForwardIt r29 = first; for (; count--; ++first) { - new (first) T(value); + JKR_NEW_ARGS (first) T(value); } } diff --git a/src/Z2AudioLib/Z2Audience.cpp b/src/Z2AudioLib/Z2Audience.cpp index 46b7107473..8ff28baa99 100644 --- a/src/Z2AudioLib/Z2Audience.cpp +++ b/src/Z2AudioLib/Z2Audience.cpp @@ -526,7 +526,7 @@ JAIAudible* Z2Audience::newAudible(const JGeometry::TVec3& pos, JAISoundID JAUAudibleParam params = Z2GetSoundInfo()->getAudibleSwFull(soundID); bool x = params.field_0x0.bytes.b0_0 != 0; - Z2Audible* audible = new Z2Audible(pos, param_2, channelNum, x); + Z2Audible* audible = JKR_NEW Z2Audible(pos, param_2, channelNum, x); if (audible == NULL) { return NULL; } @@ -552,7 +552,7 @@ JAIAudible* Z2Audience::newAudible(const JGeometry::TVec3& pos, JAISoundID } void Z2Audience::deleteAudible(JAIAudible* audible) { - delete audible; + JKR_DELETE(audible); } Z2Audible::~Z2Audible() {} diff --git a/src/Z2AudioLib/Z2AudioArcLoader.cpp b/src/Z2AudioLib/Z2AudioArcLoader.cpp index 93343014c5..1ee691534a 100644 --- a/src/Z2AudioLib/Z2AudioArcLoader.cpp +++ b/src/Z2AudioLib/Z2AudioArcLoader.cpp @@ -55,7 +55,7 @@ void Z2AudioArcLoader::readBSTN(const void* addr, u32 param_1) { u8* bstnDst = (u8*)addr; if (param_1 != 0) { - bstnDst = new (gameHeap, 4) u8[param_1]; + bstnDst = JKR_NEW_ARGS (gameHeap, 4) u8[param_1]; if (bstnDst != NULL) { memcpy(bstnDst, addr, param_1); } @@ -63,7 +63,7 @@ void Z2AudioArcLoader::readBSTN(const void* addr, u32 param_1) { JUT_ASSERT(122, bstnDst); } - JAUSoundNameTable* soundNameTable = new (gameHeap, 0) JAUSoundNameTable(true); + JAUSoundNameTable* soundNameTable = JKR_NEW_ARGS (gameHeap, 0) JAUSoundNameTable(true); JUT_ASSERT(125, soundNameTable); soundNameTable->init(bstnDst); diff --git a/src/Z2AudioLib/Z2AudioMgr.cpp b/src/Z2AudioLib/Z2AudioMgr.cpp index 7a6b1ab498..4a811292e9 100644 --- a/src/Z2AudioLib/Z2AudioMgr.cpp +++ b/src/Z2AudioLib/Z2AudioMgr.cpp @@ -89,7 +89,7 @@ void Z2AudioMgr::init(JKRSolidHeap* heap, u32 memSize, void* baaData, JKRArchive seqMgr->getParams()->moveVolume(Z2Param::VOL_BGM_DEFAULT, 0); JAIStreamMgr* streamMgr = mSoundMgr.getStreamMgr(); - JAUStreamStaticAramMgr_<1>* streamStaticAramMgr = new(heap, 0) JAUStreamStaticAramMgr_<1>(); + JAUStreamStaticAramMgr_<1>* streamStaticAramMgr = JKR_NEW_ARGS(heap, 0) JAUStreamStaticAramMgr_<1>(); streamStaticAramMgr->reserveAram(NULL, 0, 0x14); streamMgr->setStreamAramMgr(streamStaticAramMgr); streamMgr->getParams()->moveVolume(Z2Param::VOL_BGM_DEFAULT, 0); diff --git a/src/Z2AudioLib/Z2DebugSys.cpp b/src/Z2AudioLib/Z2DebugSys.cpp index 55ee66519c..2f88759d55 100644 --- a/src/Z2AudioLib/Z2DebugSys.cpp +++ b/src/Z2AudioLib/Z2DebugSys.cpp @@ -42,28 +42,28 @@ void Z2DebugSys::initJAW() { JAWPlayerChView* playerChView; JKRSetCurrentHeap(heap); u32 local_50 = heap->getFreeSize(); - soundPlayer = new (heap, 0) Z2SoundPlayer("GC-Zelda2"); - sysMemView = new (heap, 0) JAWSysMemView(); - bankView = new (heap, 0) JAWBankView(); - chView = new (heap, 0) JAWChView(); - trackView = new (heap, 0) Z2TrackView(0, Z2TrackView::DISPMODE0); - reportView = new (heap, 0) JAWReportView(); + 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(); + trackView = JKR_NEW_ARGS (heap, 0) Z2TrackView(0, Z2TrackView::DISPMODE0); + reportView = JKR_NEW_ARGS (heap, 0) JAWReportView(); JASReportInit(heap, 500); - hioBankEdit = new (heap, 0) JAWHioBankEdit(); - waveArcLoader = new (heap, 0) Z2WaveArcLoader(); - volume = new (heap, 0) JAWVolume(90, 480); - playSeView = new (heap, 0) Z2PlaySeView(); - audSettingView = new (heap, 0) Z2AudSettingView(); - dspCheck = new (heap, 0) Z2DSPCheck(); + 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(); JAWExtSystem::registWindow(1, soundPlayer, 10, 22); - entrySeView = new (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 = new (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); @@ -80,21 +80,21 @@ void Z2DebugSys::initSoundHioNode() { JKRSetCurrentHeap(heap); s32 freeSize = heap->getFreeSize(); JAHSingletonBase::newInstance(); - JAHioNode* soundRoot = new (heap, 0) JAHioNode("サウンド"); + JAHioNode* soundRoot = JKR_NEW_ARGS (heap, 0) JAHioNode("サウンド"); JUT_ASSERT(239, soundRoot); JAHSingletonBase::getIns()->init_OnGame(); JAHSingletonBase::getIns()->appendRootNode(&mDoHIO_root, soundRoot); mDoHIO_createChild("サウンド", soundRoot); - JAHSoundPlayerNode* soundPlayerNode = new (heap, 0) JAHSoundPlayerNode(); + JAHSoundPlayerNode* soundPlayerNode = JKR_NEW_ARGS (heap, 0) JAHSoundPlayerNode(); JUT_ASSERT(258, soundPlayerNode); soundRoot->appendNode(soundPlayerNode, NULL); - Z2ParamNode* paramNode = new (heap, 0) Z2ParamNode(); + Z2ParamNode* paramNode = JKR_NEW_ARGS (heap, 0) Z2ParamNode(); JUT_ASSERT(262, paramNode); soundRoot->appendNode(paramNode, NULL); - Z2FxLineEditNode* fxNode = new (heap, 0) Z2FxLineEditNode(heap); + Z2FxLineEditNode* fxNode = JKR_NEW_ARGS (heap, 0) Z2FxLineEditNode(heap); JUT_ASSERT(267, fxNode); soundRoot->appendNode(fxNode, NULL); - Z2F1SwingTestNode* f1TestWin = new (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,9 +111,9 @@ JAISeqDataMgr* Z2DebugSys::initSeSeqDataMgr(const void* param_1) { JKRExpHeap* heap = mDoExt_getGameHeap(); JKRSetCurrentHeap(heap); s32 freeSize = heap->getFreeSize(); - JAWHioReceiver* receiver = new (heap, 0) JAWHioReceiver(); + JAWHioReceiver* receiver = JKR_NEW_ARGS (heap, 0) JAWHioReceiver(); JAWExtSystem::registWindow(0, receiver, 10, 22); - seqDataMgr = new (heap, 0) Z2HioSeSeqDataMgr(param_1, receiver); + seqDataMgr = JKR_NEW_ARGS (heap, 0) Z2HioSeSeqDataMgr(param_1, receiver); JKRSetCurrentHeap(oldHeap); return seqDataMgr; } diff --git a/src/Z2AudioLib/Z2FxLineMgr.cpp b/src/Z2AudioLib/Z2FxLineMgr.cpp index 61d37c6785..d3b3722092 100644 --- a/src/Z2AudioLib/Z2FxLineMgr.cpp +++ b/src/Z2AudioLib/Z2FxLineMgr.cpp @@ -20,10 +20,10 @@ void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) { JUT_ASSERT(44, arc); JUT_ASSERT(45, heap); - mFxLineBuffer[0] = new (heap, 0x20) u8[0x2800]; - mFxLineBuffer[1] = new (heap, 0x20) u8[0x2800]; - mFxLineBuffer[2] = new (heap, 0x20) u8[0x4B00]; - mFxLineBuffer[3] = new (heap, 0x20) u8[0x4B00]; + mFxLineBuffer[0] = JKR_NEW_ARGS (heap, 0x20) u8[0x2800]; + mFxLineBuffer[1] = JKR_NEW_ARGS (heap, 0x20) u8[0x2800]; + mFxLineBuffer[2] = JKR_NEW_ARGS (heap, 0x20) u8[0x4B00]; + mFxLineBuffer[3] = JKR_NEW_ARGS (heap, 0x20) u8[0x4B00]; JUT_ASSERT(53, mFxLineBuffer[0]); JUT_ASSERT(54, mFxLineBuffer[1]); @@ -31,7 +31,7 @@ void Z2FxLineMgr::initDataArc(JKRArchive* arc, JKRHeap* heap) { JUT_ASSERT(56, mFxLineBuffer[3]); mFxDataNum = arc->countResource(); - mConfig = new (heap, 0) Z2FxLineConfig[mFxDataNum]; + mConfig = JKR_NEW_ARGS (heap, 0) Z2FxLineConfig[mFxDataNum]; for (u8 i = 0; i < mFxDataNum; i++) { void* res = arc->getResource(i); diff --git a/src/Z2AudioLib/Z2SoundHandles.cpp b/src/Z2AudioLib/Z2SoundHandles.cpp index 8990cd4fd1..9b6aa5a9ba 100644 --- a/src/Z2AudioLib/Z2SoundHandles.cpp +++ b/src/Z2AudioLib/Z2SoundHandles.cpp @@ -20,7 +20,7 @@ void Z2SoundHandles::deleteHandlesPool() { JUT_ASSERT(48, handle->getSupervisor() == this); remove(handle); - delete handle; + JKR_DELETE(handle); } handleNum_ = 0; @@ -64,7 +64,7 @@ Z2SoundHandlePool* Z2SoundHandles::getFreeHandle() { } if (getNumHandles() < handleNum_) { - Z2SoundHandlePool* handle = new Z2SoundHandlePool(); + Z2SoundHandlePool* handle = JKR_NEW Z2SoundHandlePool(); if (handle != NULL) { append(handle); JUT_ASSERT(113, handle->getSupervisor() == this); @@ -141,7 +141,7 @@ void Z2SoundHandles::setPos(const JGeometry::TVec3& pos) { } else { remove(handle); - delete handle; + JKR_DELETE(handle); } } } diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp index fdf3e67ea2..eca9b88660 100644 --- a/src/c/c_dylink.cpp +++ b/src/c/c_dylink.cpp @@ -895,7 +895,7 @@ int cCc_Init() { } if (DMC[d.mKey] == NULL) { - DMC[d.mKey] = new DynamicModuleControl(d.name); + DMC[d.mKey] = JKR_NEW DynamicModuleControl(d.name); } } } diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 5408b1eb9d..7699ebba28 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -311,7 +311,7 @@ int daDr_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49); 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); + mpModelMorf = JKR_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) { return 0; } diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index 0e546a4eab..eb09d83c73 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -124,7 +124,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { int daL7lowDr_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L7lowDr", 10); 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); + mpModelMorf = JKR_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; } diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index f6051370b1..5a05f06666 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -756,7 +756,7 @@ static int daL7ODR_Delete(daL7ODR_c* i_this) { int daL7ODR_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49); 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); + mpModelMorf = JKR_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) { return 0; diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index 6ae53c7983..27551854ff 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -4128,7 +4128,7 @@ int daAlink_c::initDemoModel(J3DModel** i_ppmodel, char const* i_resName, u32 i_ int daAlink_c::initDemoBck(mDoExt_bckAnm** i_ppbck, char const* i_resName) { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), i_resName); if (bck != NULL) { - *i_ppbck = new mDoExt_bckAnm(); + *i_ppbck = JKR_NEW mDoExt_bckAnm(); if (*i_ppbck == NULL) { return 0; @@ -4193,7 +4193,7 @@ int daAlink_c::createHeap() { return 0; } - mpHIO = new daAlinkHIO_c(); + mpHIO = JKR_NEW daAlinkHIO_c(); if (mpHIO == NULL) { return 0; } @@ -4219,33 +4219,33 @@ int daAlink_c::createHeap() { } int sp38 = 40; - J3DTransformInfo* sp1C = new J3DTransformInfo[sp38]; + J3DTransformInfo* sp1C = JKR_NEW J3DTransformInfo[sp38]; if (sp1C == NULL) { return 0; } - Quaternion* sp30 = new Quaternion[sp38]; + Quaternion* sp30 = JKR_NEW Quaternion[sp38]; if (sp30 == NULL) { return 0; } - field_0x2060 = new mDoExt_MtxCalcOldFrame(sp1C, sp30); + field_0x2060 = JKR_NEW mDoExt_MtxCalcOldFrame(sp1C, sp30); if (field_0x2060 == NULL) { return 0; } - field_0x1f20 = new mDoExt_MtxCalcAnmBlendTblOld(field_0x2060, 3, mNowAnmPackUnder); + field_0x1f20 = JKR_NEW mDoExt_MtxCalcAnmBlendTblOld(field_0x2060, 3, mNowAnmPackUnder); if (field_0x1f20 == NULL) { return 0; } - field_0x1f24 = new mDoExt_MtxCalcAnmBlendTblOld(field_0x2060, 3, mNowAnmPackUpper); + field_0x1f24 = JKR_NEW mDoExt_MtxCalcAnmBlendTblOld(field_0x2060, 3, mNowAnmPackUpper); if (field_0x1f24 == NULL) { return 0; } for (int i = 0; i < 2; i++) { - field_0x2180[i] = new daAlink_matAnm_c(); + field_0x2180[i] = JKR_NEW daAlink_matAnm_c(); if (field_0x2180[i] == NULL) { return 0; } @@ -4256,7 +4256,7 @@ int daAlink_c::createHeap() { return 0; } - field_0x2d78 = new (0x20) u8[0x800]; + field_0x2d78 = JKR_NEW_ARGS (0x20) u8[0x800]; if (field_0x2d78 == NULL) { return 0; } @@ -4284,7 +4284,7 @@ int daAlink_c::createHeap() { } if (mpDemoFCBlendModel != NULL) { - field_0x069c = new mDoExt_blkAnm(); + field_0x069c = JKR_NEW mDoExt_blkAnm(); if (field_0x069c == NULL) { return 0; } @@ -14156,7 +14156,7 @@ BOOL daAlink_c::checkMagicArmorWearAbility() const { J3DModelData* daAlink_c::loadAramBmd(u16 i_resIdx, u32 i_bufSize) { JKRArchive* anmArchive = dComIfGp_getAnmArchive(); - u8* tmpBuffer = new (0x20) u8[i_bufSize]; + u8* tmpBuffer = JKR_NEW_ARGS (0x20) u8[i_bufSize]; JKRReadIdxResource(tmpBuffer, i_bufSize, i_resIdx, anmArchive); #if DEBUG @@ -14177,7 +14177,7 @@ J3DModelData* daAlink_c::loadAramBmd(u16 i_resIdx, u32 i_bufSize) { } void* daAlink_c::loadAram(u16 i_resIdx, u32 i_bufSize) { - u8* tmpBuffer = new (0x20) u8[i_bufSize]; + u8* tmpBuffer = JKR_NEW_ARGS (0x20) u8[i_bufSize]; JKRReadIdxResource(tmpBuffer, i_bufSize, i_resIdx, dComIfGp_getAnmArchive()); #if DEBUG daPy_aramBufferCheck(tmpBuffer, i_bufSize); diff --git a/src/d/actor/d_a_alink_HIO.inc b/src/d/actor/d_a_alink_HIO.inc index aec8ad2a89..aadfa8f2c2 100644 --- a/src/d/actor/d_a_alink_HIO.inc +++ b/src/d/actor/d_a_alink_HIO.inc @@ -5172,8 +5172,8 @@ void daAlinkHIO_c::listenPropertyEvent(const JORPropertyEvent* event) { } case PROPERTY_SAVE_FILE_e: { if (file.open(6, "すべてのファイル(*.*)\0*.*\0", NULL, NULL, NULL)) { - char* fileData = new (0x20) char[0x10000]; - char* structData = new (0x20) char[0x10000]; + char* fileData = JKR_NEW_ARGS (0x20) char[0x10000]; + char* structData = JKR_NEW_ARGS (0x20) char[0x10000]; if (fileData != NULL && structData != NULL) { size_t dataSize = makeFileOutData(fileData, structData); @@ -5187,15 +5187,15 @@ void daAlinkHIO_c::listenPropertyEvent(const JORPropertyEvent* event) { OS_REPORT("メモリ破壊が起こりました！！！！！\n"); } - delete[] fileData; - delete[] structData; + JKR_DELETE_ARRAY(fileData); + JKR_DELETE_ARRAY(structData); } else { if (fileData != NULL) { - delete[] fileData; + JKR_DELETE_ARRAY(fileData); } if (structData != NULL) { - delete[] structData; + JKR_DELETE_ARRAY(structData); } // Could not secure the write area @@ -5210,12 +5210,12 @@ void daAlinkHIO_c::listenPropertyEvent(const JORPropertyEvent* event) { } case PROPERTY_LOAD_FILE_e: { if (file.open(1, "すべてのファイル(*.*)\0*.*\0", NULL, NULL, NULL)) { - char* fileData = new (0x20) char[0x10000]; + char* fileData = JKR_NEW_ARGS (0x20) char[0x10000]; if (fileData != NULL) { file.readData(fileData, 0); readFileData(fileData); - delete[] fileData; + JKR_DELETE_ARRAY(fileData); } else { // Could not secure the read area OS_REPORT("読み込み用領域確保できませんでした\n"); diff --git a/src/d/actor/d_a_alink_effect.inc b/src/d/actor/d_a_alink_effect.inc index 7af8e88645..b782890cd8 100644 --- a/src/d/actor/d_a_alink_effect.inc +++ b/src/d/actor/d_a_alink_effect.inc @@ -2075,7 +2075,7 @@ BOOL daAlink_lockCursor_c::create() { field_0x4 = false; field_0x30 = 0.0f; - mScrn = new J2DScreen(); + mScrn = JKR_NEW J2DScreen(); if (mScrn == NULL) { return false; } diff --git a/src/d/actor/d_a_alink_hook.inc b/src/d/actor/d_a_alink_hook.inc index d496148050..3240ad3b81 100644 --- a/src/d/actor/d_a_alink_hook.inc +++ b/src/d/actor/d_a_alink_hook.inc @@ -396,10 +396,10 @@ void daAlink_c::setHookshotModel() { field_0x0714 = initModel(mpHookTipModel->getModelData(), 0); mpItemModelData = loadAramBmd(dRes_ID_ALANM_BMD_AL_HS_KUSARI_e, 0x1000); - mpHookChain = new hsChainShape_c(); - mpHookSound = new Z2SoundObjSimple(); + mpHookChain = JKR_NEW hsChainShape_c(); + mpHookSound = JKR_NEW Z2SoundObjSimple(); - mpHookshotLinChk = new dBgS_ObjLinChk(); + mpHookshotLinChk = JKR_NEW dBgS_ObjLinChk(); mpHookshotLinChk->OffFullGrp(); mpHookshotLinChk->OnWaterGrp(); diff --git a/src/d/actor/d_a_alink_ironball.inc b/src/d/actor/d_a_alink_ironball.inc index 76eb232c22..897b7afdc2 100644 --- a/src/d/actor/d_a_alink_ironball.inc +++ b/src/d/actor/d_a_alink_ironball.inc @@ -92,22 +92,22 @@ void daAlink_c::setIronBallModel() { mHeldItemModel = initModelEnv(loadAramBmd(dRes_ID_ALANM_BMD_AL_IB_e, 0x2800), 0); mpItemModelData = loadAramBmd(dRes_ID_ALANM_BMD_AL_HS_KUSARI_e, 0x1000); - mpHookChain = new hsChainShape_c(); + mpHookChain = JKR_NEW hsChainShape_c(); - mIronBallChainPos = new cXyz[102]; - mIronBallChainAngle = new csXyz[102]; - field_0x3848 = new cXyz[102]; + mIronBallChainPos = JKR_NEW cXyz[102]; + mIronBallChainAngle = JKR_NEW csXyz[102]; + field_0x3848 = JKR_NEW cXyz[102]; - field_0x0774 = new dBgS_AcchCir(); - field_0x0778 = new dBgS_ObjAcch(); - mpHookSound = new Z2SoundObjSimple(); + field_0x0774 = JKR_NEW dBgS_AcchCir(); + field_0x0778 = JKR_NEW dBgS_ObjAcch(); + mpHookSound = JKR_NEW Z2SoundObjSimple(); - mpHookshotLinChk = new dBgS_ObjLinChk(); + mpHookshotLinChk = JKR_NEW dBgS_ObjLinChk(); mpHookshotLinChk->OffFullGrp(); mpHookshotLinChk->OnWaterGrp(); - field_0x780 = new dBgS_ObjLinChk(); - field_0x2f1c = new dPaPo_c(); + field_0x780 = JKR_NEW dBgS_ObjLinChk(); + field_0x2f1c = JKR_NEW dPaPo_c(); field_0x2f1c->init(field_0x0778, 32.0f, 64.0f); mDoExt_setCurrentHeap(prev_heap); diff --git a/src/d/actor/d_a_alink_swindow.inc b/src/d/actor/d_a_alink_swindow.inc index d990f8a9e1..0df7fe2a2a 100644 --- a/src/d/actor/d_a_alink_swindow.inc +++ b/src/d/actor/d_a_alink_swindow.inc @@ -239,7 +239,7 @@ void daAlink_c::changeModelDataDirectWolf(int param_0) { void daAlink_c::initStatusWindow() { onNoResetFlg2(FLG2_STATUS_WINDOW_DRAW); - void* tmpBuffer = new (0x20) void*[0x500]; + void* tmpBuffer = JKR_NEW_ARGS (0x20) void*[0x500]; JUT_ASSERT(394, tmpBuffer); u16 bckResIdx, btpResIdx, btkResIdx; @@ -261,14 +261,14 @@ void daAlink_c::initStatusWindow() { } JKRReadIdxResource(tmpBuffer, 0x1400, bckResIdx, dComIfGp_getAnmArchive()); - m_sWindowBck = new mDoExt_bckAnm(); + m_sWindowBck = JKR_NEW mDoExt_bckAnm(); JUT_ASSERT(428, m_sWindowBck); if (!m_sWindowBck->init((J3DAnmTransform*)J3DAnmLoaderDataBase::load(tmpBuffer), TRUE, 2, 1.0f, 0, -1, false)) { JUT_ASSERT(433, FALSE); } - tmpBuffer = new (0x20) void*[0x100]; + tmpBuffer = JKR_NEW_ARGS (0x20) void*[0x100]; JUT_ASSERT(437, tmpBuffer); JKRReadIdxResource(tmpBuffer, 0x400, btpResIdx, dComIfGp_getAnmArchive()); @@ -277,7 +277,7 @@ void daAlink_c::initStatusWindow() { btp->searchUpdateMaterialID(field_0x06c0); field_0x06c0->entryTexNoAnimator(btp); - tmpBuffer = new (0x20) void*[0x100]; + tmpBuffer = JKR_NEW_ARGS (0x20) void*[0x100]; JUT_ASSERT(449, tmpBuffer); JKRReadIdxResource(tmpBuffer, 0x400, btkResIdx, dComIfGp_getAnmArchive()); diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index f9e3fc4136..088ec2860a 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -6807,7 +6807,7 @@ void daAlink_c::setWolfBallModel() { field_0x0718 = static_cast(dComIfG_getObjectRes(l_arcName, 0x49)); field_0x0718->searchUpdateMaterialID(mHeldItemModel->getModelData()); - mpHookSound = new Z2SoundObjSimple(); + mpHookSound = JKR_NEW Z2SoundObjSimple(); mDoExt_setCurrentHeap(prev_heap); mEquipItem = 0x10A; diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index 777fa09d40..8434f9ab43 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -1427,7 +1427,7 @@ static int daB_BH_Delete(b_bh_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { b_bh_class* a_this = (b_bh_class*)i_this; - a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_BH", BMDV_BH), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_BH", 12), 2, 1.0f, 0, -1, &a_this->mSound, 0, 0x11000084); + a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_BH", BMDV_BH), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_BH", 12), 2, 1.0f, 0, -1, &a_this->mSound, 0, 0x11000084); if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index 17ef77cdf0..56e34e0390 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -2427,7 +2427,7 @@ static int daB_BQ_Delete(b_bq_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { b_bq_class* a_this = (b_bq_class*)i_this; - a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_bq", BMDV_BQ), NULL, + a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_bq", BMDV_BQ), NULL, NULL, NULL, J3DFrameCtrl::EMode_LOOP, 0.6f, 0, -1, &a_this->mSound, 0, 0x11000284); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { @@ -2441,7 +2441,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - a_this->mpDeadBrk = new mDoExt_brkAnm(); + a_this->mpDeadBrk = JKR_NEW mDoExt_brkAnm(); if (a_this->mpDeadBrk == NULL) { return false; } @@ -2455,7 +2455,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { a_this->mpDeadBrk->setPlaySpeed(0.0f); - a_this->mpTodomeBtk = new mDoExt_btkAnm(); + a_this->mpTodomeBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpTodomeBtk == NULL) { return false; } diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index b9c5fc548e..2da4517f5e 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -3999,12 +3999,12 @@ int daB_DR_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49); 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); + mpModelMorf = JKR_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) { return 0; } - mpCoreBrk = new mDoExt_brkAnm(); + mpCoreBrk = JKR_NEW mDoExt_brkAnm(); if (mpCoreBrk == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index b501877178..c05366b164 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -21,18 +21,18 @@ int daB_DRE_c::CreateHeap() { JUT_ASSERT(0xB4, modelData != NULL); if (mAction == 0) { - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x1D), 0, 1.0f, 0, -1, &mSound, 0, 0x11000084); } else { - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x1F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } - mpCoreBrk = new mDoExt_brkAnm(); + mpCoreBrk = JKR_NEW mDoExt_brkAnm(); if (mpCoreBrk == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index 530bf1f038..9710e29ea7 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -5308,7 +5308,7 @@ int daB_DS_c::CreateHeap() { JUT_ASSERT(0, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO( + mpMorf = JKR_NEW mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", anm_res)), 0, 1.0f, 0, -1, &mSound, 0, 0x11000084); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -5326,14 +5326,14 @@ int daB_DS_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74); JUT_ASSERT(0, modelData != NULL); - mpSwordMorf = new mDoExt_McaMorfSO( + mpSwordMorf = JKR_NEW mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", 63)), 0, 1.0f, 0, -1, NULL, 0, 0x11000084); if (mpSwordMorf == NULL || mpSwordMorf->getModel() == NULL) { return 0; } - mpSwordBrkAnm = new mDoExt_brkAnm(); + mpSwordBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpSwordBrkAnm == NULL) { return 0; } @@ -5348,7 +5348,7 @@ int daB_DS_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75); JUT_ASSERT(0, modelData != NULL); - mpZantMorf = new mDoExt_McaMorfSO( + mpZantMorf = JKR_NEW mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", 66)), 2, 1.0f, 0, -1, NULL, 0, 0x11000084); if (mpZantMorf == NULL || mpZantMorf->getModel() == NULL) { @@ -5363,7 +5363,7 @@ int daB_DS_c::CreateHeap() { return 0; } - mpOpPatternBrkAnm = new mDoExt_brkAnm(); + mpOpPatternBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpOpPatternBrkAnm == NULL) { return 0; } @@ -5375,7 +5375,7 @@ int daB_DS_c::CreateHeap() { return 0; } - mpOpPatternBtkAnm = new mDoExt_btkAnm(); + mpOpPatternBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpOpPatternBtkAnm == NULL) { return 0; } @@ -5395,7 +5395,7 @@ int daB_DS_c::CreateHeap() { return 0; } - mpPatternBrkAnm = new mDoExt_brkAnm(); + mpPatternBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpPatternBrkAnm == NULL) { return 0; } @@ -5407,7 +5407,7 @@ int daB_DS_c::CreateHeap() { return 0; } - mpPatternBtkAnm = new mDoExt_btkAnm(); + mpPatternBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpPatternBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 8623cdb422..b9bc233505 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -154,7 +154,7 @@ int daB_GG_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("B_gg", 0x23); 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); + mpModelMorf = JKR_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) { return 0; } diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 4f911c8a90..d982e5cabc 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -2013,7 +2013,7 @@ static int daB_GM_Delete(b_gm_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { b_gm_class* a_this = (b_gm_class*)i_this; - a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gm", 0x25), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gm", 30), 2, 0.6f, 0, -1, &a_this->mCreatureSound, 0, 0x11000284); + a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gm", 0x25), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gm", 30), 2, 0.6f, 0, -1, &a_this->mCreatureSound, 0, 0x11000284); if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) { return 0; } @@ -2025,7 +2025,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - a_this->mpZoomBtk = new mDoExt_btkAnm(); + a_this->mpZoomBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpZoomBtk == NULL) { return 0; } @@ -2035,12 +2035,12 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBeamModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_gm", 0x21), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gm", 7), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); + a_this->mpBeamModelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_gm", 0x21), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gm", 7), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); if (a_this->mpBeamModelMorf == NULL || a_this->mpBeamModelMorf->getModel() == NULL) { return 0; } - a_this->mpBeamBtk = new mDoExt_btkAnm(); + a_this->mpBeamBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpBeamBtk == NULL) { return 0; } @@ -2061,7 +2061,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { a_this->mSpotLightSize[i] = 1.0f; } - a_this->mpSpotLightBtk = new mDoExt_btkAnm(); + a_this->mpSpotLightBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpSpotLightBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 6349ee995a..f16b841c26 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -4592,7 +4592,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { static int const blur_model[2] = {0x66, 0x65}; static int btk_d[6] = {0x77, 0x76, 0x73, 0x74, 0x75, 0x72}; - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x69), + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x69), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gnd", 0x4b), 2, 1.0f, 0, -1, &i_this->mGndSound, 0, 0x11020284); @@ -4610,7 +4610,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { mDoMtx_stack_c::scaleS(0.0f, 0.0f, 0.0f); model->setBaseTRMtx(mDoMtx_stack_c::get()); - i_this->mpGndCoreBrk = new mDoExt_brkAnm(); + i_this->mpGndCoreBrk = JKR_NEW mDoExt_brkAnm(); if (i_this->mpGndCoreBrk == NULL) { return 0; } @@ -4622,7 +4622,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } for (int i = 0; i < 6; i++) { - i_this->mpGndEyeBtk[i] = new mDoExt_btkAnm(); + i_this->mpGndEyeBtk[i] = JKR_NEW mDoExt_btkAnm(); if (i_this->mpGndEyeBtk[i] == NULL) { return 0; } @@ -4634,7 +4634,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } } - i_this->mpGndEyeBtp = new mDoExt_btpAnm(); + i_this->mpGndEyeBtp = JKR_NEW mDoExt_btpAnm(); if (i_this->mpGndEyeBtp == NULL) { return 0; } @@ -4690,7 +4690,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { i_this->mpMantShadowModel[i]->setBaseTRMtx(mDoMtx_stack_c::get()); } - i_this->mpHorseMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_hg", 19), + i_this->mpHorseMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_hg", 19), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_hg", 15), 2, 1.0f, 0, -1, &i_this->mHorseSound, 0x80000, 0x11000084); if (i_this->mpHorseMorf == NULL || i_this->mpHorseMorf->getModel() == NULL) { @@ -4728,14 +4728,14 @@ static int useHeapInit(fopAc_ac_c* a_this) { size++; } - i_this->mpZeldaModel = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x6a), + i_this->mpZeldaModel = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x6a), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gnd", 0x5e), 0, 1.0f, 0, -1, 1, NULL, 0, 0x11020284); if (i_this->mpZeldaModel == NULL || i_this->mpZeldaModel->getModel() == NULL) { return 0; } - i_this->mpZeldaBtk = new mDoExt_btkAnm(); + i_this->mpZeldaBtk = JKR_NEW mDoExt_btkAnm(); if (i_this->mpZeldaBtk == NULL) { return 0; } @@ -4746,7 +4746,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - i_this->mpZeldaBtp = new mDoExt_btpAnm(); + i_this->mpZeldaBtp = JKR_NEW mDoExt_btpAnm(); if (i_this->mpZeldaBtp == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index 6f593b1597..5189a6e9b6 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -209,7 +209,7 @@ static int daB_GO_Delete(b_go_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { b_go_class* a_this = (b_go_class*)i_this; - a_this->mpMorf = new mDoExt_McaMorfSO( + a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO( (J3DModelData*)dComIfG_getObjectRes("B_go", RES_IS_MODEL), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_go", ANM_WAIT_03), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index a71b100158..076a40ba3a 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -328,7 +328,7 @@ static int daB_GOS_Delete(b_gos_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { b_gos_class* a_this = (b_gos_class*)i_this; - a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gos", 9), NULL, + a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_gos", 9), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gos", 6), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 8cb9ca1ae9..16d661a2d8 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -3386,7 +3386,7 @@ static int daB_MGN_Delete(daB_MGN_c* i_this) { int daB_MGN_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN); JUT_ASSERT(4010, modelData != NULL); - mpMgnModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMgnModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_mgn", BCK_MGN_WAIT),2, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11000284); if (mpMgnModelMorf == NULL || mpMgnModelMorf->getModel() == NULL) { @@ -3402,7 +3402,7 @@ int daB_MGN_c::CreateHeap() { } } - mpMgnCoreBrk = new mDoExt_brkAnm(); + mpMgnCoreBrk = JKR_NEW mDoExt_brkAnm(); if (mpMgnCoreBrk == NULL) { return 0; } @@ -3413,7 +3413,7 @@ int daB_MGN_c::CreateHeap() { return 0; } - mpMgnBtk = new mDoExt_btkAnm(); + mpMgnBtk = JKR_NEW mDoExt_btkAnm(); if (mpMgnBtk == NULL) { return 0; } @@ -3439,14 +3439,14 @@ int daB_MGN_c::CreateHeap() { JUT_ASSERT(4084, modelData != NULL); for (int i = 0; i < 4; i++) { - mpGdgateModelMorf[i] = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpGdgateModelMorf[i] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_mgne", BCK_EF_GDGATE_START), 0, 0.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11000284); if (mpGdgateModelMorf[i] == NULL || mpGdgateModelMorf[i]->getModel() == NULL) { return 0; } - mpGdgateStartBrk[i] = new mDoExt_brkAnm(); + mpGdgateStartBrk[i] = JKR_NEW mDoExt_brkAnm(); if (mpGdgateStartBrk[i] == NULL) { return 0; } @@ -3458,7 +3458,7 @@ int daB_MGN_c::CreateHeap() { return 0; } - mpGdgateAppearBrk[i] = new mDoExt_brkAnm(); + mpGdgateAppearBrk[i] = JKR_NEW mDoExt_brkAnm(); if (mpGdgateAppearBrk[i] == NULL) { return 0; } @@ -3470,7 +3470,7 @@ int daB_MGN_c::CreateHeap() { return 0; } - mpGdgateBtk[i] = new mDoExt_btkAnm(); + mpGdgateBtk[i] = JKR_NEW mDoExt_btkAnm(); if (mpGdgateBtk[i] == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 8b4c5eedb6..1cdf6a4e98 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -3290,7 +3290,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { b_ob_class* a_this = (b_ob_class*)i_this; a_this->mpCoreMorf = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDV_OH_CORE), NULL, NULL, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDV_OH_CORE), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_oh", BCK_OH_CORE_OPEN), 2, 1.0f, 0, -1, &a_this->mSound, 0, 0x11000084); @@ -3304,7 +3304,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } a_this->mBodyParts[i].mpMorf = - new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", p_bmd[i]), NULL, NULL, + JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", p_bmd[i]), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, var_r31, 0x11000084); if (a_this->mBodyParts[i].mpMorf == NULL || @@ -3335,7 +3335,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (i >= 4 && i <= 17) { a_this->mBodyParts[i].mpFinMorf = - new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINA), NULL, NULL, + JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINA), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (a_this->mBodyParts[i].mpFinMorf == NULL || @@ -3366,7 +3366,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (i >= 7 && i <= 15) { a_this->mBodyParts[i].mpFinUnkMorf = - new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINA), NULL, NULL, + JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINA), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (a_this->mBodyParts[i].mpFinUnkMorf == NULL || @@ -3391,7 +3391,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (i == 8) { a_this->mBodyParts[i].mpFinBMorf = - new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINB), NULL, NULL, + JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINB), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (a_this->mBodyParts[i].mpFinBMorf == NULL || @@ -3416,7 +3416,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (i == 17) { a_this->mBodyParts[i].mpFinCMorf = - new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINC), NULL, NULL, + JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_OI_FINC), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (a_this->mBodyParts[i].mpFinCMorf == NULL || @@ -3454,7 +3454,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { modelData->getJointNodePointer(j)->setCallBack(sui_nodeCallBack); } - a_this->mpSuiBrk = new mDoExt_brkAnm(); + a_this->mpSuiBrk = JKR_NEW mDoExt_brkAnm(); if (a_this->mpSuiBrk == NULL) { return 0; } @@ -3463,7 +3463,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpSuiBtk = new mDoExt_btkAnm(); + a_this->mpSuiBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpSuiBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp index aded45eee3..88d3c59109 100644 --- a/src/d/actor/d_a_b_oh.cpp +++ b/src/d/actor/d_a_b_oh.cpp @@ -705,7 +705,7 @@ static int daB_OH_Delete(b_oh_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { b_oh_class* this_ = (b_oh_class*)i_this; - this_->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDV_OH), NULL, + this_->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("B_oh", BMDV_OH), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0, 0x11000284); if (this_->mpMorf == NULL || this_->mpMorf->getModel() == NULL) { return 0; @@ -722,7 +722,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { nodeCallBack); } - this_->mpBtk = new mDoExt_btkAnm(); + this_->mpBtk = JKR_NEW mDoExt_btkAnm(); if (this_->mpBtk == NULL) { return 0; } @@ -735,7 +735,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { this_->mpBtk->setFrame(cM_rndF(39.0f)); this_->mpBtk->setPlaySpeed(cM_rndFX(0.1f) + 1.0f); - this_->mpBrk = new mDoExt_brkAnm(); + this_->mpBrk = JKR_NEW mDoExt_brkAnm(); if (this_->mpBrk == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp index b69e0cde42..b124e13a1d 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -217,7 +217,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { b_oh2_class* _this = static_cast(i_this); _this->mpMorf = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", 0x29), NULL, NULL, NULL, 2, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("B_oh", 0x29), NULL, NULL, NULL, 2, 1.0f, 0, -1, &_this->mZ2Enemy, 0, 0x11000284); if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { @@ -235,7 +235,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { nodeCallBack); } - _this->mpBtk = new mDoExt_btkAnm(); + _this->mpBtk = JKR_NEW mDoExt_btkAnm(); if (_this->mpBtk == NULL) { return 0; } @@ -248,7 +248,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { _this->mpBtk->setFrame(cM_rndF(39.0f)); _this->mpBtk->setPlaySpeed(cM_rndFX(0.1f) + 1.0f); - _this->mpBrk = new mDoExt_brkAnm(); + _this->mpBrk = JKR_NEW mDoExt_brkAnm(); if (_this->mpBrk == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 608cbf6336..7c52866675 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -4937,7 +4937,7 @@ int daB_TN_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("B_tnp2", BMDR_TN2); } - mpModelMorf2 = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpModelMorf2 = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_tn", BCK_TNA_WAIT), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf2 == NULL || mpModelMorf2->getModel() == NULL) { @@ -4945,7 +4945,7 @@ int daB_TN_c::CreateHeap() { } if (mType == 1) { - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -4985,7 +4985,7 @@ int daB_TN_c::CreateHeap() { } if (sVar1 != -1) { - mpBrkAnms[i] = new mDoExt_brkAnm(); + mpBrkAnms[i] = JKR_NEW mDoExt_brkAnm(); mDoExt_brkAnm* myanm = mpBrkAnms[i]; if (myanm == NULL) { @@ -5005,7 +5005,7 @@ int daB_TN_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes(mArcName, tn_part_model_id[mType * 0x10 + 0xf]); - mpModelMorf1 = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpModelMorf1 = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_tn", BCK_TNB_SWORD_B_PULL_A), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf1 == NULL || mpModelMorf1->getModel() == NULL) { diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index 70a7d42391..57efb9c5cb 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -3109,7 +3109,7 @@ int daB_YO_c::CreateHeap() { } model_data = (J3DModelData*)dComIfG_getObjectRes("B_YO", BMDE_YKW_B); - mpYetaMorf = new mDoExt_McaMorfSO( + mpYetaMorf = JKR_NEW mDoExt_McaMorfSO( model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_YO", BCK_YKW_B_WAITA), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mCreatureSound, 0, 0x11020284 ); @@ -3117,7 +3117,7 @@ int daB_YO_c::CreateHeap() { return 0; } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } @@ -3128,7 +3128,7 @@ int daB_YO_c::CreateHeap() { } model_data = mpYetaMorf->getModel()->getModelData(); - mpYetaBtkAnm = new mDoExt_btkAnm(); + mpYetaBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpYetaBtkAnm == NULL) { return 0; } @@ -3137,7 +3137,7 @@ int daB_YO_c::CreateHeap() { return 0; } - mpYetaBtpAnm = new mDoExt_btpAnm(); + mpYetaBtpAnm = JKR_NEW mDoExt_btpAnm(); if (mpYetaBtpAnm == NULL) { return 5; } @@ -3146,7 +3146,7 @@ int daB_YO_c::CreateHeap() { return 5; } - mpYetaBrkAnm = new mDoExt_brkAnm(); + mpYetaBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpYetaBrkAnm == NULL) { return 0; } @@ -3155,7 +3155,7 @@ int daB_YO_c::CreateHeap() { return 0; } - mpYetaWhiteBrkAnm = new mDoExt_brkAnm(); + mpYetaWhiteBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpYetaWhiteBrkAnm == NULL) { return 0; } @@ -3164,7 +3164,7 @@ int daB_YO_c::CreateHeap() { return 0; } - mpRoomNormalBgW = new dBgW(); + mpRoomNormalBgW = JKR_NEW dBgW(); if (mpRoomNormalBgW == NULL) { return 0; } @@ -3180,7 +3180,7 @@ int daB_YO_c::CreateHeap() { return 0; } - mpRoomArenaBgW = new dBgW(); + mpRoomArenaBgW = JKR_NEW dBgW(); if (mpRoomArenaBgW == NULL) { return 0; } @@ -3203,7 +3203,7 @@ int daB_YO_c::CreateHeap() { } model_data = (J3DModelData*)dComIfG_getObjectRes("ykW", 0xb); - mpYetaRevertedMorf = new mDoExt_McaMorfSO( + mpYetaRevertedMorf = JKR_NEW mDoExt_McaMorfSO( model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("ykW1", 0x1a), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000084 ); @@ -3219,7 +3219,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } int daB_YO_c::CreateHeap2() { - mpRoomNormalBgW = new dBgW(); + mpRoomNormalBgW = JKR_NEW dBgW(); if (mpRoomNormalBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index b38aa09b98..68b09f3272 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -5382,7 +5382,7 @@ static int daB_ZANT_Delete(daB_ZANT_c* i_this) { int daB_ZANT_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN); 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); + mpModelMorf = JKR_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; } @@ -5397,7 +5397,7 @@ int daB_ZANT_c::CreateHeap() { return 0; } - mpMahojinEndBrk = new mDoExt_brkAnm(); + mpMahojinEndBrk = JKR_NEW mDoExt_brkAnm(); if (mpMahojinEndBrk == NULL) { return 0; } @@ -5406,7 +5406,7 @@ int daB_ZANT_c::CreateHeap() { return 0; } - mpMahojinBtk = new mDoExt_btkAnm(); + mpMahojinBtk = JKR_NEW mDoExt_btkAnm(); if (mpMahojinBtk == NULL) { return 0; } @@ -5415,7 +5415,7 @@ int daB_ZANT_c::CreateHeap() { return 0; } - mpMahojinStartBtk = new mDoExt_btkAnm(); + mpMahojinStartBtk = JKR_NEW mDoExt_btkAnm(); if (mpMahojinStartBtk == NULL) { return 0; } @@ -5429,7 +5429,7 @@ int daB_ZANT_c::CreateHeap() { return 0; } - mpMahojinBrk2 = new mDoExt_brkAnm(); + mpMahojinBrk2 = JKR_NEW mDoExt_brkAnm(); if (mpMahojinBrk2 == NULL) { return 0; } @@ -5438,7 +5438,7 @@ int daB_ZANT_c::CreateHeap() { return 0; } - mpMahojinStartBtk2 = new mDoExt_btkAnm(); + mpMahojinStartBtk2 = JKR_NEW mDoExt_btkAnm(); if (mpMahojinStartBtk2 == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 7778dadf81..75834871b4 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -403,12 +403,12 @@ int daB_ZANTZ_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BMDR_ZZ); 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); + mpMorf = JKR_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) { return 0; } - mpBrk = new mDoExt_brkAnm(); + mpBrk = JKR_NEW mDoExt_brkAnm(); if (mpBrk == NULL) { return 0; } @@ -417,7 +417,7 @@ int daB_ZANTZ_c::CreateHeap() { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index 60639516ef..d73919e6af 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -150,7 +150,7 @@ int daB_ZANTS_c::CreateHeap() { return FALSE; } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return FALSE; } @@ -162,7 +162,7 @@ int daB_ZANTS_c::CreateHeap() { return FALSE; } - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return FALSE; } @@ -174,7 +174,7 @@ int daB_ZANTS_c::CreateHeap() { return FALSE; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return FALSE; } diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index f19c81c90b..aee9f40ad9 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -155,7 +155,7 @@ static int daBalloon2D_createHeap(fopAc_ac_c* i_this) { static char* l_arcName = "Balloon2D"; int daBalloon2D_c::createHeap() { - mScreen = new J2DScreen(); + mScreen = JKR_NEW J2DScreen(); if (mScreen == NULL) { return 0; } @@ -164,26 +164,26 @@ int daBalloon2D_c::createHeap() { JKRArchive* arc = resInfo->getArchive(); mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc); dPaneClass_showNullPane(mScreen); - field_0x578 = new CPaneMgr(mScreen, MULTI_CHAR('n_all'), 2, NULL); - field_0x57c = new CPaneMgr(mScreen, MULTI_CHAR('score_tn'), 0, NULL); - field_0x580 = new CPaneMgr(mScreen, MULTI_CHAR('suji_n'), 2, NULL); - field_0x584 = new CPaneMgr(mScreen, MULTI_CHAR('s_set_n'), 0, NULL); - field_0x588 = new CPaneMgr(mScreen, MULTI_CHAR('tas_n'), 0, NULL); - field_0x58c = new CPaneMgr(mScreen, MULTI_CHAR('combo_tn'), 0, NULL); - field_0x590 = new CPaneMgr(mScreen, MULTI_CHAR('num_n'), 0, NULL); - field_0x594 = new CPaneMgr(mScreen, MULTI_CHAR('co_set_n'), 2, NULL); - field_0x598 = new CPaneMgr(mScreen, MULTI_CHAR('bal_3_n'), 2, NULL); - field_0x59c = new CPaneMgr(mScreen, MULTI_CHAR('bal_2_n'), 2, NULL); - field_0x5a0 = new CPaneMgr(mScreen, MULTI_CHAR('bal_1_n'), 2, NULL); - field_0x5a4 = new CPaneMgr(mScreen, MULTI_CHAR('ba_com_n'), 2, NULL); + field_0x578 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('n_all'), 2, NULL); + field_0x57c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('score_tn'), 0, NULL); + field_0x580 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('suji_n'), 2, NULL); + field_0x584 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('s_set_n'), 0, NULL); + field_0x588 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('tas_n'), 0, NULL); + field_0x58c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('combo_tn'), 0, NULL); + field_0x590 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('num_n'), 0, NULL); + field_0x594 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('co_set_n'), 2, NULL); + field_0x598 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_3_n'), 2, NULL); + field_0x59c = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_2_n'), 2, NULL); + field_0x5a0 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('bal_1_n'), 2, NULL); + field_0x5a4 = JKR_NEW CPaneMgr(mScreen, MULTI_CHAR('ba_com_n'), 2, NULL); field_0x578->setAlphaRate(0.0f); field_0x5a4->setAlphaRate(0.0f); for (s32 i = 0; i < 10; i++) { ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getNumberTextureName(i)); - field_0x5c4[i] = new J2DPicture(resTimg); + field_0x5c4[i] = JKR_NEW J2DPicture(resTimg); } ResTIMG* resTimg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', dMeter2Info_getPlusTextureName()); - field_0x5ec = new J2DPicture(resTimg); + field_0x5ec = JKR_NEW J2DPicture(resTimg); if (field_0x578 == NULL || field_0x57c == NULL || field_0x580 == NULL || field_0x584 == NULL ||field_0x588 == NULL || field_0x58c == NULL || field_0x590 == NULL || field_0x594 == NULL || field_0x598 == NULL || diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 5287ceb48b..a987747983 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -943,14 +943,14 @@ static int daBd_Delete(bd_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { bd_class* a_this = (bd_class*)i_this; - a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Bd", 0xE), NULL, NULL, + a_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Bd", 0xE), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Bd", 8), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { return 0; } - a_this->mpBtk = new mDoExt_btkAnm(); + a_this->mpBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 39f7e07990..27daa82972 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -29,7 +29,7 @@ static int createMatAnm(J3DModelData* i_modelData, u16 i_materialID) { J3DMaterial* material = i_modelData->getMaterialNodePointer(i_materialID); if (material->getMaterialAnm() == NULL) { - J3DMaterialAnm* anm = new J3DMaterialAnm(); + J3DMaterialAnm* anm = JKR_NEW J3DMaterialAnm(); if (anm == NULL) { return 0; } @@ -46,7 +46,7 @@ static u8 const lit_3756[12] = { }; int daBg_btkAnm_c::create(J3DModelData* i_modelData, J3DAnmTextureSRTKey* i_btk, int i_anmPlay) { - mpBtk = new mDoExt_btkAnm(); + mpBtk = JKR_NEW mDoExt_btkAnm(); if (mpBtk == NULL) { return 0; } @@ -75,7 +75,7 @@ void daBg_btkAnm_c::play() { } int daBg_brkAnm_c::create(J3DModelData* i_modelData, J3DAnmTevRegKey* i_brk, int i_anmPlay) { - mpBrk = new mDoExt_brkAnm(); + mpBrk = JKR_NEW mDoExt_brkAnm(); if (mpBrk == NULL) { return 0; @@ -143,7 +143,7 @@ int daBg_c::createHeap() { J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(arcName, l_btkName[i]); if (btk != NULL) { - bgPart->btk = new daBg_btkAnm_c(); + bgPart->btk = JKR_NEW daBg_btkAnm_c(); if (bgPart->btk == NULL) { return 0; } @@ -160,7 +160,7 @@ int daBg_c::createHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getStageRes(arcName, l_brkName[i]); if (brk != NULL) { - bgPart->brk = new daBg_brkAnm_c(); + bgPart->brk = JKR_NEW daBg_brkAnm_c(); if (bgPart->brk == NULL) { return 0; } @@ -195,7 +195,7 @@ int daBg_c::createHeap() { return 0; } - bgPart->tevstr = new dKy_tevstr_c(); + bgPart->tevstr = JKR_NEW dKy_tevstr_c(); if (bgPart->tevstr == NULL) { return 0; } @@ -209,7 +209,7 @@ int daBg_c::createHeap() { cBgD_t* dzb = (cBgD_t*)dComIfG_getStageRes(arcName, "room.dzb"); if (dzb != NULL) { mpKCol = NULL; - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } @@ -226,7 +226,7 @@ int daBg_c::createHeap() { if (kcl != NULL && plc != NULL) { mpBgW = NULL; - mpKCol = new dBgWKCol(); + mpKCol = JKR_NEW dBgWKCol(); if (mpKCol == NULL) { return 0; } diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index bf131498f5..d4a7b19a9f 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -545,7 +545,7 @@ int daBgObj_c::CreateHeapType0() { J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes( daSetBgObj_c::getArcName(this), getBtkName(0, i)); if (btk != NULL) { - field_0x5b8[0][i] = new mDoExt_btkAnm(); + field_0x5b8[0][i] = JKR_NEW mDoExt_btkAnm(); if (field_0x5b8[0][i] == NULL || !field_0x5b8[0][i]->init(modelData, btk, TRUE, 2, 1.0f, 0, -1)) { @@ -558,7 +558,7 @@ int daBgObj_c::CreateHeapType0() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes( daSetBgObj_c::getArcName(this), getBrkName(0, i)); if (brk != NULL) { - field_0x5c8[0][i] = new mDoExt_brkAnm(); + field_0x5c8[0][i] = JKR_NEW mDoExt_brkAnm(); if (field_0x5c8[0][i] == NULL || !field_0x5c8[0][i]->init(modelData, brk, TRUE, 2, 1.0f, 0, -1)) { @@ -596,7 +596,7 @@ int daBgObj_c::CreateHeapType1() { J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes( daSetBgObj_c::getArcName(this), getBtkName(i, j)); if (btk != NULL) { - field_0x5b8[i][j] = new mDoExt_btkAnm(); + field_0x5b8[i][j] = JKR_NEW mDoExt_btkAnm(); if (field_0x5b8[i][j] == NULL || !field_0x5b8[i][j]->init(modelData, btk, TRUE, 2, 1.0f, 0, -1)) @@ -610,7 +610,7 @@ int daBgObj_c::CreateHeapType1() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes( daSetBgObj_c::getArcName(this), getBrkName(i, j)); if (brk != NULL) { - field_0x5c8[i][j] = new mDoExt_brkAnm(); + field_0x5c8[i][j] = JKR_NEW mDoExt_brkAnm(); if (field_0x5c8[i][j] == NULL || !field_0x5c8[i][j]->init(modelData, brk, TRUE, 2, 1.0f, 0, -1)) @@ -628,7 +628,7 @@ int daBgObj_c::CreateHeapType1() { cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), getDzbName(1)); if (dzb != NULL) { - mpBgW2 = new dBgW(); + mpBgW2 = JKR_NEW dBgW(); if (mpBgW2 == NULL || mpBgW2->Set(dzb, cBgW::MOVE_BG_e, &mBgMtx)) { mpBgW2 = NULL; return 0; diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index 59ee181d4c..a983ec27e2 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -18,7 +18,7 @@ int daBoomerang_sight_c::createHeap() { void* tmpData; JKRArchive* archive = dComIfG_getObjectResInfo(daAlink_c::getAlinkArcName())->getArchive(); - m_cursorYellowScrn = new J2DScreen(); + m_cursorYellowScrn = JKR_NEW J2DScreen(); if (m_cursorYellowScrn == NULL) { return 0; } @@ -54,7 +54,7 @@ int daBoomerang_sight_c::createHeap() { return 0; } - m_cursorRedScrn = new J2DScreen(); + m_cursorRedScrn = JKR_NEW J2DScreen(); if (m_cursorRedScrn == NULL) { return 0; } @@ -76,7 +76,7 @@ int daBoomerang_sight_c::createHeap() { return 0; } - m_cursorOrangeScrn = new J2DScreen(); + m_cursorOrangeScrn = JKR_NEW J2DScreen(); if (m_cursorOrangeScrn == NULL) { return 0; } diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index e6a4fa52f2..54203c1f6e 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -107,7 +107,7 @@ static char* l_arcName = "Coach2D"; static daCoach2D_HIO_c l_HOSTIO; int daCoach2D_c::createHeap() { - mpScrn = new J2DScreen(); + mpScrn = JKR_NEW J2DScreen(); if (mpScrn == NULL) { return 0; } @@ -124,15 +124,15 @@ int daCoach2D_c::createHeap() { mpFireIconBrk->searchUpdateMaterialID(mpScrn); setBrkAnime(true); - mpPaneAll = new CPaneMgr(mpScrn, MULTI_CHAR('n_all'), 2, NULL); - mpPaneBasha = new CPaneMgr(mpScrn, MULTI_CHAR('basha_n'), 2, NULL); - mpPaneFire = new CPaneMgr(mpScrn, MULTI_CHAR('fire_n'), 2, NULL); + mpPaneAll = JKR_NEW CPaneMgr(mpScrn, MULTI_CHAR('n_all'), 2, NULL); + mpPaneBasha = JKR_NEW CPaneMgr(mpScrn, MULTI_CHAR('basha_n'), 2, NULL); + mpPaneFire = JKR_NEW CPaneMgr(mpScrn, MULTI_CHAR('fire_n'), 2, NULL); mpScrn->search(MULTI_CHAR('fire_b_n'))->move(mpPaneFire->getPosX(), mpPaneFire->getPosY()); - mpPaneFireB = new CPaneMgr(mpScrn, MULTI_CHAR('fire_b_n'), 2, NULL); + mpPaneFireB = JKR_NEW CPaneMgr(mpScrn, MULTI_CHAR('fire_b_n'), 2, NULL); - mMsgLight = new dMsgScrnLight_c(6, 0xFF); + mMsgLight = JKR_NEW dMsgScrnLight_c(6, 0xFF); if (mpPaneAll == NULL || mpPaneBasha == NULL || mpPaneFire == NULL || mpPaneFireB == NULL || mMsgLight == NULL) { return 0; diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index 2b12092989..13679c173f 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -2975,7 +2975,7 @@ int daCow_c::CreateHeap() { JUT_ASSERT(3826, NULL != modelData); int r24 = 0x11020084; mpMorf = - new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, r24); + JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, r24); if (!mpMorf || !mpMorf->getModel()) { return cPhs_INIT_e; @@ -2990,7 +2990,7 @@ int daCow_c::CreateHeap() { } setBck(daCow_c::Animation_WaitA, J3DFrameCtrl::EMode_LOOP, 0.0f, 1.0f); - mpBtp = new mDoExt_btpAnm(); + mpBtp = JKR_NEW mDoExt_btpAnm(); if (mpBtp == NULL) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 833a9f5892..5bd1a2e8a7 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -53,7 +53,7 @@ int daCstaF_c::CreateHeap() { const data* data_p = &dataTbl[m_type]; void* pbck = dComIfG_getObjectRes(m_arcName, data_p->bck_idx); - mp_modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(m_arcName, data_p->bmd_idx), NULL, NULL, (J3DAnmTransform*)pbck, 0, 0.0f, 0, -1, &m_sound, 0x80000, 0x11000284); + mp_modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(m_arcName, data_p->bmd_idx), NULL, NULL, (J3DAnmTransform*)pbck, 0, 0.0f, 0, -1, &m_sound, 0x80000, 0x11000284); if (mp_modelMorf == NULL || mp_modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 57536d8c55..b9bfbb9636 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -158,7 +158,7 @@ int daCstatue_c::createHeap() { resource_index = data->modelIndex; } - mpMorf = new mDoExt_McaMorfSO( + mpMorf = JKR_NEW mDoExt_McaMorfSO( static_cast(dComIfG_getObjectRes(mResName, (u16)resource_index)), NULL, NULL, animation, 0, 0.0f, animation->getFrameMax(), -1, &mSound, mType == daCstatueType_Normal2 ? J3DMdlFlag_None : J3DMdlFlag_DifferedDLBuffer, data->morfIndex); @@ -180,20 +180,20 @@ int daCstatue_c::createHeap() { } if (checkBossType()) { - mSph = new dCcD_Sph[9](); + mSph = JKR_NEW dCcD_Sph[9](); if (!mSph) { return cPhs_INIT_e; } } else if (mType == daCstatueType_Normal) { - mCps1 = new dCcD_Cps(); + mCps1 = JKR_NEW dCcD_Cps(); if (!mCps1) { return cPhs_INIT_e; } - mCps2 = new dCcD_Cps(); + mCps2 = JKR_NEW dCcD_Cps(); if (!mCps2) { return cPhs_INIT_e; } - mCyl2 = new dCcD_Cyl(); + mCyl2 = JKR_NEW dCcD_Cyl(); if (!mCyl2) { return cPhs_INIT_e; } diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index c9eda75917..db85071fb3 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -204,7 +204,7 @@ static BOOL awaCheck(J3DModel* i_model) { for (u16 i = 0; i < texture->getNum(); i++) { const char* name = nameTab->getName(i); if (strcmp(name, "B_dummy") == 0 || strcmp(name, "cy_kankyo") == 0) { - J3DSkinDeform* skinDeform = new J3DSkinDeform(); + J3DSkinDeform* skinDeform = JKR_NEW J3DSkinDeform(); if (skinDeform == NULL) { return FALSE; } @@ -251,7 +251,7 @@ int daDemo00_c::createHeap() { } if (mModel.mID.field_0xc != -1) { - mModel.mpBtpAnm = new mDoExt_btpAnm(); + mModel.mpBtpAnm = JKR_NEW mDoExt_btpAnm(); if (mModel.mpBtpAnm == NULL) { return 0; } @@ -271,7 +271,7 @@ int daDemo00_c::createHeap() { } if (mModel.mID.field_0x10 != -1) { - mModel.mpBtkAnm = new mDoExt_btkAnm(); + mModel.mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mModel.mpBtkAnm == NULL) { return 0; } @@ -295,7 +295,7 @@ int daDemo00_c::createHeap() { } if (mModel.mID.field_0x14 != -1) { - mModel.mpBrkAnm = new mDoExt_brkAnm(); + mModel.mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mModel.mpBrkAnm == NULL) { return 0; } @@ -313,7 +313,7 @@ int daDemo00_c::createHeap() { } if (mModel.mID.field_0x8 != -1) { - mModel.mpBpkAnm = new mDoExt_bpkAnm(); + mModel.mpBpkAnm = JKR_NEW mDoExt_bpkAnm(); if (mModel.mpBpkAnm == NULL) { return 0; } @@ -352,9 +352,9 @@ int daDemo00_c::createHeap() { } if (field_0x6ad == 0) { - mModel.mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, anm, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); + mModel.mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, anm, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); } else { - mModel.mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, anm, -1, 1.0f, 0, -1, &mSound, 0, uVar1); + mModel.mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, anm, -1, 1.0f, 0, -1, &mSound, 0, uVar1); } if (mModel.mpModelMorf == NULL || mModel.mpModelMorf->getModel() == NULL) { @@ -369,7 +369,7 @@ int daDemo00_c::createHeap() { } if (field_0x6b4 != 0) { - mModel.field_0x5d8 = new mDoExt_invisibleModel(); + mModel.field_0x5d8 = JKR_NEW mDoExt_invisibleModel(); if (mModel.field_0x5d8 == NULL) { return 0; } @@ -383,7 +383,7 @@ int daDemo00_c::createHeap() { mModel.mID.field_0x18 = 1; if (mModel.mID.field_0x18 != -1) { - mModel.mShadow = new daDemo00_shadow_c(); + mModel.mShadow = JKR_NEW daDemo00_shadow_c(); if (mModel.mShadow == NULL) { return 0; } @@ -395,7 +395,7 @@ int daDemo00_c::createHeap() { setShadowSize(); } - mModel.mBgc = new daDemo00_bgc_c(); + mModel.mBgc = JKR_NEW daDemo00_bgc_c(); if (mModel.mBgc == NULL) { return 0; } @@ -406,7 +406,7 @@ int daDemo00_c::createHeap() { JUT_ASSERT(687, mModel.mDeformData != NULL); if (mModel.mID.field_0x20 != -1) { - mModel.mpBlkAnm = new mDoExt_blkAnm(); + mModel.mpBlkAnm = JKR_NEW mDoExt_blkAnm(); if (mModel.mpBlkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index dbe02cdf85..1f096b090f 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -11,7 +11,7 @@ static const char l_arcName[] = "Dmidna"; int daDmidna_c::createHeap() { - mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(l_arcName, 8), NULL, + mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(l_arcName, 8), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4), 2, 1.0f, 0, -1, NULL, 0, 0); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index f8632be6c9..22e32c7e9c 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -2356,7 +2356,7 @@ static int daDo_Delete(do_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { do_class* _this = (do_class*)i_this; - _this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Do", 25), NULL, NULL, + _this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Do", 25), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Do", 14), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11020284); @@ -2374,7 +2374,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } - _this->mpBtk = new mDoExt_btkAnm(); + _this->mpBtk = JKR_NEW mDoExt_btkAnm(); if (_this->mpBtk == NULL) { return 0; } @@ -2386,7 +2386,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - _this->mpBtp = new mDoExt_btpAnm(); + _this->mpBtp = JKR_NEW mDoExt_btpAnm(); if (_this->mpBtp == NULL) { return 0; } diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index 1b124f12bf..973e11475e 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -54,12 +54,12 @@ int daBdoor_c::CreateHeap() { } J3DAnmTransform* lock_bck = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "VlockB.bck"); - mpLockAnm = new mDoExt_bckAnm(); + mpLockAnm = JKR_NEW mDoExt_bckAnm(); if (mpLockAnm == NULL || !mpLockAnm->init(lock_bck, 1, 0, 1.0f, 0, -1, false)) { return 0; } - J3DSkinDeform* deform = new J3DSkinDeform(); + J3DSkinDeform* deform = JKR_NEW J3DSkinDeform(); if (deform == NULL) { return 0; } @@ -67,7 +67,7 @@ int daBdoor_c::CreateHeap() { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(getArcName(), getDzb()); if (dzb == NULL) { return 0; diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index 83e9454a61..4eb9abe0e7 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -204,14 +204,14 @@ int daBdoorL1_c::CreateHeap() { if (nowLevel == 8) { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), "door_shutterBoss.btk"); JUT_ASSERT(341, pbtk != NULL); - field_0x58c = new mDoExt_btkAnm(); + field_0x58c = JKR_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 != NULL); - field_0x588 = new mDoExt_bckAnm(); + field_0x588 = JKR_NEW mDoExt_bckAnm(); if (field_0x588 == NULL || !field_0x588->init(anm, 1, 0, 1.0f, 0, -1,false)) { return 0; } @@ -222,7 +222,7 @@ int daBdoorL1_c::CreateHeap() { field_0x584->calc(); } calcMtx(); - field_0x590 = new dBgW(); + field_0x590 = JKR_NEW dBgW(); if (field_0x590 == NULL || field_0x590->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x7ec)) { return 0; } diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index e78bc00e7b..8c1f0e4850 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -81,7 +81,7 @@ int daBdoorL5_c::CreateHeap() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); JUT_ASSERT(354, anm != NULL); - field_0x584 = new mDoExt_bckAnm(); + field_0x584 = JKR_NEW mDoExt_bckAnm(); if (field_0x584 == NULL || !field_0x584->init(anm, 1, 0, 1.0f, 0, -1, false)) { return 0; } @@ -89,7 +89,7 @@ int daBdoorL5_c::CreateHeap() { field_0x584->entry(field_0x580->getModelData()); field_0x580->calc(); calcMtx(); - field_0x588 = new dBgW(); + field_0x588 = JKR_NEW dBgW(); if (field_0x588 == NULL || field_0x588->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x580->getBaseTRMtx())) { return 0; } diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index 0f0f827d0c..520e395045 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -90,7 +90,7 @@ int daDbDoor00_c::CreateHeap() { nodePointerR->setCallBack(nodeCallBack); mpModel2->setUserArea((uintptr_t)this); - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); cBgD_t* dzb = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()); if (dzb == NULL) { return 0; diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index 05958a9b45..ef63a995de 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -91,7 +91,7 @@ int daKnob20_c::CreateHeap() { if (mModel2 == 0) { return 0; } - field_0x5a0 = new dBgW(); + field_0x5a0 = JKR_NEW dBgW(); if (field_0x5a0 == NULL) { return 0; } diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index 1636dd22b9..958bd063c4 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -303,7 +303,7 @@ int daMBdoorL1_c::CreateHeap() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes( getAlwaysArcName(), "FDoorA.bck"); JUT_ASSERT(597, anm != NULL); - mBckAnms[i] = new mDoExt_bckAnm(); + mBckAnms[i] = JKR_NEW mDoExt_bckAnm(); if (mBckAnms[i] == NULL || !mBckAnms[i]->init(anm, 1, 0, 1.0f, 0, -1, false)) { return 0; } @@ -324,7 +324,7 @@ int daMBdoorL1_c::CreateHeap() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); JUT_ASSERT(628, anm != NULL); - mBckAnms[0] = new mDoExt_bckAnm(); + mBckAnms[0] = JKR_NEW mDoExt_bckAnm(); if (mBckAnms[0] == NULL || !mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, false)) { return 0; } @@ -334,7 +334,7 @@ int daMBdoorL1_c::CreateHeap() { if (level == 8) { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk()); JUT_ASSERT(646, pbtk != NULL); - field_0x594 = new mDoExt_btkAnm(); + field_0x594 = JKR_NEW mDoExt_btkAnm(); if (field_0x594 == NULL || !field_0x594->init(mModels[0]->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) { @@ -361,7 +361,7 @@ int daMBdoorL1_c::CreateHeap() { mDoMtx_stack_c::scaleM(1.0f, 1.4f, 1.0f); } MTXCopy(mDoMtx_stack_c::get(), field_0x59c); - field_0x598 = new dBgW(); + field_0x598 = JKR_NEW dBgW(); if (field_0x598 == NULL || field_0x598->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()), 1, &field_0x59c)) { return 0; } diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 29f6e6f18e..a37d9b2ed5 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -111,7 +111,7 @@ int daDoorPush_c::CreateHeap() { return 0; } } - mpDoorBgW = new dBgW(); + mpDoorBgW = JKR_NEW dBgW(); if (mpDoorBgW == NULL || mpDoorBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 8), 1, &mDoorMtx)) { diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index 4689faed0a..dd53741f7e 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -147,7 +147,7 @@ int daDoor20_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk; pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk()); JUT_ASSERT(421, pbtk != NULL); - field_0x5c0 = new mDoExt_btkAnm(); + field_0x5c0 = JKR_NEW mDoExt_btkAnm(); if (field_0x5c0 == NULL || !field_0x5c0->init(mModel1->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) { @@ -177,7 +177,7 @@ int daDoor20_c::CreateHeap() { mDoMtx_stack_c::scaleM(1.0f, 1.4f, 1.0f); } MTXCopy(mDoMtx_stack_c::get(), field_0x5f4); - field_0x5c4 = new dBgW(); + field_0x5c4 = JKR_NEW dBgW(); if (field_0x5c4 == 0 || field_0x5c4->Set((cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzbName()), 1, &field_0x5f4)) { return 0; } diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index 133194549a..cd51d419d6 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -218,7 +218,7 @@ int daSpiral_c::CreateHeap() { return 0; } - mpSpiralDzb = new dBgW(); + mpSpiralDzb = JKR_NEW dBgW(); if (mpSpiralDzb == NULL) { return 0; } @@ -230,7 +230,7 @@ int daSpiral_c::CreateHeap() { return 0; } - mDoorDarkDzb = new dBgW(); + mDoorDarkDzb = JKR_NEW dBgW(); if (mDoorDarkDzb == NULL) { return 0; } @@ -1048,7 +1048,7 @@ int dSpiral_stop_c::create(daSpiral_c* i_spiral) { return 0; } - mpBgw = new dBgW(); + mpBgw = JKR_NEW dBgW(); if (mpBgw == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index a35bee546a..a6688c9b79 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -861,12 +861,12 @@ int e_ai_class::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_AI", 0xD); JUT_ASSERT(1703, modelData != NULL); - m_modelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_AI", 9), 2, 1.0f, 0, -1, &m_sound, 0, 0x11000084); + m_modelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_AI", 9), 2, 1.0f, 0, -1, &m_sound, 0, 0x11000084); if (m_modelMorf == NULL || m_modelMorf->getModel() == NULL) { return 0; } - m_brk = new mDoExt_brkAnm(); + m_brk = JKR_NEW mDoExt_brkAnm(); if (m_brk == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index f1271aa873..7238a1d5bf 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -978,7 +978,7 @@ static int daE_BA_Delete(e_ba_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_ba_class* _this = (e_ba_class*)i_this; - _this->mpMorf = new mDoExt_McaMorfSO( + _this->mpMorf = JKR_NEW mDoExt_McaMorfSO( static_cast(dComIfG_getObjectRes(_this->mArcName, 13)), NULL, NULL, static_cast(dComIfG_getObjectRes(_this->mArcName, 10)), 2, 1.0f, 0, -1, &_this->mCreatureSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index c0363529c6..32fa690983 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -1288,7 +1288,7 @@ int daE_BG_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BG", 10); JUT_ASSERT(0, modelData != NULL); - mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BG", 7), 0, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11000084); if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) { @@ -1303,7 +1303,7 @@ int daE_BG_c::CreateHeap() { model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack); } - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index e6eb59aeb3..9cf419259d 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -854,7 +854,7 @@ static int daE_BI_Delete(e_bi_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { e_bi_class* i_this = (e_bi_class*)actor; - i_this->anm_p = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_BI", BMDR_BI), NULL, NULL, + i_this->anm_p = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_BI", BMDR_BI), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BI", BCK_BI_WAIT01), 2, 1.0f, 0, -1, &i_this->sound, 0x80000, 0x11000084); if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 3f2cfdef58..b20ebdcd5f 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -797,7 +797,7 @@ static int daE_BS_Delete(e_bs_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_bs_class* a_this = (e_bs_class*)i_this; - a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData* )dComIfG_getObjectRes("E_BS", 0xE), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BS", 7), 0, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData* )dComIfG_getObjectRes("E_BS", 0xE), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BS", 7), 0, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { return 0; } @@ -811,7 +811,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } - a_this->weponModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_BS", 0xF), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BS", 0xA), 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084); + a_this->weponModelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_BS", 0xF), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BS", 0xA), 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084); if (a_this->weponModelMorf == NULL || a_this->weponModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index d636a9be5d..679fd7b8b0 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -1008,7 +1008,7 @@ static int daE_BU_Delete(e_bu_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_bu_class* a_this = (e_bu_class*)i_this; - a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_BU", 11), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BU", 7), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_BU", 11), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BU", 7), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index 4c360fdece..7c29177787 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -461,7 +461,7 @@ static int daE_CR_Delete(e_cr_class* a_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_cr_class* a_this = (e_cr_class*)i_this; - a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_CR", 0xD), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_CR", 9), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_CR", 0xD), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_CR", 9), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index bb03745617..fd7e276fda 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -2033,7 +2033,7 @@ static int daE_DB_Delete(e_db_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_db_class* a_this = (e_db_class*)i_this; - a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_db", 0x17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_db", 0x12), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_db", 0x17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_db", 0x12), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index 0fe9346bf5..9c6b3f10ae 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -33,7 +33,7 @@ static int daE_DB_LEAF_Delete(e_db_leaf_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_db_leaf_class* leaf = static_cast(i_this); - leaf->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_DB", 0x18), NULL, NULL, + leaf->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_DB", 0x18), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_DB", 0x13), 2, 1.0, 0, -1, 1, NULL, 0x80000, 0x11000084); if (leaf->mpMorf == NULL || leaf->mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 1094366738..8801595ef7 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -1573,7 +1573,7 @@ static int daE_DD_Delete(e_dd_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { e_dd_class* i_this = (e_dd_class*)a_this; - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_dd", BMDR_DD), NULL, NULL, + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_dd", BMDR_DD), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_dd", BCK_DD_WAIT), 2, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11020084); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { @@ -1593,7 +1593,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { }; for (int i = 0; i < 5; i++) { - i_this->mpBrkAnms[i] = new mDoExt_brkAnm(); + i_this->mpBrkAnms[i] = JKR_NEW mDoExt_brkAnm(); if (i_this->mpBrkAnms[i] == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index cd1fd1b187..c607e59233 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -39,7 +39,7 @@ int daE_DF_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DF", 0xD); JUT_ASSERT(161, modelData != NULL); - mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_DF", 10), 2, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11000084); if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index a21506dcba..83f7914b74 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -939,7 +939,7 @@ static int daE_DK_Delete(daE_DK_c* i_this) { int daE_DK_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DK", BMDR_DK); JUT_ASSERT(1488, modelData != NULL); - mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_DK", BCK_DK_WAIT), 0, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x31000284); @@ -948,7 +948,7 @@ int daE_DK_c::CreateHeap() { } for (s32 i = 0; i < 2; i++) { - mpBrkAnm[i] = new mDoExt_brkAnm(); + mpBrkAnm[i] = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm[i] == 0) { return 0; } @@ -960,7 +960,7 @@ int daE_DK_c::CreateHeap() { return 0; } - mpBtkAnm[i] = new mDoExt_btkAnm(); + mpBtkAnm[i] = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm[i] == 0) { return 0; } @@ -975,7 +975,7 @@ int daE_DK_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("E_DK", BMDR_DK_CORE); JUT_ASSERT(1537, modelData != NULL); - mpCoreMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpCoreMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_DK", BCK_DK_C_WAIT), 0, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index c68d2510bf..975f5f69c7 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -3312,7 +3312,7 @@ static dJntColData_c jc_data[12] = { static int useHeapInit(fopAc_ac_c* actor) { e_dn_class* i_this = (e_dn_class*)actor; - i_this->anm_p = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_dn", 38), NULL, NULL, + i_this->anm_p = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_dn", 38), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_dn", 31), 0, 1.0f, 0, -1, &i_this->sound, 0x80000, 0x11000084); if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 7b52cf0f37..a2c532a5e1 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -2414,7 +2414,7 @@ static int daE_DT_Delete(daE_DT_c* i_this) { int daE_DT_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_DT", 28); - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_DT", 23), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mSound, 0, 0x11000084); diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index 877e43d537..259faf7c00 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -870,7 +870,7 @@ static int daE_FB_Delete(daE_FB_c* i_this) { int daE_FB_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_FL", 0xB); JUT_ASSERT(1516, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_FL", 0x8), 0, 1.0f, 0, -1, &mCreatureSound, 0, 0x31000084); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -889,7 +889,7 @@ int daE_FB_c::CreateHeap() { } } - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index 8a3c406c3d..7d38d8f40f 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -37,7 +37,7 @@ daE_FK_HIO_c::daE_FK_HIO_c() { int daE_FK_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_fk", 15); JUT_ASSERT(189, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_fk", 12), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_fk", 12), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_fm.cpp b/src/d/actor/d_a_e_fm.cpp index 3dae088fbd..dcc16f5448 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -3474,7 +3474,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { J3DModelData* modelData; e_fm_class* a_this = (e_fm_class*)i_this; - a_this->mpFmModelMorf = new mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL, + a_this->mpFmModelMorf = JKR_NEW mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL, static_cast(dComIfG_getObjectRes("E_fm", BCK_FM_WAIT01)), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); if (a_this->mpFmModelMorf == NULL || a_this->mpFmModelMorf->getModel() == NULL) { return 0; @@ -3491,7 +3491,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { int anm_mode; for (int i = 0; i < 9; i++) { - a_this->mpFmBrk[i] = new mDoExt_brkAnm(); + a_this->mpFmBrk[i] = JKR_NEW mDoExt_brkAnm(); if (a_this->mpFmBrk[i] == NULL) { return 0; } @@ -3512,7 +3512,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpFmBtk[i] = new mDoExt_btkAnm(); + a_this->mpFmBtk[i] = JKR_NEW mDoExt_btkAnm(); if (a_this->mpFmBtk[i] == NULL) { return 0; } @@ -3528,13 +3528,13 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } - a_this->mpDemoFmModelMorf = new mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL, + a_this->mpDemoFmModelMorf = JKR_NEW mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_fm", BMDR_FM)), NULL, NULL, static_cast(dComIfG_getObjectRes("E_fm", BCK_FM_DEMOEND03)), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); if (a_this->mpDemoFmModelMorf == NULL || a_this->mpDemoFmModelMorf->getModel() == NULL) { return 0; } - a_this->mpDemoFmBrk = new mDoExt_brkAnm(); + a_this->mpDemoFmBrk = JKR_NEW mDoExt_brkAnm(); if (a_this->mpDemoFmBrk == NULL) { return 0; } @@ -3552,7 +3552,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpCoreBrk = new mDoExt_brkAnm(); + a_this->mpCoreBrk = JKR_NEW mDoExt_brkAnm(); if (a_this->mpCoreBrk == NULL) { return 0; } @@ -3563,7 +3563,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpCoreBtk = new mDoExt_btkAnm(); + a_this->mpCoreBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpCoreBtk == NULL) { return 0; } @@ -3578,13 +3578,13 @@ static int useHeapInit(fopAc_ac_c* i_this) { for (int i = 0; i < 2; i++) { static int eff_bmd[] = {BMDR_EF_FMATTACK_A, BMDR_EF_FMATTACK_B}; - a_this->mpAttackEfModelMorf[i] = new mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_fm", eff_bmd[i])), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); + a_this->mpAttackEfModelMorf[i] = JKR_NEW mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_fm", eff_bmd[i])), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); if (a_this->mpAttackEfModelMorf[i] == NULL || a_this->mpAttackEfModelMorf[i]->getModel() == NULL) { return 0; } if (i != 0) { - a_this->mpAttackEfBrk = new mDoExt_brkAnm(); + a_this->mpAttackEfBrk = JKR_NEW mDoExt_brkAnm(); if (a_this->mpAttackEfBrk == NULL) { return 0; } @@ -3596,7 +3596,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } - a_this->mpAttackEfBtk[i] = new mDoExt_btkAnm(); + a_this->mpAttackEfBtk[i] = JKR_NEW mDoExt_btkAnm(); if (a_this->mpAttackEfBtk[i] == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index 7e57585d0e..68567113d3 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -707,7 +707,7 @@ static int daE_Fs_Delete(e_fs_class* i_this) { static int useHeapIe_fst(fopAc_ac_c* i_this) { e_fs_class* _this = (e_fs_class*)i_this; - _this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_FS", 0xc), NULL, + _this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_FS", 0xc), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_FS", 9), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &_this->mCreatureSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index e3aff4c735..26fe45d105 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -1563,14 +1563,14 @@ static int daE_GB_Delete(e_gb_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { e_gb_class* i_this = (e_gb_class*)actor; - i_this->anmP = new mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BMD_GB_e)), NULL, NULL, + i_this->anmP = JKR_NEW mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BMD_GB_e)), NULL, NULL, static_cast(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BCK_GB_WAIT_e)), 2, 1.0f, 0, -1, 1, NULL, J3DMdlFlag_DifferedDLBuffer, 0x11000084); if (i_this->anmP == NULL || i_this->anmP->getModel() == NULL) { return 0; } - i_this->flowerAnmP = new mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BMD_GF_e)), NULL, NULL, + i_this->flowerAnmP = JKR_NEW mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BMD_GF_e)), NULL, NULL, static_cast(dComIfG_getObjectRes("E_gb", dRes_INDEX_E_GB_BCK_GF_WAIT_CLOSE_e)), 2, 1.0f, 0, -1, 1, NULL, J3DMdlFlag_DifferedDLBuffer, 0x11000084); i_this->bodyAnmNo = dRes_ID_E_GB_BCK_GF_WAIT_CLOSE_e; @@ -1578,7 +1578,7 @@ static int useHeapInit(fopAc_ac_c* actor) { return 0; } - i_this->brkAnmP = new mDoExt_brkAnm(); + i_this->brkAnmP = JKR_NEW mDoExt_brkAnm(); if (i_this->brkAnmP == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index f0784578d8..182b514940 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -1257,7 +1257,7 @@ static int daE_GE_Delete(daE_GE_c* i_this) { } int daE_GE_c::CreateHeap() { - mpMorfSO = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_GE", 0xF), NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_GE", 0xF), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_GE", 0xC), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 4dac5344b4..3c0d38b4db 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -989,7 +989,7 @@ int daE_GI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x13); JUT_ASSERT(1621, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_GI", 0xB), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_GI", 0xB), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index eef5561904..0232d04ae6 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -1660,7 +1660,7 @@ int daE_GM_c::CreateHeap() { JUT_ASSERT(2683, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9), + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9), 0, 1.0f, 0, -1, &mSound, 0, 0x11000084); } else { if (mType != TYPE_NORMAL) { @@ -1678,7 +1678,7 @@ int daE_GM_c::CreateHeap() { JUT_ASSERT(2714, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_APPEAR), + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gm", BCK_GB_APPEAR), 0, 1.0f, 0, -1, &mSound, 0, 0x11000084); } diff --git a/src/d/actor/d_a_e_gob.cpp b/src/d/actor/d_a_e_gob.cpp index 724c4ff83e..4362ff5d2b 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -2244,7 +2244,7 @@ static int daE_GOB_Delete(e_gob_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_gob_class* a_this = (e_gob_class*)i_this; - a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_gob", BMDR_MG), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gob", BCK_MG_WAIT), 2, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084); + a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_gob", BMDR_MG), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gob", BCK_MG_WAIT), 2, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084); if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index a9683523e6..07696af21a 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -172,7 +172,7 @@ static int daE_GS_Delete(e_gs_class* a_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_gs_class* a_this = (e_gs_class*)i_this; - a_this->model_morf = new mDoExt_McaMorfSO((J3DModelData* )dComIfG_getObjectRes("E_gs", 9), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gs", 6), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + a_this->model_morf = JKR_NEW mDoExt_McaMorfSO((J3DModelData* )dComIfG_getObjectRes("E_gs", 9), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_gs", 6), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); if (a_this->model_morf == NULL || a_this->model_morf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index 46d1cd9645..d278a2d535 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -1341,7 +1341,7 @@ static int daE_HB_Delete(e_hb_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_hb_class* a_this = (e_hb_class*)i_this; - a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_hb", 0x17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_hb", 0x12), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_hb", 0x17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_hb", 0x12), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index 4a28434d3c..21d1c0b262 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -48,7 +48,7 @@ static int daE_HB_LEAF_Delete(e_hb_leaf_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_hb_leaf_class* a_this = static_cast(i_this); - a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_HB", 0x18), NULL, + a_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_HB", 0x18), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HB", 0x13), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 472f0dc65d..3945401d8a 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -56,7 +56,7 @@ void daE_HM_HIO_c::genMessage(JORMContext* ctx) { int daE_HM_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HM", 17); JUT_ASSERT(0xbf, modelData != NULL); - mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HM", 13), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000284); if (mAnm_p == NULL || mAnm_p->getModel() == NULL) { @@ -65,7 +65,7 @@ int daE_HM_c::CreateHeap() { J3DModel* model = mAnm_p->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -74,7 +74,7 @@ int daE_HM_c::CreateHeap() { return 0; } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index f51abeba26..907f71a729 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -1136,7 +1136,7 @@ static int daE_HP_Delete(daE_HP_c* i_this) { int daE_HP_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 19); JUT_ASSERT(0x764, modelData != NULL); - mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 13), 2, 1.0f, 0, -1, &mSound1, 0x80000, 0x11000084); if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) { @@ -1173,7 +1173,7 @@ int daE_HP_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("E_HP", 18); mpMorf = - new mDoExt_McaMorf(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 4), + JKR_NEW mDoExt_McaMorf(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 4), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (mpMorf == NULL || mpMorf->getModel() == 0) { diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 03c15253fd..9f1ff610c8 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -1917,7 +1917,7 @@ int daE_HZ_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HZ", dRes_INDEX_E_HZ_BMD_HZ_e); JUT_ASSERT(2479, modelData != NULL); - mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HZ", dRes_INDEX_E_HZ_BCK_HZ_WAIT_e), 0, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11000084); @@ -1938,7 +1938,7 @@ int daE_HZ_c::CreateHeap() { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index 1630397e1a..3c56c33e4d 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -1311,7 +1311,7 @@ static int daE_HZELDA_Delete(e_hzelda_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_hzelda_class* a_this = (e_hzelda_class*)i_this; - a_this->mpModelMorf = new mDoExt_McaMorfSO(static_cast(dComIfG_getObjectRes("Hzelda", 0x1B)), NULL, NULL, + a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO(static_cast(dComIfG_getObjectRes("Hzelda", 0x1B)), NULL, NULL, static_cast(dComIfG_getObjectRes("Hzelda", 0x15)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000284); if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) { @@ -1339,7 +1339,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpTriangleAtBrk = new mDoExt_brkAnm(); + a_this->mpTriangleAtBrk = JKR_NEW mDoExt_brkAnm(); if (a_this->mpTriangleAtBrk == NULL) { return 0; } @@ -1349,7 +1349,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpTriangleAtBtk = new mDoExt_btkAnm(); + a_this->mpTriangleAtBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpTriangleAtBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 1379fbf62e..505406a6d5 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -619,7 +619,7 @@ static int daE_IS_Delete(e_is_class* a_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_is_class* a_this = (e_is_class*)i_this; - a_this->model_morf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_IS", 0x13), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_IS", 0xE), 2, 1.0f, 0, -1, &a_this->sound, 0, 0x11020203); + a_this->model_morf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_IS", 0x13), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_IS", 0xE), 2, 1.0f, 0, -1, &a_this->sound, 0, 0x11020203); if (a_this->model_morf == NULL || a_this->model_morf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index 570944ff21..db90f9175d 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -656,14 +656,14 @@ static int daE_KG_Delete(e_kg_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_kg_class* a_this = (e_kg_class*) i_this; - a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kg", 0x12), NULL, NULL, + a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kg", 0x12), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_kg", 0xE), 2, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11020084); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { return 0; } - a_this->mpBtp = new mDoExt_btpAnm(); + a_this->mpBtp = JKR_NEW mDoExt_btpAnm(); if (a_this->mpBtp == NULL) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index 8038ca1365..99e5a50711 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -1329,7 +1329,7 @@ int daE_KK_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x22); JUT_ASSERT(2212, modelData != NULL); - mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_KK", 0x19), 0, 1.0f, 0, -1, &mCreatureSound, 0, 0x31000084); if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) { @@ -1347,7 +1347,7 @@ int daE_KK_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x23); JUT_ASSERT(2247, modelData != NULL); - mpWeaponMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpWeaponMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_KK", 0x1D), 0, 1.0f, 0, -1, &mCreatureSound, 0, 0x31000084); if (mpWeaponMorfSO == NULL || mpWeaponMorfSO->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index 4001092815..23bf78828f 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -2225,7 +2225,7 @@ static int daE_Kr_Delete(e_kr_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_kr_class* kr = (e_kr_class*)i_this; - kr->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kr", 24), NULL, NULL, + kr->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_kr", 24), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_kr", 13), 2, 1.0f, 0, -1, &((e_kr_class*)i_this)->mSound, 0x80000, 0x11000084); if (kr->mpMorf == NULL || kr->mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index b750c328fd..0febef285f 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -638,12 +638,12 @@ static int daE_MB_Delete(e_mb_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_mb_class* a_this = (e_mb_class*)i_this; - a_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x19), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 10), 0, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11020084); + a_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x19), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 10), 0, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11020084); if (a_this->mpModelMorf == NULL || a_this->mpModelMorf->getModel() == NULL) { return 0; } - a_this->mpBtp = new mDoExt_btpAnm(); + a_this->mpBtp = JKR_NEW mDoExt_btpAnm(); if (a_this->mpBtp == NULL) { return cPhs_ERROR_e; } @@ -653,12 +653,12 @@ static int useHeapInit(fopAc_ac_c* i_this) { return cPhs_ERROR_e; } - a_this->mpBombModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x1B), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 0x15), 0, 1.0f, 0, 1, 0, &a_this->mSound, 0x80000, 0x11000084); + a_this->mpBombModelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x1B), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 0x15), 0, 1.0f, 0, 1, 0, &a_this->mSound, 0x80000, 0x11000084); if (a_this->mpBombModelMorf == NULL || a_this->mpBombModelMorf->getModel() == NULL) { return 0; } - a_this->mpBombModel2Morf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x1A), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 0x14), 0, 1.0f, 0, 1, 0, &a_this->mSound, 0x80000, 0x11000084); + a_this->mpBombModel2Morf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mb", 0x1A), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mb", 0x14), 0, 1.0f, 0, 1, 0, &a_this->mSound, 0x80000, 0x11000084); if (a_this->mpBombModel2Morf == NULL || a_this->mpBombModel2Morf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index dbc3cdf3ff..cd14e582bf 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -68,20 +68,20 @@ int daE_MD_c::CreateHeap() { JUT_ASSERT(180, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } if (mType == TYPE_DUMMY) { modelData = dComIfG_getObjectRes("E_MD", 0xD); - mpYariModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); + mpYariModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); if (mpYariModelMorf == NULL || mpYariModelMorf->getModel() == NULL) { return 0; } } else if (mType == TYPE_LV9) { modelData = dComIfG_getObjectRes("E_MD", 0xA); - mpYariModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); + mpYariModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); if (mpYariModelMorf == NULL || mpYariModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index 0c3c101416..326c79199a 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -3099,7 +3099,7 @@ static dJntColData_c jc_data[12] = { static int useHeapInit(fopAc_ac_c* a_this) { e_mf_class* i_this = (e_mf_class*)a_this; - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mf", 38), NULL, NULL, + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mf", 38), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mf", 31), 0, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index c5b4b7a34c..9e97935ad2 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -2791,14 +2791,14 @@ static int daE_MK_Delete(e_mk_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { e_mk_class* i_this = (e_mk_class*)actor; - i_this->anmP = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BMD_MK_e), NULL, NULL, + i_this->anmP = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BMD_MK_e), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BCK_MK_WAIT_e), 0, 1.0f, 0, -1, &i_this->sound, 0x80000, 0x11020084); if (i_this->anmP == NULL || i_this->anmP->getModel() == NULL) { return 0; } - i_this->btpP = new mDoExt_btpAnm(); + i_this->btpP = JKR_NEW mDoExt_btpAnm(); if (i_this->btpP == NULL) { return 0; } @@ -2807,7 +2807,7 @@ static int useHeapInit(fopAc_ac_c* actor) { return 0; } - i_this->crownAnmP = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BMD_OK_e), NULL, NULL, + i_this->crownAnmP = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BMD_OK_e), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mk", dRes_INDEX_E_MK_BCK_OK_DEFAULTPOSE_e), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (i_this->crownAnmP == NULL || i_this->crownAnmP->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index 8d4c430fa7..a9b696ac16 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -736,12 +736,12 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->efModelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mk", 0x2F), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mk", 6), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); + a_this->efModelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_mk", 0x2F), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mk", 6), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); if (a_this->efModelMorf == NULL || a_this->efModelMorf->getModel() == NULL) { return 0; } - a_this->pbtk = new mDoExt_btkAnm(); + a_this->pbtk = JKR_NEW mDoExt_btkAnm(); if (a_this->pbtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index dcca056461..220fef256b 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -1017,7 +1017,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { bmd_index = 0x12; } - a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MM", bmd_index), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_MM", 0xD), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MM", bmd_index), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_MM", 0xD), 2, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index a70515fe13..5df36f37c0 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -961,7 +961,7 @@ static int daE_MS_Delete(e_ms_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { e_ms_class* i_this = (e_ms_class*)actor; mDoExt_McaMorfSO* mMorf = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MS", 20), NULL, NULL, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_MS", 20), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_MS", 16), 2, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); i_this->mpModelMorf = mMorf; diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 59f4258f7e..e6a55efce6 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -663,7 +663,7 @@ static int daE_NZ_Delete(e_nz_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { e_nz_class* i_this = (e_nz_class*)a_this; - i_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_NZ", 13), NULL, + i_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_NZ", 13), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_NZ", 10), 2, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 2dc8ee4845..bd3dfee8db 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -2638,7 +2638,7 @@ static void daE_OC_Delete(daE_OC_c* i_this) { int daE_OC_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(mName, 0x3); JUT_ASSERT(3443, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ocb", 0x1b), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index a16544f204..ebcd906f2f 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -764,7 +764,7 @@ int daE_OctBg_c::JointCallBack(J3DJoint* param_0, int param_1) { int daE_OctBg_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_bg", 10); JUT_ASSERT(1341, modelData != NULL); - field_0x5b4 = new mDoExt_McaMorfSO( + field_0x5b4 = JKR_NEW mDoExt_McaMorfSO( modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_bg", 7), 0, 1.0f, 0, -1, &field_0x5bc, 0x80000, 0x11000084); if (field_0x5b4 == NULL || field_0x5b4->getModel() == NULL) { @@ -775,7 +775,7 @@ int daE_OctBg_c::CreateHeap() { for (u16 i = 1; i < model->getModelData()->getJointNum(); i++) { model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack); } - field_0x5b8 = new mDoExt_brkAnm(); + field_0x5b8 = JKR_NEW mDoExt_brkAnm(); if (field_0x5b8 == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index e4849ccad6..bbb7e6cdb1 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -710,7 +710,7 @@ static int daE_OT_Delete(daE_OT_c* i_this) { int daE_OT_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_OT", 14); - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_OT", ANM_BORN), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); @@ -724,7 +724,7 @@ int daE_OT_c::CreateHeap() { return 0; } - mpEggAnm = new mDoExt_btkAnm(); + mpEggAnm = JKR_NEW mDoExt_btkAnm(); if (mpEggAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 63365ee1ce..73ca2ebf56 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -159,7 +159,7 @@ int daE_PH_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PH", PH_BMD); JUT_ASSERT(0, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO( + mpMorf = JKR_NEW mDoExt_McaMorfSO( modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", ANM_WAIT), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpMorf == NULL || mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index 56041078ce..deadd0998b 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -174,7 +174,7 @@ int daE_PM_c::DemoSkipCallBack(void* i_this, int param_1) { int daE_PM_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1d); - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 0x10), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11020084); @@ -182,7 +182,7 @@ int daE_PM_c::CreateHeap() { return 0; } - mpEyeAnm = new mDoExt_btpAnm(); + mpEyeAnm = JKR_NEW mDoExt_btpAnm(); if (mpEyeAnm == NULL) { return 5; } @@ -198,7 +198,7 @@ int daE_PM_c::CreateHeap() { return 0; } - mpTrumpetMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1f), NULL, + mpTrumpetMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1f), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 0x19), J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); @@ -206,7 +206,7 @@ int daE_PM_c::CreateHeap() { return 0; } - mpGlowEffectMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1c), NULL, + mpGlowEffectMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PM", 0x1c), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PM", 5), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); @@ -293,7 +293,7 @@ void daE_PM_c::SetAnm(int i_anm, int i_attr, f32 i_morf, f32 i_rate) { } static void dummy() { - delete (cM3dGPla*)NULL; + JKR_DELETE((cM3dGPla*)NULL); } static BOOL way_bg_check2(daE_PM_c* i_this, cXyz i_start, cXyz i_end) { diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 04e8bf0ff8..57a6a293c4 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -2841,7 +2841,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { e_po_class* a_this = (e_po_class*)i_this; a_this->mpMorf = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1B), NULL, NULL, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1B), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PO", 0x15), 2, 1.0f, 0, -1, &a_this->mSound1, 0x80000, 0x11000084); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { @@ -2866,7 +2866,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } a_this->mpMorf3 = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1D), NULL, NULL, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1D), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PO", 0x17), 0, 1.0f, 0, -1, &a_this->mSound1, 0x80000, 0x11000084); if (a_this->mpMorf3 == NULL || a_this->mpMorf3->getModel() == NULL) { @@ -2878,7 +2878,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpMorf2 = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1A), NULL, + a_this->mpMorf2 = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_PO", 0x1A), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PO", 0x4), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (a_this->mpMorf2 == NULL || a_this->mpMorf2->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index bb5e1c6688..b37f19b0d0 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -2392,7 +2392,7 @@ int daE_PZ_c::CreateHeap() { return 0; } - mpPortalBtk = new mDoExt_btkAnm(); + mpPortalBtk = JKR_NEW mDoExt_btkAnm(); if (mpPortalBtk == NULL) { return 0; } @@ -2402,7 +2402,7 @@ int daE_PZ_c::CreateHeap() { } for (int i = 0; i < 2; i++) { - mpPortalBrk[i] = new mDoExt_brkAnm(); + mpPortalBrk[i] = JKR_NEW mDoExt_brkAnm(); if (mpPortalBrk[i] == NULL) { return 0; } @@ -2415,13 +2415,13 @@ int daE_PZ_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("E_PZ", 0x19); JUT_ASSERT(3920, modelData != NULL); - mpBallModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", 7), 2, 1.0f, 0, -1, NULL, 0, 0x11000084); + mpBallModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", 7), 2, 1.0f, 0, -1, NULL, 0, 0x11000084); if (mpBallModelMorf == NULL) { return 0; } for (int i = 0; i < 2; i++) { - mpBallBrk = new mDoExt_brkAnm(); + mpBallBrk = JKR_NEW mDoExt_brkAnm(); if (mpBallBrk == NULL) { return 0; } @@ -2436,12 +2436,12 @@ int daE_PZ_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PZ", 0x1C); JUT_ASSERT(3959, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", 8), 2, 1.0f, 0, -1, &field_0x5dc, 0, 0x11000284); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PZ", 8), 2, 1.0f, 0, -1, &field_0x5dc, 0, 0x11000284); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } - mpPzBrk = new mDoExt_brkAnm(); + mpPzBrk = JKR_NEW mDoExt_brkAnm(); if (mpPzBrk == NULL) { return 0; } @@ -2450,7 +2450,7 @@ int daE_PZ_c::CreateHeap() { return 0; } - mpPzBtk = new mDoExt_btkAnm(); + mpPzBtk = JKR_NEW mDoExt_btkAnm(); if (mpPzBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index bf8e917245..e44bb45f8d 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -756,7 +756,7 @@ static int daE_RB_Delete(e_rb_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_rb_class* a_this = (e_rb_class*)i_this; - a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rb", 0xB), NULL, NULL, NULL, 0, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); + a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rb", 0xB), NULL, NULL, NULL, 0, 1.0f, 0, -1, &a_this->sound, 0x80000, 0x11000084); if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 98e8ce700a..1e17a0eb9a 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -7133,7 +7133,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { J3DModel* model; if (i_this->mBossMode != 0) { - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB), NULL, NULL, + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BCK_RB_RWAIT), 2, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { @@ -7148,7 +7148,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } if (i_this->mBossMode == 1) { - i_this->mpMorfHornAnm = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB_HORN), + i_this->mpMorfHornAnm = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB_HORN), NULL, NULL, NULL, 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (i_this->mpMorfHornAnm == NULL || i_this->mpMorfHornAnm->getModel() == NULL) { return 0; @@ -7194,7 +7194,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } } } else { - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD), NULL, NULL, + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, BCK_RD_WAIT01), 0, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { @@ -7226,7 +7226,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { i_this->field_0x694->setBaseTRMtx(mDoMtx_stack_c::get()); } else if (i_this->field_0x5bc >= 2) { - i_this->mpMorfBowAnm = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_BOW), NULL, NULL, + i_this->mpMorfBowAnm = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_BOW), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, BCK_RD_BOW_SHOOT), 0, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); if (i_this->mpMorfBowAnm == NULL || i_this->mpMorfBowAnm->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index f5c533fcb7..21e5262e64 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -1752,7 +1752,7 @@ static int daE_RDB_Delete(e_rdb_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { e_rdb_class* i_this = (e_rdb_class*)actor; i_this->mpModelMorf = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB), NULL, NULL, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BCK_RB_WAIT01), 2, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index c12cfef2d9..2e395f43b4 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -4795,7 +4795,7 @@ static dJntColData_c jc_data[11] = { static int useHeapInit(fopAc_ac_c* i_this) { e_rdy_class* _this = (e_rdy_class*)i_this; - _this->mpMorf = new mDoExt_McaMorfSO( + _this->mpMorf = JKR_NEW mDoExt_McaMorfSO( (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 81), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(_this->mpArcName, 76), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, &_this->mSound, 0x80000, 0x11000084); @@ -4820,7 +4820,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } } else if (_this->mWeaponType >= WEAPON_BOW) { - _this->mpBowMorf = new mDoExt_McaMorfSO( + _this->mpBowMorf = JKR_NEW mDoExt_McaMorfSO( (J3DModelData*)dComIfG_getObjectRes(_this->mpArcName, 84), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(_this->mpArcName, 11), J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 352cdb985f..509dbd94b0 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -2063,7 +2063,7 @@ static dJntColData_c jc_data[] = { static int useHeapInit(fopAc_ac_c* i_this) { e_s1_class* a_this = (e_s1_class*)i_this; - a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_S2", 0x22), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_S2", 0x1D), 0, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084); + a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_S2", 0x22), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_S2", 0x1D), 0, 1.0f, 0, -1, &a_this->mSound, 0x80000, 0x11000084); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index d876993191..953e4ef048 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -68,7 +68,7 @@ void daE_SB_HIO_c::genMessage(JORMContext* ctext) { int daE_SB_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_SB", 0xF); JUT_ASSERT(271, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_SB", 0xC), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index 55414997c4..0b574194f1 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -1697,7 +1697,7 @@ static int daE_SF_Delete(e_sf_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { e_sf_class* i_this = (e_sf_class*)a_this; - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_sf", BMDR_SF), NULL, NULL, + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_sf", BMDR_SF), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_sf", BCK_SF_WAIT01), 0, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index a2d7722926..08bb359e56 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -1130,7 +1130,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { e_sh_class* sh = (e_sh_class*)i_this; - sh->mAnm_p = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_sh", 22), NULL, NULL, + sh->mAnm_p = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_sh", 22), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_sh", 14), 2, 1.0f, 0, -1, &sh->mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index 9814a6021a..184bb878df 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -1847,7 +1847,7 @@ int daE_SM_c::CreateHeap() { return 0; } - mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_SM", BMDR_SC), NULL, NULL, + mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_SM", BMDR_SC), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_SM", BCK_SC_WAIT), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index 47b5b5872e..f9f6518edf 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -1418,7 +1418,7 @@ static int daE_SM2_Delete(e_sm2_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_sm2_class* a_this = (e_sm2_class*)i_this; - a_this->modelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_sm2", 8), NULL, NULL, NULL, 2, 1.0f, 0, -1, &a_this->sound, 0, 0x11000284); + a_this->modelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_sm2", 8), NULL, NULL, NULL, 2, 1.0f, 0, -1, &a_this->sound, 0, 0x11000284); if (a_this->modelMorf == NULL || a_this->modelMorf->getModel() == NULL) { return 0; } @@ -1435,7 +1435,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } - a_this->pbtk = new mDoExt_btkAnm(); + a_this->pbtk = JKR_NEW mDoExt_btkAnm(); if (a_this->pbtk == NULL) { return 0; } @@ -1444,7 +1444,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->pieceModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_sm2", 5), NULL, NULL, NULL, 0, 1.0f, 0, -1, &a_this->sound, 0, 0x11000084); + a_this->pieceModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_sm2", 5), NULL, NULL, NULL, 0, 1.0f, 0, -1, &a_this->sound, 0, 0x11000084); if (a_this->pieceModelMorf == NULL || a_this->pieceModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index e5b148b07a..8ace2cf30a 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -2910,7 +2910,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { i_index = BMDR_ST2; } - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_st", i_index), NULL, NULL, + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_st", i_index), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_st", BCK_ST_WAIT), 0, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 62b0ada490..baa6ef8538 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -1624,7 +1624,7 @@ static int daE_SW_Delete(daE_SW_c* i_this) { } int daE_SW_c::CreateHeap() { - mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_SW", BMDR_SW), NULL, NULL, + mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_SW", BMDR_SW), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_SW", BCK_SW_WAIT), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index cb9caf6fa0..4cc9410d05 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -1175,7 +1175,7 @@ static int daE_TH_Delete(e_th_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { e_th_class* i_this = (e_th_class*)a_this; - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_th", 0x1F), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_th", 0x1B), 0, 1.0f, 0, -1, &i_this->mSound, 0, 0x11000084); + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_th", 0x1F), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_th", 0x1B), 0, 1.0f, 0, -1, &i_this->mSound, 0, 0x11000084); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index dbe22e40f4..dbf4bcefff 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -721,7 +721,7 @@ static int useHeapInit(fopAc_ac_c* actor) { e_tk_class* i_this = static_cast(actor); i_this->mpMorf = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_tk", 0xE), NULL, NULL, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_tk", 0xE), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_tk", ANM_TK_SWIM), 2, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index 4d2b62d295..e88ab75a12 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -533,7 +533,7 @@ static int useHeapInit(fopAc_ac_c* actor) { e_tk2_class* i_this = static_cast(actor); i_this->mpMorf = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_tk2", 0xE), NULL, NULL, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_tk2", 0xE), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_tk2", 0x9), 2, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index a8ad219025..c9e9b9228d 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -1206,7 +1206,7 @@ int daE_TT_c::CreateHeap() { JUT_ASSERT(1881, modelData != NULL); - mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_TT", 0xE), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index a0fc8b926c..23a27828c5 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -3651,7 +3651,7 @@ int daE_VA_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x33); JUT_ASSERT(0, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 15), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x31000084); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -3679,7 +3679,7 @@ int daE_VA_c::CreateHeap() { return 0; } - mpWeaponBrk = new mDoExt_brkAnm(); + mpWeaponBrk = JKR_NEW mDoExt_brkAnm(); if (mpWeaponBrk == NULL) { return 0; } @@ -3694,7 +3694,7 @@ int daE_VA_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x37); JUT_ASSERT(0, modelData != NULL); - mpEndEfMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpEndEfMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 7), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x31000084); if (mpEndEfMorf == NULL || mpEndEfMorf->getModel() == NULL) { @@ -3710,7 +3710,7 @@ int daE_VA_c::CreateHeap() { } } - mpEndEfBrk = new mDoExt_brkAnm(); + mpEndEfBrk = JKR_NEW mDoExt_brkAnm(); if (mpEndEfBrk == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index 7157621c62..9eb21d0814 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -819,7 +819,7 @@ static int useHeapInit(fopAc_ac_c* actor) { return 0; } - i_this->mpBtk = new mDoExt_btkAnm(); + i_this->mpBtk = JKR_NEW mDoExt_btkAnm(); if (i_this->mpBtk == NULL) { return 0; } @@ -828,7 +828,7 @@ static int useHeapInit(fopAc_ac_c* actor) { return 0; } - i_this->mpBrks[0] = new mDoExt_brkAnm(); + i_this->mpBrks[0] = JKR_NEW mDoExt_brkAnm(); if (i_this->mpBrks[0] == NULL) { return 0; } @@ -838,7 +838,7 @@ static int useHeapInit(fopAc_ac_c* actor) { } i_this->mpBrks[0]->setPlaySpeed(0.0f); - i_this->mpBrks[1] = new mDoExt_brkAnm(); + i_this->mpBrks[1] = JKR_NEW mDoExt_brkAnm(); if (i_this->mpBrks[1] == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index 165b936064..48b3b790e9 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -5473,7 +5473,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { e_wb_class* i_this = (e_wb_class*)a_this; i_this->mpModelMorf = - new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, 0x2e), NULL, + JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->mResName, 0x2e), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(i_this->mResName, 0x28), 0, 1.0f, 0, -1, &i_this->mZ2Ride, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 4c4d80c248..4f5e229cc7 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -891,7 +891,7 @@ int daE_WS_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_WS", 0xD); JUT_ASSERT(1401, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_WS", 7), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_WS", 7), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index 1977378579..d1a8a207de 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -2151,7 +2151,7 @@ int daE_WW_c::CreateHeap() { JUT_ASSERT(2823, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_WW", BCK_WW_APPEAR), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_WW", BCK_WW_APPEAR), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index f6b975f4e9..9e9a5d4c82 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -742,7 +742,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { e_yc_class* _this = static_cast(i_this); _this->mpMorf = - new mDoExt_McaMorfSO(static_cast(dComIfG_getObjectRes("E_yc", 24)), NULL, + JKR_NEW mDoExt_McaMorfSO(static_cast(dComIfG_getObjectRes("E_yc", 24)), NULL, NULL, static_cast(dComIfG_getObjectRes("E_yc", 21)), 2, 1.0f, 0, -1, &_this->mCreatureSound, 0x80000, 0x11000084); if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index bd54664088..4eb3402964 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -1313,7 +1313,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { e_yd_class* a_this = (e_yd_class*)i_this; - a_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_yd", 24), + a_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_yd", 24), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_yd", 19), 2, 1.0f, 0, -1, &a_this->mCreatureSound, 0x80000, 0x11000084); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { @@ -1322,7 +1322,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { J3DModel* model = a_this->mpMorf->getModel(); - a_this->mBrkAnm = new mDoExt_brkAnm(); + a_this->mBrkAnm = JKR_NEW mDoExt_brkAnm(); if (a_this->mBrkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index dbcc9a2f93..c6ba61eddf 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -55,7 +55,7 @@ static int daE_YD_LEAF_Delete(e_yd_leaf_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_yd_leaf_class* a_this = static_cast(i_this); - a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_YD", 0x19), NULL, + a_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("E_YD", 0x19), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YD", 0x14), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index f0a3059f62..74f109f3f5 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -1318,7 +1318,7 @@ static int daE_YG_Delete(e_yg_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { e_yg_class* i_this = (e_yg_class*)a_this; - i_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_YG", 0x13), NULL, NULL, + i_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_YG", 0x13), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YG", 0xF), 2, 1.0f, 0, -1, &i_this->mSound, J3DMdlFlag_DifferedDLBuffer, 0x11000084); if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 871708c0f9..8c2978d821 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -2072,7 +2072,7 @@ static int daE_YH_Delete(e_yh_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { e_yh_class* i_this = (e_yh_class*)a_this; - i_this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_yd", 0x18), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_yd", 0x13), 2, 1.0, 0, -1, &i_this->mSound, + i_this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_yd", 0x18), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_yd", 0x13), 2, 1.0, 0, -1, &i_this->mSound, 0x80000, 0x11000084); if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) { @@ -2080,7 +2080,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } J3DModel* model = i_this->mpMorf->getModel(); - i_this->mBrk = new mDoExt_brkAnm(); + i_this->mBrk = JKR_NEW mDoExt_brkAnm(); if (i_this->mBrk == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index b9dcff3ff8..01ad370b34 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -1411,7 +1411,7 @@ static int daE_YK_Delete(e_yk_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_yk_class* yk = (e_yk_class*)i_this; - yk->mpMorfSO = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_YK", 12), + yk->mpMorfSO = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_YK", 12), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YK",9), 2, 1.0f, 0, -1, &yk->mCreature, 0x80000,0x11000084); if (!yk->mpMorfSO || !yk->mpMorfSO->mpModel) { return 0; diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index 9180972082..b0aa3f5c9c 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3321,13 +3321,13 @@ int daE_YM_c::CreateHeap() { if (mFlyType == 1) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_TM", 0x11); JUT_ASSERT(0x1094, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_TM", 10), + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_TM", 10), 0, 1.0f, 0, -1, &mSound, 0x80000,0x11000084); if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; } - mpBrk = new mDoExt_brkAnm(); + mpBrk = JKR_NEW mDoExt_brkAnm(); if (mpBrk == NULL) { return 0; } @@ -3340,13 +3340,13 @@ int daE_YM_c::CreateHeap() { } else { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_YM", 0x13); JUT_ASSERT(0x10bb, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YM", 0x10), + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YM", 0x10), 0, 1.0f, 0, -1, &mSound, 0x80000,0x11000084); if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; } - mpBrk = new mDoExt_brkAnm(); + mpBrk = JKR_NEW mDoExt_brkAnm(); if (mpBrk == NULL) { return 0; } @@ -3359,7 +3359,7 @@ int daE_YM_c::CreateHeap() { } if (mType == 6) { - field_0x6d0 = new cXyz[45]; + field_0x6d0 = JKR_NEW cXyz[45]; } return 1; diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 2ef563ca6e..8c8b5ec117 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -3114,7 +3114,7 @@ static int daE_YMB_Delete(daE_YMB_c* i_this) { int daE_YMB_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_YB", BMDR_YB_TW); JUT_ASSERT(4196, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YB", BCK_YB_FLY_WAIT), + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_YB", BCK_YB_FLY_WAIT), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x31000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; @@ -3130,7 +3130,7 @@ int daE_YMB_c::CreateHeap() { model->getModelData()->getJointNodePointer(i)->setCallBack(JointCallBack); } - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -3139,7 +3139,7 @@ int daE_YMB_c::CreateHeap() { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index a5dfd55d9d..57fee093a5 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -2379,7 +2379,7 @@ static int daE_Yr_Delete(e_yr_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { e_yr_class* yr = (e_yr_class*)i_this; - yr->mpMorfSO = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_Yr", 21), NULL, NULL, + yr->mpMorfSO = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("E_Yr", 21), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_Yr", 12), 2, 1.0f, 0, -1, &yr->mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 4cae4a1adc..4ae78fd80c 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -2130,13 +2130,13 @@ int daE_ZH_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ZH", BMDV_ZH); JUT_ASSERT(3305, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", BCK_ZH_WAIT01), + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", BCK_ZH_WAIT01), 2, 1.0f, 0, -1, &mSound, 0, 0x31000284); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 6432a9acf8..81aca02290 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -893,7 +893,7 @@ int daE_ZM_c::CreateHeap() { JUT_ASSERT(1558, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZM", BCK_ZM_MOUTHOPEN), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZM", BCK_ZM_MOUTHOPEN), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index 1a2e827453..840c27697b 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -487,7 +487,7 @@ static int daE_ZS_Delete(daE_ZS_c* i_this) { int daE_ZS_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_ZS", 0xC); JUT_ASSERT(0x3e9, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZS", 4), + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZS", 4), 1, 1.0f, 0, -1, &mSound, 0,0x11000084); if (mpMorf == NULL) { return 0; diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index 531172731b..fa937bd96f 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -213,7 +213,7 @@ void daFmtMng_c::executeReverse() { int i; FmtPos_c* currentPos; currentPos = mPos; - tempPos = new FmtPos_c[mFormationRow]; + tempPos = JKR_NEW FmtPos_c[mFormationRow]; for (i = 0; i < mFormationRow; i++, currentPos++, tempPos++) { tempPos->field_0x10.set(currentPos->field_0x10); tempPos->field_0x1c = currentPos->field_0x1c; @@ -226,7 +226,7 @@ void daFmtMng_c::executeReverse() { currentPos->chgDir(); currentPos->setNextPoint(¤tPos->field_0x10); } - delete [] (tempPos + 1); + JKR_DELETE_ARRAY((tempPos + 1)); setAction(MODE_1_e); } } @@ -354,10 +354,10 @@ void daFmtMng_c::create_init() { mFormationLine = getFormationLine(); mFormationRow = getFormationRow(); mPos = NULL; - mPos = new FmtPos_c[mFormationRow]; + mPos = JKR_NEW FmtPos_c[mFormationRow]; JUT_ASSERT(357, mPos != NULL); mMember = NULL; - mMember = new FmtMember_c[mFormationLine * mFormationRow]; + mMember = JKR_NEW FmtMember_c[mFormationLine * mFormationRow]; JUT_ASSERT(361, mMember != NULL); FmtMember_c* member = mMember; diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 7eb4b89c9d..aa3d2bd026 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -658,7 +658,7 @@ static int daFr_Delete(fr_class* i_this) { static BOOL useHeapIfrt(fopAc_ac_c* a_this) { fr_class* i_this = (fr_class*)a_this; - i_this->mMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Fr", 14), NULL, NULL, + i_this->mMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Fr", 14), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Fr", 11), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); @@ -666,7 +666,7 @@ static BOOL useHeapIfrt(fopAc_ac_c* a_this) { return 0; } - i_this->mBtkAnm = new mDoExt_btkAnm(); + i_this->mBtkAnm = JKR_NEW mDoExt_btkAnm(); if (i_this->mBtkAnm == 0) { return 0; } diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 33a079524c..686dc34ca2 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -65,7 +65,7 @@ bool daGrass_c::createGrass() { return 1; } - m_grass = new dGrass_packet_c(); + m_grass = JKR_NEW dGrass_packet_c(); if (m_grass == NULL) { return 0; } @@ -75,7 +75,7 @@ bool daGrass_c::createGrass() { void daGrass_c::deleteGrass() { if (m_grass != NULL) { - delete m_grass; + JKR_DELETE(m_grass); m_grass = NULL; } } @@ -105,7 +105,7 @@ bool daGrass_c::createFlower() { return 1; } - m_flower = new dFlower_packet_c(); + m_flower = JKR_NEW dFlower_packet_c(); if (m_flower == NULL) { return 0; } @@ -115,7 +115,7 @@ bool daGrass_c::createFlower() { void daGrass_c::deleteFlower() { if (m_flower != NULL) { - delete m_flower; + JKR_DELETE(m_flower); m_flower = NULL; } } diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index e6303ca10e..77eac0a3ea 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -495,22 +495,22 @@ int daHorse_c::createHeap() { return 0; } - J3DTransformInfo* transInfoBuf = new J3DTransformInfo[38]; + J3DTransformInfo* transInfoBuf = JKR_NEW J3DTransformInfo[38]; if (transInfoBuf == NULL) { return 0; } - Quaternion* quatBuf = new Quaternion[38]; + Quaternion* quatBuf = JKR_NEW Quaternion[38]; if (quatBuf == NULL) { return 0; } - m_oldFrame = new mDoExt_MtxCalcOldFrame(transInfoBuf, quatBuf); + m_oldFrame = JKR_NEW mDoExt_MtxCalcOldFrame(transInfoBuf, quatBuf); if (m_oldFrame == NULL) { return 0; } - m_mtxcalc = new mDoExt_MtxCalcAnmBlendTblOld(m_oldFrame, 3, m_anmRatio); + m_mtxcalc = JKR_NEW mDoExt_MtxCalcAnmBlendTblOld(m_oldFrame, 3, m_anmRatio); if (m_mtxcalc == NULL) { return 0; } @@ -519,7 +519,7 @@ int daHorse_c::createHeap() { return 0; } - m_hio = new HORSE_HIO_CLASS(); + m_hio = JKR_NEW HORSE_HIO_CLASS(); if (m_hio == NULL) { return 0; } @@ -537,12 +537,12 @@ int daHorse_c::createHeap() { daHorseRein_c* rein_p = m_rein; for (int i = 0; i < 3; i++, rein_p++) { - rein_p->field_0x0[0] = new cXyz[rein_p->field_0x8[1]]; + rein_p->field_0x0[0] = JKR_NEW cXyz[rein_p->field_0x8[1]]; if (rein_p->field_0x0[0] == NULL) { return 0; } - rein_p->field_0x0[1] = new cXyz[rein_p->field_0x8[1]]; + rein_p->field_0x0[1] = JKR_NEW cXyz[rein_p->field_0x8[1]]; if (rein_p->field_0x0[1] == NULL) { return 0; } diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index 4d64d0e6ed..1032ff5e65 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -82,28 +82,28 @@ BOOL daHoZelda_c::createHeap() { } for (int i = 0; i < 2; i++) { - mpMatAnm[i] = new daHoZelda_matAnm_c(); + mpMatAnm[i] = JKR_NEW daHoZelda_matAnm_c(); if (mpMatAnm[i] == NULL) { return FALSE; } } - J3DTransformInfo* transinfo_buf = new J3DTransformInfo[47]; + J3DTransformInfo* transinfo_buf = JKR_NEW J3DTransformInfo[47]; if (transinfo_buf == NULL) { return FALSE; } - Quaternion* quat_buf = new Quaternion[47]; + Quaternion* quat_buf = JKR_NEW Quaternion[47]; if (quat_buf == NULL) { return FALSE; } - field_0x5c4 = new mDoExt_MtxCalcOldFrame(transinfo_buf, quat_buf); + field_0x5c4 = JKR_NEW mDoExt_MtxCalcOldFrame(transinfo_buf, quat_buf); if (field_0x5c4 == NULL) { return FALSE; } - field_0x5a8 = new mDoExt_MtxCalcAnmBlendTblOld(field_0x5c4, 3, mAnmRatioPack); + field_0x5a8 = JKR_NEW mDoExt_MtxCalcAnmBlendTblOld(field_0x5c4, 3, mAnmRatioPack); if (field_0x5a8 == NULL) { return FALSE; } @@ -125,7 +125,7 @@ BOOL daHoZelda_c::createHeap() { return FALSE; } - mpHIO = new HOZELDA_HIO_CLASS(); + mpHIO = JKR_NEW HOZELDA_HIO_CLASS(); if (mpHIO == NULL) { return FALSE; } diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index 680f5bb6c7..8cea887b87 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -60,7 +60,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(i_arcName, i_btkName); JUT_ASSERT(0, pbtk != NULL); - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL || !mpBtkAnm->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { return 0; } @@ -71,7 +71,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(i_arcName, i_bpkName); JUT_ASSERT(0, pbpk != NULL); - mpBpkAnm = new mDoExt_bpkAnm(); + mpBpkAnm = JKR_NEW mDoExt_bpkAnm(); if (mpBpkAnm == NULL || !mpBpkAnm->init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { return 0; } @@ -82,7 +82,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_bckName); JUT_ASSERT(0, pbck != NULL); - mpBckAnm = new mDoExt_bckAnm(); + mpBckAnm = JKR_NEW mDoExt_bckAnm(); if (mpBckAnm == NULL || !mpBckAnm->init(pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { return 0; } @@ -99,7 +99,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk anmPlay = FALSE; } - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, anmPlay, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { return 0; } @@ -110,7 +110,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk J3DAnmTexPattern* pbtp = (J3DAnmTexPattern*)dComIfG_getObjectRes(i_arcName, i_btpName); JUT_ASSERT(0, pbtp != NULL); - mpBtpAnm = new mDoExt_btpAnm(); + mpBtpAnm = JKR_NEW mDoExt_btpAnm(); if (mpBtpAnm == NULL || !mpBtpAnm->init(modelData, pbtp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index 4e2b90659d..7ef2d453e6 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -3753,7 +3753,7 @@ int daKago_c::CreateHeap() { } JUT_ASSERT(0x139f, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO( + mpMorf = JKR_NEW mDoExt_McaMorfSO( modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(field_0x75c, getBckName(9)), 2, 1.0f, 0, -1, &this->mSound, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 2fdb98d877..3e682df3c9 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -3659,7 +3659,7 @@ static int useHeapInit2(fopAc_ac_c* i_actor) { if (i_this->mpModel[0] == NULL) { return 0; } - i_this->mpBtpAnm = new mDoExt_btpAnm(); + i_this->mpBtpAnm = JKR_NEW mDoExt_btpAnm(); if (i_this->mpBtpAnm == 0) { return 0; } @@ -3723,7 +3723,7 @@ static int useHeapImg_fisht(fopAc_ac_c* i_actor) { } else { i_this->mAnmTransform = 0; } - i_this->mpMorf = new mDoExt_McaMorf( + i_this->mpMorf = JKR_NEW mDoExt_McaMorf( (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, fish_bmd[i_this->mGedouKind]), NULL, NULL, i_this->mAnmTransform, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); @@ -3742,7 +3742,7 @@ static int useHeapImg_fisht(fopAc_ac_c* i_actor) { } if (i_this->mKind2 == 4) { - i_this->mpBrkAnm = new mDoExt_brkAnm(); + i_this->mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (i_this->mpBrkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 87b27246de..b113387457 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -1129,7 +1129,7 @@ static int koro2_heapinit(fopAc_ac_c* actor) { fshop_class* i_this = (fshop_class*)actor; - i_this->koro2WakuBgw = new dBgW(); + i_this->koro2WakuBgw = JKR_NEW dBgW(); if (i_this->koro2WakuBgw == NULL) { return 0; } @@ -1225,7 +1225,7 @@ static int koro2_heapinit(fopAc_ac_c* actor) { return 0; } - i_this->mKoro2[part_no].bgw = new dBgW(); + i_this->mKoro2[part_no].bgw = JKR_NEW dBgW(); if (i_this->mKoro2[part_no].bgw == NULL) { return 0; } @@ -1414,7 +1414,7 @@ static int useHeapInit(fopAc_ac_c* actor) { return 0; } - i_this->tableBgw = new dBgW(); + i_this->tableBgw = JKR_NEW dBgW(); if (i_this->tableBgw == NULL) { return 0; } diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 9acbaea735..9d94c14a28 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -6151,7 +6151,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } - a_this->rod_modelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes(a_this->arcname, 4), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084); + a_this->rod_modelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes(a_this->arcname, 4), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084); if (a_this->rod_modelMorf == NULL || a_this->rod_modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 1134047179..fc4a16659b 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -374,7 +374,7 @@ int daMidna_c::createHeap() { } for (int i = 0; i < 2; i++) { - mpEyeMatAnm[i] = new daMidna_matAnm_c(); + mpEyeMatAnm[i] = JKR_NEW daMidna_matAnm_c(); if (mpEyeMatAnm[i] == NULL) { return 0; } @@ -463,7 +463,7 @@ int daMidna_c::createHeap() { J3DAnmTransform* md_anm = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(mBckHeap[0].getBuffer()); modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 14); JUT_ASSERT(852, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, &mMorfCB, NULL, md_anm, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, NULL, 0, 0x11000284); + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, &mMorfCB, NULL, md_anm, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, NULL, 0, 0x11000284); if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; } @@ -508,13 +508,13 @@ int daMidna_c::createHeap() { return 0; } - mpHIO = new NPC_MIDNA_HIO_CLASS(); + mpHIO = JKR_NEW NPC_MIDNA_HIO_CLASS(); if (mpHIO == NULL) { return 0; } if (mpDemoFCBlendBmd != NULL) { - mpDemoFCTmpBlk = new mDoExt_blkAnm(); + mpDemoFCTmpBlk = JKR_NEW mDoExt_blkAnm(); if (mpDemoFCTmpBlk == NULL) { return 0; } diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 6e28336fd2..e70dfff674 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -442,7 +442,7 @@ int daMyna_c::createHeap() { J3DModelData* aMdlData_p = NULL; aMdlData_p = static_cast(dComIfG_getObjectRes("Npc_myna", "MYNA.bmd")); JUT_ASSERT(803, NULL != aMdlData_p); - mpMorf = new mDoExt_McaMorfSO(aMdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, + mpMorf = JKR_NEW mDoExt_McaMorfSO(aMdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, 0x11020084); if (mpMorf != NULL && mpMorf->getModel() == NULL) { mpMorf->stopZelAnime(); diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 6e1f937010..8e5b6558bd 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -145,7 +145,7 @@ int daNbomb_c::createHeap() { } if (trans != NULL) { - mpBck = new mDoExt_bckAnm(); + mpBck = JKR_NEW mDoExt_bckAnm(); if (mpBck == NULL) { return 0; } diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 982276ff8b..1402afc69e 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -1851,7 +1851,7 @@ static int daNi_Delete(ni_class* i_this) { static BOOL useHeapInit(fopAc_ac_c* i_this) { ni_class* a_this = (ni_class*)i_this; - a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Ni", 16), NULL, NULL, + a_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Ni", 16), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Ni", 11), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); @@ -1867,7 +1867,7 @@ static BOOL useHeapInit(fopAc_ac_c* i_this) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - a_this->mpBtk = new mDoExt_btkAnm(); + a_this->mpBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpBtk == NULL) { return false; } diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index 2558f4c092..9d5d0beee8 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -717,7 +717,7 @@ int daBaseNpc_moveBgActor_c::MoveBGCreateHeap() { return 1; } - mpBgw = new dBgW(); + mpBgw = JKR_NEW dBgW(); if (mpBgw != NULL && !mpBgw->Set((cBgD_t*)dComIfG_getObjectRes(m_name, m_dzb_id), 1, &mBgMtx)) { if (m_set_func != NULL) { diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index a8e81fbc99..0ce72250d3 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -464,7 +464,7 @@ int daNpc_Aru_c::CreateHeap() { } u32 sp_0x18 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x18); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -476,7 +476,7 @@ int daNpc_Aru_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index d4cd04573a..922ad1b6f9 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -306,7 +306,7 @@ cPhs_Step daNpcAsh_c::Create() { BOOL daNpcAsh_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcNames[0], 11)); - mAnm_p = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->mpModel == NULL) { mAnm_p->stopZelAnime(); @@ -322,7 +322,7 @@ BOOL daNpcAsh_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return false; } diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index ec241ac46a..7f6668566e 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -183,7 +183,7 @@ BOOL daNpcAshB_c::CreateHeap() { mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], 28)); JUT_ASSERT(332, NULL != mdlData_p); u32 sp_0x18 = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, 0x80000, sp_0x18); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -199,7 +199,7 @@ BOOL daNpcAshB_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return false; } else { diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 8bb1ec6260..7ebf8e0f5b 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -450,7 +450,7 @@ int daNpc_Bans_c::CreateHeap() { } u32 uVar2 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, (int)idx == 1 ? J3DMdlFlag_DifferedDLBuffer : J3DMdlFlag_None, uVar2); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, (int)idx == 1 ? J3DMdlFlag_DifferedDLBuffer : J3DMdlFlag_None, uVar2); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -461,7 +461,7 @@ int daNpc_Bans_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } @@ -476,7 +476,7 @@ int daNpc_Bans_c::CreateHeap() { } uVar2 = 0x11000084; - mpScoopMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, J3DMdlFlag_DifferedDLBuffer, uVar2); + mpScoopMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, J3DMdlFlag_DifferedDLBuffer, uVar2); if (mpScoopMorf == NULL || mpScoopMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index 366dcacb2e..1f406e6459 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -726,7 +726,7 @@ int daNpc_Besu_c::CreateHeap() { } u32 dbg_0x24 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, dbg_0x24); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -737,7 +737,7 @@ int daNpc_Besu_c::CreateHeap() { modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } @@ -754,7 +754,7 @@ int daNpc_Besu_c::CreateHeap() { } dbg_0x24 = 0x11000084; - mpCupModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, + mpCupModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, 0x80000, dbg_0x24); if (mpCupModelMorf == NULL || mpCupModelMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index 7492657fd4..1849505b80 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -199,7 +199,7 @@ int daNpcBlueNS_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 0x10); JUT_ASSERT(406, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index 23640f7a09..804791f529 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -253,7 +253,7 @@ int daNpc_Bou_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -265,7 +265,7 @@ int daNpc_Bou_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index 991eb7ce85..b600ca1bc7 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -386,7 +386,7 @@ int daNpcBouS_c::CreateHeap() { JUT_ASSERT(393, NULL != mdlData_p); u32 i_differedDlistFlag = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, i_differedDlistFlag); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, i_differedDlistFlag); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -402,7 +402,7 @@ int daNpcBouS_c::CreateHeap() { } mdl_p->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 629f029a92..40e170519e 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -180,7 +180,7 @@ int daNpcCd_c::NpcCreate(int param_1) { JUT_ASSERT(470, NULL != a_mdlData_p); - mpMorf = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, + mpMorf = JKR_NEW mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, 0x11000084); if (mpMorf != NULL && mpMorf->getModel() == NULL) { mpMorf->stopZelAnime(); diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 503bff2d3f..d2bf70089e 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -252,7 +252,7 @@ int daNpcCd2_c::NpcCreate(int param_1) { } else { uVar5 = 0x11000084; } - mpMorf = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCitizen, + mpMorf = JKR_NEW mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCitizen, 0x80000, uVar5); if (mpMorf != NULL && mpMorf->getModel() == NULL) { mpMorf->stopZelAnime(); @@ -264,7 +264,7 @@ int daNpcCd2_c::NpcCreate(int param_1) { mCitizen.init(¤t.pos, &eyePos, 3, 1); mCitizen.setMdlType(param_1, false, mIsDarkWorld != 0 ? 1 : 0); if (anmTex != NULL) { - mpBtpAnm = new mDoExt_btpAnm(); + mpBtpAnm = JKR_NEW mDoExt_btpAnm(); JUT_ASSERT(622, NULL != mpBtpAnm); if (mpBtpAnm == NULL || !mpBtpAnm->init(a_mdlData_p, anmTex, 1, 2, 1.0f, 0, -1)) { return 0; diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index 2099c572f1..a80c4212b6 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -2288,7 +2288,7 @@ BOOL daNpcChat_c::NpcCreate(int type) { J3DAnmTexPattern* texAnmP = getTexAnmP(type); u32 uVar1 = texAnmP != NULL ? 0x11020084 : 0x11000084; - mAnm_p = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 500ff60eaa..ecf363d79a 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -334,7 +334,7 @@ int daNpcChin_c::CreateHeap() { JUT_ASSERT(625, NULL != mdlData_p); u32 differedDlistFlag = 0x15020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, differedDlistFlag); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -351,7 +351,7 @@ int daNpcChin_c::CreateHeap() { model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index e3175bb4cd..382234a12c 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -180,7 +180,7 @@ int daNpc_clerkA_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[res_idx], bmd_idx); mpMorf[0] = - new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); + JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -195,7 +195,7 @@ int daNpc_clerkA_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 41ec390d4a..5606caaedc 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -186,7 +186,7 @@ int daNpc_clerkB_c::CreateHeap() { static_cast(dComIfG_getObjectRes(l_resNameList[res_idx], bmd_idx)); mpMorf[0] = - new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020285); + JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020285); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -201,7 +201,7 @@ int daNpc_clerkB_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 43544cd533..307c18ef81 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -173,7 +173,7 @@ int daNpcClerkT_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[res_idx], bmd_idx); mpMorf[0] = - new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); + JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -188,7 +188,7 @@ int daNpcClerkT_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index 759f9b82be..eb4c3fc74f 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -705,7 +705,7 @@ int daNpcCoach_c::createHeap() { JUT_ASSERT(2702, modelData != NULL); - mChHorse.mpModelMorf = new mDoExt_McaMorf2(modelData, NULL, NULL, + mChHorse.mpModelMorf = JKR_NEW mDoExt_McaMorf2(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_HU_WAIT_01), NULL, 2, 1.0f, 0, -1, &mChHorse.mSound, 0x80000, 0x11020084); if (mChHorse.mpModelMorf != NULL && mChHorse.mpModelMorf->getModel() == NULL) { @@ -723,14 +723,14 @@ int daNpcCoach_c::createHeap() { } mChHorse.mpModelMorf->getModel()->setUserArea((uintptr_t)this); - mChHorse.mpBtpAnm = new mDoExt_btpAnm(); + mChHorse.mpBtpAnm = JKR_NEW mDoExt_btpAnm(); J3DAnmTexPattern* i_btk = (J3DAnmTexPattern*)dComIfG_getObjectRes(l_arcName, BTP_HU_EYE); if (mChHorse.mpBtpAnm == NULL || mChHorse.mpBtpAnm->init(modelData, i_btk, 1, 0, 1.0f, 0, -1) == 0) { return 0; } - mChHorse.mpBckAnm = new mDoExt_bckAnm(); + mChHorse.mpBckAnm = JKR_NEW mDoExt_bckAnm(); J3DAnmTransform* i_bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_HU_LASH); if (mChHorse.mpBckAnm == NULL || mChHorse.mpBckAnm->init(i_bck, 1, 0, 1.0f, 0, -1, false) == 0) { return 0; @@ -764,7 +764,7 @@ int daNpcCoach_c::createHeap() { } mChHarness.mHarnessModel->setUserArea((uintptr_t)this); - mChHarness.field_0x6a0 = new dBgW(); + mChHarness.field_0x6a0 = JKR_NEW dBgW(); if (mChHarness.field_0x6a0 == NULL) { return 0; } @@ -794,7 +794,7 @@ int daNpcCoach_c::createHeap() { } mChCoach.mCoachModel->setUserArea((uintptr_t)this); - mChCoach.field_0x564 = new dBgW(); + mChCoach.field_0x564 = JKR_NEW dBgW(); if (mChCoach.field_0x564 == NULL) { return 0; } @@ -809,7 +809,7 @@ int daNpcCoach_c::createHeap() { JUT_ASSERT(2816, modelData != NULL); - mChYelia.mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_YELIA_WAIT), + mChYelia.mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_YELIA_WAIT), -1, 1.0f, 0, -1, &mChYelia.mSound, 0x80000, 0x11000084); if (mChYelia.mpModelMorf != NULL && mChYelia.mpModelMorf->getModel() == NULL) { mChYelia.mpModelMorf->stopZelAnime(); diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 3300891133..39cb5e98a6 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -234,7 +234,7 @@ int daNpc_Doc_c::CreateHeap() { } u32 sp1C = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, sp1C); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, sp1C); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -245,7 +245,7 @@ int daNpc_Doc_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index edd785c781..af2cafb2dd 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -243,7 +243,7 @@ int daNpcDoorBoy_c::CreateHeap() { JUT_ASSERT(292, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index 0b4e8250f3..5002050a83 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -142,7 +142,7 @@ int daNpcDrSol_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[mType], l_bmdGetParamList[mType]); JUT_ASSERT(268, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index 9443a720ed..01358eb4e1 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -603,7 +603,7 @@ static int daNpc_Du_Delete(npc_du_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { npc_du_class* i_this = (npc_du_class*)actor; - i_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_Du", 0xA), NULL, NULL, + i_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_Du", 0xA), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Npc_Du", 6), 0, 1.0f, 0, -1, 1, NULL, J3DMdlFlag_DifferedDLBuffer, 0x11020084); if (i_this->mpMorf == NULL || i_this->mpMorf->getModel() == NULL) { @@ -616,7 +616,7 @@ static int useHeapInit(fopAc_ac_c* actor) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - i_this->mpBtpAnm = new mDoExt_btpAnm(); + i_this->mpBtpAnm = JKR_NEW mDoExt_btpAnm(); if (i_this->mpBtpAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index c1187ab9e5..a874cbbe66 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -322,7 +322,7 @@ BOOL _Fairy_Feather_c::loadModel() { JUT_ASSERT(674, NULL != mdlData_p); u32 uVar1 = 0x11000284; - mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_None, uVar1); + mpMorf = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_None, uVar1); if (mpMorf != NULL && mpMorf->getModel() == NULL) { mpMorf->stopZelAnime(); mpMorf = NULL; @@ -586,7 +586,7 @@ int daNpc_Fairy_c::CreateHeap() { JUT_ASSERT(1113, NULL != mdlData_p); u32 uVar1 = 0x11020285; - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_None, uVar1); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_None, uVar1); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -607,7 +607,7 @@ int daNpc_Fairy_c::CreateHeap() { mdl_p->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index bc34c405af..d171ffadec 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -179,7 +179,7 @@ int daNpc_Gnd_c::CreateHeap() { JUT_ASSERT(433, NULL != mdlData_p); u32 sp_0x24 = 0x11020285; - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x24); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x24); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -196,7 +196,7 @@ int daNpc_Gnd_c::CreateHeap() { model->setUserArea((uintptr_t)this); for (int idx = 0; idx < 2; ++idx) { - mpMatAnm[idx] = new daNpcT_MatAnm_c(); + mpMatAnm[idx] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[idx] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 65c2e6baa2..eb4f432556 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -419,7 +419,7 @@ BOOL daNpc_grA_c::CreateHeap() { } JUT_ASSERT(774, NULL != mdlData_p); int v = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, v); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, v); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 39637c0317..f44acce792 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -383,7 +383,7 @@ int daNpc_grC_c::CreateHeap() { JUT_ASSERT(452, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index 351e05b443..c8176cf824 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -233,7 +233,7 @@ int daNpc_Grd_c::CreateHeap() { l_bmdGetParamList[0].fileIdx); } - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -250,7 +250,7 @@ int daNpc_Grd_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return false; } diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index 96e22082a0..f79ef34760 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -233,7 +233,7 @@ int daNpc_grM_c::CreateHeap() { JUT_ASSERT(701, NULL != mdlData_p); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index d88ff0fa3d..3fc5dc56d4 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -293,7 +293,7 @@ int daNpc_grMC_c::CreateHeap() { JUT_ASSERT(701, NULL != mdlData_p); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 4c98adfe70..bc18d97ac0 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -469,7 +469,7 @@ int daNpc_grO_c::CreateHeap() { JUT_ASSERT(480, NULL != mdlData_p); u32 uVar1 = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -485,7 +485,7 @@ int daNpc_grO_c::CreateHeap() { } mdl_p->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index a01093ccb6..66b72d329b 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -336,7 +336,7 @@ int daNpc_grR_c::CreateHeap() { JUT_ASSERT(458, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -352,7 +352,7 @@ int daNpc_grR_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 760b8a6139..cdc9e82d6d 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -219,7 +219,7 @@ int daNpc_grS_c::CreateHeap() { } JUT_ASSERT(420, NULL != mdlData_p); u32 differedDlistFlag = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, differedDlistFlag); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { @@ -236,7 +236,7 @@ int daNpc_grS_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index 39f3b84bd1..1c1e451873 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -525,7 +525,7 @@ int daNpc_Grz_c::CreateHeap() { JUT_ASSERT(556, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -541,7 +541,7 @@ int daNpc_Grz_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index 75a68afda6..fac7c1b054 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -364,7 +364,7 @@ int daNpc_GWolf_c::CreateHeap() { JUT_ASSERT(538, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -380,7 +380,7 @@ int daNpc_GWolf_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index b03f22d716..336c97bb66 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -255,7 +255,7 @@ int daNpc_Hanjo_c::CreateHeap() { if (modelData == NULL) { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -265,7 +265,7 @@ int daNpc_Hanjo_c::CreateHeap() { modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 3256ea2b5c..6d9178bfc3 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -204,7 +204,7 @@ static f32 dummy_m300() { } static void dummy_dt_cm3dgpla() { - delete (cM3dGPla*)NULL; + JKR_DELETE((cM3dGPla*)NULL); } static void* s_npc_sub(void* param_0, void* param_1) { @@ -2608,7 +2608,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { resId = 38; } - a_this->mpMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Henna", resId), NULL, + a_this->mpMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Henna", resId), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11020284); if (a_this->mpMorf == NULL || a_this->mpMorf->getModel() == NULL) { return 0; @@ -2622,7 +2622,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } for (s32 i = 0; i < 3; i++) { - a_this->mpBtkAnms[i] = new mDoExt_btkAnm(); + a_this->mpBtkAnms[i] = JKR_NEW mDoExt_btkAnm(); if (a_this->mpBtkAnms[i] == NULL) { return 0; } @@ -2634,7 +2634,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } for (s32 i = 0; i < 8; i++) { - a_this->mpBtpAnms[i] = new mDoExt_btpAnm(); + a_this->mpBtpAnms[i] = JKR_NEW mDoExt_btpAnm(); if (a_this->mpBtpAnms[i] == NULL) { return 0; } @@ -2648,7 +2648,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } for (s32 i = 0; i < 8; i++) { - a_this->mpBckAnms[i] = new mDoExt_bckAnm(); + a_this->mpBckAnms[i] = JKR_NEW mDoExt_bckAnm(); if (a_this->mpBckAnms[i] == 0) { return 0; } diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 2315be87d6..772aadaa9f 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -378,7 +378,7 @@ int daNpc_Hoz_c::CreateHeap() { JUT_ASSERT(1543, NULL != mdlData_p); u32 sp1C = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, sp1C); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, sp1C); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -394,7 +394,7 @@ int daNpc_Hoz_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 7241c9c87f..5c466967a4 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -188,7 +188,7 @@ BOOL daNpcImpal_c::CreateHeap() { mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], 26)); JUT_ASSERT(349, 0 != mdlData_p); u32 reg_r23 = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, 0x80000, reg_r23); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -204,7 +204,7 @@ BOOL daNpcImpal_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return FALSE; } diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index b5e812256a..1747d476c5 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -419,7 +419,7 @@ static int daNpc_Inko_Delete(npc_inko_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { npc_inko_class* i_this = (npc_inko_class*)actor; - i_this->anm_p = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_inko", 8), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084); + i_this->anm_p = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_inko", 8), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, 0, 0x80000, 0x11000084); if (i_this->anm_p == NULL || i_this->anm_p->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index c228481ad2..38b8cd147c 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -468,7 +468,7 @@ int daNpcIns_c::CreateHeap() { JUT_ASSERT(424, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -503,7 +503,7 @@ int daNpcIns_c::CreateHeap() { } } - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 30830d06c5..ba2864971b 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -397,7 +397,7 @@ int daNpc_Jagar_c::CreateHeap() { if (modelData == NULL) { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -408,7 +408,7 @@ int daNpc_Jagar_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index efa8931a47..8960512ce4 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -257,7 +257,7 @@ int daNpc_Kakashi_c::CreateHeap() { } u32 diff_flags = J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 2, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE); - mpMorf[0] = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, J3DMdlFlag_DifferedDLBuffer, diff_flags); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, J3DMdlFlag_DifferedDLBuffer, diff_flags); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 2d592ec85e..9258661a9c 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -697,7 +697,7 @@ int daNpcKasiHana_c::CreateHeap() { JUT_ASSERT(950, NULL != mdlData_p); u32 reg_r25 = 0x11020084; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, reg_r25); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, reg_r25); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index 27c4a0b6ba..0ce8d82a2f 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -268,7 +268,7 @@ int daNpcKasiKyu_c::CreateHeap() { JUT_ASSERT(322, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index 4b3d7ca068..fc36f6ab41 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -268,7 +268,7 @@ int daNpcKasiMich_c::CreateHeap() { JUT_ASSERT(314, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index 9be15f2f63..769708aa55 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -404,7 +404,7 @@ int daNpc_Kkri_c::CreateHeap() { } u32 diff_flags = J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 2, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE); - mpMorf[0] = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, diff_flags); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, diff_flags); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -416,7 +416,7 @@ int daNpc_Kkri_c::CreateHeap() { mdl_p->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index 9378de990d..b0e7252033 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -606,7 +606,7 @@ int daNpc_Kn_c::CreateHeap() { JUT_ASSERT(1259, NULL != mdlData_p); u32 sp2C = 0x11020284; - mpModelMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp2C); + mpModelMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp2C); if (mpModelMorf[0] != NULL && mpModelMorf[0]->getModel() == NULL) { mpModelMorf[0]->stopZelAnime(); mpModelMorf[0] = NULL; @@ -635,7 +635,7 @@ int daNpc_Kn_c::CreateHeap() { JUT_ASSERT(1310, NULL != mdlData_p); sp2C = 0x11020284; - mpModelMorf[1] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp2C); + mpModelMorf[1] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp2C); if (mpModelMorf[1] != NULL && mpModelMorf[1]->getModel() == NULL) { mpModelMorf[1] = NULL; diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index 51d8b5020b..418c62bd29 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -181,7 +181,7 @@ int daNpc_Knj_c::CreateHeap() { J3DModelData* modelData = static_cast( dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0])); - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index b4cd80eb38..0f02316a86 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -499,7 +499,7 @@ int daNpc_Kolin_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -510,7 +510,7 @@ int daNpc_Kolin_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index a9036c679d..90e4756fc9 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -356,7 +356,7 @@ int daNpc_Kolinb_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -367,7 +367,7 @@ int daNpc_Kolinb_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index de11edd71d..cbc6c52086 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -6886,7 +6886,7 @@ static int daNpc_Ks_Delete(npc_ks_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { npc_ks_class* i_this = (npc_ks_class*)actor; - i_this->model = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->res_name, npc_ks_class::BMDR_SARU), NULL, NULL, + i_this->model = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes(i_this->res_name, npc_ks_class::BMDR_SARU), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(i_this->res_name, npc_ks_class::BCK_SARU_WAIT_A), 0, 1.0f, 0, -1, &i_this->sound, 0x80000, 0x11020084); if (i_this->model == NULL || i_this->model->getModel() == NULL) { @@ -6899,7 +6899,7 @@ static int useHeapInit(fopAc_ac_c* actor) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - i_this->btp = new mDoExt_btpAnm(); + i_this->btp = JKR_NEW mDoExt_btpAnm(); if (i_this->btp == NULL) { return 0; } @@ -6908,7 +6908,7 @@ static int useHeapInit(fopAc_ac_c* actor) { return 0; } - i_this->btp2 = new mDoExt_btpAnm(); + i_this->btp2 = JKR_NEW mDoExt_btpAnm(); if (i_this->btp2 == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 84c497373e..9dd4a05527 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -227,7 +227,7 @@ int daNpc_Kyury_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -241,7 +241,7 @@ int daNpc_Kyury_c::CreateHeap() { model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index 2ff8e76fda..8a00b3d707 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -226,7 +226,7 @@ int daNpc_Len_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -240,7 +240,7 @@ int daNpc_Len_c::CreateHeap() { model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index 4958e6436f..2d60eaeabe 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -305,7 +305,7 @@ int daNpc_Lud_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -319,7 +319,7 @@ int daNpc_Lud_c::CreateHeap() { model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } @@ -331,7 +331,7 @@ int daNpc_Lud_c::CreateHeap() { res_idx = l_bmdData[bmd_idx][0]; modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[arc_idx], res_idx); - mpBowlMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, + mpBowlMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, 0x80000, 0x11000084); if (mpBowlMorf == NULL || mpBowlMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 492d83527e..bad2b96625 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -348,7 +348,7 @@ int daNpc_Maro_c::CreateHeap() { } u32 sp_0x1c = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x1c); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -360,7 +360,7 @@ int daNpc_Maro_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index 91228a5fc5..429cacd39a 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -205,7 +205,7 @@ int daNpc_midP_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes( l_resNameList[l_bmdData[0][1]], l_bmdData[0][0])); - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { if (mpMorf[0] != NULL) { @@ -221,7 +221,7 @@ int daNpc_midP_c::CreateHeap() { model->setUserArea((uintptr_t)this); for (int i = 0; i < 2; i++) { - mpMatAnm[i] = new daNpcT_MatAnm_c(); + mpMatAnm[i] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[i] == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index e3e5aee06b..8f2af3db18 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -336,7 +336,7 @@ int daNpc_Moi_c::CreateHeap() { return 1; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -350,7 +350,7 @@ int daNpc_Moi_c::CreateHeap() { model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index 64ab83e0d9..766d47e729 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -391,7 +391,7 @@ int daNpcMoiR_c::CreateHeap() { JUT_ASSERT(403, NULL != mdlData_p); u32 sp_0x18 = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x18); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x18); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -407,7 +407,7 @@ int daNpcMoiR_c::CreateHeap() { } mdl_p->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index e8725b9f70..4f2c98b4b8 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -264,7 +264,7 @@ int daNpc_myna2_c::CreateHeap() { JUT_ASSERT(476, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 414022d377..6e9ca08771 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -3035,7 +3035,7 @@ static int daNpc_Ne_Delete(npc_ne_class* i_this) { static int useHeapInit(fopAc_ac_c* i_this) { npc_ne_class* _this = static_cast(i_this); _this->mpMorf = - new mDoExt_McaMorf(static_cast(dComIfG_getObjectRes(_this->mResName, 28)), + JKR_NEW mDoExt_McaMorf(static_cast(dComIfG_getObjectRes(_this->mResName, 28)), NULL, NULL, static_cast(dComIfG_getObjectRes(_this->mResName, 24)), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11020284); @@ -3053,7 +3053,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } - _this->mpBtkAnm = new mDoExt_btkAnm(); + _this->mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (_this->mpBtkAnm == NULL) { return 0; } @@ -3062,7 +3062,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - _this->mpBtpAnm = new mDoExt_btpAnm(); + _this->mpBtpAnm = JKR_NEW mDoExt_btpAnm(); if (_this->mpBtpAnm == NULL) { return 0; } @@ -3082,7 +3082,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } else { dish_flag = 0; } - _this->mpDishMorf = new mDoExt_McaMorf( + _this->mpDishMorf = JKR_NEW mDoExt_McaMorf( static_cast(dComIfG_getObjectRes(_this->mResName, 29)), NULL, NULL, static_cast(dComIfG_getObjectRes(_this->mResName, dish_bck[dish_flag])), diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 62fcf206fc..fdbc4c0e70 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -608,7 +608,7 @@ int daNpc_Pachi_Besu_c::CreateHeap() { return 1; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -620,7 +620,7 @@ int daNpc_Pachi_Besu_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index dc53405829..99e5ed78a6 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -625,7 +625,7 @@ int daNpc_Pachi_Maro_c::CreateHeap() { } u32 uVar1 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -637,7 +637,7 @@ int daNpc_Pachi_Maro_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index 67fe0fa550..57e8505625 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -849,7 +849,7 @@ int daNpc_Pachi_Taro_c::CreateHeap() { } u32 uVar1 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -861,7 +861,7 @@ int daNpc_Pachi_Taro_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 7b8fb2018c..d860e63b95 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -462,7 +462,7 @@ int daNpc_Post_c::CreateHeap() { } u32 uVar1 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, uVar1); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -473,7 +473,7 @@ int daNpc_Post_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } @@ -488,7 +488,7 @@ int daNpc_Post_c::CreateHeap() { if (mType != TYPE_BAR) { u32 uVar2 = 0x11000084; - mpFlagModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, J3DMdlFlag_DifferedDLBuffer, uVar2); + mpFlagModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, J3DMdlFlag_DifferedDLBuffer, uVar2); if (mpFlagModelMorf == NULL || mpFlagModelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 5d36a5992a..b12ddaa6e0 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -233,7 +233,7 @@ int daNpc_Pouya_c::CreateHeap() { u32 local_30 = chkPouyaB() ? 0x11020284 : 0x11000284; mpMorf[0] = - new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, local_30); + JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, local_30); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -247,7 +247,7 @@ int daNpc_Pouya_c::CreateHeap() { model->setUserArea((uintptr_t)this); if (chkPouyaB()) { - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index 4974fad798..1cfc2c18df 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -175,7 +175,7 @@ int daNpcPray_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 9); JUT_ASSERT(313, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 065da80d35..e3c3010206 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -294,7 +294,7 @@ int daNpc_Raca_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -310,7 +310,7 @@ int daNpc_Raca_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index 152b9fc5d2..ba63df5d93 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -283,7 +283,7 @@ int daNpcRafrel_c::CreateHeap() { JUT_ASSERT(403, NULL != mdlData_p); u32 mdl_diff_flags = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, mdl_diff_flags); + mAnm_p = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, mdl_diff_flags); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -301,7 +301,7 @@ int daNpcRafrel_c::CreateHeap() { mdl_p->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index 8a1a370478..be2006e5e9 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -371,7 +371,7 @@ int daNpc_Saru_c::CreateHeap() { if (modelData == NULL) { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 3d430c0e47..f90e378f15 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -182,7 +182,7 @@ int daNpc_seiB_c::CreateHeap() { JUT_ASSERT(466, NULL != mdlData_p); mpMorf[0] = - new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); + JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 5b75031fd4..7efc4ff6bb 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -185,7 +185,7 @@ int daNpc_seiC_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]); JUT_ASSERT(424, NULL != mdlData_p); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index de3a3c2c72..41ec220af0 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -185,7 +185,7 @@ int daNpc_seiD_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]); JUT_ASSERT(424, NULL != mdlData_p); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index a0ec617f87..746105d49f 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -267,7 +267,7 @@ int daNpc_Seira_c::CreateHeap() { } u32 sp_0x28 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x28); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -279,7 +279,7 @@ int daNpc_Seira_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } @@ -295,7 +295,7 @@ int daNpc_Seira_c::CreateHeap() { } sp_0x28 = 0x11000084; - mpSeiraMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, + mpSeiraMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, 0, sp_0x28); if (mpSeiraMorf == NULL || mpSeiraMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 7f79648d9a..6f24f4a357 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -252,7 +252,7 @@ int daNpc_Seira2_c::CreateHeap() { } u32 sp_0x28 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x28); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -264,7 +264,7 @@ int daNpc_Seira2_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } @@ -276,7 +276,7 @@ int daNpc_Seira2_c::CreateHeap() { l_resNameList[res_name_idx], sp_0x2c)); sp_0x28 = 0x11000084; - mpSeiraMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, + mpSeiraMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, 0, sp_0x28); if (mpSeiraMorf == NULL || mpSeiraMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 306df2a332..67460a13f7 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -292,7 +292,7 @@ int daNpc_Seirei_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index ec87bf930f..091df803f7 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -474,7 +474,7 @@ cPhs_Step daNpcShad_c::Create() { int daNpcShad_c::CreateHeap() { J3DModelData* mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], BMDR_SHAD)); JUT_ASSERT(483, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -491,7 +491,7 @@ int daNpcShad_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index aedba3e5f9..96703c4188 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -303,7 +303,7 @@ int daNpc_Sha_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -314,7 +314,7 @@ int daNpc_Sha_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index 06b63797a7..03b513ec58 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -175,7 +175,7 @@ BOOL daNpcShoe_c::CreateHeap() { JUT_ASSERT(292, NULL != mdlData_p) - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, 0x11020084); if (mAnm_p != NULL && mAnm_p->mpModel == NULL) { diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 78157b3ba8..a8732a4ce7 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -75,7 +75,7 @@ int daNpc_Shop0_c::createHeap() { return 0; } - mpShopParam = new daNpc_Shop0_Param_c(); + mpShopParam = JKR_NEW daNpc_Shop0_Param_c(); if (mpShopParam == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index a8361e6b7e..2bf4b7d29b 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -160,7 +160,7 @@ int daNpc_solA_c::CreateHeap() { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[res_name_idx], sp_0x2c); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 439ae1f11f..8337164b25 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -277,7 +277,7 @@ int daNpc_SoldierA_c::CreateHeap() { JUT_ASSERT(413, NULL != mdlData_p); u32 uVar1 = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 74d68caa56..24237bdde6 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -237,7 +237,7 @@ int daNpc_SoldierB_c::CreateHeap() { } u32 uVar1 = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index cb883f0b24..fc3e4277f4 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -300,14 +300,14 @@ static int useHeapInit(fopAc_ac_c* i_this) { npc_sq_class* _this = static_cast(i_this); _this->mpMorf = - new mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("Sq", 17)), NULL, NULL, + JKR_NEW mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("Sq", 17)), NULL, NULL, static_cast(dComIfG_getObjectRes("Sq", 9)), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { return 0; } - _this->mpBtkAnm = new mDoExt_btkAnm(); + _this->mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (_this->mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index 4bcfb6a0d8..32513ec2ba 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -358,7 +358,7 @@ int daNpc_Taro_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -369,7 +369,7 @@ int daNpc_Taro_c::CreateHeap() { modelData->getJointNodePointer(i)->setCallBack(ctrlJointCallBack); } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 7d63b43c42..8af4146e69 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -195,7 +195,7 @@ int daNpcThe_c::CreateHeap() { dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[bmd_get_idx].arcIdx], l_bmdGetParamList[bmd_get_idx].fileIdx)); } - mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { @@ -212,7 +212,7 @@ int daNpcThe_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 3a01c9bd7c..a40826b95d 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -293,7 +293,7 @@ int daNpcTheB_c::CreateHeap() { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0x26); JUT_ASSERT(383, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 0x1B), + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 0x1B), 2, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -311,7 +311,7 @@ int daNpcTheB_c::CreateHeap() { mdlData_p->getJointNodePointer(JNT_MOUTH)->setCallBack(ctrlJointCallBack); mAnm_p->getModel()->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index e9980c953e..4ce9e365bd 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -3207,7 +3207,7 @@ int daNPC_TK_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Npc_tk", "tk.bmd"); JUT_ASSERT(0xf4f, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Npc_tk", 6), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpMorf == NULL || mpMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index bb9581eca1..ffd16076aa 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -268,7 +268,7 @@ int daNpcTkc_c::CreateHeap() { JUT_ASSERT(330, NULL != mdlData_p); u32 uVar1 = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, uVar1); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -284,7 +284,7 @@ int daNpcTkc_c::CreateHeap() { } mdl_p->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index 8cf5ac0250..d51295843b 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -220,7 +220,7 @@ int daNpcTkj_c::CreateHeap() { JUT_ASSERT(446, NULL != mdlData_p); u32 diff_flags = J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 2, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, diff_flags); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, diff_flags); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -237,7 +237,7 @@ int daNpcTkj_c::CreateHeap() { mdl_p->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index 5d047e150b..75ec7a0a10 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -1042,7 +1042,7 @@ static int daNpc_Tkj2_Delete(npc_tkj2_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { npc_tkj2_class* i_this = (npc_tkj2_class*)a_this; - i_this->mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("Tkj2", BMDR_TKJ), NULL, NULL, + i_this->mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)dComIfG_getObjectRes("Tkj2", BMDR_TKJ), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Tkj2", BCK_TKJ_WAIT_A), 0, 1.0f, 0, -1, &i_this->mSound, 0x80000, 0x11020284); if (i_this->mpModelMorf == NULL || i_this->mpModelMorf->getModel() == NULL) { return 0; @@ -1055,7 +1055,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - i_this->mpBtkAnm = new mDoExt_btkAnm(); + i_this->mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (i_this->mpBtkAnm == NULL) { return 0; } @@ -1064,7 +1064,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - i_this->mpBtpAnm = new mDoExt_btpAnm(); + i_this->mpBtpAnm = JKR_NEW mDoExt_btpAnm(); if (i_this->mpBtpAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 76d4bc6615..ca8a545421 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -370,7 +370,7 @@ int daNpcTks_c::CreateHeap() { JUT_ASSERT(410, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -386,7 +386,7 @@ int daNpcTks_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } @@ -404,7 +404,7 @@ int daNpcTks_c::CreateHeap() { JUT_ASSERT(453, NULL != mdlData_p); - mTksTsubo.mpModelMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, getTrnsfrmKeyAnmP(l_arcName, BCK_TKS_TUBO_HIDE), -1, 1.0f, 0, -1, &mTksTsubo.mSound, 0x80000, 0x11000084); + mTksTsubo.mpModelMorf = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, getTrnsfrmKeyAnmP(l_arcName, BCK_TKS_TUBO_HIDE), -1, 1.0f, 0, -1, &mTksTsubo.mSound, 0x80000, 0x11000084); if (mTksTsubo.mpModelMorf == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 1d934e3ada..d043eecb0d 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -358,7 +358,7 @@ int daNpc_Toby_c::CreateHeap() { } u32 sp_0x24 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x24); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x24); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -369,7 +369,7 @@ int daNpc_Toby_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index c1c706d311..62036cf75f 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -290,7 +290,7 @@ int daNpc_Uri_c::CreateHeap() { return 1; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -304,7 +304,7 @@ int daNpc_Uri_c::CreateHeap() { model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 3d9eefe1e7..26add3330b 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -732,7 +732,7 @@ int daNpcWrestler_c::CreateHeap() { JUT_ASSERT(830, NULL != mdlData_p); u32 reg_r23 = 0x11020284; - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, reg_r23); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, reg_r23); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -747,7 +747,7 @@ int daNpcWrestler_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index ea0f13ea94..108f4214a1 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -267,7 +267,7 @@ int daNpc_yamiD_c::CreateHeap() { JUT_ASSERT(477, NULL != mdlData_p); u32 sp_0x1C = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x1C); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x1C); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -283,7 +283,7 @@ int daNpc_yamiD_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index 64d36e12f2..b02b469b5a 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -202,7 +202,7 @@ int daNpc_yamiS_c::CreateHeap() { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[res_name_idx], index); u32 sp_0x1C = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x1C); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); @@ -219,7 +219,7 @@ int daNpc_yamiS_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 611bdc9feb..69bd7dd245 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -205,7 +205,7 @@ int daNpc_yamiT_c::CreateHeap() { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[res_name_idx], index); u32 sp_0x1C = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp_0x1C); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); @@ -222,7 +222,7 @@ int daNpc_yamiT_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 55e13fd4a1..cceb16cc49 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -443,7 +443,7 @@ int daNpc_Yelia_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; @@ -455,7 +455,7 @@ int daNpc_Yelia_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 706634a16e..e60d784801 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -655,7 +655,7 @@ int daNpc_ykM_c::CreateHeap() { } int sp34 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp34); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, sp34); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -666,7 +666,7 @@ int daNpc_ykM_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } @@ -699,7 +699,7 @@ int daNpc_ykM_c::CreateHeap() { JUT_ASSERT(1595, NULL != mdlData_p); sp34 = 0x11000084; - mFishModelMorf = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mFishModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, 0x80000, sp34); if (mFishModelMorf == NULL || mFishModelMorf->getModel() == NULL) { return 0; @@ -713,7 +713,7 @@ int daNpc_ykM_c::CreateHeap() { JUT_ASSERT(1622, NULL != mdlData_p); sp34 = 0x11000084; - mLeafModelMorf = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mLeafModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, 0x80000, sp34); if (mLeafModelMorf == NULL || mLeafModelMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index 36c55f22e7..0b74c771d5 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -388,7 +388,7 @@ int daNpc_ykW_c::CreateHeap() { } int temp1 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, temp1); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { @@ -405,7 +405,7 @@ int daNpc_ykW_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 93058921fc..7312511e2b 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -214,7 +214,7 @@ int daNpc_zanB_c::CreateHeap() { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, 0x11020284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -225,7 +225,7 @@ int daNpc_zanB_c::CreateHeap() { } mdl_p->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index 0353f6ccc8..c48a8b103d 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -150,7 +150,7 @@ int daNpc_Zant_c::create() { int daNpc_Zant_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[1]], l_bmdData[0]); - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index 0e5da0c5c2..2e882b8b05 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -202,7 +202,7 @@ int daNpc_ZelR_c::CreateHeap() { JUT_ASSERT(0x1b0, NULL != mdlData_p); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -219,7 +219,7 @@ int daNpc_ZelR_c::CreateHeap() { model->setUserArea((uintptr_t)this); for (int i = 0; i < 2; i++) { - mpMatAnm[i] = new daNpcT_MatAnm_c(); + mpMatAnm[i] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[i] == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 5c5bad2c4c..e015484e56 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -227,7 +227,7 @@ int daNpc_ZelRo_c::CreateHeap() { JUT_ASSERT(432, NULL != mdlData_p); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); mpMorf[0] = NULL; @@ -244,7 +244,7 @@ int daNpc_ZelRo_c::CreateHeap() { model->setUserArea((uintptr_t)this); for (int i = 0; i < 2; i++) { - mpMatAnm[i] = new daNpcT_MatAnm_c(); + mpMatAnm[i] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[i] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index 563fcea24c..840a0f91fc 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -257,7 +257,7 @@ int daNpc_Zelda_c::CreateHeap() { } s32 temp4 = 0x11020284; - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, temp4); + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, temp4); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { return 0; } @@ -270,7 +270,7 @@ int daNpc_Zelda_c::CreateHeap() { model->setUserArea((uintptr_t)this); for (s32 i = 0; i < 2; i++) { - mpMatAnm[i] = new daNpcT_MatAnm_c(); + mpMatAnm[i] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[i] == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index aa78729989..50ee064e3c 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -604,7 +604,7 @@ int daNpc_zrA_c::CreateHeap() { } model_flag = 0; } - mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, model_flag, 0x11020285); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -632,7 +632,7 @@ int daNpc_zrA_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 2745b04d8f..07599054c6 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -305,7 +305,7 @@ int daNpc_zrC_c::CreateHeap() { model_flag = 0; } - mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, model_flag, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -321,7 +321,7 @@ int daNpc_zrC_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index a600f217cc..8daf178997 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -277,7 +277,7 @@ int daNpc_zrZ_c::CreateHeap() { } } - mAnm_p = new mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mAnm_p = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreatureSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); @@ -297,7 +297,7 @@ int daNpc_zrZ_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index 35711715ed..89a98a348c 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -95,7 +95,7 @@ int daTurara_c::CreateHeap() { if (mpModel[1] == NULL) { return 0; } - field_0x980 = new dBgW; + field_0x980 = JKR_NEW dBgW; if (field_0x980 == NULL || field_0x980->Set((cBgD_t *)dComIfG_getObjectRes("M_Turara", 0xd), 1, &mBgMtx) != 0) { field_0x980 = NULL; diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index beb5e8524a..93d82b2109 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -84,7 +84,7 @@ int daObjARI_c::CreateHeap() { } else { model_data = static_cast(dComIfG_getObjectRes("I_Ari", 10)); } - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, static_cast(dComIfG_getObjectRes("I_Ari", 6)), 2, 0.5f, 0, -1, &mCreatureSound, 0, 0x11000284); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -92,7 +92,7 @@ int daObjARI_c::CreateHeap() { } J3DModel* model = mpMorf->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -108,7 +108,7 @@ int daObjARI_c::CreateHeap() { } } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index 7a54a16fce..3c43af4d69 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -126,7 +126,7 @@ int daObj_AutoMata_c::CreateHeap() { if (modelData == NULL) { return 0; } - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, 0x11000284); if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 23b4daf8fa..d4dc612b11 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -88,12 +88,12 @@ int daObjAvalanche_c::CreateHeap() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 6); JUT_ASSERT(247, anm != NULL); - mBckAnm = new mDoExt_bckAnm(); + mBckAnm = JKR_NEW mDoExt_bckAnm(); if (mBckAnm == NULL || !mBckAnm->init(anm, 1, 0, 1.0, 0, -1, false)) { return 0; } mBckAnm->setPlaySpeed(0.0f); - mpBgW2 = new dBgW(); + mpBgW2 = JKR_NEW dBgW(); if (mpBgW2 != NULL && !mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, l_dzb[1]), 1, &mMtx2)) { mpBgW2->SetCrrFunc(dBgS_MoveBGProc_Trans); } else { diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 03dc458775..04dbc4c91d 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -88,7 +88,7 @@ static u32 const l_batta_btk_index[2] = { inline int daObjBATTA_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Bat", 0xb); JUT_ASSERT(256, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Bat", 8), 2, 1.0f, 0, -1, &mCreature, 0x80000, 0x11000284); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -96,7 +96,7 @@ inline int daObjBATTA_c::CreateHeap() { } J3DModel* morfModel = mpMorf->getModel(); - mBrk = new mDoExt_brkAnm(); + mBrk = JKR_NEW mDoExt_brkAnm(); if (mBrk == NULL) { return 0; } @@ -106,7 +106,7 @@ inline int daObjBATTA_c::CreateHeap() { return 0; } - mBtk = new mDoExt_btkAnm(); + mBtk = JKR_NEW mDoExt_btkAnm(); if (mBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index 37de863ca6..074710cf86 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -93,7 +93,7 @@ int daObj_Bed_c::CreateHeap() { if (mpModel == NULL) { return 0; } - mpCollider = new dBgW(); + mpCollider = JKR_NEW dBgW(); if (mpCollider == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 25dd1587ef..654ce6e023 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -411,7 +411,7 @@ int daObjBm_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BRK_SERCH_e); JUT_ASSERT(780, pbrk != NULL); - mSerchBrk = new mDoExt_brkAnm(); + mSerchBrk = JKR_NEW mDoExt_brkAnm(); if (mSerchBrk == NULL || mSerchBrk->init(modelData, pbrk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1) == 0) { return 0; } @@ -423,7 +423,7 @@ int daObjBm_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_BM_UP_e); JUT_ASSERT(798, pbck != NULL); - mBeamosBck = new mDoExt_bckAnm(); + mBeamosBck = JKR_NEW mDoExt_bckAnm(); if (mBeamosBck == NULL || mBeamosBck->init(pbck, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { return 0; } @@ -437,7 +437,7 @@ int daObjBm_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAMB_OFF_e); JUT_ASSERT(827, pbtk != NULL); - mBeamBtk = new mDoExt_btkAnm(); + mBeamBtk = JKR_NEW mDoExt_btkAnm(); if (mBeamBtk == NULL || mBeamBtk->init(modelData, pbtk, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1) == 0) { return 0; } @@ -450,14 +450,14 @@ int daObjBm_c::CreateHeap() { pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BTK_EF_BIMOBEAM_e); JUT_ASSERT(846, pbtk != NULL); - mBeamEffBtk = new mDoExt_btkAnm(); + mBeamEffBtk = JKR_NEW mDoExt_btkAnm(); if (mBeamEffBtk == NULL || mBeamEffBtk->init(modelData, pbtk, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1) == 0) { return 0; } J3DAnmTransform* pbck2 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_EF_BIMOBEAM_e); JUT_ASSERT(858, pbck != NULL); - mBeamEffBck = new mDoExt_bckAnm(); + mBeamEffBck = JKR_NEW mDoExt_bckAnm(); if (mBeamEffBck == NULL || mBeamEffBck->init(pbck2, 1, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false) == 0) { return 0; } @@ -471,7 +471,7 @@ int daObjBm_c::CreateHeap() { J3DAnmTransform* pbck3 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, dRes_INDEX_OBJ_BM_BCK_BMF_OFF_e); JUT_ASSERT(885, pbck != NULL); - mBmfOffBck = new mDoExt_bckAnm(); + mBmfOffBck = JKR_NEW mDoExt_bckAnm(); if (mBmfOffBck == NULL || mBmfOffBck->init(pbck3, 1, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false) == 0) { return 0; } diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index e5f6a56994..a2a3251372 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -63,7 +63,7 @@ int daBkLeaf_c::CreateHeap() { } else { J3DAnmTransform* transform = static_cast(dComIfG_getObjectRes(l_arcName, l_bckName)); - mpBckAnm = new mDoExt_bckAnm; + mpBckAnm = JKR_NEW mDoExt_bckAnm; if (mpBckAnm == NULL || mpBckAnm->init(transform, 1, 0, 1.0f, 0, -1, false) == 0) { retVal = 0; } else { diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index f5894f7c7a..b65aadd3bc 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -156,7 +156,7 @@ int daBkyRock_c::createHeap() { } } if (nameNo == 1) { - mBgW = new dBgW(); + mBgW = JKR_NEW dBgW(); if (mBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index ab8f014d15..6381e5888a 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -128,7 +128,7 @@ int daObjBossWarp_c::CreateHeap() { } J3DAnmTevRegKey* brk_anm = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 9); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(model_data, brk_anm, 1, 0, 1.0f, 0, -1)) { return 0; } @@ -139,7 +139,7 @@ int daObjBossWarp_c::CreateHeap() { for (int i = 0; i < 2; i++) { J3DAnmTextureSRTKey* btk_anm = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, l_btk_idx[i]); - mpBtkAnm[i] = new mDoExt_btkAnm(); + mpBtkAnm[i] = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm[i] == NULL || !mpBtkAnm[i]->init(model_data, btk_anm, 1, l_play_mode[i], 1.0f, 0, -1)) { diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index 6a43938f72..4ea698c8e2 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -155,7 +155,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBrk = new mDoExt_brkAnm(); + a_this->mpBrk = JKR_NEW mDoExt_brkAnm(); if (!a_this->mpBrk) { return 0; } @@ -168,7 +168,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpDBgW = new dBgW(); + a_this->mpDBgW = JKR_NEW dBgW(); if (!a_this->mpDBgW) { return 0; } diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index dbe848e6d3..dcccb14c68 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -1603,7 +1603,7 @@ static int CallbackCreateHeap(fopAc_ac_c* i_this) { OS_REPORT("BGSV SET 1!\n"); - a_this->mpBgW = new dBgWSv(); + a_this->mpBgW = JKR_NEW dBgWSv(); if (a_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index 9744a71b1e..fd96759686 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -174,7 +174,7 @@ static int useHeapInit(fopAc_ac_c* actor) { return 0; } if (i_this->home.angle.x == 0) { - i_this->mBgW = new dBgW(); + i_this->mBgW = JKR_NEW dBgW(); if (i_this->mBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index 870dd108d8..0eb34c08d5 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -162,7 +162,7 @@ int daObjCBlk_c::CreateHeap() { if (model1 == NULL) { return 0; } - chains = new chain_s[6]; + chains = JKR_NEW chain_s[6]; if (chains == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index a6f8fc56bb..a94e8ec387 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -54,7 +54,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { int daObjCHO_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("I_Cho", 10); - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Cho", 6), 2, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000284); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -62,7 +62,7 @@ int daObjCHO_c::CreateHeap() { } J3DModel* model = mpMorf->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -78,7 +78,7 @@ int daObjCHO_c::CreateHeap() { } } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index b7805ef4ac..ac07b447f1 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -168,7 +168,7 @@ int daObjCwall_c::CreateHeap() { if (mWallModel == NULL) { return 0; } - mChains = new chain_s[6]; + mChains = JKR_NEW chain_s[6]; if (mChains == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 84446f5cb3..47632f1089 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -55,7 +55,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { int daObjDAN_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("I_Dan", 11); - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, static_cast(dComIfG_getObjectRes("I_Dan", 8)), J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000284); @@ -64,7 +64,7 @@ int daObjDAN_c::CreateHeap() { } J3DModel* model = mpMorf->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -82,7 +82,7 @@ int daObjDAN_c::CreateHeap() { } } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } @@ -94,7 +94,7 @@ int daObjDAN_c::CreateHeap() { return 0; } } else { - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); J3DAnmTextureSRTKey* tex_anm = static_cast(dComIfG_getObjectRes("I_Dan", 19)); if (!mpBtkAnm->init(model->getModelData(), tex_anm, TRUE, diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index 69123a477a..1156cbb4cd 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -223,7 +223,7 @@ int daObjDmElevator_c::CreateHeap() { if (mpSwitchModel == NULL) { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW != NULL && mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_sw_arcName, 8), 1, &mMtx) == 0) { diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index c85d1c8f94..d54c35712f 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -135,7 +135,7 @@ int daObjE_CREATE_c::Execute() { int daObjE_CREATE_c::Delete() { if (mActorList != NULL) { - delete[] mActorList; + JKR_DELETE_ARRAY(mActorList); } return 1; @@ -234,7 +234,7 @@ int daObjE_CREATE_c::create() { mActivateSw = fopAcM_GetParam(this) >> 8; mDeactivateSw = fopAcM_GetParam(this) >> 0x10; - mActorList = new u32[mEnemyNum]; + mActorList = JKR_NEW u32[mEnemyNum]; if (mActorList == NULL) { return cPhs_ERROR_e; diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index 52f864d150..981b429fff 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -124,7 +124,7 @@ int daObjFan_c::CreateHeap() { if (mModel == NULL) { return 0; } - field_0x5ac = new dBgW(); + field_0x5ac = JKR_NEW dBgW(); if (field_0x5ac == NULL || field_0x5ac->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName[field_0xad4], l_dzb3[field_0xad4]), 1, &mBgMtx)) diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index a61b60bf5b..1af70c33c3 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -115,13 +115,13 @@ int daObjFPillar2_c::CreateHeap() { } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 11); JUT_ASSERT(377, pbtk != NULL); - mBtk = new mDoExt_btkAnm(); + mBtk = JKR_NEW mDoExt_btkAnm(); if (mBtk == NULL || !mBtk->init(modelData, pbtk, 1, 2, 1.0f, 0, -1)) { return 0; } J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5); JUT_ASSERT(389, pbck != NULL); - mBck = new mDoExt_bckAnm(); + mBck = JKR_NEW mDoExt_bckAnm(); if (mBck == NULL || !mBck->init(pbck, 1, 0, 1.0f, 0, -1, false)) { return 0; } diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index e3de14f9b4..061032544d 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -58,7 +58,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBgW = new dBgW(); + a_this->mpBgW = JKR_NEW dBgW(); if (a_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index 48f11e1c1d..d4717e7706 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -220,7 +220,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - i_this->mpBgW = new dBgW(); + i_this->mpBgW = JKR_NEW dBgW(); if (i_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 7f6704af47..a3e279eaa5 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -75,7 +75,7 @@ int daObjGWall_c::CreateHeap() { return 0; } J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 7); - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL || mpBtkAnm->init(model_data, btk, 1, 2, 1.0, 0, -1) == 0) { diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 80513d1bc1..8280b387dd 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -65,7 +65,7 @@ int daObjGWall2_c::CreateHeap() { return 0; } J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 8); - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL || mpBtkAnm->init(model_data, btk, 1, 2, 1.0f, 0, -1) == 0) { diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index 238099a0f6..9867c5dd54 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -130,7 +130,7 @@ static int useHeapInit(fopAc_ac_c* actor) { if (i_this->mModel == NULL) { return 0; } - i_this->mBtk = new mDoExt_btkAnm(); + i_this->mBtk = JKR_NEW mDoExt_btkAnm(); if (i_this->mBtk == NULL) { return 0; } @@ -139,7 +139,7 @@ static int useHeapInit(fopAc_ac_c* actor) { if (i_this->mBtk->init(i_this->mModel->getModelData(), anmTexture, 1, 2, 1.0f, 0, -1) == 0) { return 0; } - i_this->mBrk = new mDoExt_brkAnm(); + i_this->mBrk = JKR_NEW mDoExt_brkAnm(); if (i_this->mBrk== NULL) { return 0; } @@ -148,7 +148,7 @@ static int useHeapInit(fopAc_ac_c* actor) { if (i_this->mBrk->init(i_this->mModel->getModelData(), anmTevKey, 1, 2, 0.0f, 0, -1) == 0) { return 0; } - i_this->mpBgW = new dBgW(); + i_this->mpBgW = JKR_NEW dBgW(); if (i_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index 9ac731d7ac..79a557db53 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -377,7 +377,7 @@ int daObj_GrA_c::CreateHeap() { aMdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[1]], l_bmdGetParamList[0]); JUT_ASSERT(854, NULL != aMdlData_p); u32 reg_r25 = 0x11020284; - mpModelMorf = new mDoExt_McaMorfSO(aMdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, reg_r25); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(aMdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, reg_r25); if (mpModelMorf != NULL && mpModelMorf->getModel() == NULL) { mpModelMorf->stopZelAnime(); mpModelMorf = NULL; diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index e1f42e611b..cc6d6afbbe 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -38,7 +38,7 @@ int daObjHFtr_c::createHeap() { return 0; } - field_0x5a4 = new dBgW(); + field_0x5a4 = JKR_NEW dBgW(); if (field_0x5a4 == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 43a078154c..d87acfbd48 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -312,7 +312,7 @@ int daObjIceBlk_c::CreateHeap() { return 0; } - mpIceBgW = new dBgW(); + mpIceBgW = JKR_NEW dBgW(); if (mpIceBgW != NULL && !mpIceBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 11), dBgW::MOVE_BG_e, &mBgMtx)) { diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index f146c0da91..873f5058fb 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -157,7 +157,7 @@ int daObjIceLeaf_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); JUT_ASSERT(0x196, pbck != NULL); - mpBck = new mDoExt_bckAnm(); + mpBck = JKR_NEW mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { return 0; } diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index fe3219ee6c..cebb15bebc 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -117,7 +117,7 @@ static int useHeapInit(fopAc_ac_c* i_actor) { return 0; } - i_this->mpBgW = new dBgW(); + i_this->mpBgW = JKR_NEW dBgW(); if (i_this->mpBgW == NULL) { return 0; } @@ -136,7 +136,7 @@ static int useHeapInit(fopAc_ac_c* i_actor) { return 0; } - i_this->mpBtkAnm = new mDoExt_btkAnm(); + i_this->mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (i_this->mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 7a298a1aad..e8f7dc9153 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -61,7 +61,7 @@ int daObjKABUTO_c::CreateHeap() { } else { model_data = static_cast(dComIfG_getObjectRes("Kab_m", 11)); } - mpMorf = new mDoExt_McaMorfSO(model_data, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(model_data, NULL, NULL, static_cast(dComIfG_getObjectRes("Kab_m", 7)), 2, 1.5f, 0, -1, &mCreatureSound, 0, 0x11000284); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -69,7 +69,7 @@ int daObjKABUTO_c::CreateHeap() { } J3DModel* model = mpMorf->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -85,7 +85,7 @@ int daObjKABUTO_c::CreateHeap() { } } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 22db0ab5cb..6bba8ca379 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -90,14 +90,14 @@ int daObjKAG_c::CreateHeap() { JUT_ASSERT(246, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), 2, 1.0f, 0, -1, &mSound, 0, 0x11000284); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kag", BCK_KAG_FLY), 2, 1.0f, 0, -1, &mSound, 0, 0x11000284); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; } J3DModel* model = mpModelMorf->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -106,7 +106,7 @@ int daObjKAG_c::CreateHeap() { return 0; } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index 41cf54d343..90892c6eac 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -64,14 +64,14 @@ int daObjKAM_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kam", 10); JUT_ASSERT(0x103, modelData != NULL); } - mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorfSO = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kam", 7), 2, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000284); if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) { return 0; } J3DModel* model = mpMorfSO->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -91,7 +91,7 @@ int daObjKAM_c::CreateHeap() { } } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 17316f9618..e4b38e9ee4 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -87,14 +87,14 @@ int daObjKAT_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kat", 9); JUT_ASSERT(0x136, modelData != NULL); mpMorfSO = - new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Kat", 6), + JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Kat", 6), 2, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000284); if (mpMorfSO == NULL || mpMorfSO->getModel() == NULL) { return 0; } J3DModel* model = mpMorfSO->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -113,7 +113,7 @@ int daObjKAT_c::CreateHeap() { } } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index 968d2a073e..833c5cfe82 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -451,7 +451,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } a_this->model = i_this->mModel; - i_this->mBgw = new dBgW(); + i_this->mBgw = JKR_NEW dBgW(); if (i_this->mBgw == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index 73733ebfed..296f222ee9 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -681,7 +681,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } } else { - a_this->lock_modelMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes(a_this->arcname, bmd_d[a_this->arg0]), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, mdl_f[a_this->arg0], 0x11000084); + a_this->lock_modelMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes(a_this->arcname, bmd_d[a_this->arg0]), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, mdl_f[a_this->arg0], 0x11000084); if (a_this->lock_modelMorf == NULL || a_this->lock_modelMorf->getModel() == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 8866ac7a4c..7f2d395f99 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -305,7 +305,7 @@ int daObjKGate_c::CreateHeap() { } } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL || mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateDzbIdx[mNameArg]), cBgW::MOVE_BG_e, &field_0xae8)) diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index cec0fa740c..95f68c5a3f 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -110,7 +110,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { obj_ki_class* _this = static_cast(i_this); _this->mpMorf = - new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_Ki", ki_bmd[_this->mBmdIdx]), + JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_Ki", ki_bmd[_this->mBmdIdx]), NULL, NULL, NULL, 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { return 0; @@ -125,7 +125,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { model->getModelData()->getJointNodePointer(i)->setCallBack(nodeCallBack); } - _this->mpBgW = new dBgW(); + _this->mpBgW = JKR_NEW dBgW(); if (_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index cedff61cf8..41ee61bbf7 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -189,7 +189,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - i_this->mKitas[i].mBgW = new dBgW(); + i_this->mKitas[i].mBgW = JKR_NEW dBgW(); if (i_this->mKitas[i].mBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index 221e4f8812..fc641bc40f 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -110,8 +110,8 @@ static const int l_dzbidx[] = {9}; // force dCcD_Sph::~dCcD_Sph to be emitted earlier than it otherwise would static void dummy() { - delete (dCcD_Sph*)NULL; - delete (dCcD_Cyl*)NULL; + JKR_DELETE((dCcD_Sph*)NULL); + JKR_DELETE((dCcD_Cyl*)NULL); } cPhs_Step daObjKLift00_c::create1st() { @@ -251,14 +251,14 @@ int daObjKLift00_c::CreateHeap() { mpChainBase = NULL; } - mChainPositions = new ChainPos[mNumChains]; + mChainPositions = JKR_NEW ChainPos[mNumChains]; if(!mChainPositions) return 0; mChainModelData = static_cast(dComIfG_getObjectRes(l_arcName, l_bmdidx[1])); JUT_ASSERT(334, mChainModelData != NULL); - mChainMdlObjs = new dMdl_obj_c[mNumChainModels]; + mChainMdlObjs = JKR_NEW dMdl_obj_c[mNumChainModels]; return mChainMdlObjs ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index a484837a78..2923578977 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -264,7 +264,7 @@ int daObjKshtr_c::CreateHeap() { JUT_ASSERT(446, anm != NULL); - mpBckAnm = new mDoExt_bckAnm(); + mpBckAnm = JKR_NEW mDoExt_bckAnm(); if (mpBckAnm == NULL || mpBckAnm->init(anm, 1, 0, 1.0f, 0, -1, false) == 0) { return 0; } diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 7d3f399ea6..e31e1c12c0 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -80,14 +80,14 @@ int daObjKUW_c::CreateHeap() { JUT_ASSERT(259, modelData != NULL); } - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kuw", 7), 2, 1.0f, 0, -1, &mSound, 0, 0x11000284); + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kuw", 7), 2, 1.0f, 0, -1, &mSound, 0, 0x11000284); if (mpMorf == NULL || mpMorf->getModel() == NULL) { return 0; } J3DModel* model = mpMorf->getModel(); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL) { return 0; } @@ -105,7 +105,7 @@ int daObjKUW_c::CreateHeap() { } } - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index b861f43bab..03e1da7cd9 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -143,7 +143,7 @@ int daObjKWheel01_c::CreateHeap() { mKLiftCollisions[i] = NULL; } else { - mKLiftCollisions[i] = new (dBgW); + mKLiftCollisions[i] = JKR_NEW (dBgW); if(!mKLiftCollisions[i]) return 0; diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index e5a6923793..54a210cea2 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -194,7 +194,7 @@ int daObjLdy_c::createHeap() { J3DAnmTextureSRTKey* key = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, "J_Sentaku.btk"); - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); int initResult = mpBtkAnm->init(modelData, key, 1, 2, 1.0f, 0, -1); if (initResult == 0) { return 0; diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index 2928266677..9dff68dfeb 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -120,7 +120,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBgW = new dBgW(); + a_this->mpBgW = JKR_NEW dBgW(); if (a_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index 43a3e3d76f..1b3d94ceb1 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -114,7 +114,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBWaterBtk = new mDoExt_btkAnm(); + a_this->mpBWaterBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpBWaterBtk == NULL) { return 0; } @@ -126,7 +126,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBWaterBgW = new dBgW(); + a_this->mpBWaterBgW = JKR_NEW dBgW(); if (a_this->mpBWaterBgW == NULL) { return 0; } @@ -144,7 +144,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpOctHibiBgW = new dBgW(); + a_this->mpOctHibiBgW = JKR_NEW dBgW(); if (a_this->mpOctHibiBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index b6e1a5ce70..c087f9859c 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -45,7 +45,7 @@ static int const l_dzbIdx2[] = {4, 4}; static char* l_arcName[] = {"Obj_saka", "Obj_saka2"}; int daObjLv3saka_c::CreateHeap() { - mpBgW2 = new dBgW(); + mpBgW2 = JKR_NEW dBgW(); if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName[getType()], l_dzbIdx2[getType()]), 1, &mBgMtx)) diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 918cd4da77..3c1638633e 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -213,17 +213,17 @@ int daObjLv4Chan_c::CreateHeap() { return 0; } - mChains[0] = new ChainPos[mChainLengths[0]]; + mChains[0] = JKR_NEW ChainPos[mChainLengths[0]]; if (mChains[0] == NULL) { return 0; } - mChains[1] = new ChainPos[mChainLengths[1]]; + mChains[1] = JKR_NEW ChainPos[mChainLengths[1]]; if (mChains[1] == NULL) { return 0; } - mChains[2] = new ChainPos[mChainLengths[2]]; + mChains[2] = JKR_NEW ChainPos[mChainLengths[2]]; if (mChains[2] == NULL) { return 0; } @@ -231,17 +231,17 @@ int daObjLv4Chan_c::CreateHeap() { mChainModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[1]); JUT_ASSERT(500, mChainModelData != NULL); - mMdls[0] = new dMdl_obj_c[mMdlLengths[0]]; + mMdls[0] = JKR_NEW dMdl_obj_c[mMdlLengths[0]]; if (mMdls[0] == NULL) { return 0; } - mMdls[1] = new dMdl_obj_c[mMdlLengths[1]]; + mMdls[1] = JKR_NEW dMdl_obj_c[mMdlLengths[1]]; if (mMdls[1] == NULL) { return 0; } - mMdls[2] = new dMdl_obj_c[mMdlLengths[2]]; + mMdls[2] = JKR_NEW dMdl_obj_c[mMdlLengths[2]]; if (mMdls[2] == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index 6552b64759..7aa0f51a39 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -49,7 +49,7 @@ int daObjLv4Sand_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 8); JUT_ASSERT(181, pbtk != NULL); - mpBtk = new mDoExt_btkAnm(); + mpBtk = JKR_NEW mDoExt_btkAnm(); if (mpBtk == NULL || !mpBtk->init(modelData, pbtk, TRUE, 2, 1.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index e0e966a8df..22d8f4a64c 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -77,7 +77,7 @@ int daLv6SwGate_c::CreateHeap() { if (mModel2 == NULL) { return FALSE; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW != NULL && !mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("L6SwGate", 7), 0x1, &mMtx)) { mpBgW->SetCrrFunc(dBgS_MoveBGProc_TypicalRotY); } else { diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index 2ac61affec..269a4f24f6 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -56,7 +56,7 @@ int daLv6SzGate_c::CreateHeap() { return 0; } - field_0x5e8 = new dBgW(); + field_0x5e8 = JKR_NEW dBgW(); if (field_0x5e8 != NULL && !field_0x5e8->Set(static_cast(dComIfG_getObjectRes("L6SzGate", 15)), 1, &mMtx)) diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 578feaecf6..e774f505b4 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -88,7 +88,7 @@ int daTenbin_c::CreateHeap() { if (mModel2 == NULL) { return FALSE; } - mdBgW = new dBgW(); + mdBgW = JKR_NEW dBgW(); if (mdBgW != NULL && !mdBgW->Set((cBgD_t*)dComIfG_getObjectRes("L6Tenbin", 8), 1, &field_0x620)) { mdBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); } else { diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 2945ce8fce..15dea7088d 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -179,7 +179,7 @@ int daObjL6Bm_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM_ON); JUT_ASSERT(648, pbtk != NULL); - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL || mpBtkAnm->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { return 0; } @@ -191,14 +191,14 @@ int daObjL6Bm_c::CreateHeap() { pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM); JUT_ASSERT(666, pbtk != NULL); - mpBtkAnm2 = new mDoExt_btkAnm(); + mpBtkAnm2 = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm2 == NULL || mpBtkAnm2->init(modelData, pbtk, 1, 2, 1.0f, 0, -1) == 0) { return 0; } J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_EF_BIMOBEAM); JUT_ASSERT(678, pbck != NULL); - mBeamBck = new mDoExt_bckAnm(); + mBeamBck = JKR_NEW mDoExt_bckAnm(); if (mBeamBck == NULL || mBeamBck->init(pbck, 1, 2, 1.0f, 0, -1, false) == 0) { return 0; } diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index b56db1563e..e8e6c503d7 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -245,7 +245,7 @@ int daObjLv6Bm_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, BRK_BM6_SERCH); JUT_ASSERT(633, pbrk != NULL); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || mpBrkAnm->init(modelData, pbrk, 1, 0, 1.0f, 0, -1) == 0) { return 0; } @@ -257,7 +257,7 @@ int daObjLv6Bm_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_BM6_UP); JUT_ASSERT(651, pbck != NULL); - mpBckAnm = new mDoExt_bckAnm(); + mpBckAnm = JKR_NEW mDoExt_bckAnm(); if (mpBckAnm == NULL || mpBckAnm->init(pbck, 1, 0, 1.0f, 0, -1, false) == 0) { return 0; } @@ -271,7 +271,7 @@ int daObjLv6Bm_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOL6_OFF); JUT_ASSERT(680, pbtk != NULL); - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL || mpBtkAnm->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { return 0; } @@ -284,14 +284,14 @@ int daObjLv6Bm_c::CreateHeap() { pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOL6); JUT_ASSERT(699, pbtk != NULL); - mpBtkAnm2 = new mDoExt_btkAnm(); + mpBtkAnm2 = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm2 == NULL || mpBtkAnm2->init(modelData, pbtk, 1, 2, 1.0f, 0, -1) == 0) { return 0; } J3DAnmTransform* pbck2 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_EF_BIMOL6); JUT_ASSERT(711, pbck != NULL); - mpBckAnm2 = new mDoExt_bckAnm(); + mpBckAnm2 = JKR_NEW mDoExt_bckAnm(); if (mpBckAnm2 == NULL || mpBckAnm2->init(pbck2, 1, 2, 1.0f, 0, -1, false) == 0) { return 0; } diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 6d4b35cec5..3e5632dcbd 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -196,13 +196,13 @@ int daObjLv7Brg_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[mKind], l_bck[i]); JUT_ASSERT(411, pbck != NULL); - mpBck[i] = new mDoExt_bckAnm(); + mpBck[i] = JKR_NEW mDoExt_bckAnm(); if (mpBck[i] == NULL || !mpBck[i]->init(pbck, 1, 0, 1.0f, 0, -1, 0)) { return 0; } } - mpBgw2 = new dBgW(); + mpBgw2 = JKR_NEW dBgW(); if (mpBgw2 != NULL && !mpBgw2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName[mKind], 0xE), 1, &mBgMtx)) { mpBgw2->SetCrrFunc(dBgS_MoveBGProc_Typical); } else { diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index e2531f8d34..b6a1882226 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -261,7 +261,7 @@ int daObjMarm_c::CreateHeap() { return FALSE; } - mpBgW1 = new dBgW(); + mpBgW1 = JKR_NEW dBgW(); if (mpBgW1 == NULL || mpBgW1->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 22), cBgW::MOVE_BG_e, &mBgMtx1)) { @@ -287,7 +287,7 @@ int daObjMarm_c::CreateHeap() { } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 15); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(model_data, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { @@ -296,7 +296,7 @@ int daObjMarm_c::CreateHeap() { mpBrkAnm->setPlaySpeed(1.0f); J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 18); - mpBtkAnm = new mDoExt_btkAnm(); + mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpBtkAnm == NULL || !mpBtkAnm->init(model_data, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { @@ -304,7 +304,7 @@ int daObjMarm_c::CreateHeap() { } mpBtkAnm->setPlaySpeed(1.0f); - mpBgW2 = new dBgW(); + mpBgW2 = JKR_NEW dBgW(); if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 23), cBgW::MOVE_BG_e, &mBgMtx3)) { @@ -315,8 +315,8 @@ int daObjMarm_c::CreateHeap() { field_0xA28 = 2; field_0xA29 = 5; - mpRope1 = new mDoExt_3DlineMat1_c(); - mpRope2 = new mDoExt_3DlineMat1_c(); + mpRope1 = JKR_NEW mDoExt_3DlineMat1_c(); + mpRope2 = JKR_NEW mDoExt_3DlineMat1_c(); if (mpRope1 == NULL || mpRope2 == NULL) { return FALSE; } diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index 8c36b8bd2c..0d10e4c836 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -155,7 +155,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mBrk = new mDoExt_brkAnm(); + a_this->mBrk = JKR_NEW mDoExt_brkAnm(); if (a_this->mBrk == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index 7c7a1a15b4..2baf2058b7 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -145,7 +145,7 @@ int daObjMHole_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[mKind], l_brk[mKind]); JUT_ASSERT(360, pbrk != NULL); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { @@ -156,7 +156,7 @@ int daObjMHole_c::CreateHeap() { { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[mKind], l_btk1[mKind]); JUT_ASSERT(375, pbtk != NULL); - mpBtk1Anm = new mDoExt_btkAnm(); + mpBtk1Anm = JKR_NEW mDoExt_btkAnm(); if (mpBtk1Anm == NULL || !mpBtk1Anm->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { @@ -168,7 +168,7 @@ int daObjMHole_c::CreateHeap() { { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[mKind], l_btk2[mKind]); JUT_ASSERT(391, pbtk != NULL); - mpBtk2Anm = new mDoExt_btkAnm(); + mpBtk2Anm = JKR_NEW mDoExt_btkAnm(); if (mpBtk2Anm == NULL || !mpBtk2Anm->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) { diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index 91076e19a7..6e679cc1e2 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -89,7 +89,7 @@ int daObjMirror6Pole_c::CreateHeap() { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); JUT_ASSERT(327, bck != NULL); - mpBck = new mDoExt_bckAnm(); + mpBck = JKR_NEW mDoExt_bckAnm(); f32 speed = isSwitch() ? 1.0f : 0.0f; diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index 47cec7b99f..3787cd954e 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -204,7 +204,7 @@ int daObjMirrorChain_c::createHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 21); JUT_ASSERT(316, brk != NULL); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, brk, 1, 2, 1.0f, 0, -1)) { return 0; } @@ -230,7 +230,7 @@ int daObjMirrorChain_c::createHeap() { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 9); JUT_ASSERT(344, bck != NULL); - mpBckAnm = new mDoExt_bckAnm(); + mpBckAnm = JKR_NEW mDoExt_bckAnm(); if (mpBckAnm == NULL || !mpBckAnm->init(bck, 1, 2, 1.0f, 0, -1, false)) { return 0; } @@ -238,7 +238,7 @@ int daObjMirrorChain_c::createHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 20); JUT_ASSERT(353, brk != NULL); - mpPortalBrkAnm = new mDoExt_brkAnm(); + mpPortalBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpPortalBrkAnm == NULL || !mpPortalBrkAnm->init(modelData, brk, 1, 0, 1.0f, 0, -1)) { return 0; @@ -254,7 +254,7 @@ int daObjMirrorChain_c::createHeap() { } else { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 8); JUT_ASSERT(367, bck != NULL); - mpBckAnm = new mDoExt_bckAnm(); + mpBckAnm = JKR_NEW mDoExt_bckAnm(); /* dSv_event_flag_c::F_0361 - Arbiter's Grounds - Spun the spinning pillars */ f32 rate = (fopAcM_isSwitch(this, getSwitchNo()) || dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[361])) ? 1.0f : 0.0f; @@ -270,7 +270,7 @@ int daObjMirrorChain_c::createHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 19); JUT_ASSERT(381, brk != NULL); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, brk, 1, 0, 0.0f, 0, -1)) { return 0; diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 112d2f69c0..128708577a 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -18,7 +18,7 @@ int daObjMirrorSand_c::createHeap() { } J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5); - mpBck = new mDoExt_bckAnm(); + mpBck = JKR_NEW mDoExt_bckAnm(); f32 speed; if (isSwitch()) { diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index 5746ad13d1..1bba3330f9 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -44,7 +44,7 @@ int daObjMirrorTable_c::createHeap() { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 10); JUT_ASSERT(123, bck != NULL); - mpTableUpBckAnm = new mDoExt_bckAnm(); + mpTableUpBckAnm = JKR_NEW mDoExt_bckAnm(); f32 rate = isSwitch() ? 1.0f : 0.0f; if (mpTableUpBckAnm == NULL || !mpTableUpBckAnm->init(bck, 1, 0, rate, 0, -1, false)) { return 0; @@ -84,7 +84,7 @@ int daObjMirrorTable_c::createHeap() { J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 25); JUT_ASSERT(160, brk != NULL); - mpStairBrkAnm = new mDoExt_brkAnm(); + mpStairBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpStairBrkAnm == NULL || !mpStairBrkAnm->init(modelData, brk, 1, 0, 1.0f, 0, -1)) { @@ -105,7 +105,7 @@ int daObjMirrorTable_c::createHeap() { J3DAnmTextureSRTKey* btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 28); JUT_ASSERT(187, btk != NULL); - mpLightBtkAnm = new mDoExt_btkAnm(); + mpLightBtkAnm = JKR_NEW mDoExt_btkAnm(); if (mpLightBtkAnm == NULL || !mpLightBtkAnm->init(modelData, btk, 1, 0, 1.0f, 0, -1)) { @@ -118,7 +118,7 @@ int daObjMirrorTable_c::createHeap() { brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 24); JUT_ASSERT(202, brk != NULL); - mpMSquareBrkAnm = new mDoExt_brkAnm(); + mpMSquareBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpMSquareBrkAnm == NULL || !mpMSquareBrkAnm->init(modelData, brk, 1, 0, 1.0f, 0, -1)) { @@ -127,7 +127,7 @@ int daObjMirrorTable_c::createHeap() { bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 9); JUT_ASSERT(210, bck != NULL); - mpMSquareBckAnm = new mDoExt_bckAnm(); + mpMSquareBckAnm = JKR_NEW mDoExt_bckAnm(); if (mpMSquareBckAnm == NULL || !mpMSquareBckAnm->init(bck, 1, 0, 1.0f, 0, -1, false)) { diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index 319bb9746e..6aaa8c81cc 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -1109,7 +1109,7 @@ void daObjMovebox::Act_c::mode_afl() { } static void dummy() { - delete (dBgS_ObjGndChk*)NULL; + JKR_DELETE((dBgS_ObjGndChk*)NULL); } void daObjMovebox::Act_c::mode_proc_call() { diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index db66eeb608..c155cadb5b 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -379,7 +379,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - i_this->mpBgW = new dBgW(); + i_this->mpBgW = JKR_NEW dBgW(); if (i_this->mpBgW == NULL) { return 0; } @@ -392,7 +392,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { i_this->mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); i_this->mpBgW->SetRideCallback(ride_call_back); - i_this->mpBtk = new mDoExt_btkAnm(); + i_this->mpBtk = JKR_NEW mDoExt_btkAnm(); if (i_this->mpBtk == NULL) { return 0; } @@ -401,7 +401,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - i_this->mpBrk = new mDoExt_brkAnm(); + i_this->mpBrk = JKR_NEW mDoExt_brkAnm(); if (i_this->mpBrk == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index 2c7e7ee191..dfdab85bb1 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -90,7 +90,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBrk = new mDoExt_brkAnm(); + a_this->mpBrk = JKR_NEW mDoExt_brkAnm(); if (a_this->mpBrk == NULL) { return 0; } @@ -102,7 +102,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBtk = new mDoExt_btkAnm(); + a_this->mpBtk = JKR_NEW mDoExt_btkAnm(); if (a_this->mpBtk == NULL) { return 0; } @@ -114,7 +114,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBgW = new dBgW(); + a_this->mpBgW = JKR_NEW dBgW(); if (a_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index 0537544cf5..e2153b4bd8 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -197,7 +197,7 @@ daObjIsuChild_c::daObjIsuChild_c() { daObjIsuChild_c::~daObjIsuChild_c() {} int daObjIsuChild_c::createHeap() { - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 03284cf3d9..7631aa49a2 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -61,14 +61,14 @@ static int const l_nan_btk_index[2] = { inline int daObjNAN_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("I_Nan", 9); JUT_ASSERT(254, modelData != NULL); - mMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Nan", 6), 2, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000284); if (mMorf == NULL || mMorf->getModel() == NULL) { return 0; } J3DModel* model = mMorf->getModel(); - mBrk = new mDoExt_brkAnm(); + mBrk = JKR_NEW mDoExt_brkAnm(); if (mBrk == NULL) { return 0; } @@ -77,7 +77,7 @@ inline int daObjNAN_c::CreateHeap() { if (mBrk->init(model->getModelData(), anmRegKey, 1, 2, 1.0f, 0, -1) == 0) { return 0; } - mBtk = new mDoExt_btkAnm(); + mBtk = JKR_NEW mDoExt_btkAnm(); if (mBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index b1f99c034e..b79a3f9eb2 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -340,7 +340,7 @@ static int daObjOCTHASHI_IsDelete(daObjOCTHASHI_c* param_0) { } static void dummy() { - delete (cCcD_GStts*)NULL; + JKR_DELETE((cCcD_GStts*)NULL); } int daObjOCTHASHI_c::Create() { diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index ac339bb52f..891cd048cf 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -59,7 +59,7 @@ int daObjOnsen_c::CreateHeap() { J3DAnmTextureSRTKey* srtKey = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[mType], l_btk[mType]); - mpBtk = new mDoExt_btkAnm(); + mpBtk = JKR_NEW mDoExt_btkAnm(); if (!mpBtk || !mpBtk->init(modelData, srtKey, 1, 2, 1.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index 9218105670..64e45d1d1a 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -218,7 +218,7 @@ int daObjOnCloth_c::createHeap() { JUT_ASSERT(420, pbtk != NULL); - mBtkAnm = new mDoExt_btkAnm(); + mBtkAnm = JKR_NEW mDoExt_btkAnm(); JUT_ASSERT(424, mBtkAnm); diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index 6132e10d7c..8b479251fb 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -65,7 +65,7 @@ int daObjPDwall_c::CreateHeap() { } for (int i = 0; i < 9; i++) { - mpBgw[i] = new dBgW(); + mpBgw[i] = JKR_NEW dBgW(); if (mpBgw[i] == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index 35943067e0..69e6e432e3 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -60,7 +60,7 @@ int daObjPicture_c::createHeap() { break; } - mpBgw[i] = new dBgW(); + mpBgw[i] = JKR_NEW dBgW(); if (mpBgw[i] == NULL) { return 0; } @@ -97,7 +97,7 @@ int daObjPicture_c::createHeap() { } for (int i = 0; i < 2; i++) { - mpRopeMat[i] = new mDoExt_3DlineMat1_c(); + mpRopeMat[i] = JKR_NEW mDoExt_3DlineMat1_c(); if (mpRopeMat[i] == NULL) { OS_REPORT_ERROR("止め具ロープ：３Ｄラインマテリアルクラス生成失敗\n"); return 0; diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index 74a4f89de3..f660e6114e 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -90,7 +90,7 @@ int daPoTbox_c::CreateHeap() { res = mBrk.init(modelData2, (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_type[mStat], 0xF), 1, 0, 1.0f, 0, -1); JUT_ASSERT(244, res == TRUE); - mpBgw2 = new dBgW(); + mpBgw2 = JKR_NEW dBgW(); if (mpBgw2 == NULL || mpBgw2->Set((cBgD_t*)dComIfG_getObjectRes(l_type[mStat], 0x16), 1, &mBgMtx)) { mpBgw2 = NULL; return 0; diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index 024b545284..13d2b8c54b 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -290,7 +290,7 @@ int daObjRgate_c::CreateHeap() { } } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL || mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 10), cBgW::MOVE_BG_e, &field_0xae4)) { diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index c50e0ed155..967b214ba4 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -359,13 +359,13 @@ int daObjRBridge_c::CreateHeap() { if (!fopAcM_isSwitch(this, getSwbit2()) && !fopAcM_isSwitch(this, getSwbit())) { mRopeSegmentNum = 10; - field_0xb04 = new cXyz[mRopeSegmentNum]; + field_0xb04 = JKR_NEW cXyz[mRopeSegmentNum]; if (field_0xb04 == NULL) { return 0; } for (int i = 0; i < 2; i++) { - mpLineMat[i] = new mDoExt_3DlineMat1_c(); + mpLineMat[i] = JKR_NEW mDoExt_3DlineMat1_c(); if (mpLineMat[i] == NULL) { // "Rope Stop: 3D line material class creation failure" OS_REPORT_ERROR("止め具ロープ：３Ｄラインマテリアルクラス生成失敗\n"); diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index bee843be0f..bb9ce07e06 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -78,7 +78,7 @@ int daRotBridge_c::CreateHeap() { u8 temp_r25 = (fopAcM_GetParam(this) & 0xF000) >> 0xC; if (mType == 1 && temp_r25 != 15) { - mpBgW2 = new dBgW(); + mpBgW2 = JKR_NEW dBgW(); if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_resNameIdx[mType], 0xB), 1, &mMtx)) { mpBgW2 = NULL; return 0; diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 72f7217102..452ff01684 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -85,7 +85,7 @@ int daRotTrap_c::CreateHeap() { return 0; } - mpBgW2 = new dBgW(); + mpBgW2 = JKR_NEW dBgW(); if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes("P_kama", 8), 1, &mBgMtx)) { mpBgW2 = NULL; return 0; diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 32112c3135..802697e8d0 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -92,12 +92,12 @@ int daObjRotStair_c::CreateHeap() { } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, l_wtr_btk[i]); JUT_ASSERT(245, pbtk != NULL); - mBtks[i] = new mDoExt_btkAnm(); + mBtks[i] = JKR_NEW mDoExt_btkAnm(); if (mBtks[i] == NULL || mBtks[i]->init(modelData, pbtk, 1, 2, 1.0f, 0, -1) == 0) { return 0; } } - mWaterBgw = new dBgW(); + mWaterBgw = JKR_NEW dBgW(); if (mWaterBgw == NULL || mWaterBgw->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 0xf), 1, &mBgMtx) != 0) { mWaterBgw = NULL; return 0; diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index d0fbc480af..c55e56f274 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -144,8 +144,8 @@ inline daObjItaRope_c::~daObjItaRope_c() { #if DEBUG M_hio.dt(); #endif - delete [] mRopes; - delete [] mSakuitas; + JKR_DELETE_ARRAY(mRopes); + JKR_DELETE_ARRAY(mSakuitas); if (field_0x636 != 0) { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd"); @@ -267,13 +267,13 @@ void daObjItaRope_c::setNormalRopePos() { inline int daObjItaRope_c::createHeap() { mRopes = NULL; - mRopes = new RopeWork_c[field_0x635 - 2]; + mRopes = JKR_NEW RopeWork_c[field_0x635 - 2]; if (mRopes == NULL) { return 0; } mSakuitas = NULL; - mSakuitas = new Sakuita_c[field_0x635 - 2]; + mSakuitas = JKR_NEW Sakuita_c[field_0x635 - 2]; if (mSakuitas == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 475dddbe5d..5821ae3103 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -309,7 +309,7 @@ int daSCannon_c::createHeap() { if (mIsPortal != 0) { J3DAnmTextureSRTKey* a_btk_p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName_Crash, 9); JUT_ASSERT(606, a_btk_p != NULL); - mpCrashBtk = new mDoExt_btkAnm(); + mpCrashBtk = JKR_NEW mDoExt_btkAnm(); if (mpCrashBtk == NULL || !mpCrashBtk->init(a_model_data_p, a_btk_p, 1, 0, 0.0f, 0, -1)) { return 0; } @@ -323,14 +323,14 @@ int daSCannon_c::createHeap() { a_btk_p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName_Ptl, 0xC); JUT_ASSERT(642, a_btk_p != NULL); - mpPtlBtk = new mDoExt_btkAnm(); + mpPtlBtk = JKR_NEW mDoExt_btkAnm(); if (mpPtlBtk == NULL || !mpPtlBtk->init(a_ptl_model_data_p, a_btk_p, 1, 2, 0.0f, 0, -1)) { return 0; } } } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index d682aec9cb..fcd7f2b6cd 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -410,7 +410,7 @@ int daSCannonCrs_c::createHeap() { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_scannon_ten.cpp b/src/d/actor/d_a_obj_scannon_ten.cpp index 6d9025f079..a60d464ede 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -54,7 +54,7 @@ int daObjSCannonTen_c::createHeap() { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 490005649b..1166a1f934 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -246,7 +246,7 @@ int daObj_Sekizoa_c::CreateHeap() { if (modelData == NULL) { return 0; } - mpMorf[0] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000284); if (mpMorf[0] == NULL || mpMorf[0]->getModel() == NULL) { @@ -258,7 +258,7 @@ int daObj_Sekizoa_c::CreateHeap() { return 0; } - mpMorf[1] = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, + mpMorf[1] = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000284); if (mpMorf[1] == NULL || mpMorf[1]->getModel() == NULL) { return 0; @@ -293,7 +293,7 @@ int daObj_Sekizoa_c::CreateHeap() { if (modelData == NULL) { return 0; } - mpMcaMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, + mpMcaMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, -1, 1.0f, 0, -1, NULL, 0x80000, 0x11000284); if (mpMcaMorf == NULL || mpMcaMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index 1eab4fb32c..3db70885a5 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -130,7 +130,7 @@ int daSmWStone_c::createHeap() { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 02671f7c3a..b0a514f0f7 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -937,7 +937,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } for (int i = 0; i < 2; i++) { - i_this->mBgW[i] = new dBgW(); + i_this->mBgW[i] = JKR_NEW dBgW(); if (i_this->mBgW[i] == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index 601e09e3ca..6a2fd2b856 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -64,14 +64,14 @@ int daObj_SSDrink_c::CreateHeap() { pbtp = (J3DAnmTexPattern*)dComIfG_getObjectRes(l_resFileName, "al_bottle.btp"); JUT_ASSERT(230, pbtp != NULL); - mpBtpAnm = new mDoExt_btpAnm(); + mpBtpAnm = JKR_NEW mDoExt_btpAnm(); if (mpBtpAnm == NULL || !mpBtpAnm->init(mdlData_p, pbtp, 1, 2, 1.0f, 0, -1)) { return 0; } pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_resFileName, "al_bottle.brk"); JUT_ASSERT(242, pbrk != NULL); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(mdlData_p, pbrk, 1, 2, 1.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index 4f5209e7bc..b9f33151ad 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -661,7 +661,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { if (i_this->field_0x570 == 8) { for (int i = 0; i < 8; i++) { i_this->field_0x5a8[i].mpModelMorf = - new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_ksw", 17), NULL, NULL, + JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Npc_ksw", 17), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Npc_ksw", 13), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index ffed7cbaa2..af9237be3c 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -139,7 +139,7 @@ int daObjSwBallA_c::CreateHeap() { } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 7); JUT_ASSERT(381, pbtk != NULL); - field_0x588 = new mDoExt_btkAnm(); + field_0x588 = JKR_NEW mDoExt_btkAnm(); if (field_0x588 == NULL || field_0x588->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { return 0; } diff --git a/src/d/actor/d_a_obj_swBallB.cpp b/src/d/actor/d_a_obj_swBallB.cpp index 94c837e986..7b53115c02 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -167,7 +167,7 @@ int daObjSwBallB_c::CreateHeap() { } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 9); JUT_ASSERT(441, pbtk != NULL); - field_0x588 = new mDoExt_btkAnm(); + field_0x588 = JKR_NEW mDoExt_btkAnm(); if (field_0x588 == NULL || field_0x588->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { return 0; } diff --git a/src/d/actor/d_a_obj_swBallC.cpp b/src/d/actor/d_a_obj_swBallC.cpp index 7461739c8e..e4ceb8e3ee 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -104,7 +104,7 @@ int daObjSwBallC_c::CreateHeap() { } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 10); JUT_ASSERT(441, pbtk != NULL); - field_0x574 = new mDoExt_btkAnm(); + field_0x574 = JKR_NEW mDoExt_btkAnm(); if (field_0x574 == NULL || field_0x574->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { return 0; } diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index 3938dc5761..70ce64e101 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -197,7 +197,7 @@ int daObjSwChain_c::Create() { } int daObjSwChain_c::CreateHeap() { - mChains = new chain_s[mChainNum + 1]; + mChains = JKR_NEW chain_s[mChainNum + 1]; if (mChains == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 8b75c9b5db..69811270ce 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -161,7 +161,7 @@ int daObjSwHang_c::CreateHeap() { if (mpModel == NULL) { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL || mpBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName[mType], l_dzbIdx[mType]), 1, &field_0x738) != 0) @@ -489,7 +489,7 @@ static int daObjSwHang_MoveBGDraw(daObjSwHang_c* i_this) { static void dummy() { ((dEvLib_callback_c*)NULL)->eventStart(); - delete (cCcD_GStts*)NULL; + JKR_DELETE((cCcD_GStts*)NULL); } static actor_method_class daObjSwHang_METHODS = { diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index f4866be6ad..f0cd11d1d0 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -91,7 +91,7 @@ bool daObjSwpush::Act_c::create_heap() { JUT_ASSERT(569, bg_data != NULL); bool bVar2 = false; - mpBgW = new dBgWSv(); + mpBgW = JKR_NEW dBgWSv(); if (mpBgW != NULL && mpBgW->Set(bg_data, 0) == 0) { bVar2 = true; } diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index 58a3286517..e97638bbaa 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -160,7 +160,7 @@ bool daObjSwpush2::Act_c::create_heap() { { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(getArcName(), getNmlBrkName()); JUT_ASSERT(452, pbrk != NULL); - mpNmlBrk = new mDoExt_brkAnm(); + mpNmlBrk = JKR_NEW mDoExt_brkAnm(); if (mpNmlBrk == NULL || !mpNmlBrk->init((J3DModelData*)model_data, pbrk, 1, 2, 1.0f, 0, -1)) { return 0; } @@ -172,7 +172,7 @@ bool daObjSwpush2::Act_c::create_heap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), getNmlBtkName()); JUT_ASSERT(465, pbtk != NULL); - mpNmlBtk = new mDoExt_btkAnm(); + mpNmlBtk = JKR_NEW mDoExt_btkAnm(); if (mpNmlBtk == NULL || !mpNmlBtk->init((J3DModelData*)model_data, pbtk, 1, 2, 1.0f, 0, -1)) { return 0; } @@ -183,7 +183,7 @@ bool daObjSwpush2::Act_c::create_heap() { { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), getOnBtkName()); JUT_ASSERT(478, pbtk != NULL); - mpOnBtk = new mDoExt_btkAnm(); + mpOnBtk = JKR_NEW mDoExt_btkAnm(); if (mpOnBtk == NULL || !mpOnBtk->init((J3DModelData*)model_data, pbtk, 1, 0, 1.0f, 0, -1)) { return 0; } @@ -194,7 +194,7 @@ bool daObjSwpush2::Act_c::create_heap() { { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), getRunBtkName()); JUT_ASSERT(491, pbtk != NULL); - mpRunBtk = new mDoExt_btkAnm(); + mpRunBtk = JKR_NEW mDoExt_btkAnm(); if (mpRunBtk == NULL || !mpRunBtk->init((J3DModelData*)model_data, pbtk, 1, 0, 1.0f, 0, -1)) { return 0; } @@ -205,7 +205,7 @@ bool daObjSwpush2::Act_c::create_heap() { { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(getArcName(), getRunBrkName()); JUT_ASSERT(504, pbrk != NULL); - mpRunBrk = new mDoExt_brkAnm(); + mpRunBrk = JKR_NEW mDoExt_brkAnm(); if (mpRunBrk == NULL || !mpRunBrk->init((J3DModelData*)model_data, pbrk, 1, 0, 1.0f, 0, -1)) { return 0; } @@ -216,7 +216,7 @@ bool daObjSwpush2::Act_c::create_heap() { { J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(getArcName(), getRunBpkName()); JUT_ASSERT(517, pbpk != NULL); - mpRunBpk = new mDoExt_bpkAnm(); + mpRunBpk = JKR_NEW mDoExt_bpkAnm(); if (mpRunBpk == NULL || !mpRunBpk->init((J3DModelData*)model_data, pbpk, 1, 0, 1.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index b3b5fad08f..6374368885 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -123,7 +123,7 @@ int daObjSw5_c::CreateHeap() { return 0; } - mpBgW2 = new dBgW(); + mpBgW2 = JKR_NEW dBgW(); if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, l_dzbIdx[0]), 1, &mMtx)) { mpBgW2 = NULL; return 0; diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index bb72938ba9..964f9a7376 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -87,7 +87,7 @@ int daObjSwSpinner_c::CreateHeap() { return 0; } - mpBgW2 = new dBgW(); + mpBgW2 = JKR_NEW dBgW(); if (mpBgW2 == NULL || mpBgW2->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, 8), 1, &mMtx)) { mpBgW2 = NULL; return 0; diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 60d50e393f..af3cffff89 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -92,7 +92,7 @@ int daSyRock_c::CreateHeap() { if(!mpModels[1]) return 0; - mpBrokenCollision = new dBgW; + mpBrokenCollision = JKR_NEW dBgW; if(!mpBrokenCollision || mpBrokenCollision->Set(static_cast(dComIfG_getObjectRes("syourock", 9)), 1, &mBgMtx)) { mpBrokenCollision = NULL; diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index e8a1e919f2..58e2ca31fe 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -59,7 +59,7 @@ int daTkraDai_c::CreateHeap() { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW != NULL && !mpBgW->Set((cBgD_t*)dComIfG_getObjectRes("M_TakaraD", 9), 1, &field_0x62c)) { diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index 68c81bf8f4..cbc684f27e 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -57,13 +57,13 @@ static int useHeapInit(fopAc_ac_c* actor) { daObjTEN_c* i_this = static_cast(actor); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("I_Ten", 10); JUT_ASSERT(246, modelData != NULL); - i_this->mMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, + i_this->mMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, &i_this->mCreature, 0, 0x11000284); if (i_this->mMorf == NULL || i_this->mMorf->getModel() == NULL) { return 0; } J3DModel* model = i_this->mMorf->getModel(); - i_this->mBrk = new mDoExt_brkAnm(); + i_this->mBrk = JKR_NEW mDoExt_brkAnm(); if (i_this->mBrk == NULL) { return 0; } @@ -79,7 +79,7 @@ static int useHeapInit(fopAc_ac_c* actor) { return 0; } } - i_this->mBtk = new mDoExt_btkAnm(); + i_this->mBtk = JKR_NEW mDoExt_btkAnm(); if (i_this->mBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index 0d0e8495a5..9d1d899677 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -102,8 +102,8 @@ static int daObjTHASHI_Delete(daObjTHASHI_c* i_this) { // stripped function to move dtor weak ordering static void strippedFunc3(cXyz* a, csXyz* b) { - delete[] b; - delete[] a; + JKR_DELETE_ARRAY(b); + JKR_DELETE_ARRAY(a); } void daObjTHASHI_c::setBaseMtx() { @@ -194,7 +194,7 @@ int daObjTHASHI_c::CreateHeap() { return FALSE; } u32 ind = dComIfG_getObjctResName2Index(l_arcName, "S_thashi01.dzb"); - unk5A0 = new dBgW(); + unk5A0 = JKR_NEW dBgW(); if (unk5A0 != NULL && !unk5A0->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, ind), 1, &mBgMtx)) { if (m_set_func != NULL) { diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index f01ec869f7..f02d49a694 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -174,7 +174,7 @@ int daObjTks_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0xE); JUT_ASSERT(314, NULL != mdlData_p); - mAnm_p = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); + mAnm_p = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mAnm_p != NULL && mAnm_p->getModel() == NULL) { mAnm_p->stopZelAnime(); mAnm_p = NULL; @@ -192,7 +192,7 @@ int daObjTks_c::CreateHeap() { mdl_p->setUserArea((uintptr_t)this); - mpMatAnm = new daNpcF_MatAnm_c(); + mpMatAnm = JKR_NEW daNpcF_MatAnm_c(); if (mpMatAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 17ee50cfcc..5c776f541d 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -35,7 +35,7 @@ int daObjToaruMaki_c::createHeap() { return 0; } if (nameArg == 0) { - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 6e98282eb1..ae226c10f7 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -444,7 +444,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { return 0; } - pYuka->mBgW = new dBgW(); + pYuka->mBgW = JKR_NEW dBgW(); if (pYuka->mBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index ae0b860467..fe5b1f9cc9 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -192,7 +192,7 @@ int daObjTobyHouse_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[mType], l_bck[i]); JUT_ASSERT(447, pbck != NULL); - mBcks[i] = new mDoExt_bckAnm(); + mBcks[i] = JKR_NEW mDoExt_bckAnm(); if (mBcks[i] == NULL || !mBcks[i]->init(pbck, 1, 0, 1.0, 0, -1, false)) { return 0; } diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index 16b6edddf7..eaa06e536b 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -82,7 +82,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { int daObjTOMBO_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Tombo", 9); JUT_ASSERT(259, modelData != NULL); - mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, + mpMorf = JKR_NEW mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Tombo", 6), 2, 1.0, 0, -1, &mCreature, 0, 0x11000284); if (mpMorf == NULL || mpMorf->getModel() == NULL) { @@ -90,7 +90,7 @@ int daObjTOMBO_c::CreateHeap() { } J3DModel* morfModel = mpMorf->getModel(); - mBrk = new mDoExt_brkAnm(); + mBrk = JKR_NEW mDoExt_brkAnm(); if (mBrk == NULL) { return 0; } @@ -104,7 +104,7 @@ int daObjTOMBO_c::CreateHeap() { return 0; } } - mBtk = new mDoExt_btkAnm(); + mBtk = JKR_NEW mDoExt_btkAnm(); if (mBtk == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index 4a8eccd9da..9c19dfcab2 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -327,13 +327,13 @@ static dCcD_SrcCyl cc_cyl_src = { static int useHeapInit(fopAc_ac_c* i_this) { obj_tp_class* tp = static_cast(i_this); tp->mMorf = - new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_tp", bmd[tp->field_0x594]), + JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_tp", bmd[tp->field_0x594]), NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Obj_tp", 7), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000084); if (tp->mMorf == NULL || tp->mMorf->getModel() == NULL) { return 0; } - tp->mBrk = new mDoExt_brkAnm(); + tp->mBrk = JKR_NEW mDoExt_brkAnm(); if (tp->mBrk == NULL) { return 0; } @@ -354,7 +354,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (tp->mModels[i] == NULL) { return 0; } - tp->mBtks[i] = new mDoExt_btkAnm(); + tp->mBtks[i] = JKR_NEW mDoExt_btkAnm(); if (tp->mBtks[i] == NULL) { return 0; }; @@ -367,7 +367,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { { return 0; } - tp->mBrks[i] = new mDoExt_brkAnm(); + tp->mBrks[i] = JKR_NEW mDoExt_brkAnm(); if (tp->mBrks[i] == NULL) { return 0; } @@ -380,7 +380,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } } - tp->mBgw = new dBgW(); + tp->mBgw = JKR_NEW dBgW(); if (tp->mBgw == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index 43cd6e35b9..2f360a94a5 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -92,7 +92,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - a_this->mpBgW = new dBgW(); + a_this->mpBgW = JKR_NEW dBgW(); if (a_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index acf8b1c5ab..a91a7c9fa6 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -59,7 +59,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } OS_REPORT("//////////////OBJ_USAKU SET 5 !!\n"); - a_this->mpBgW = new dBgW(); + a_this->mpBgW = JKR_NEW dBgW(); if (a_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 47dae42331..bcc355eef1 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -46,7 +46,7 @@ int daObjVGnd_c::CreateHeap() { { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0xb); JUT_ASSERT(198, pbtk != NULL); - mpBtk = new mDoExt_btkAnm(); + mpBtk = JKR_NEW mDoExt_btkAnm(); if ((!mpBtk) || (!mpBtk->init(modelData, pbtk, 1, NULL, 1.0f, NULL, -1))) { return 0; } @@ -55,7 +55,7 @@ int daObjVGnd_c::CreateHeap() { { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 0x8); JUT_ASSERT(212, pbrk != NULL); - mpBrk = new mDoExt_brkAnm(); + mpBrk = JKR_NEW mDoExt_brkAnm(); if ((!mpBrk) || (!mpBrk->init(modelData, pbrk, 1, NULL, 1.0f, NULL, -1))) { return 0; } diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 1c239ff129..0edeb24036 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -148,21 +148,21 @@ int daObjVolcBom_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 16); JUT_ASSERT(403, pbrk != NULL); - mBrk1 = new mDoExt_brkAnm(); + mBrk1 = JKR_NEW mDoExt_brkAnm(); if (mBrk1 == NULL || !mBrk1->init(modelData, pbrk, 1, 2, 1.0f, 0, -1)) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 21); JUT_ASSERT(416, pbtk != NULL); - mBtk1 = new mDoExt_btkAnm(); + mBtk1 = JKR_NEW mDoExt_btkAnm(); if (mBtk1 == NULL || !mBtk1->init(modelData, pbtk, 1, 2, 1.0f, 0, -1)) { return 0; } J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 8); JUT_ASSERT(428, pbck != NULL); - mBck1 = new mDoExt_bckAnm(); + mBck1 = JKR_NEW mDoExt_bckAnm(); if (mBck1 == NULL || !mBck1->init(pbck, 1, 0, 1.0f, 0, -1, false)) { return 0; } @@ -177,7 +177,7 @@ int daObjVolcBom_c::CreateHeap() { pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 15); JUT_ASSERT(457, pbrk != NULL); - mBrk2 = new mDoExt_brkAnm(); + mBrk2 = JKR_NEW mDoExt_brkAnm(); if (mBrk2 == NULL || !mBrk2->init(modelData, pbrk, 1, 0, 1.0f, 0, -1)) { return 0; } @@ -185,7 +185,7 @@ int daObjVolcBom_c::CreateHeap() { mBrk2->setPlaySpeed(0.0f); pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 19); JUT_ASSERT(471, pbtk != NULL); - mBtk2 = new mDoExt_btkAnm(); + mBtk2 = JKR_NEW mDoExt_btkAnm(); if (mBtk2 == NULL || !mBtk2->init(modelData, pbtk, 1, 2, 1.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 7532b31a0a..4b1af11ff9 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -166,7 +166,7 @@ int daObjWarpKBrg_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], l_btk_idx[getNameArg()]); JUT_ASSERT(394, pbtk != NULL); - mpBridgeBtk = new mDoExt_btkAnm(); + mpBridgeBtk = JKR_NEW mDoExt_btkAnm(); if (mpBridgeBtk == NULL || !mpBridgeBtk->init(modelData, pbtk, TRUE, 0, 1.0f, 0, -1)) { return 0; } @@ -174,7 +174,7 @@ int daObjWarpKBrg_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[getNameArg()], l_bck_idx[getNameArg()]); JUT_ASSERT(407, pbck != NULL); - mpBridgeBck = new mDoExt_bckAnm(); + mpBridgeBck = JKR_NEW mDoExt_bckAnm(); if (mpBridgeBck == NULL || !mpBridgeBck->init(pbck, TRUE, 0, 1.0f, 0, -1, false)) { return 0; } @@ -189,7 +189,7 @@ int daObjWarpKBrg_c::CreateHeap() { pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], 18); JUT_ASSERT(438, pbtk != NULL); - mpPortalBtk = new mDoExt_btkAnm(); + mpPortalBtk = JKR_NEW mDoExt_btkAnm(); if (mpPortalBtk == NULL || !mpPortalBtk->init(modelData, pbtk, TRUE, 2, 1.0f, 0, -1)) { return 0; } @@ -197,7 +197,7 @@ int daObjWarpKBrg_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], 14); JUT_ASSERT(451, pbrk != NULL); - mpPortalBrk = new mDoExt_brkAnm(); + mpPortalBrk = JKR_NEW mDoExt_brkAnm(); if (mpPortalBrk == NULL || !mpPortalBrk->init(modelData, pbrk, TRUE, 0, 1.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index c040f6b6b5..aef1acc546 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -99,7 +99,7 @@ int daObjWarpOBrg_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_bck_idx[getNameArg()]); JUT_ASSERT(263, pbck != NULL); - mpBck = new mDoExt_bckAnm(); + mpBck = JKR_NEW mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(pbck, TRUE, 0, 0.0f, 0, -1, false)) { return 0; } @@ -111,7 +111,7 @@ int daObjWarpOBrg_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, l_btk_idx[getNameArg()]); JUT_ASSERT(271, pbtk != NULL); - mpBtk = new mDoExt_btkAnm(); + mpBtk = JKR_NEW mDoExt_btkAnm(); if (mpBtk == NULL || !mpBtk->init(modelData, pbtk, TRUE, 0, 0.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index 58a002058c..c323eb4703 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -180,7 +180,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - _this->mpBrk = new mDoExt_brkAnm(); + _this->mpBrk = JKR_NEW mDoExt_brkAnm(); if (_this->mpBrk == NULL) { return 0; } @@ -193,7 +193,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { _this->mpBrk->setPlaySpeed(0.0f); - _this->mpBgW = new dBgW(); + _this->mpBgW = JKR_NEW dBgW(); if (_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 23586b8825..20cd899aea 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -208,7 +208,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { return 0; } - _this->mpBrk = new mDoExt_brkAnm(); + _this->mpBrk = JKR_NEW mDoExt_brkAnm(); if (_this->mpBrk == NULL) { return 0; } @@ -220,7 +220,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { _this->mpBrk->setPlaySpeed(0.0f); - _this->mpBgW = new dBgW(); + _this->mpBgW = JKR_NEW dBgW(); if (_this->mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index 7fea4e50df..9bfe15abb1 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -152,11 +152,11 @@ static int useHeapInit(fopAc_ac_c* i_actor) { if (i_this->mpModel == NULL) { return 0; } - i_this->mMorf = new mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_wflag", 11), NULL, NULL, ( J3DAnmTransform*)dComIfG_getObjectRes("Obj_wflag", 6), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11020284); + i_this->mMorf = JKR_NEW mDoExt_McaMorf((J3DModelData*)dComIfG_getObjectRes("Obj_wflag", 11), NULL, NULL, ( J3DAnmTransform*)dComIfG_getObjectRes("Obj_wflag", 6), 2, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11020284); if (i_this->mMorf == NULL || i_this->mMorf->getModel() == NULL) { return 0; } - i_this->field_0x578 = new mDoExt_btkAnm(); + i_this->field_0x578 = JKR_NEW mDoExt_btkAnm(); if (i_this->field_0x578 == NULL) { return 0; } @@ -165,7 +165,7 @@ static int useHeapInit(fopAc_ac_c* i_actor) { return 0; } - i_this->field_0x57c = new mDoExt_btpAnm(); + i_this->field_0x57c = JKR_NEW mDoExt_btpAnm(); if (i_this->field_0x57c == NULL) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index 5a1c51639f..7d68521c15 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -28,7 +28,7 @@ int daWindStone_c::createHeap() { if (mpModel == NULL) { return 0; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index fe74f440de..e51f4f55a2 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -72,7 +72,7 @@ int daObjWindow_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_bck[mType]); JUT_ASSERT(266, pbck != NULL); - mpBckAnm = new mDoExt_bckAnm(); + mpBckAnm = JKR_NEW mDoExt_bckAnm(); if (mpBckAnm == NULL || !mpBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false)) { return 0; } diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index 20555536f1..68c16b5271 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -41,7 +41,7 @@ int daObjYOUSEI_c::CreateHeap() { void* modelData = dComIfG_getObjectRes("Always", 0x21); JUT_ASSERT(177, modelData != NULL); - mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Always", 0xF), 2, 0.4f, 0, -1, &mSound, 0x80000, 0x11000084); + mpModelMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Always", 0xF), 2, 0.4f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index 09d38e6d8c..b573b021ef 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -216,21 +216,21 @@ static int useHeapInit(fopAc_ac_c* i_this) { J3DAnmTevRegKey* brk_anm = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[_this->mLevel], l_brkIndex[_this->mLevel]); - _this->mpBrkAnm = new mDoExt_brkAnm(); + _this->mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (_this->mpBrkAnm == NULL || !_this->mpBrkAnm->init((J3DModelData*)model_data, brk_anm, 1, 2, 1.0f, 0, -1)) { return 0; } } else { - _this->mpMorf = new mDoExt_McaMorfSO((J3DModelData*)model_data, NULL, NULL, + _this->mpMorf = JKR_NEW mDoExt_McaMorfSO((J3DModelData*)model_data, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[_this->mLevel], 5), 0, 1.0f, 0, -1, NULL, 0, 0x11000284); if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { return 0; } - _this->mpBtkAnm = new mDoExt_btkAnm(); + _this->mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (_this->mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 9e9767db06..0cb710e4a1 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -65,7 +65,7 @@ int daZrTurara_c::CreateHeap() { if (mpRockModel == NULL) { return 0; } - mpRockBgW = new dBgW(); + mpRockBgW = JKR_NEW dBgW(); if (mpRockBgW == NULL || mpRockBgW->Set((cBgD_t*)dComIfG_getObjectRes("M_DrpRock", 8), 1, &mRockBgMtx)) { diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index c48a9e76ad..f032f50ee1 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -525,7 +525,7 @@ void daPasserMng_c::create_init() { dPnt* pnt1 = dPath_GetPnt(mPath, 1); current.pos.set(pnt0->m_position); current.angle.y = cLib_targetAngleY(pnt0->m_position, pnt1->m_position); - childProcIds = new fpc_ProcID[getMaxNum()]; + childProcIds = JKR_NEW fpc_ProcID[getMaxNum()]; currentChildIndex = 0; int time = getTime(); intervalTime = getIntervalTime() * 5; @@ -556,7 +556,7 @@ void daPasserMng_c::create_init() { max = mPath->m_num - 2; } int i; - int* arr = new int[max]; + int* arr = JKR_NEW int[max]; int ind = 0; while (ind < max) { int rnd = cLib_getRndValue(1, mPath->m_num - 2); @@ -590,7 +590,7 @@ void daPasserMng_c::create_init() { -1, 0); currentChildIndex = (currentChildIndex + 1) % getMaxNum(); } - delete [] arr; + JKR_DELETE_ARRAY(arr); } } diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index fd4e5716bf..ac0579ff6c 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -241,7 +241,7 @@ int daPeru_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[idx][1]], l_bmdData[idx][0]); JUT_ASSERT(660, NULL != mdlData_p); - mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, + mpMorf[0] = JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { mpMorf[0]->stopZelAnime(); @@ -258,7 +258,7 @@ int daPeru_c::CreateHeap() { } model->setUserArea((uintptr_t)this); - mpMatAnm[0] = new daNpcT_MatAnm_c(); + mpMatAnm[0] = JKR_NEW daNpcT_MatAnm_c(); if (mpMatAnm[0] == NULL) { return 0; } diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 8d9a056c4a..64dccbb0b0 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -233,7 +233,7 @@ void daPy_anmHeap_c::initData() { } void* daPy_anmHeap_c::mallocBuffer() { - mBuffer = new (0x20) u8[mBufferSize]; + mBuffer = JKR_NEW_ARGS (0x20) u8[mBufferSize]; return mBuffer; } @@ -262,19 +262,19 @@ void daPy_anmHeap_c::createHeap(daPy_anmHeap_c::daAlinkHEAP_TYPE i_heapType) { mAnimeHeap = mDoExt_createSolidHeapFromGameToCurrent(&tmp, size, 0x20); if (i_heapType == 4) { - tmpWork = new char[size]; + tmpWork = JKR_NEW char[size]; JUT_ASSERT(669, tmpWork != NULL); } else if (i_heapType == 3) { - tmpTransBas = new mDoExt_transAnmBas(NULL); + tmpTransBas = JKR_NEW mDoExt_transAnmBas(NULL); JUT_ASSERT(672, tmpTransBas != NULL); } else if (i_heapType == 0) { - tmpTrans = new J3DAnmTransformKey(); + tmpTrans = JKR_NEW J3DAnmTransformKey(); JUT_ASSERT(675, tmpTrans != NULL); } else if (i_heapType == 1) { - tmpTp = new J3DAnmTexPattern(); + tmpTp = JKR_NEW J3DAnmTexPattern(); JUT_ASSERT(678, tmpTp != NULL); } else { - tmpTk = new J3DAnmTextureSRTKey(); + tmpTk = JKR_NEW J3DAnmTextureSRTKey(); JUT_ASSERT(681, tmpTk != NULL); } diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index d1e91a366f..08e4b91040 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -14,7 +14,7 @@ static int daSkip2D_createHeap(fopAc_ac_c* i_this) { } int daSkip2D_c::createHeap() { - mpButton = new dMeterButton_c(); + mpButton = JKR_NEW dMeterButton_c(); if (mpButton == NULL) { return 0; diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index a8abcd0134..cc9b120e0f 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -474,14 +474,14 @@ static int useHeapInit(fopAc_ac_c* i_this) { sq_class* _this = static_cast(i_this); _this->mpMorf = - new mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("Sq", 17)), NULL, NULL, + JKR_NEW mDoExt_McaMorf(static_cast(dComIfG_getObjectRes("Sq", 17)), NULL, NULL, static_cast(dComIfG_getObjectRes("Sq", 9)), 0, 1.0f, 0, -1, 1, NULL, 0x80000, 0x11000284); if (_this->mpMorf == NULL || _this->mpMorf->getModel() == NULL) { return 0; } - _this->mpBtkAnm = new mDoExt_btkAnm(); + _this->mpBtkAnm = JKR_NEW mDoExt_btkAnm(); if (_this->mpBtkAnm == NULL) { return 0; } diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index caad0162a2..e00d893413 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -33,7 +33,7 @@ inline int daTagLv6Gate_c::createHeap() { btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 19); JUT_ASSERT(100, btk != NULL); - mpBtk[0] = new mDoExt_btkAnm(); + mpBtk[0] = JKR_NEW mDoExt_btkAnm(); if (mpBtk[0] == NULL || !mpBtk[0]->init(modelData, btk, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1)) { @@ -46,7 +46,7 @@ inline int daTagLv6Gate_c::createHeap() { btk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 20); JUT_ASSERT(108, btk != NULL); - mpBtk[1] = new mDoExt_btkAnm(); + mpBtk[1] = JKR_NEW mDoExt_btkAnm(); if (mpBtk[1] == NULL || !mpBtk[1]->init(modelData, btk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index cf402f4848..205c359c33 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -29,7 +29,7 @@ int daTagLv7Gate_c::createHeap() { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7); JUT_ASSERT(100, bck != NULL); - mpBck = new mDoExt_bckAnm(); + mpBck = JKR_NEW mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(bck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { return 0; diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 892653e6ed..2373cec8e6 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -99,7 +99,7 @@ int daTagLv8Gate_c::createHeap() { J3DAnmTransform* bck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 5); JUT_ASSERT(283, bck != NULL); - mpBck = new mDoExt_bckAnm(); + mpBck = JKR_NEW mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(bck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 75d949d4d9..a12a1bea00 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -1080,7 +1080,7 @@ int daTagTWGate_c::CreateHeap() { mdlData_p = static_cast(dComIfG_getObjectRes("TWGate_Md", 7)); JUT_ASSERT(1685, NULL != mdlData_p); mpMorf = - new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, + JKR_NEW mDoExt_McaMorfSO(mdlData_p, NULL, NULL, static_cast(dComIfG_getObjectRes("TWGate_Md", 4)), 0, 0.0f, 0, -1, NULL, 0, 0x11000084); diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index 24be671d06..57c9f01581 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -114,7 +114,7 @@ int daTagCsw_c::createHeap() { } field_0x8e8.x = field_0x8e8.y = field_0x8e8.z; setMtx(); - field_0x57c = new mDoExt_brkAnm(); + field_0x57c = JKR_NEW mDoExt_brkAnm(); if (field_0x57c == NULL) { return 0; } @@ -127,7 +127,7 @@ int daTagCsw_c::createHeap() { if (field_0x578 == NULL) { field_0x580 = NULL; } else { - field_0x580 = new mDoExt_brkAnm(); + field_0x580 = JKR_NEW mDoExt_brkAnm(); if (field_0x580 == NULL) { return 0; } @@ -138,7 +138,7 @@ int daTagCsw_c::createHeap() { return 0; } } - field_0x584 = new dBgW(); + field_0x584 = JKR_NEW dBgW(); if (field_0x584 == NULL) { return 0; } @@ -148,7 +148,7 @@ int daTagCsw_c::createHeap() { if (field_0x578 == NULL) { field_0x5f0 = NULL; } else { - field_0x5f0 = new dBgW(); + field_0x5f0 = JKR_NEW dBgW(); if (field_0x5f0 == NULL) { return 0; } @@ -156,7 +156,7 @@ int daTagCsw_c::createHeap() { return 0; } } - field_0x588 = new dBgW(); + field_0x588 = JKR_NEW dBgW(); if (field_0x588 == NULL) { return 0; } diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 25cf35e224..baaa4ff5b3 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -62,7 +62,7 @@ int daTag_Msg_c::create() { } int daTag_Msg_c::createHeap() { - mpHIO = new TAG_MSG_HIO_CLASS(); + mpHIO = JKR_NEW TAG_MSG_HIO_CLASS(); if (mpHIO == NULL) { return 0; } diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index eb7d3752eb..3017abcb07 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -161,7 +161,7 @@ int daTagStatue_c::CreateHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 12); JUT_ASSERT(291, pbtk != NULL); - mpPlatformCircleBtk = new mDoExt_btkAnm(); + mpPlatformCircleBtk = JKR_NEW mDoExt_btkAnm(); if (!mpPlatformCircleBtk || !mpPlatformCircleBtk->init(modelData, pbtk, 1, 0, 1.0f, 0, -1)) { @@ -170,7 +170,7 @@ int daTagStatue_c::CreateHeap() { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 9); JUT_ASSERT(303, pbrk != NULL); - mpGlowingSkyCharacterBrk = new mDoExt_brkAnm(); + mpGlowingSkyCharacterBrk = JKR_NEW mDoExt_brkAnm(); if (!mpGlowingSkyCharacterBrk || !mpGlowingSkyCharacterBrk->init(modelData, pbrk, 1, 0, 1.0f, 0, -1)) { diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index a9a58b44fd..852a7dcfc8 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -107,7 +107,7 @@ cPhs_Step daTbox_c::commonShapeSet() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mModelResNo); JUT_ASSERT(0x191, modelData != NULL); - mpAnm = new mDoExt_bckAnm(); + mpAnm = JKR_NEW mDoExt_bckAnm(); if (mpAnm == NULL) { return cPhs_ERROR_e; } @@ -145,7 +145,7 @@ cPhs_Step daTbox_c::commonShapeSet() { return cPhs_ERROR_e; } - mpEffectAnm = new mDoExt_brkAnm(); + mpEffectAnm = JKR_NEW mDoExt_brkAnm(); if (mpEffectAnm == NULL) { return cPhs_ERROR_e; } @@ -183,7 +183,7 @@ cPhs_Step daTbox_c::bgCheckSet() { cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(model_info->mArcName, model_info->mOpenDzbResNo); JUT_ASSERT(528, bgd != NULL); - mpOpenBgW = new dBgW(); + mpOpenBgW = JKR_NEW dBgW(); if (mpOpenBgW == NULL) { return cPhs_ERROR_e; } diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index d148a5343f..4da1b364af 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -114,12 +114,12 @@ int daTbox2_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bck_no); JUT_ASSERT(0, pbck != NULL); - mpBck = new mDoExt_bckAnm(); + mpBck = JKR_NEW mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { return false; } - mBoxBgW = new dBgW(); + mBoxBgW = JKR_NEW dBgW(); if (mBoxBgW != NULL && !mBoxBgW->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].dzb_no), cBgW::MOVE_BG_e, &mBgMtx)) diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index 55229336b8..b22492fe3c 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -177,7 +177,7 @@ void daTitle_c::loadWait_proc() { mpHeap = heap; mpFont = mDoExt_getMesgFont(); - mTitle.Scr = new J2DScreen(); + mTitle.Scr = JKR_NEW J2DScreen(); mTitle.Scr->setPriority("zelda_press_start.blo", 0x100000, mpMount->getArchive()); @@ -196,7 +196,7 @@ void daTitle_c::loadWait_proc() { fopMsgM_messageGet(text[i]->getStringPtr(), 100); } - field_0x600 = new CPaneMgrAlpha(mTitle.Scr, MULTI_CHAR('n_all'), 2, NULL); + field_0x600 = JKR_NEW CPaneMgrAlpha(mTitle.Scr, MULTI_CHAR('n_all'), 2, NULL); field_0x600->setAlpha(0); J2DPane* pane = mTitle.Scr->search(MULTI_CHAR('n_all')); pane->translate(g_daTitHIO.mPSPosX, g_daTitHIO.mPSPosY); @@ -329,12 +329,12 @@ int daTitle_c::Draw() { int daTitle_c::Delete() { dComIfG_resDelete(&mPhaseReq, l_arcName); - delete mTitle.Scr; - delete field_0x600; + JKR_DELETE(mTitle.Scr); + JKR_DELETE(field_0x600); mpMount->getArchive()->removeResourceAll(); mpMount->getArchive()->unmount(); - delete mpMount; + JKR_DELETE(mpMount); if (m2DHeap != NULL) { m2DHeap->destroy(); diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index 2e0a1bc089..d317b12fe4 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -22,7 +22,7 @@ int daWarpBug_c::createHeap() { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, "kisei.btk"); if (pbrk != NULL) { - mpBrk = new mDoExt_brkAnm(); + mpBrk = JKR_NEW mDoExt_brkAnm(); if (!mpBrk->init(modelData, pbrk, TRUE, 2, 1.0f, 0, -1)) { return 0; @@ -30,7 +30,7 @@ int daWarpBug_c::createHeap() { } if (pbtk != NULL) { - mpBtk = new mDoExt_btkAnm(); + mpBtk = JKR_NEW mDoExt_btkAnm(); if (!mpBtk->init(modelData, pbtk, TRUE, 2, 1.0f, 0, -1)) { return 0; diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 237a1a7770..b19b7c4fb9 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -251,7 +251,7 @@ dAttention_c::dAttention_c(fopAc_ac_c* i_player, u32 i_padNo) { mZHintTarget.init(); mCatghTarget.init(); mLookTarget.init(); - new (&mAttParam) dAttParam_c(0); + JKR_NEW_ARGS (&mAttParam) dAttParam_c(0); g_AttDwHIO.field_0x4 = mDoHIO_CREATE_CHILD("注目カーソル", &g_AttDwHIO); } diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index 7d4dcd38f2..1eea75ba44 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -115,7 +115,7 @@ void dBgp_c::model_c::create(J3DModelData* i_modelData, Mtx i_mtx) { JUT_ASSERT(205, i_modelData->getJointNum() == 1); JUT_ASSERT(206, i_modelData->getMaterialNum() != 0); - mMaterial = new modelMaterial_c[i_modelData->getMaterialNum()]; + mMaterial = JKR_NEW modelMaterial_c[i_modelData->getMaterialNum()]; JUT_ASSERT(212, mMaterial != NULL); J3DJoint* joint = i_modelData->getJointNodePointer(0); @@ -243,11 +243,11 @@ void dBgp_c::share_c::reset() { for (u16 i = 0; i < mModelData->getMaterialNum(); i++) { J3DMaterial* material = mModelData->getMaterialNodePointer(i); if (material->getMaterialAnm() != NULL) { - delete material->getMaterialAnm(); + JKR_DELETE(material->getMaterialAnm()); } } - delete[] mMaterial; + JKR_DELETE_ARRAY(mMaterial); dComIfG_deleteObjectResMain(getArcName()); mStatus = -1; @@ -264,7 +264,7 @@ static BOOL createMatAnm(J3DModelData* i_modelData, u16 i_materialId) { if (i_materialId != 0xFFFF) { J3DMaterial* material = i_modelData->getMaterialNodePointer(i_materialId); if (material->getMaterialAnm() == NULL) { - J3DMaterialAnm* anm = new J3DMaterialAnm(); + J3DMaterialAnm* anm = JKR_NEW J3DMaterialAnm(); if (anm == NULL) { return FALSE; } @@ -289,7 +289,7 @@ int dBgp_c::share_c::execute() { JUT_ASSERT(544, mModelData->getMaterialNum() != 0); - mMaterial = new modelMaterial_c[mModelData->getMaterialNum()]; + mMaterial = JKR_NEW modelMaterial_c[mModelData->getMaterialNum()]; JUT_ASSERT(546, mMaterial != NULL); for (u16 i = 0; i < mModelData->getMaterialNum(); i++) { @@ -447,11 +447,11 @@ void dBgp_c::create(s8 i_roomNo, void* i_data) { JKRHeap* prevHeap = mDoExt_setCurrentHeap(mHeap); - mModel = new model_c[((stage_map_unit_class*)mPointer)->num]; + mModel = JKR_NEW model_c[((stage_map_unit_class*)mPointer)->num]; JUT_ASSERT(886, mModel != NULL); unit_class* mapUnit = (unit_class*)((stage_map_unit_class*)mPointer)->entries; - mBgWork = new dBgW[mapUnit->num]; + mBgWork = JKR_NEW dBgW[mapUnit->num]; JUT_ASSERT(890, mBgWork != NULL); dBgW* bgw = mBgWork; @@ -759,7 +759,7 @@ void dBgp_c::createShare() { mShareHeap = mDoExt_createSolidHeapFromGameToCurrent(0, 0x20); JUT_ASSERT(1409, mShareHeap != NULL); - mShare = new share_c[16]; + mShare = JKR_NEW share_c[16]; JUT_ASSERT(1411, mShare != NULL); u32 heapSize = mDoExt_adjustSolidHeapToSystem(mShareHeap); diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp index 3e0735cf91..a3030349f6 100644 --- a/src/d/d_bg_s_movebg_actor.cpp +++ b/src/d/d_bg_s_movebg_actor.cpp @@ -66,7 +66,7 @@ int dBgS_MoveBgActor::MoveBGCreateHeap() { return 1; } - mpBgW = new dBgW(); + mpBgW = JKR_NEW dBgW(); if (mpBgW != NULL) { cBgD_t* res = (cBgD_t*)dComIfG_getObjectRes(m_name, m_dzb_id); if (!mpBgW->Set(res, cBgW::MOVE_BG_e, &mBgMtx)) { diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp index d0f5a718eb..3a5dd23599 100644 --- a/src/d/d_bg_w.cpp +++ b/src/d/d_bg_w.cpp @@ -75,7 +75,7 @@ bool cBgW::SetVtx() { if (mFlags & NO_VTX_TBL_e) { pm_vtx_tbl = NULL; } else if (mFlags & MOVE_BG_e) { - pm_vtx_tbl = (cBgD_Vtx_t*)new Vec[pm_bgd->m_v_num]; + pm_vtx_tbl = (cBgD_Vtx_t*)JKR_NEW Vec[pm_bgd->m_v_num]; if (pm_vtx_tbl == NULL) { return true; @@ -116,7 +116,7 @@ void cBgW::CalcPlane() { } bool cBgW::SetTri() { - pm_tri = new cBgW_TriElm[pm_bgd->m_t_num]; + pm_tri = JKR_NEW cBgW_TriElm[pm_bgd->m_t_num]; if (pm_tri == NULL) { return true; @@ -364,25 +364,25 @@ bool cBgW::Set(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) { return true; } - pm_rwg = new cBgW_RwgElm[pm_bgd->m_t_num]; + pm_rwg = JKR_NEW cBgW_RwgElm[pm_bgd->m_t_num]; if (pm_rwg == NULL) { FreeArea(); return true; } - pm_blk = new cBgW_BlkElm[pm_bgd->m_b_num]; + pm_blk = JKR_NEW cBgW_BlkElm[pm_bgd->m_b_num]; if (pm_blk == NULL) { FreeArea(); return true; } - pm_node_tree = new cBgW_NodeTree[pm_bgd->m_tree_num]; + pm_node_tree = JKR_NEW cBgW_NodeTree[pm_bgd->m_tree_num]; if (pm_node_tree == NULL) { FreeArea(); return true; } - pm_grp = new cBgW_GrpElm[pm_bgd->m_g_num]; + pm_grp = JKR_NEW cBgW_GrpElm[pm_bgd->m_g_num]; if (pm_grp == NULL) { FreeArea(); return true; @@ -2131,7 +2131,7 @@ u32 dBgW::ChkMoveFlag() const { } dBgW* dBgW_NewSet(cBgD_t* pbgd, u32 flags, Mtx* pbase_mtx) { - dBgW* nw = new dBgW(); + dBgW* nw = JKR_NEW dBgW(); if (nw == NULL) { return NULL; diff --git a/src/d/d_bg_w_sv.cpp b/src/d/d_bg_w_sv.cpp index e532d9224c..064a323900 100644 --- a/src/d/d_bg_w_sv.cpp +++ b/src/d/d_bg_w_sv.cpp @@ -18,7 +18,7 @@ u8 dBgWSv::Set(cBgD_t* pbgd, u32 param_1) { return 0; } - field_0xc0 = new Vec[pm_bgd->m_v_num]; + field_0xc0 = JKR_NEW Vec[pm_bgd->m_v_num]; return field_0xc0 == NULL; } diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index e7695b7451..36f24ebd72 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -13,7 +13,7 @@ dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { mArchive = i_archive; - mBrightCheck.mMsgString = new dMsgString_c(); + mBrightCheck.mMsgString = JKR_NEW dMsgString_c(); JUT_ASSERT(0, mBrightCheck.mMsgString != NULL); screenSet(); @@ -22,8 +22,8 @@ dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { } dBrightCheck_c::~dBrightCheck_c() { - delete mBrightCheck.Scr; - delete mBrightCheck.mMsgString; + JKR_DELETE(mBrightCheck.Scr); + JKR_DELETE(mBrightCheck.mMsgString); } void dBrightCheck_c::screenSet() { @@ -57,7 +57,7 @@ void dBrightCheck_c::screenSet() { }; #endif - mBrightCheck.Scr = new J2DScreen(); + mBrightCheck.Scr = JKR_NEW J2DScreen(); JUT_ASSERT(0, mBrightCheck.Scr != NULL); mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive); diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index cd2c187a20..ab37e7ae07 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -11089,7 +11089,7 @@ static int init_phase2(camera_class* i_this) { fopAcM_setStageLayer(player); dComIfGp_setWindowNum(1); - new (body) dCamera_c(i_this); + JKR_NEW_ARGS (body) dCamera_c(i_this); f32 var_f31 = 0.0f; f32 var_f30 = 160000.0f; diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 57b76d8b10..94b88a9521 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -852,19 +852,19 @@ int dComIfG_play_c::getLayerNo(int) { } void dComIfG_play_c::createParticle() { - mParticle = new dPa_control_c(); + mParticle = JKR_NEW dPa_control_c(); } dSmplMdl_draw_c* dComIfG_play_c::createSimpleModel() { if (mSimpleModel == NULL) { - mSimpleModel = new dSmplMdl_draw_c(); + mSimpleModel = JKR_NEW dSmplMdl_draw_c(); } return mSimpleModel; } void dComIfG_play_c::deleteSimpleModel() { if (mSimpleModel != NULL) { - delete mSimpleModel; + JKR_DELETE(mSimpleModel); mSimpleModel = NULL; } } @@ -1115,7 +1115,7 @@ void dComIfG_inf_c::baseCsr_c::create() { field_0x8.getScreen()->setUserInfo((uintptr_t)m_navi); - m_navi = new navi_c(); + m_navi = JKR_NEW navi_c(); JUT_ASSERT(1517, m_navi != NULL); m_navi->create(); } @@ -1152,7 +1152,7 @@ void dComIfG_inf_c::ct() { #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG void dComIfG_inf_c::createBaseCsr() { JUT_ASSERT(1622, m_baseCsr == NULL); - m_baseCsr = new baseCsr_c(1); + m_baseCsr = JKR_NEW baseCsr_c(1); JUT_ASSERT(1624, m_baseCsr != NULL); m_baseCsr->create(); mDoGph_gInf_c::entryBaseCsr(m_baseCsr); diff --git a/src/d/d_debug_camera.cpp b/src/d/d_debug_camera.cpp index b2ebdf699e..c970eca313 100644 --- a/src/d/d_debug_camera.cpp +++ b/src/d/d_debug_camera.cpp @@ -726,7 +726,7 @@ int dDbgCamera_c::makeZevData() { field_0xb14 = 0; if (zevwork::WorkBuffer == NULL) { - zevwork::WorkBuffer = new u8[zevwork::WorkSize]; + zevwork::WorkBuffer = JKR_NEW u8[zevwork::WorkSize]; if (zevwork::WorkBuffer == NULL) { OSReport("debug camera: memory allocate error!! %d byte\n", zevwork::WorkSize); return 0; diff --git a/src/d/d_debug_viewer.cpp b/src/d/d_debug_viewer.cpp index eb873f483d..288e073259 100644 --- a/src/d/d_debug_viewer.cpp +++ b/src/d/d_debug_viewer.cpp @@ -17,7 +17,7 @@ J3DPacket* dDbVw_setDrawPacketList(J3DPacket* i_packet, int i_bufferType) { } if (l_drawPacketListNum >= 1000) { - delete (void*)i_packet; + JKR_DELETE((void*)i_packet); return NULL; } @@ -28,29 +28,29 @@ J3DPacket* dDbVw_setDrawPacketList(J3DPacket* i_packet, int i_bufferType) { void dDbVw_deleteDrawPacketList() { for (int i = 0; i < l_drawPacketListNum; i++) { - delete (void*)l_drawPacketList[i]; + JKR_DELETE((void*)l_drawPacketList[i]); } l_drawPacketListNum = 0; } void dDbVw_drawCube8p(int i_bufferType, cXyz* i_points, const GXColor& i_color) { - mDoExt_cube8pPacket* packet = new mDoExt_cube8pPacket(i_points, i_color); + mDoExt_cube8pPacket* packet = JKR_NEW mDoExt_cube8pPacket(i_points, i_color); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawCube(int i_bufferType, cXyz& i_pos, cXyz& i_size, csXyz& i_angle, const GXColor& i_color) { - mDoExt_cubePacket* packet = new mDoExt_cubePacket(i_pos, i_size, i_angle, i_color); + mDoExt_cubePacket* packet = JKR_NEW mDoExt_cubePacket(i_pos, i_size, i_angle, i_color); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawTriangle(int i_bufferType, cXyz* i_points, const GXColor& i_color, u8 i_clipZ) { - mDoExt_trianglePacket* packet = new mDoExt_trianglePacket(i_points, i_color, i_clipZ); + mDoExt_trianglePacket* packet = JKR_NEW mDoExt_trianglePacket(i_points, i_color, i_clipZ); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawQuad(int i_bufferType, cXyz* i_points, const GXColor& i_color, u8 i_clipZ) { - mDoExt_quadPacket* packet = new mDoExt_quadPacket(i_points, i_color, i_clipZ); + mDoExt_quadPacket* packet = JKR_NEW mDoExt_quadPacket(i_points, i_color, i_clipZ); dDbVw_setDrawPacketList(packet, i_bufferType); } @@ -75,42 +75,42 @@ void dDbVw_drawQuad(int i_bufferType, cXyz* param_1, cXyz* param_2, cXyz* i_pos, mDoMtx_stack_c::multVec(&points[i], &points[i]); } - mDoExt_quadPacket* packet = new mDoExt_quadPacket(points, i_color, i_clipZ); + mDoExt_quadPacket* packet = JKR_NEW mDoExt_quadPacket(points, i_color, i_clipZ); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawLine(int i_bufferType, cXyz& i_start, cXyz& i_end, const GXColor& i_color, u8 i_clipZ, u8 i_width) { - mDoExt_linePacket* packet = new mDoExt_linePacket(i_start, i_end, i_color, i_clipZ, i_width); + mDoExt_linePacket* packet = JKR_NEW mDoExt_linePacket(i_start, i_end, i_color, i_clipZ, i_width); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawArrow(int i_bufferType, cXyz& i_pos, cXyz& param_2, const GXColor& i_color, u8 i_clipZ, u8 i_width) { - mDoExt_ArrowPacket* packet = new mDoExt_ArrowPacket(i_pos, param_2, i_color, i_clipZ, i_width); + mDoExt_ArrowPacket* packet = JKR_NEW mDoExt_ArrowPacket(i_pos, param_2, i_color, i_clipZ, i_width); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawPoint(int i_bufferType, cXyz& i_pos, const GXColor& i_color, u8 i_clipZ, u8 i_width) { - mDoExt_pointPacket* packet = new mDoExt_pointPacket(i_pos, i_color, i_clipZ, i_width); + mDoExt_pointPacket* packet = JKR_NEW mDoExt_pointPacket(i_pos, i_color, i_clipZ, i_width); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawCircle(int i_bufferType, cXyz& i_pos, f32 i_radius, const GXColor& i_color, u8 i_clipZ, u8 i_width) { - mDoExt_circlePacket* packet = new mDoExt_circlePacket(i_pos, i_radius, i_color, i_clipZ, i_width); + mDoExt_circlePacket* packet = JKR_NEW mDoExt_circlePacket(i_pos, i_radius, i_color, i_clipZ, i_width); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawSphere(int i_bufferType, cXyz& i_pos, f32 i_size, const GXColor& i_color, u8 i_clipZ) { - mDoExt_spherePacket* packet = new mDoExt_spherePacket(i_pos, i_size, i_color, i_clipZ); + mDoExt_spherePacket* packet = JKR_NEW mDoExt_spherePacket(i_pos, i_size, i_color, i_clipZ); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawCylinder(int i_bufferType, cXyz& i_pos, f32 i_radius, f32 i_height, const GXColor& i_color, u8 i_clipZ) { - mDoExt_cylinderPacket* packet = new mDoExt_cylinderPacket(i_pos, i_radius, i_height, i_color, i_clipZ); + mDoExt_cylinderPacket* packet = JKR_NEW mDoExt_cylinderPacket(i_pos, i_radius, i_height, i_color, i_clipZ); dDbVw_setDrawPacketList(packet, i_bufferType); } void dDbVw_drawCylinderM(int i_bufferType, Mtx i_mtx, const GXColor& i_color, u8 i_clipZ) { - mDoExt_cylinderMPacket* packet = new mDoExt_cylinderMPacket(i_mtx, i_color, i_clipZ); + mDoExt_cylinderMPacket* packet = JKR_NEW mDoExt_cylinderMPacket(i_mtx, i_color, i_clipZ); dDbVw_setDrawPacketList(packet, i_bufferType); } diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index 1181ce2abf..c73af1a2c2 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -46,7 +46,7 @@ jstudio_tCreateObject_message::create(JStudio::TObject** ppObject, switch (type) { case 'JMSG': { - jstudio_tAdaptor_message* adaptor = new jstudio_tAdaptor_message(); + jstudio_tAdaptor_message* adaptor = JKR_NEW jstudio_tAdaptor_message(); if (adaptor == NULL) { return false; } @@ -652,7 +652,7 @@ JStage::TObject* dDemo_object_c::appendActor(fopAc_ac_c* p_actor) { return NULL; } - demoActor = new dDemo_actor_c(); + demoActor = JKR_NEW dDemo_actor_c(); if (demoActor == NULL) { // "Failed to get Demo Actor!!\n" OS_REPORT("デモアクター確保失敗！！\n"); @@ -687,7 +687,7 @@ JStage::TObject* dDemo_object_c::createCamera() { return mpCamera; } - mpCamera = new dDemo_camera_c(); + mpCamera = JKR_NEW dDemo_camera_c(); return mpCamera; } @@ -706,7 +706,7 @@ JStage::TObject* dDemo_object_c::createAmbient() { return mpAmbient; } - mpAmbient = new dDemo_ambient_c(); + mpAmbient = JKR_NEW dDemo_ambient_c(); return mpAmbient; } @@ -717,7 +717,7 @@ JStage::TObject* dDemo_object_c::appendLight() { return NULL; } - dDemo_light_c* demoLight = new dDemo_light_c(); + dDemo_light_c* demoLight = JKR_NEW dDemo_light_c(); if (demoLight == NULL) { // "Failed to get Demo Light!!\n" OS_REPORT("デモライト確保失敗！！\n"); @@ -738,31 +738,31 @@ JStage::TObject* dDemo_object_c::createFog() { return mpFog; } - mpFog = new dDemo_fog_c(); + mpFog = JKR_NEW dDemo_fog_c(); return mpFog; } void dDemo_object_c::remove() { while (mActorNum != 0) { - delete mpActors[--mActorNum]; + JKR_DELETE(mpActors[--mActorNum]); } if (mpCamera != NULL) { - delete mpCamera; + JKR_DELETE(mpCamera); mpCamera = NULL; } if (mpAmbient != NULL) { - delete mpAmbient; + JKR_DELETE(mpAmbient); mpAmbient = NULL; } while (mLightNum != 0) { - delete mpLights[--mLightNum]; + JKR_DELETE(mpLights[--mLightNum]); } if (mpFog != NULL) { - delete mpFog; + JKR_DELETE(mpFog); mpFog = NULL; } } @@ -823,32 +823,32 @@ int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNam } void dDemo_c::create() { - m_system = new dDemo_system_c(); + m_system = JKR_NEW dDemo_system_c(); JUT_ASSERT(0, m_system != NULL); - m_control = new JStudio::TControl(); + m_control = JKR_NEW JStudio::TControl(); JUT_ASSERT(0, m_control != NULL); - m_mesgControl = new jmessage_tControl(); + m_mesgControl = JKR_NEW jmessage_tControl(); JUT_ASSERT(0, m_mesgControl != NULL); - m_stage = new JStudio_JStage::TCreateObject(m_system); + m_stage = JKR_NEW JStudio_JStage::TCreateObject(m_system); JUT_ASSERT(0, m_stage != NULL); - m_audio = new JStudio_JAudio2::TCreateObject(Z2GetSoundStarter(), m_system); + m_audio = JKR_NEW JStudio_JAudio2::TCreateObject(Z2GetSoundStarter(), m_system); JUT_ASSERT(0, m_audio != NULL); m_audio->mPermit_onExit_notEnd = true; - m_particle = new dDemo_particle_c(dPa_control_c::getEmitterManager(), m_system); + m_particle = JKR_NEW dDemo_particle_c(dPa_control_c::getEmitterManager(), m_system); JUT_ASSERT(0, m_particle != NULL); - m_message = new jstudio_tCreateObject_message(); + m_message = JKR_NEW jstudio_tCreateObject_message(); JUT_ASSERT(0, m_message != NULL); - m_factory = new JStudio::TFactory(); + m_factory = JKR_NEW JStudio::TFactory(); JUT_ASSERT(0, m_factory != NULL); - m_object = new dDemo_object_c(); + m_object = JKR_NEW dDemo_object_c(); JUT_ASSERT(0, m_object != NULL); m_control->setSecondPerFrame(1.0f / 30.0f); @@ -868,47 +868,47 @@ void dDemo_c::remove() { end(); if (m_object != NULL) { - delete m_object; + JKR_DELETE(m_object); m_object = NULL; } if (m_factory != NULL) { - delete m_factory; + JKR_DELETE(m_factory); m_factory = NULL; } if (m_message != NULL) { - delete m_message; + JKR_DELETE(m_message); m_message = NULL; } if (m_particle != NULL) { - delete m_particle; + JKR_DELETE(m_particle); m_particle = NULL; } if (m_audio != NULL) { - delete m_audio; + JKR_DELETE(m_audio); m_audio = NULL; } if (m_stage != NULL) { - delete m_stage; + JKR_DELETE(m_stage); m_stage = NULL; } if (m_mesgControl != NULL) { - delete m_mesgControl; + JKR_DELETE(m_mesgControl); m_mesgControl = NULL; } if (m_control != NULL) { - delete m_control; + JKR_DELETE(m_control); m_control = NULL; } if (m_system != NULL) { - delete m_system; + JKR_DELETE(m_system); m_system = NULL; } } diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 855566b7c7..a666895c10 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -887,7 +887,7 @@ static void dummy_misc() { J2DPane* pane; J2DPicture* picture; J2DAnmBase* anmBase; - delete anmBase; + JKR_DELETE(anmBase); picture->setBlack(JUtility::TColor(0, 0, 0, 0)); picture->setWhite(JUtility::TColor(0, 0, 0, 0)); pane->getTypeID(); @@ -1025,14 +1025,14 @@ void dDlst_shadowPoly_c::draw() { } static J3DDrawBuffer* J3DDrawBuffer__create(u32 size) { - J3DDrawBuffer* buffer = new J3DDrawBuffer(); + J3DDrawBuffer* buffer = JKR_NEW J3DDrawBuffer(); if (buffer) { int error = buffer->allocBuffer(size); if (error == kJ3DError_Success) { return buffer; } - delete buffer; + JKR_DELETE(buffer); } return NULL; } @@ -1392,7 +1392,7 @@ void dDlst_shadowControl_c::init() { u16 size = l_realImageSize[i]; u32 buffer_size = GXGetTexBufferSize(size, size, 5, GX_DISABLE, 0); - field_0x15ef0[i] = new (0x20) u8[buffer_size]; + field_0x15ef0[i] = JKR_NEW_ARGS (0x20) u8[buffer_size]; GXInitTexObj(&field_0x15eb0[i], field_0x15ef0[i], size, size, GX_TF_RGB5A3, GX_CLAMP, GX_CLAMP, GX_DISABLE); GXInitTexObjLOD(&field_0x15eb0[i], GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, @@ -1758,7 +1758,7 @@ dDlst_list_c::~dDlst_list_c() { J3DDrawBuffer* tmp = *buffer; buffer++; - delete tmp; + JKR_DELETE(tmp); } } diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index f869a08c61..c6cda91826 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -22,23 +22,23 @@ dFile_info_c::dFile_info_c(JKRArchive* i_archive, u8 param_1) { } dFile_info_c::~dFile_info_c() { - delete mFileInfo.Scr; - delete mDatBase; - delete mNoDatBase; + JKR_DELETE(mFileInfo.Scr); + JKR_DELETE(mDatBase); + JKR_DELETE(mNoDatBase); mDoExt_removeMesgFont(); } void dFile_info_c::screenSet() { - mFileInfo.Scr = new J2DScreen(); + mFileInfo.Scr = JKR_NEW J2DScreen(); JUT_ASSERT(0, mFileInfo.Scr != NULL); mFileInfo.Scr->setPriority("zelda_file_select_info_text.blo", 0x1100000, mArchive); mFileInfo.mFont = mDoExt_getMesgFont(); mFileInfo.Scr->search(MULTI_CHAR('w_cp_ef1'))->hide(); mFileInfo.field_0x10 = mFileInfo.Scr->search(MULTI_CHAR('w_dat_i1')); - mDatBase = new CPaneMgrAlpha(mFileInfo.Scr, MULTI_CHAR('w_dat_i1'), 2, NULL); - mNoDatBase = new CPaneMgrAlpha(mFileInfo.Scr, MULTI_CHAR('w_nda_i1'), 2, NULL); + mDatBase = JKR_NEW CPaneMgrAlpha(mFileInfo.Scr, MULTI_CHAR('w_dat_i1'), 2, NULL); + mNoDatBase = JKR_NEW CPaneMgrAlpha(mFileInfo.Scr, MULTI_CHAR('w_nda_i1'), 2, NULL); J2DTextBox* info_text[4]; diff --git a/src/d/d_file_sel_warning.cpp b/src/d/d_file_sel_warning.cpp index 4fbce3920b..e2d767453b 100644 --- a/src/d/d_file_sel_warning.cpp +++ b/src/d/d_file_sel_warning.cpp @@ -25,10 +25,10 @@ dFile_warning_c::dFile_warning_c(JKRArchive* i_archive, u8 param_1) { } dFile_warning_c::~dFile_warning_c() { - delete mFileWarn.mMsgString; - delete mFileWarn.Scr; - delete field_0x24; - delete mpRootPane; + JKR_DELETE(mFileWarn.mMsgString); + JKR_DELETE(mFileWarn.Scr); + JKR_DELETE(field_0x24); + JKR_DELETE(mpRootPane); mDoExt_removeMesgFont(); } @@ -44,10 +44,10 @@ void dFile_warning_c::screenSet() { "zelda_option_set_up_window.bck", }; - mFileWarn.Scr = new J2DScreen(); + mFileWarn.Scr = JKR_NEW J2DScreen(); JUT_ASSERT(0, mFileWarn.Scr != NULL); - mFileWarn.mMsgString = new dMsgString_c(); + mFileWarn.mMsgString = JKR_NEW dMsgString_c(); JUT_ASSERT(0, mFileWarn.mMsgString != NULL); mFileWarn.Scr->setPriority(blo_name[field_0x3e], 0x100000, mpArchive); @@ -59,7 +59,7 @@ void dFile_warning_c::screenSet() { mFileWarn.Scr->animation(); mFileWarn.mFont = mDoExt_getMesgFont(); - mpRootPane = new CPaneMgr(mFileWarn.Scr, MULTI_CHAR('Nm_02'), 0, NULL); + mpRootPane = JKR_NEW CPaneMgr(mFileWarn.Scr, MULTI_CHAR('Nm_02'), 0, NULL); JUT_ASSERT(0, mpRootPane != NULL); field_0x34 = mpRootPane->getTranslateY(); diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 865dd109fc..e517662ac9 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -130,101 +130,101 @@ static dFs_HIO_c g_fsHIO; dFile_select_c::dFile_select_c(JKRArchive* i_archiveP) { mpArchive = i_archiveP; - mpFileSelect3d = new dFile_select3D_c(); + mpFileSelect3d = JKR_NEW dFile_select3D_c(); } dFile_select_c::~dFile_select_c() { int i; for (i = 0; i < 3; i++) { - delete mSelFileMoyoPane[i]; - delete mSelFileGoldPane[i]; - delete mSelFileGold2Pane[i]; - delete m3mSelPane_mo[i]; - delete m3mSelPane_g[i]; - delete m3mSelPane_gr[i]; - delete m3mSelTextPane[i]; - delete mSelFilePane_Book_l[i]; - delete mDeleteEfPane[i]; - delete mCopyEfPane[i]; - delete mSelFilePanes[i]; - delete m3mSelPane[i]; - delete mFileInfo[i]; + JKR_DELETE(mSelFileMoyoPane[i]); + JKR_DELETE(mSelFileGoldPane[i]); + JKR_DELETE(mSelFileGold2Pane[i]); + JKR_DELETE(m3mSelPane_mo[i]); + JKR_DELETE(m3mSelPane_g[i]); + JKR_DELETE(m3mSelPane_gr[i]); + JKR_DELETE(m3mSelTextPane[i]); + JKR_DELETE(mSelFilePane_Book_l[i]); + JKR_DELETE(mDeleteEfPane[i]); + JKR_DELETE(mCopyEfPane[i]); + JKR_DELETE(mSelFilePanes[i]); + JKR_DELETE(m3mSelPane[i]); + JKR_DELETE(mFileInfo[i]); } - delete mBaseMovePane; + JKR_DELETE(mBaseMovePane); for (i = 0; i < 2; i++) { - delete mYnSelPane[i]; - delete mYnSelPane_m[i]; - delete mYnSelPane_g[i]; - delete mYnSelPane_gr[i]; - delete mHeaderTxtPane[i]; - delete mErrorMsgTxtPane[i]; - delete mYnSelTxtPane[i]; - delete mCpFileInfo[i]; - delete mCpSelPane[i]; - delete mCpSelPane_moyo[i]; - delete mCpSelPane_gold[i]; - delete mCpSelPane_gold2[i]; - delete mCpSelPane_book[i]; + JKR_DELETE(mYnSelPane[i]); + JKR_DELETE(mYnSelPane_m[i]); + JKR_DELETE(mYnSelPane_g[i]); + JKR_DELETE(mYnSelPane_gr[i]); + JKR_DELETE(mHeaderTxtPane[i]); + JKR_DELETE(mErrorMsgTxtPane[i]); + JKR_DELETE(mYnSelTxtPane[i]); + JKR_DELETE(mCpFileInfo[i]); + JKR_DELETE(mCpSelPane[i]); + JKR_DELETE(mCpSelPane_moyo[i]); + JKR_DELETE(mCpSelPane_gold[i]); + JKR_DELETE(mCpSelPane_gold2[i]); + JKR_DELETE(mCpSelPane_book[i]); } - delete mBbtnPane; - delete mModoruTxtPane; - delete mAbtnPane; - delete mKetteiTxtPane; - delete mBaseMoveAnm; - delete field_0x0088; - delete mYnSelBck3; - delete mFileSelBpk; - delete mFileSel05Btk; - delete mSelFileBookBpk; - delete mSelFileBookBtk; - delete mSelFileBookBrk; - delete mDtEffBtk; - delete mCpEffBtk; - delete mCpDtEffBrk; - delete field_0x0090; - delete field_0x0094; - delete field_0x0098; - delete field_0x009c; + JKR_DELETE(mBbtnPane); + JKR_DELETE(mModoruTxtPane); + JKR_DELETE(mAbtnPane); + JKR_DELETE(mKetteiTxtPane); + JKR_DELETE(mBaseMoveAnm); + JKR_DELETE(field_0x0088); + JKR_DELETE(mYnSelBck3); + JKR_DELETE(mFileSelBpk); + JKR_DELETE(mFileSel05Btk); + JKR_DELETE(mSelFileBookBpk); + JKR_DELETE(mSelFileBookBtk); + JKR_DELETE(mSelFileBookBrk); + JKR_DELETE(mDtEffBtk); + JKR_DELETE(mCpEffBtk); + JKR_DELETE(mCpDtEffBrk); + JKR_DELETE(field_0x0090); + JKR_DELETE(field_0x0094); + JKR_DELETE(field_0x0098); + JKR_DELETE(field_0x009c); mDoExt_removeMesgFont(); mDoExt_removeSubFont(); - delete stick; - delete mSelIcon; - delete mSelIcon2; - delete mpName; - delete mpFileWarning; + JKR_DELETE(stick); + JKR_DELETE(mSelIcon); + JKR_DELETE(mSelIcon2); + JKR_DELETE(mpName); + JKR_DELETE(mpFileWarning); - delete mCpSelBck; - delete mCpSelBck2; - delete mCpSelBpk; - delete mCpSel03Btk; - delete mCpSelBookBpk; - delete mCpSelBookBtk; - delete mCpSelBookBrk; + JKR_DELETE(mCpSelBck); + JKR_DELETE(mCpSelBck2); + JKR_DELETE(mCpSelBpk); + JKR_DELETE(mCpSel03Btk); + JKR_DELETE(mCpSelBookBpk); + JKR_DELETE(mCpSelBookBtk); + JKR_DELETE(mCpSelBookBrk); - delete mYnSelBck; - delete mYnSelBck2; - delete mYnSelBpk; - delete mYnSelBtk; + JKR_DELETE(mYnSelBck); + JKR_DELETE(mYnSelBck2); + JKR_DELETE(mYnSelBpk); + JKR_DELETE(mYnSelBtk); - delete m3mBck; - delete m3mBck2; - delete m3mBpk; - delete m3mBtk; + JKR_DELETE(m3mBck); + JKR_DELETE(m3mBck2); + JKR_DELETE(m3mBpk); + JKR_DELETE(m3mBtk); - delete mSelDtBtk; - delete mSelDtPane_mset; + JKR_DELETE(mSelDtBtk); + JKR_DELETE(mSelDtPane_mset); mpFileSelect3d->_delete(); - delete mpFileSelect3d; + JKR_DELETE(mpFileSelect3d); #if PLATFORM_GCN - delete mpFadePict; + JKR_DELETE(mpFadePict); dComIfGp_getMain2DArchive()->removeResourceAll(); #endif @@ -238,7 +238,7 @@ void dFile_select_c::_create() { mDoGph_gInf_c::setFadeColor(static_cast(g_blackColor)); - stick = new STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000); + stick = JKR_NEW STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000); JUT_ASSERT(355, stick != NULL); g_fsHIO.no = mDoHIO_CREATE_CHILD("ファイルセレクト画面", &g_fsHIO); @@ -2926,7 +2926,7 @@ void dFile_select_c::screenSet() { static u64 l_tagName131[3] = {MULTI_CHAR('N_sel_00'), MULTI_CHAR('N_sel_01'), MULTI_CHAR('N_sel_02')}; - fileSel.Scr = new J2DScreen(); + fileSel.Scr = JKR_NEW J2DScreen(); JUT_ASSERT(4917, fileSel.Scr != NULL); fileSel.Scr->setPriority("zelda_file_select.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(fileSel.Scr); @@ -2943,25 +2943,25 @@ void dFile_select_c::screenSet() { field_0x0090->searchUpdateMaterialID(fileSel.Scr); field_0x009c->searchUpdateMaterialID(fileSel.Scr); - mBaseMovePane = new CPaneMgr(fileSel.Scr, MULTI_CHAR('w_move_n'), 0, NULL); + mBaseMovePane = JKR_NEW CPaneMgr(fileSel.Scr, MULTI_CHAR('w_move_n'), 0, NULL); mBaseSubPane = fileSel.Scr->search(MULTI_CHAR('w_sub_n')); for (int i = 0; i < 3; i++) { - mSelFilePanes[i] = new CPaneMgr(fileSel.Scr, l_tagName0[i], 1, NULL); + mSelFilePanes[i] = JKR_NEW CPaneMgr(fileSel.Scr, l_tagName0[i], 1, NULL); } fileSel.Scr->search(MULTI_CHAR('Wi_btn_n'))->hide(); - mBbtnPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_n_bbtn'), 2, NULL); - mAbtnPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_n_abtn'), 2, NULL); + mBbtnPane = JKR_NEW CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_n_bbtn'), 2, NULL); + mAbtnPane = JKR_NEW CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_n_abtn'), 2, NULL); #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) - mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_modo'), 2, NULL); - mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_kete'), 2, NULL); + mModoruTxtPane = JKR_NEW CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_modo'), 2, NULL); + mKetteiTxtPane = JKR_NEW CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('w_kete'), 2, NULL); fileSel.Scr->search(MULTI_CHAR('f_modo'))->hide(); fileSel.Scr->search(MULTI_CHAR('f_kete'))->hide(); #else - mModoruTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('f_modo'), 2, NULL); - mKetteiTxtPane = new CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('f_kete'), 2, NULL); + mModoruTxtPane = JKR_NEW CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('f_modo'), 2, NULL); + mKetteiTxtPane = JKR_NEW CPaneMgrAlpha(fileSel.Scr, MULTI_CHAR('f_kete'), 2, NULL); fileSel.Scr->search(MULTI_CHAR('w_modo'))->hide(); fileSel.Scr->search(MULTI_CHAR('w_kete'))->hide(); #endif @@ -2991,9 +2991,9 @@ void dFile_select_c::screenSet() { mSelFileBtk05Frame = 0; for (int i = 0; i < 3; i++) { - mSelFileMoyoPane[i] = new CPaneMgr(fileSel.Scr, l_tagName3[i], 0, NULL); - mSelFileGoldPane[i] = new CPaneMgr(fileSel.Scr, l_tagName4[i], 0, NULL); - mSelFileGold2Pane[i] = new CPaneMgr(fileSel.Scr, l_tagName5[i], 0, NULL); + mSelFileMoyoPane[i] = JKR_NEW CPaneMgr(fileSel.Scr, l_tagName3[i], 0, NULL); + mSelFileGoldPane[i] = JKR_NEW CPaneMgr(fileSel.Scr, l_tagName4[i], 0, NULL); + mSelFileGold2Pane[i] = JKR_NEW CPaneMgr(fileSel.Scr, l_tagName5[i], 0, NULL); mSelFileMoyoPane[i]->getPanePtr()->setAnimation(mFileSelBpk); mSelFileGoldPane[i]->getPanePtr()->setAnimation(mFileSelBpk); mSelFileGold2Pane[i]->getPanePtr()->setAnimation(mFileSelBpk); @@ -3020,7 +3020,7 @@ void dFile_select_c::screenSet() { mSelFileBookBtkFrame = 0; mSelFileBookBrkFrame = 0; for (int i = 0; i < 3; i++) { - mSelFilePane_Book_l[i] = new CPaneMgr(fileSel.Scr, l_tagName12[i], 0, NULL); + mSelFilePane_Book_l[i] = JKR_NEW CPaneMgr(fileSel.Scr, l_tagName12[i], 0, NULL); mSelFilePane_Book_l[i]->getPanePtr()->setAnimation(mSelFileBookBpk); mSelFilePane_Book_l[i]->getPanePtr()->setAnimation(mSelFileBookBtk); mSelFilePane_Book_l[i]->getPanePtr()->setAnimation(mSelFileBookBrk); @@ -3041,7 +3041,7 @@ void dFile_select_c::screenSet() { #endif for (int i = 0; i < 2; i++) { - mHeaderTxtPane[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName21[i], 0, NULL); + mHeaderTxtPane[i] = JKR_NEW CPaneMgrAlpha(fileSel.Scr, l_tagName21[i], 0, NULL); ((J2DTextBox*)mHeaderTxtPane[i]->getPanePtr())->setFont(fileSel.font[0]); ((J2DTextBox*)mHeaderTxtPane[i]->getPanePtr())->setString(512, ""); #if VERSION == VERSION_GCN_JPN @@ -3074,8 +3074,8 @@ void dFile_select_c::screenSet() { mCpEffBtkFrame = 0; mCpDtEffBrkFrame = 0; for (int i = 0; i < 3; i++) { - mDeleteEfPane[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName18[i], 0, NULL); - mCopyEfPane[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName19[i], 0, NULL); + mDeleteEfPane[i] = JKR_NEW CPaneMgrAlpha(fileSel.Scr, l_tagName18[i], 0, NULL); + mCopyEfPane[i] = JKR_NEW CPaneMgrAlpha(fileSel.Scr, l_tagName19[i], 0, NULL); mDeleteEfPane[i]->getPanePtr()->setAnimation(mDtEffBtk); mDeleteEfPane[i]->getPanePtr()->setAnimation(mCpDtEffBrk); mCopyEfPane[i]->getPanePtr()->setAnimation(mCpEffBtk); @@ -3097,7 +3097,7 @@ void dFile_select_c::screenSet() { fileSel.Scr->search(MULTI_CHAR('w_er_msE'))->hide(); for (int i = 0; i < 2; i++) { - mErrorMsgTxtPane[i] = new CPaneMgrAlpha(fileSel.Scr, l_tagName20[i], 0, NULL); + mErrorMsgTxtPane[i] = JKR_NEW CPaneMgrAlpha(fileSel.Scr, l_tagName20[i], 0, NULL); ((J2DTextBox*)mErrorMsgTxtPane[i]->getPanePtr())->setFont(fileSel.font[0]); ((J2DTextBox*)mErrorMsgTxtPane[i]->getPanePtr())->setString(512, ""); @@ -3123,7 +3123,7 @@ void dFile_select_c::screenSet() { mErrorMsgTxtPane[mErrorTxtDispIdx]->setAlpha(0xff); mErrorMsgTxtPane[mErrorTxtDispIdx ^ 1]->setAlpha(0); - mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); + mSelIcon = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL); JUT_ASSERT(5209, mSelIcon != NULL); mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); Vec vtxCenter; @@ -3147,23 +3147,23 @@ void dFile_select_c::screenSet() { J2DPane* selChildPanes[3]; for (int i = 0; i < 3; i++) { - selChildPanes[i] = new J2DPane(l_tagName13[i], JGeometry::TBox2(238.0f, 43.0f, 712.0f, 130.0f)); + selChildPanes[i] = JKR_NEW J2DPane(l_tagName13[i], JGeometry::TBox2(238.0f, 43.0f, 712.0f, 130.0f)); selChildPanes[i]->setUserInfo('n_43'); mSelFilePanes[i]->getPanePtr()->insertChild(fileSel.Scr->search(l_tagName131[i]), selChildPanes[i]); } for (int i = 0; i < 3; i++) { - mFileInfo[i] = new dFile_info_c(mpArchive, 0); + mFileInfo[i] = JKR_NEW dFile_info_c(mpArchive, 0); mFileInfo[i]->setBasePane(selChildPanes[i]); mFileInfoDatBasePane[i] = mFileInfo[i]->getDatBase(); mFileInfoNoDatBasePane[i] = mFileInfo[i]->getNoDatBase(); } mNameBasePane = fileSel.Scr->search(MULTI_CHAR('name_n')); - mpName = new dName_c(mNameBasePane); + mpName = JKR_NEW dName_c(mNameBasePane); field_0x0128 = false; - mpFileWarning = new dFile_warning_c(mpArchive, 0); + mpFileWarning = JKR_NEW dFile_warning_c(mpArchive, 0); mSelDt.mpPane = fileSel.Scr->search(MULTI_CHAR('w_moyo03')); #if PLATFORM_GCN @@ -3173,7 +3173,7 @@ void dFile_select_c::screenSet() { white.a = 0xff; ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpFadePict = new J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2(0.0f, FB_WIDTH, 0.0f, FB_HEIGHT), + mpFadePict = JKR_NEW J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2(0.0f, FB_WIDTH, 0.0f, FB_HEIGHT), timg, NULL); mpFadePict->setBlackWhite(black, white); mpFadePict->setAlpha(0); @@ -3188,7 +3188,7 @@ void dFile_select_c::screenSetCopySel() { static u64 l_tagName004[2] = {MULTI_CHAR('w_bk_l01'), MULTI_CHAR('w_bk_l02')}; static u64 l_tagName005[2] = {MULTI_CHAR('w_cp_ef1'), MULTI_CHAR('w_cp_ef2')}; - mCpSel.Scr = new J2DScreen(); + mCpSel.Scr = JKR_NEW J2DScreen(); JUT_ASSERT(5286, mCpSel.Scr != NULL); mCpSel.Scr->setPriority("zelda_file_select_copy_select.blo", 0x1100000, mpArchive); @@ -3230,11 +3230,11 @@ void dFile_select_c::screenSetCopySel() { mCpSelBookBrkFrame = 0; for (int i = 0; i < 2; i++) { - mCpSelPane[i] = new CPaneMgr(mCpSel.Scr, l_tagName000[i], 0, NULL); - mCpSelPane_moyo[i] = new CPaneMgr(mCpSel.Scr, l_tagName001[i], 0, NULL); - mCpSelPane_gold[i] = new CPaneMgr(mCpSel.Scr, l_tagName002[i], 0, NULL); - mCpSelPane_gold2[i] = new CPaneMgr(mCpSel.Scr, l_tagName003[i], 0, NULL); - mCpSelPane_book[i] = new CPaneMgr(mCpSel.Scr, l_tagName004[i], 0, NULL); + mCpSelPane[i] = JKR_NEW CPaneMgr(mCpSel.Scr, l_tagName000[i], 0, NULL); + mCpSelPane_moyo[i] = JKR_NEW CPaneMgr(mCpSel.Scr, l_tagName001[i], 0, NULL); + mCpSelPane_gold[i] = JKR_NEW CPaneMgr(mCpSel.Scr, l_tagName002[i], 0, NULL); + mCpSelPane_gold2[i] = JKR_NEW CPaneMgr(mCpSel.Scr, l_tagName003[i], 0, NULL); + mCpSelPane_book[i] = JKR_NEW CPaneMgr(mCpSel.Scr, l_tagName004[i], 0, NULL); mCpSelPane_moyo[i]->getPanePtr()->setAnimation(mCpSelBpk); mCpSelPane_gold[i]->getPanePtr()->setAnimation(mCpSelBpk); @@ -3254,7 +3254,7 @@ void dFile_select_c::screenSetCopySel() { namePane->animationTransform(); namePane->setAnimation((J2DAnmTransform*)NULL); - mSelIcon2 = new dSelect_cursor_c(0, 1.0f, NULL); + mSelIcon2 = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL); JUT_ASSERT(5406, mSelIcon2 != NULL); mSelIcon2->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); Vec center = mCpSelPane[0]->getGlobalVtxCenter(false, 0); @@ -3262,7 +3262,7 @@ void dFile_select_c::screenSetCopySel() { mSelIcon2->setAlphaRate(0.0f); for (int i = 0; i < 2; i++) { - mCpFileInfo[i] = new dFile_info_c(mpArchive, 0); + mCpFileInfo[i] = JKR_NEW dFile_info_c(mpArchive, 0); mCpFileInfo[i]->setBasePane(mCpSel.Scr->search(l_tagName13[i + 1])); } @@ -3281,7 +3281,7 @@ void dFile_select_c::screenSetYesNo() { static u64 l_tagName11[2] = {MULTI_CHAR('w_no_gr'), MULTI_CHAR('w_yes_gr')}; static u8 l_msgNum2[2] = {0x08, 0x07}; - mYnSel.ScrYn = new J2DScreen(); + mYnSel.ScrYn = JKR_NEW J2DScreen(); JUT_ASSERT(5435, mYnSel.ScrYn != NULL); mYnSel.ScrYn->setPriority("zelda_file_select_yes_no_window.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(mYnSel.ScrYn); @@ -3295,12 +3295,12 @@ void dFile_select_c::screenSetYesNo() { mYnSelBck3->searchUpdateMaterialID(mYnSel.ScrYn); for (int i = 0; i < 2; i++) { - mYnSelPane[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName012[i], 0, NULL); + mYnSelPane[i] = JKR_NEW CPaneMgr(mYnSel.ScrYn, l_tagName012[i], 0, NULL); #if VERSION == VERSION_GCN_JPN - mYnSelTxtPane[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName013[i], 0, NULL); + mYnSelTxtPane[i] = JKR_NEW CPaneMgr(mYnSel.ScrYn, l_tagName013[i], 0, NULL); mYnSel.ScrYn->search(l_tagName013U[i])->hide(); #else - mYnSelTxtPane[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName013U[i], 0, NULL); + mYnSelTxtPane[i] = JKR_NEW CPaneMgr(mYnSel.ScrYn, l_tagName013U[i], 0, NULL); mYnSel.ScrYn->search(l_tagName013[i])->hide(); #endif ((J2DTextBox*)mYnSelTxtPane[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); @@ -3323,9 +3323,9 @@ void dFile_select_c::screenSetYesNo() { mYnSelBtkFrame = 0; for (int i = 0; i < 2; i++) { - mYnSelPane_m[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName9[i], 0, NULL); - mYnSelPane_g[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName10[i], 0, NULL); - mYnSelPane_gr[i] = new CPaneMgr(mYnSel.ScrYn, l_tagName11[i], 0, NULL); + mYnSelPane_m[i] = JKR_NEW CPaneMgr(mYnSel.ScrYn, l_tagName9[i], 0, NULL); + mYnSelPane_g[i] = JKR_NEW CPaneMgr(mYnSel.ScrYn, l_tagName10[i], 0, NULL); + mYnSelPane_gr[i] = JKR_NEW CPaneMgr(mYnSel.ScrYn, l_tagName11[i], 0, NULL); mYnSelPane_m[i]->getPanePtr()->setAnimation(mYnSelBpk); mYnSelPane_g[i]->getPanePtr()->setAnimation(mYnSelBpk); @@ -3344,7 +3344,7 @@ void dFile_select_c::screenSet3Menu() { static u64 l_tagName011U[3] = {MULTI_CHAR('f_sta'), MULTI_CHAR('f_del'), MULTI_CHAR('f_cop_t')}; static u8 l_msgNum[3] = {0x57, 0x58, 0x56}; - m3mSel.Scr3m = new J2DScreen(); + m3mSel.Scr3m = JKR_NEW J2DScreen(); JUT_ASSERT(5530, m3mSel.Scr3m != NULL); m3mSel.Scr3m->setPriority("zelda_file_select_3menu_window.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(m3mSel.Scr3m); @@ -3373,12 +3373,12 @@ void dFile_select_c::screenSet3Menu() { m3mMenuPane->animationTransform(); for (int i = 0; i < 3; i++) { - m3mSelPane[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName1[i], 0, NULL); + m3mSelPane[i] = JKR_NEW CPaneMgr(m3mSel.Scr3m, l_tagName1[i], 0, NULL); #if VERSION == VERSION_GCN_JPN - m3mSelTextPane[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName011[i], 0, NULL); + m3mSelTextPane[i] = JKR_NEW CPaneMgr(m3mSel.Scr3m, l_tagName011[i], 0, NULL); m3mSel.Scr3m->search(l_tagName011U[i])->hide(); #else - m3mSelTextPane[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName011U[i], 0, NULL); + m3mSelTextPane[i] = JKR_NEW CPaneMgr(m3mSel.Scr3m, l_tagName011U[i], 0, NULL); m3mSel.Scr3m->search(l_tagName011[i])->hide(); #endif @@ -3387,9 +3387,9 @@ void dFile_select_c::screenSet3Menu() { fopMsgM_messageGet(textbuf, l_msgNum[i]); ((J2DTextBox*)m3mSelTextPane[i]->getPanePtr())->setString(textbuf); - m3mSelPane_mo[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName6[i], 0, NULL); - m3mSelPane_g[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName7[i], 0, NULL); - m3mSelPane_gr[i] = new CPaneMgr(m3mSel.Scr3m, l_tagName8[i], 0, NULL); + m3mSelPane_mo[i] = JKR_NEW CPaneMgr(m3mSel.Scr3m, l_tagName6[i], 0, NULL); + m3mSelPane_g[i] = JKR_NEW CPaneMgr(m3mSel.Scr3m, l_tagName7[i], 0, NULL); + m3mSelPane_gr[i] = JKR_NEW CPaneMgr(m3mSel.Scr3m, l_tagName8[i], 0, NULL); m3mSelPane_mo[i]->getPanePtr()->setAnimation(m3mBpk); m3mSelPane_g[i]->getPanePtr()->setAnimation(m3mBpk); @@ -3401,7 +3401,7 @@ void dFile_select_c::screenSet3Menu() { } void dFile_select_c::screenSetDetail() { - mSelDt.ScrDt = new J2DScreen(); + mSelDt.ScrDt = JKR_NEW J2DScreen(); JUT_ASSERT(5622, mSelDt.ScrDt != NULL); mSelDt.ScrDt->setPriority("zelda_file_select_details.blo", 0x1100000, mpArchive); @@ -3412,7 +3412,7 @@ void dFile_select_c::screenSetDetail() { mSelDtBtkFrame = 0; mSelDt.mpPane2 = mSelDt.ScrDt->search(MULTI_CHAR('n_all')); - mSelDtPane_mset = new CPaneMgr(mSelDt.ScrDt, MULTI_CHAR('mset_p_n'), 0, NULL); + mSelDtPane_mset = JKR_NEW CPaneMgr(mSelDt.ScrDt, MULTI_CHAR('mset_p_n'), 0, NULL); mpFileSelect3d->setBasePane(mSelDtPane_mset); mpFileSelect3d->setBase2Pane(fileSel.Scr->search(MULTI_CHAR('w_sub_n'))); @@ -5262,12 +5262,12 @@ void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char con JUT_ASSERT(8823, modelData != NULL); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { - material = new J3DMaterialAnm(); + material = JKR_NEW J3DMaterialAnm(); modelData->getMaterialNodePointer(i)->change(); modelData->getMaterialNodePointer(i)->setMaterialAnm(material); } - mpModel = new J3DModel(modelData, 0, 1); + mpModel = JKR_NEW J3DModel(modelData, 0, 1); JUT_ASSERT(8836, mpModel != NULL); if (param_1) { @@ -5275,7 +5275,7 @@ void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char con anmBase = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(bckRes); JUT_ASSERT(8846, anmBase != NULL); - mBckAnm = new mDoExt_bckAnm(); + mBckAnm = JKR_NEW mDoExt_bckAnm(); if (mBckAnm == NULL || !mBckAnm->init((J3DAnmTransform*)anmBase, 1, 2, 1.0f, 0, -1, false)) { return; @@ -5288,7 +5288,7 @@ void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char con JUT_ASSERT(8859, anmBase != NULL); ((J3DAnmTevRegKey*)anmBase)->searchUpdateMaterialID(modelData); - mBrkAnm = new mDoExt_brkAnm(); + mBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mBrkAnm == NULL || !mBrkAnm->init(modelData, (J3DAnmTevRegKey*)anmBase, -1, 2, 1.0f, 0, -1)) { diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index b5b6485be2..f2fc4d0c64 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -141,8 +141,8 @@ int dGameover_c::_create() { JKRHeap* old_heap = mDoExt_setCurrentHeap(mpHeap); int temp = mpHeap->getTotalFreeSize(); - dgo_screen_c = new dDlst_GameOverScrnDraw_c(resInfo->getArchive()); - dMs_c = new dMenu_save_c(); + dgo_screen_c = JKR_NEW dDlst_GameOverScrnDraw_c(resInfo->getArchive()); + dMs_c = JKR_NEW dMenu_save_c(); JUT_ASSERT(0, dMs_c != NULL); if (dMeter2Info_getGameOverType() == 1) { @@ -161,7 +161,7 @@ int dGameover_c::_create() { } dMs_c->_create(); - dgo_capture_c = new dDlst_Gameover_CAPTURE_c(); + dgo_capture_c = JKR_NEW dDlst_Gameover_CAPTURE_c(); JUT_ASSERT(0, dgo_capture_c != NULL); OS_REPORT("game over create size ===> %d\n", temp - mpHeap->getTotalFreeSize()); @@ -344,13 +344,13 @@ int dGameover_c::_delete() { JKRHeap* old_heap = mDoExt_setCurrentHeap(mpHeap); if (dgo_screen_c != NULL) { - delete dgo_screen_c; + JKR_DELETE(dgo_screen_c); dgo_screen_c = NULL; } dMs_c->_delete(); - delete dMs_c; - delete dgo_capture_c; + JKR_DELETE(dMs_c); + JKR_DELETE(dgo_capture_c); mpHeap->freeAll(); dComIfGp_offHeapLockFlag(0); @@ -361,7 +361,7 @@ int dGameover_c::_delete() { } dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) { - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); mpScreen->setPriority("zelda_game_over.blo", 0x100000, i_archive); dPaneClass_showNullPane(mpScreen); @@ -384,7 +384,7 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) { ResTIMG* img = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); mpBackImg = - new J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2(0.0f, 486.0f, 0.0f, 660.0f), img, NULL); + JKR_NEW J2DPicture(MULTI_CHAR('PICT01'), JGeometry::TBox2(0.0f, 486.0f, 0.0f, 660.0f), img, NULL); mpBackImg->setBlackWhite(img_white, img_black); J2DTextBox* gold_tbox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('gold_00')); @@ -394,14 +394,14 @@ dDlst_GameOverScrnDraw_c::dDlst_GameOverScrnDraw_c(JKRArchive* i_archive) { dMeter2Info_getString(0x381, string, NULL); gold_tbox->setString(string); - mpLight = new dMsgScrnLight_c(6, 0xFF); + mpLight = JKR_NEW dMsgScrnLight_c(6, 0xFF); field_0x10 = 0.0f; } dDlst_GameOverScrnDraw_c::~dDlst_GameOverScrnDraw_c() { - delete mpBackImg; - delete mpScreen; + JKR_DELETE(mpBackImg); + JKR_DELETE(mpScreen); dComIfGp_getMain2DArchive()->removeResourceAll(); } diff --git a/src/d/d_home_button.cpp b/src/d/d_home_button.cpp index bd11f303eb..942a2b86b7 100644 --- a/src/d/d_home_button.cpp +++ b/src/d/d_home_button.cpp @@ -164,7 +164,7 @@ void dHomeButton_c::onReset() { } void dHomeButton_c::create(int param_0, void* param_1) { - m_myObj = new dHomeButton_c(); + m_myObj = JKR_NEW dHomeButton_c(); m_myObj->create_(param_0, param_1); } diff --git a/src/d/d_jcam_editor.cpp b/src/d/d_jcam_editor.cpp index 4700fdbe10..2d0d315e73 100644 --- a/src/d/d_jcam_editor.cpp +++ b/src/d/d_jcam_editor.cpp @@ -5,13 +5,13 @@ dJcame_c* dJcame_c::m_myObj; dJcame_c::dJcame_c(const JStage::TSystem* i_system, f32 param_1, JUTGamePad& i_pad) { - mOrthoGraph = new J2DOrthoGraph(0.0f, 0.0f, 608.0f, 448.0f, -1.0f, 1.0f); - mFont = new JUTResFont((ResFONT*)JUTResFONT_Ascfont_fix12, NULL); + mOrthoGraph = JKR_NEW J2DOrthoGraph(0.0f, 0.0f, 608.0f, 448.0f, -1.0f, 1.0f); + mFont = JKR_NEW JUTResFont((ResFONT*)JUTResFONT_Ascfont_fix12, NULL); mHeap = JKRExpHeap::create(0x100000, JKRHeap::getRootHeap2(), false); JUT_ASSERT(54, mHeap != NULL); - mControl = new JStudioCameraEditor::TControl(); + mControl = JKR_NEW JStudioCameraEditor::TControl(); mHioId = mDoHIO_createChild("JStudioCameraEditor", mControl); JUT_ASSERT(57, mControl != NULL); @@ -29,29 +29,29 @@ dJcame_c::dJcame_c(const JStage::TSystem* i_system, f32 param_1, JUTGamePad& i_p dJcame_c::~dJcame_c() { if (mAdaptor != NULL) { - delete mAdaptor; + JKR_DELETE(mAdaptor); } mControl->jstudio_setAdaptor(NULL); mDoHIO_deleteChild(mHioId); - delete mControl; + JKR_DELETE(mControl); mHeap->destroy(); - delete mFont; - delete mOrthoGraph; + JKR_DELETE(mFont); + JKR_DELETE(mOrthoGraph); m_myObj = NULL; } void dJcame_c::create(const JStage::TSystem* i_system, f32 param_1, JUTGamePad& i_pad) { JUT_ASSERT(109, m_myObj == NULL); - new dJcame_c(i_system, param_1, i_pad); + JKR_NEW dJcame_c(i_system, param_1, i_pad); JUT_ASSERT(111, m_myObj != NULL); } void dJcame_c::remove() { JUT_ASSERT(126, m_myObj != NULL); - delete m_myObj; + JKR_DELETE(m_myObj); } void dJcame_c::update() { @@ -63,7 +63,7 @@ void dJcame_c::update() { return; } - mAdaptor = new JStudio_JStage::TAdaptor_camera(mSystem, (JStage::TCamera*)object); + mAdaptor = JKR_NEW JStudio_JStage::TAdaptor_camera(mSystem, (JStage::TCamera*)object); JUT_ASSERT(155, mAdaptor != NULL); mControl->jstudio_setAdaptor(mAdaptor); diff --git a/src/d/d_jpreviewer.cpp b/src/d/d_jpreviewer.cpp index 5321d02f89..ad15e50191 100644 --- a/src/d/d_jpreviewer.cpp +++ b/src/d/d_jpreviewer.cpp @@ -32,15 +32,15 @@ public: }; dJprev_c::dJprev_c(JStudio::TControl* param_1, const JUTGamePad& param_2) { - mOrthoGraph = new J2DOrthoGraph(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f); + mOrthoGraph = JKR_NEW J2DOrthoGraph(0.0f, 0.0f, 640.0f, 480.0f, -1.0f, 1.0f); JUT_ASSERT(72, mOrthoGraph != NULL) - mFont = new JUTResFont((ResFONT*)JUTResFONT_Ascfont_fix12, NULL); + mFont = JKR_NEW JUTResFont((ResFONT*)JUTResFONT_Ascfont_fix12, NULL); JUT_ASSERT(74, mFont != NULL) - m_parse = new tParse_(); + m_parse = JKR_NEW tParse_(); JUT_ASSERT(76, m_parse != NULL) mHeap = JKRExpHeap::create(0x100000, JKRHeap::getRootHeap2(), NULL); JUT_ASSERT(82, mHeap != NULL) - mControl = new dJprevCtrl_c(); + mControl = JKR_NEW dJprevCtrl_c(); JUT_ASSERT(86, mControl != NULL) mHIOId = mDoHIO_createChild("JStudioPreviewer", mControl); mControl->interface_setPad(¶m_2); @@ -53,23 +53,23 @@ dJprev_c::dJprev_c(JStudio::TControl* param_1, const JUTGamePad& param_2) { dJprev_c::~dJprev_c() { mDoHIO_deleteChild(mHIOId); - delete mControl; + JKR_DELETE(mControl); mHeap->destroy(); - delete m_parse; - delete mFont; - delete mOrthoGraph; + JKR_DELETE(m_parse); + JKR_DELETE(mFont); + JKR_DELETE(mOrthoGraph); m_myObj = NULL; } void dJprev_c::create(JStudio::TControl* pControl, const JUTGamePad& pad) { JUT_ASSERT(130, m_myObj == NULL); - new dJprev_c(pControl, pad); + JKR_NEW dJprev_c(pControl, pad); JUT_ASSERT(132, m_myObj != NULL); } void dJprev_c::remove() { JUT_ASSERT(147, m_myObj != NULL); - delete m_myObj; + JKR_DELETE(m_myObj); } void dJprev_c::update() { diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index a619943ccc..4594622b95 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -18,7 +18,7 @@ int dkWmark_c::m_nowID; int dkWmark_c::create() { static cXyz wolfFootScale(1.1f, 1.0f, 0.6f); - new (this) dkWmark_c(); + JKR_NEW_ARGS (this) dkWmark_c(); field_0x48a = this->parameters >> 0x10; this->parameters &= 0xFFFF; diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index b89783c6ee..bb70b50cf9 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() { - new (this) dkWpillar_c(); + JKR_NEW_ARGS (this) dkWpillar_c(); int roomNo; u8 envrOverride; diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index 028e2d6229..fc0e7400af 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -1172,7 +1172,7 @@ static void undwater_init() { g_env_light.undwater_ef_model = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11020202); if (g_env_light.undwater_ef_model != NULL) { - g_env_light.undwater_btk = new mDoExt_btkAnm(); + g_env_light.undwater_btk = JKR_NEW mDoExt_btkAnm(); if (g_env_light.undwater_btk != NULL) { if (!g_env_light.undwater_btk->init(modelData2, (J3DAnmTextureSRTKey*)dComIfG_getObjectRes("Always", 0x3C), TRUE, diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index 3769ab6f10..f42d7daa9d 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -1225,7 +1225,7 @@ void dKyr_housi_move() { void dKyr_snow_init() { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - g_env_light.mpSnowPacket = new (32) dKankyo_snow_Packet(); + g_env_light.mpSnowPacket = JKR_NEW_ARGS (32) dKankyo_snow_Packet(); if (g_env_light.mpSnowPacket == NULL) { return; @@ -1519,7 +1519,7 @@ void dKyr_snow_move() { void dKyr_star_init() { camera_class* camera = (camera_class*)dComIfGp_getCamera(0); - g_env_light.mpStarPacket = new (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 8acb561fde..5be17461fb 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -316,50 +316,50 @@ void dKyw_wether_init2() { void dKyw_wether_delete() { if (g_env_light.mSunInitialized) { - delete g_env_light.mpSunPacket; - delete g_env_light.mpSunLenzPacket; + JKR_DELETE(g_env_light.mpSunPacket); + JKR_DELETE(g_env_light.mpSunLenzPacket); g_env_light.mpSunPacket = NULL; g_env_light.mpSunLenzPacket = NULL; } if (g_env_light.mRainInitialized) { - delete g_env_light.mpRainPacket; + JKR_DELETE(g_env_light.mpRainPacket); g_env_light.mpRainPacket = NULL; } if (g_env_light.mSnowInitialized) { - delete g_env_light.mpSnowPacket; + JKR_DELETE(g_env_light.mpSnowPacket); g_env_light.mpSnowPacket = NULL; g_env_light.field_0xe90 = 0; } if (g_env_light.mStarInitialized) { - delete g_env_light.mpStarPacket; + JKR_DELETE(g_env_light.mpStarPacket); g_env_light.mpStarPacket = NULL; } if (g_env_light.mHousiInitialized) { - delete g_env_light.mpHousiPacket; + JKR_DELETE(g_env_light.mpHousiPacket); g_env_light.mpHousiPacket = NULL; } if (g_env_light.mCloudInitialized) { - delete g_env_light.mpCloudPacket; + JKR_DELETE(g_env_light.mpCloudPacket); g_env_light.mpCloudPacket = NULL; } if (g_env_light.mOdourData.mOdourPacketStatus) { - delete g_env_light.mOdourData.mpOdourPacket; + JKR_DELETE(g_env_light.mOdourData.mpOdourPacket); g_env_light.mOdourData.mpOdourPacket = NULL; } if (g_env_light.mMudInitialized) { - delete g_env_light.mpMudPacket; + JKR_DELETE(g_env_light.mpMudPacket); g_env_light.mpMudPacket = NULL; } if (g_env_light.mEvilInitialized) { - delete g_env_light.mpEvilPacket; + JKR_DELETE(g_env_light.mpEvilPacket); g_env_light.mpEvilPacket = NULL; } } @@ -386,7 +386,7 @@ dKankyo_sun_Packet::~dKankyo_sun_Packet() {} void dKyw_wether_delete2() { if (g_env_light.mVrkumoStatus != 0) { - delete g_env_light.mpVrkumoPacket; + JKR_DELETE(g_env_light.mpVrkumoPacket); g_env_light.mpVrkumoPacket = NULL; } } @@ -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 = new (0x20) dKankyo_sun_Packet(); - g_env_light.mpSunLenzPacket = new (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"); @@ -499,8 +499,8 @@ static void wether_move_sun() { case TRUE: if (!sunVisible) { g_env_light.mSunInitialized = false; - delete g_env_light.mpSunPacket; - delete g_env_light.mpSunLenzPacket; + JKR_DELETE(g_env_light.mpSunPacket); + JKR_DELETE(g_env_light.mpSunLenzPacket); g_env_light.mpSunPacket = NULL; g_env_light.mpSunLenzPacket = NULL; } else { @@ -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 = new (32) dKankyo_rain_Packet(); + g_env_light.mpRainPacket = JKR_NEW_ARGS (32) dKankyo_rain_Packet(); if (g_env_light.mpRainPacket != NULL) { dKyr_rain_init(); @@ -547,7 +547,7 @@ static void wether_move_rain() { if (g_env_light.raincnt <= 3) { g_env_light.mRainInitialized = 0; mDoAud_seStart(JA_SE_ATM_RAIN_END, NULL, 0, 0); - delete g_env_light.mpRainPacket; + JKR_DELETE(g_env_light.mpRainPacket); g_env_light.mpRainPacket = NULL; } break; @@ -653,7 +653,7 @@ static void wether_move_star() { if (g_env_light.mStarCount == 0) { g_env_light.mStarInitialized = false; - delete g_env_light.mpStarPacket; + JKR_DELETE(g_env_light.mpStarPacket); g_env_light.mpStarPacket = NULL; } break; @@ -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 = new (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) { @@ -748,7 +748,7 @@ static void wether_move_housi() { g_env_light.mpHousiPacket->field_0x5de8 <= 0.0f) { g_env_light.mHousiInitialized = false; - delete g_env_light.mpHousiPacket; + JKR_DELETE(g_env_light.mpHousiPacket); g_env_light.mpHousiPacket = NULL; } else { dKyr_housi_move(); @@ -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 = new (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); @@ -778,7 +778,7 @@ static void wether_move_odour() { if (g_env_light.mOdourData.field_0xf21 == 0) { g_env_light.mOdourData.mOdourPacketStatus = 0; if (g_env_light.mOdourData.mpOdourPacket != NULL) { - delete g_env_light.mOdourData.mpOdourPacket; + JKR_DELETE(g_env_light.mOdourData.mpOdourPacket); g_env_light.mOdourData.mpOdourPacket = NULL; } } else { @@ -788,7 +788,7 @@ static void wether_move_odour() { case 2: g_env_light.mOdourData.field_0xf21 = 0; g_env_light.mOdourData.mOdourPacketStatus = 0; - delete g_env_light.mOdourData.mpOdourPacket; + JKR_DELETE(g_env_light.mOdourData.mpOdourPacket); g_env_light.mOdourData.mpOdourPacket = NULL; break; } @@ -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 = new (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); @@ -822,7 +822,7 @@ static void wether_move_moya() { if (g_env_light.mMoyaCount == 0 && g_env_light.mpCloudPacket->mCount == 0) { g_env_light.mCloudInitialized = 0; - delete g_env_light.mpCloudPacket; + JKR_DELETE(g_env_light.mpCloudPacket); g_env_light.mpCloudPacket = NULL; } break; @@ -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 = new (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 = new (32) dKankyo_mud_Packet(); + g_env_light.mpMudPacket = JKR_NEW_ARGS (32) dKankyo_mud_Packet(); if (g_env_light.mpMudPacket != NULL) { dKyr_mud_init(); @@ -979,7 +979,7 @@ static void wether_move_mud() { if (g_env_light.field_0x1048 == 0 && g_env_light.mpMudPacket->mEffectNum == 0) { g_env_light.mMudInitialized = 0; - delete g_env_light.mpMudPacket; + JKR_DELETE(g_env_light.mpMudPacket); g_env_light.mpMudPacket = NULL; } break; @@ -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 = new (32) dKankyo_evil_Packet(); + g_env_light.mpEvilPacket = JKR_NEW_ARGS (32) dKankyo_evil_Packet(); if (g_env_light.mpEvilPacket != NULL) { dKyr_evil_init(); @@ -1005,7 +1005,7 @@ static void wether_move_evil() { if (g_env_light.field_0x1054 == 0 && g_env_light.mpEvilPacket->mEffectNum == 0) { g_env_light.mEvilInitialized = 0; - delete g_env_light.mpEvilPacket; + JKR_DELETE(g_env_light.mpEvilPacket); g_env_light.mpEvilPacket = NULL; } break; diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index fa31a962ea..427351053e 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -12,28 +12,28 @@ dKantera_icon_c::dKantera_icon_c() { } dKantera_icon_c::~dKantera_icon_c() { - delete mpKanteraIcon->getScreen(); - delete mpKanteraIcon; + JKR_DELETE(mpKanteraIcon->getScreen()); + JKR_DELETE(mpKanteraIcon); mpKanteraIcon = NULL; - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; - delete mpGauge; + JKR_DELETE(mpGauge); mpGauge = NULL; } void dKantera_icon_c::initiate() { - mpKanteraIcon = new dDlst_KanteraIcon_c(); + mpKanteraIcon = JKR_NEW dDlst_KanteraIcon_c(); - J2DScreen* scrn = new J2DScreen(); + J2DScreen* scrn = JKR_NEW J2DScreen(); scrn->setPriority("zelda_kantera_icon_mater.blo", 0x20000, dComIfGp_getMain2DArchive()); dPaneClass_showNullPane(scrn); mpKanteraIcon->setScreen(scrn); - mpParent = new CPaneMgr(scrn, MULTI_CHAR('kan_m_n'), 2, NULL); + mpParent = JKR_NEW CPaneMgr(scrn, MULTI_CHAR('kan_m_n'), 2, NULL); - mpGauge = new CPaneMgr(scrn, MULTI_CHAR('yellow_m'), 0, NULL); + mpGauge = JKR_NEW CPaneMgr(scrn, MULTI_CHAR('yellow_m'), 0, NULL); } void dKantera_icon_c::setAlphaRate(f32 alphaRate) { diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index 77545a769c..d4b35e2e9c 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -151,7 +151,7 @@ int dThunder_c::create() { f32 var_r28; f32 var_r27; - new (this) dThunder_c(); + JKR_NEW_ARGS (this) dThunder_c(); J3DModelData* modelData; if (cM_rndF(1.0f) < 0.5f) { diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index 1cc6a4dfb4..17c8fa5961 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -1131,7 +1131,7 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) { m_mySelfPointer = this; #endif - m_res = new (0x20) dMap_prm_res_s; + m_res = JKR_NEW_ARGS (0x20) dMap_prm_res_s; JUT_ASSERT(2559, m_res != NULL); dMap_HIO_prm_res_dst_s::m_res = m_res; @@ -1176,12 +1176,12 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) { } int buffer_size = GXGetTexBufferSize(param_2, param_3, 9, GX_FALSE, 0); - mImage_p = new (0x20) u8[buffer_size]; + mImage_p = JKR_NEW_ARGS (0x20) u8[buffer_size]; JUT_ASSERT(2638, mImage_p != NULL); renderingDAmap_c::init(mImage_p, mTexSizeX, mTexSizeY, mTexSizeX, mTexSizeY); - mResTIMG = new (0x20) ResTIMG; + mResTIMG = JKR_NEW_ARGS (0x20) ResTIMG; JUT_ASSERT(2647, mResTIMG != NULL); makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33); @@ -1207,17 +1207,17 @@ void dMap_c::changeTextureSize(int param_1, int param_2, int param_3) { void dMap_c::_remove() { if (mImage_p != NULL) { - delete[] mImage_p; + JKR_DELETE_ARRAY(mImage_p); mImage_p = NULL; } if (mResTIMG != NULL) { - delete mResTIMG; + JKR_DELETE(mResTIMG); mResTIMG = NULL; } if (m_res != NULL) { - delete m_res; + JKR_DELETE(m_res); m_res = NULL; } } diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp index ca95a043fd..50519677e5 100644 --- a/src/d/d_map_path.cpp +++ b/src/d/d_map_path.cpp @@ -19,7 +19,7 @@ void dMpath_n::dTexObjAggregate_c::create() { }; for (int lp1 = 0; lp1 < 7; lp1++) { - mp_texObj[lp1] = new GXTexObj(); + mp_texObj[lp1] = JKR_NEW GXTexObj(); JUT_ASSERT(70, mp_texObj[lp1] != NULL); ResTIMG* image = (ResTIMG*)dComIfG_getObjectRes("Always", data[lp1]); JUT_ASSERT(72, image != NULL); @@ -31,7 +31,7 @@ void dMpath_n::dTexObjAggregate_c::create() { void dMpath_n::dTexObjAggregate_c::remove() { for (int i = 0; i < 7; i++) { - delete mp_texObj[i]; + JKR_DELETE(mp_texObj[i]); mp_texObj[i] = NULL; } } @@ -209,13 +209,13 @@ bool dMpath_HIO_file_base_c::readBinaryFile(const char* param_1) { } if (file.open(JORFile::EFlags_READ, r26, NULL, NULL, NULL)) { s32 r28 = file.getFileSize(); - char* buf = new char[r28]; + char* buf = JKR_NEW char[r28]; JUT_ASSERT(855, buf != NULL); file.readData(buf, r28); copyReadBufToData(buf, r28); OSReport("write read success!::%6d\n", r28); result = true; - delete[] buf; + JKR_DELETE_ARRAY(buf); buf = NULL; file.close(); } else { diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp index 4f45717806..99c851e30f 100644 --- a/src/d/d_map_path_dmap.cpp +++ b/src/d/d_map_path_dmap.cpp @@ -384,7 +384,7 @@ int dMpath_c::getTopBottomFloorNo(s8* i_topFloorNo, s8* i_bottomFloorNo) { } void dMpath_c::createWork() { - mLayerList = new dDrawPath_c::layer_data; + mLayerList = JKR_NEW dDrawPath_c::layer_data; JUT_ASSERT(1416, mLayerList!=NULL); } diff --git a/src/d/d_map_path_fmap.cpp b/src/d/d_map_path_fmap.cpp index f3fbef9441..085bf863ee 100644 --- a/src/d/d_map_path_fmap.cpp +++ b/src/d/d_map_path_fmap.cpp @@ -6,7 +6,7 @@ void fmpTresTypeGroupDataList_c::addTypeGroupData(u8 i_typeGroupNo, dTres_c::data_s const* i_tresData) { fmpTresTypeGroupData_c* next = mpNextData; - fmpTresTypeGroupData_c* fmpTresTypeGroupData_p = new fmpTresTypeGroupData_c(); + fmpTresTypeGroupData_c* fmpTresTypeGroupData_p = JKR_NEW fmpTresTypeGroupData_c(); if (mpTypeGroupDataHead == NULL) { mpTypeGroupDataHead = fmpTresTypeGroupData_p; @@ -35,7 +35,7 @@ void dMenu_Fmap_room_data_c::buildTresTypeGroup(int i_stageNo, int i_roomIndex, dTres_c::data_s* data_p = tresure_p->field_0x4->getDataPointer(); if (mp_fmpTresTypeGroupDataListAll == NULL) { - mp_fmpTresTypeGroupDataListAll = new fmpTresTypeGroupDataListAll_c(); + mp_fmpTresTypeGroupDataListAll = JKR_NEW fmpTresTypeGroupDataListAll_c(); } for (int i = 0; i < num; i++) { diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index acf6408a6d..b0f2579827 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -96,11 +96,11 @@ dMenu_Collect2D_c::~dMenu_Collect2D_c() { void dMenu_Collect2D_c::_create() { mpHeap->getTotalFreeSize(); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); mpScreen->setPriority("zelda_collect_soubi_screen.blo", 0x1020000, dComIfGp_getCollectResArchive()); dPaneClass_showNullPane(mpScreen); - mpScreenIcon = new J2DScreen(); + mpScreenIcon = JKR_NEW J2DScreen(); mpScreenIcon->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, dComIfGp_getCollectResArchive()); for (int i = 0; i < 2; i++) { @@ -108,13 +108,13 @@ void dMenu_Collect2D_c::_create() { mpButtonText[i] = NULL; } dPaneClass_showNullPane(mpScreenIcon); - mpDraw2DTop = new dMenu_Collect2DTop_c(this); + mpDraw2DTop = JKR_NEW dMenu_Collect2DTop_c(this); ResTIMG* image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBlackTex = new J2DPicture(image); + mpBlackTex = JKR_NEW J2DPicture(image); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); mpBlackTex->setAlpha(0); - mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); - mpString = new dMsgString_c(); + mpDrawCursor = JKR_NEW dSelect_cursor_c(2, 1.0f, NULL); + mpString = JKR_NEW dMsgString_c(); mpSaveScrn = NULL; mpOptionScrn = NULL; mpLetterScrn = NULL; @@ -131,81 +131,81 @@ void dMenu_Collect2D_c::_create() { void dMenu_Collect2D_c::_delete() { mpHeap->getTotalFreeSize(); dMeter2Info_setCollectCursorPosXY(mCursorX, mCursorY); - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpScreenIcon; + JKR_DELETE(mpScreenIcon); mpScreenIcon = NULL; for (int i = 0; i < 2; i++) { if (mpButtonAB[i]) { - delete mpButtonAB[i]; + JKR_DELETE(mpButtonAB[i]); mpButtonAB[i] = NULL; } if (mpButtonText[i]) { - delete mpButtonText[i]; + JKR_DELETE(mpButtonText[i]); mpButtonText[i] = NULL; } } - delete mpDraw2DTop; + JKR_DELETE(mpDraw2DTop); mpDraw2DTop = NULL; - delete mpBlackTex; + JKR_DELETE(mpBlackTex); mpBlackTex = NULL; - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; - delete mpString; + JKR_DELETE(mpString); mpString = NULL; JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); if (mpSaveScrn) { mpSaveScrn->_delete(); - delete mpSaveScrn; + JKR_DELETE(mpSaveScrn); mpSaveScrn = NULL; mpSubHeap->freeAll(); } if (mpOptionScrn) { mpOptionScrn->_delete(); - delete mpOptionScrn; + JKR_DELETE(mpOptionScrn); mpOptionScrn = NULL; mpSubHeap->freeAll(); } if (mpLetterScrn) { - delete mpLetterScrn; + JKR_DELETE(mpLetterScrn); mpLetterScrn = NULL; mpSubHeap->freeAll(); } if (mpFishingScrn) { - delete mpFishingScrn; + JKR_DELETE(mpFishingScrn); mpFishingScrn = NULL; mpSubHeap->freeAll(); } if (mpSkillScrn) { - delete mpSkillScrn; + JKR_DELETE(mpSkillScrn); mpSkillScrn = NULL; mpSubHeap->freeAll(); } if (mpInsectScrn) { - delete mpInsectScrn; + JKR_DELETE(mpInsectScrn); mpInsectScrn = NULL; mpSubHeap->freeAll(); } mDoExt_setCurrentHeap(heap); - delete mpAnmKey; + JKR_DELETE(mpAnmKey); mpAnmKey = NULL; for (int i = 0; i < 7; i++) { for (int j = 0; j < 6; j++) { if (mpSelPm[i][j]) { - delete mpSelPm[i][j]; + JKR_DELETE(mpSelPm[i][j]); mpSelPm[i][j] = NULL; } } } - delete mpLinkPm; + JKR_DELETE(mpLinkPm); mpLinkPm = NULL; - delete mpMaskPm; + JKR_DELETE(mpMaskPm); mpMaskPm = NULL; - delete mpModelBg; + JKR_DELETE(mpModelBg); mpModelBg = NULL; - delete mpHeartParent; + JKR_DELETE(mpHeartParent); mpHeartParent = NULL; - delete mpHeartPiece; + JKR_DELETE(mpHeartPiece); mpHeartPiece = NULL; dComIfGp_getCollectResArchive()->removeResourceAll(); } @@ -634,7 +634,7 @@ void dMenu_Collect2D_c::screenSet() { for (int i = 0; i < 7; i++) { for (int j = 0; j < 6; j++) { if (getItemTag(i, j, true)) { - mpSelPm[i][j] = new CPaneMgr(mpScreen, getItemTag(i, j, true), 0, NULL); + mpSelPm[i][j] = JKR_NEW CPaneMgr(mpScreen, getItemTag(i, j, true), 0, NULL); if (!bVar18) { i_copy = i; j_copy = j; @@ -661,14 +661,14 @@ void dMenu_Collect2D_c::screenSet() { mCursorX = i_copy; mCursorY = j_copy; } - mpLinkPm = new CPaneMgr(mpScreen, MULTI_CHAR('linki_n'), 0, NULL); + mpLinkPm = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('linki_n'), 0, NULL); mLinkGlobalCenterPos.x = mpLinkPm->getInitGlobalCenterPosX(); mLinkGlobalCenterPos.y = mpLinkPm->getInitGlobalCenterPosY(); mLinkGlobalCenterPos.z = -1000.0f; - mpMaskPm = new CPaneMgr(mpScreen, MULTI_CHAR('kamen_n'), 0, NULL); - mpModelBg = new CPaneMgr(mpScreen, MULTI_CHAR('modelbgn'), 2, NULL); - mpHeartParent = new CPaneMgr(mpScreen, MULTI_CHAR('heart_n'), 0, NULL); - mpHeartPiece = new CPaneMgr(mpScreen, MULTI_CHAR('heart_kn'), 0, NULL); + mpMaskPm = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('kamen_n'), 0, NULL); + mpModelBg = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('modelbgn'), 2, NULL); + mpHeartParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('heart_n'), 0, NULL); + mpHeartPiece = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('heart_kn'), 0, NULL); setAButtonString(mCurrentAString); setBButtonString(mCurrentBString); setItemNameString(mCursorX, mCursorY); @@ -1537,38 +1537,38 @@ void dMenu_Collect2D_c::wait_init() { if (mpSaveScrn != NULL) { mpSaveScrn->_delete(); - delete mpSaveScrn; + JKR_DELETE(mpSaveScrn); mpSaveScrn = NULL; mpSubHeap->freeAll(); } if (mpOptionScrn != NULL) { mpOptionScrn->_delete(); - delete mpOptionScrn; + JKR_DELETE(mpOptionScrn); mpOptionScrn = NULL; mpSubHeap->freeAll(); } if (mpLetterScrn != NULL) { - delete mpLetterScrn; + JKR_DELETE(mpLetterScrn); mpLetterScrn = NULL; mpSubHeap->freeAll(); } if (mpFishingScrn != NULL) { - delete mpFishingScrn; + JKR_DELETE(mpFishingScrn); mpFishingScrn = NULL; mpSubHeap->freeAll(); } if (mpSkillScrn != NULL) { - delete mpSkillScrn; + JKR_DELETE(mpSkillScrn); mpSkillScrn = NULL; mpSubHeap->freeAll(); } if (mpInsectScrn != NULL) { - delete mpInsectScrn; + JKR_DELETE(mpInsectScrn); mpInsectScrn = NULL; mpSubHeap->freeAll(); } @@ -1682,7 +1682,7 @@ void dMenu_Collect2D_c::wait_proc() { void dMenu_Collect2D_c::save_open_init() { JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); if (!mpSaveScrn) { - mpSaveScrn = new dMenu_save_c(); + mpSaveScrn = JKR_NEW dMenu_save_c(); } mpSaveScrn->setUseType(1); mpSaveScrn->_create(); @@ -1740,7 +1740,7 @@ void dMenu_Collect2D_c::save_close_proc() { void dMenu_Collect2D_c::option_open_init() { JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); if (!mpOptionScrn) { - mpOptionScrn = new dMenu_Option_c(dComIfGp_getCollectResArchive(), mpStick); + mpOptionScrn = JKR_NEW dMenu_Option_c(dComIfGp_getCollectResArchive(), mpStick); } mpOptionScrn->initialize(); setAButtonString(0); @@ -1796,7 +1796,7 @@ void dMenu_Collect2D_c::option_close_proc() { void dMenu_Collect2D_c::letter_open_init() { JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); if (!mpLetterScrn) { - mpLetterScrn = new dMenu_Letter_c(mpSubHeap, mpStick, mpCStick); + mpLetterScrn = JKR_NEW dMenu_Letter_c(mpSubHeap, mpStick, mpCStick); } setAButtonString(0); setBButtonString(0); @@ -1851,7 +1851,7 @@ void dMenu_Collect2D_c::letter_close_proc() { void dMenu_Collect2D_c::fishing_open_init() { JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); if (!mpFishingScrn) { - mpFishingScrn = new dMenu_Fishing_c(mpSubHeap, mpStick, mpCStick); + mpFishingScrn = JKR_NEW dMenu_Fishing_c(mpSubHeap, mpStick, mpCStick); } setAButtonString(0); setBButtonString(0); @@ -1906,7 +1906,7 @@ void dMenu_Collect2D_c::fishing_close_proc() { void dMenu_Collect2D_c::skill_open_init() { JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); if (!mpSkillScrn) { - mpSkillScrn = new dMenu_Skill_c(mpSubHeap, mpStick, mpCStick); + mpSkillScrn = JKR_NEW dMenu_Skill_c(mpSubHeap, mpStick, mpCStick); } setAButtonString(0); setBButtonString(0); @@ -1961,7 +1961,7 @@ void dMenu_Collect2D_c::skill_close_proc() { void dMenu_Collect2D_c::insect_open_init() { JKRHeap* heap = mDoExt_setCurrentHeap(mpSubHeap); if (!mpInsectScrn) { - mpInsectScrn = new dMenu_Insect_c(mpSubHeap, mpStick, mpCStick, 0); + mpInsectScrn = JKR_NEW dMenu_Insect_c(mpSubHeap, mpStick, mpCStick, 0); } setAButtonString(0); setBButtonString(0); @@ -2336,15 +2336,15 @@ void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const c resArchive->getResource('BMD ', param_0), 0x51020010); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { - J3DMaterialAnm* matAnm = new J3DMaterialAnm(); + J3DMaterialAnm* matAnm = JKR_NEW J3DMaterialAnm(); modelData->getMaterialNodePointer(i)->change(); modelData->getMaterialNodePointer(i)->setMaterialAnm(matAnm); } - mpModel = new J3DModel(modelData, 0, 1); + mpModel = JKR_NEW J3DModel(modelData, 0, 1); if (param_1 != NULL) { J3DAnmTransform* pbck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load( resArchive->getResource('BCK ', param_1), J3DLOADER_UNK_FLAG0); - mpBckAnm = new mDoExt_bckAnm(); + mpBckAnm = JKR_NEW mDoExt_bckAnm(); if (mpBckAnm == NULL || !mpBckAnm->init(pbck, 1, 2, 1.0f, 0, -1, false)) { return; } @@ -2353,7 +2353,7 @@ void dMenu_Collect3D_c::setJ3D(const char* param_0, const char* param_1, const c J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)J3DAnmLoaderDataBase::load( resArchive->getResource('BRK ', param_2), J3DLOADER_UNK_FLAG0); pbrk->searchUpdateMaterialID(modelData); - mpBrkAnm = new mDoExt_brkAnm(); + mpBrkAnm = JKR_NEW mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, -1, 2, 1.0f, 0, -1)) { return; } @@ -2615,17 +2615,17 @@ void dMenu_Collect2DTop_c::draw() { } dMenu_Collect_c::dMenu_Collect_c(JKRExpHeap* param_0, STControl* param_1, CSTControl* param_2) { - mpCollect2D = new dMenu_Collect2D_c(param_0, param_1, param_2); - mpCollect3D = new dMenu_Collect3D_c(param_0, mpCollect2D, param_2); + mpCollect2D = JKR_NEW dMenu_Collect2D_c(param_0, param_1, param_2); + mpCollect3D = JKR_NEW dMenu_Collect3D_c(param_0, mpCollect2D, param_2); } dMenu_Collect_c::~dMenu_Collect_c() { if (mpCollect2D) { - delete mpCollect2D; + JKR_DELETE(mpCollect2D); mpCollect2D = NULL; } if (mpCollect3D) { - delete mpCollect3D; + JKR_DELETE(mpCollect3D); mpCollect3D = NULL; } } diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index bd81807b18..c6a33051b7 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -94,7 +94,7 @@ dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) { field_0xdd7 = 0; field_0xdd8 = 1; - mString = new dMsgString_c(); + mString = JKR_NEW dMsgString_c(); JUT_ASSERT(621, mString != NULL); mpTalkHeap = JKRCreateExpHeap(0x32000, mpHeap, false); @@ -102,7 +102,7 @@ dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) { mpItemExplain = NULL; - mpMeterHaihai = new dMeterHaihai_c(2); + mpMeterHaihai = JKR_NEW dMeterHaihai_c(2); JUT_ASSERT(630, mpMeterHaihai != NULL); field_0xdda = 0; @@ -136,7 +136,7 @@ dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) { void dMenu_DmapBg_c::mapScreenInit() { for (int i = 0; i < 2; i++) { - mMapScreen[i] = new J2DScreen(); + mMapScreen[i] = JKR_NEW J2DScreen(); JUT_ASSERT(689, mMapScreen[i] != NULL); bool fg = mMapScreen[i]->setPriority("zelda_dungeon_map_map.blo", 0x20000, dComIfGp_getDmapResArchive()); @@ -146,7 +146,7 @@ void dMenu_DmapBg_c::mapScreenInit() { } #if (PLATFORM_WII || PLATFORM_SHIELD) - mpBlack = new CPaneMgrAlpha(mMapScreen[0], MULTI_CHAR('m_black'), 2, NULL); + mpBlack = JKR_NEW CPaneMgrAlpha(mMapScreen[0], MULTI_CHAR('m_black'), 2, NULL); JUT_ASSERT(699, mpBlack != NULL); mpBlack->setAlphaRate(0.0f); #else @@ -177,7 +177,7 @@ void dMenu_DmapBg_c::mapScreenInit() { } for (int i = 0; i < 2; i++) { - mpMapRoot[i] = new CPaneMgrAlphaMorf(mMapScreen[i], 'ROOT', 2, NULL); + mpMapRoot[i] = JKR_NEW CPaneMgrAlphaMorf(mMapScreen[i], 'ROOT', 2, NULL); JUT_ASSERT(751, mpMapRoot[i] != NULL); } @@ -211,7 +211,7 @@ void dMenu_DmapBg_c::mapScreenInit() { initiate(dComIfGp_getDmapResArchive()); for (int i = 0; i < 2; i++) { - mpMapSpace[i] = new CPaneMgr(mMapScreen[i], MULTI_CHAR('mapspace'), 0, NULL); + mpMapSpace[i] = JKR_NEW CPaneMgr(mMapScreen[i], MULTI_CHAR('mapspace'), 0, NULL); JUT_ASSERT(817, mpMapSpace[i] != NULL); mpMapSpace[i]->paneTrans(0.0f, -15.0f); @@ -293,7 +293,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { #endif }; - mButtonScreen = new J2DScreen(); + mButtonScreen = JKR_NEW J2DScreen(); JUT_ASSERT(916, mButtonScreen != NULL); bool fg = mButtonScreen->setPriority("zelda_dungeon_map_spot_button.blo", 0x20000, dComIfGp_getDmapResArchive()); @@ -301,14 +301,14 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { dPaneClass_showNullPane(mButtonScreen); #if (PLATFORM_WII || PLATFORM_SHIELD) - mDecorateScreen = new J2DScreen(); + mDecorateScreen = JKR_NEW J2DScreen(); JUT_ASSERT(926, mDecorateScreen != NULL); fg = mDecorateScreen->setPriority("zelda_dungeon_map_decoration_revo.blo", 0x20000, dComIfGp_getDmapResArchive()); JUT_ASSERT(930, fg != false); dPaneClass_showNullPane(mDecorateScreen); - mpDecorateRoot = new CPaneMgrAlphaMorf(mDecorateScreen, 'ROOT', 2, NULL); + mpDecorateRoot = JKR_NEW CPaneMgrAlphaMorf(mDecorateScreen, 'ROOT', 2, NULL); JUT_ASSERT(934, mpDecorateRoot != NULL); #else mDecorateScreen = NULL; @@ -318,7 +318,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { mButtonScreen->search(MULTI_CHAR('spot01'))->hide(); #endif - mpButtonRoot = new CPaneMgrAlphaMorf(mButtonScreen, 'ROOT', 2, NULL); + mpButtonRoot = JKR_NEW CPaneMgrAlphaMorf(mButtonScreen, 'ROOT', 2, NULL); JUT_ASSERT(952, mpButtonRoot != NULL); for (int i = 0; i < 2; i++) { @@ -326,7 +326,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { mpButtonText[i] = NULL; } - mpCButton = new CPaneMgrAlpha(mButtonScreen, MULTI_CHAR('c_btn'), 2, NULL); + mpCButton = JKR_NEW CPaneMgrAlpha(mButtonScreen, MULTI_CHAR('c_btn'), 2, NULL); JUT_ASSERT(978, mpCButton != NULL); mpJButton = NULL; @@ -348,7 +348,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { #endif } - field_0xcf4 = new CPaneMgr(mButtonScreen, 'c_n', 2, NULL); + field_0xcf4 = JKR_NEW CPaneMgr(mButtonScreen, 'c_n', 2, NULL); field_0xcf8 = NULL; J2DTextBox* textBox; @@ -446,7 +446,7 @@ void dMenu_DmapBg_c::setJButtonString(u32 i_msgNo) { void dMenu_DmapBg_c::createExplain() { if (mpItemExplain == NULL) { JKRHeap* prevHeap = mDoExt_setCurrentHeap(mpTalkHeap); - mpItemExplain = new dMenu_ItemExplain_c(mpTalkHeap, dComIfGp_getDmapResArchive(), mpStick, true); + mpItemExplain = JKR_NEW dMenu_ItemExplain_c(mpTalkHeap, dComIfGp_getDmapResArchive(), mpStick, true); JUT_ASSERT(1308, mpItemExplain != NULL); mDoExt_setCurrentHeap(prevHeap); @@ -456,21 +456,21 @@ void dMenu_DmapBg_c::createExplain() { void dMenu_DmapBg_c::deleteExplain() { if (mpItemExplain != NULL) { JKRHeap* prevHeap = mDoExt_setCurrentHeap(mpTalkHeap); - delete mpItemExplain; + JKR_DELETE(mpItemExplain); mpItemExplain = NULL; mDoExt_setCurrentHeap(prevHeap); } } void dMenu_DmapBg_c::baseScreenInit() { - mBaseScreen = new J2DScreen(); + mBaseScreen = JKR_NEW J2DScreen(); JUT_ASSERT(1336, mBaseScreen != NULL); bool fg = mBaseScreen->setPriority("zelda_dungeon_map_base.blo", 0x20000, dComIfGp_getDmapResArchive()); JUT_ASSERT(1347, fg != false); dPaneClass_showNullPane(mBaseScreen); - mFloorScreen = new J2DScreen(); + mFloorScreen = JKR_NEW J2DScreen(); JUT_ASSERT(1351, mFloorScreen != NULL); fg = mFloorScreen->setPriority("zelda_dungeon_map_floor_parts.blo", 0x20000, @@ -480,13 +480,13 @@ void dMenu_DmapBg_c::baseScreenInit() { mBaseScreen->search(MULTI_CHAR('w_btn_n'))->hide(); - mpBaseRoot = new CPaneMgrAlphaMorf(mBaseScreen, 'ROOT', 2, NULL); + mpBaseRoot = JKR_NEW CPaneMgrAlphaMorf(mBaseScreen, 'ROOT', 2, NULL); JUT_ASSERT(1396, mpBaseRoot != NULL); - mpFloorRoot = new CPaneMgrAlphaMorf(mFloorScreen, 'ROOT', 2, NULL); + mpFloorRoot = JKR_NEW CPaneMgrAlphaMorf(mFloorScreen, 'ROOT', 2, NULL); JUT_ASSERT(1399, mpFloorRoot != NULL); - mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); + mpDrawCursor = JKR_NEW dSelect_cursor_c(2, 1.0f, NULL); JUT_ASSERT(1403, mpDrawCursor != NULL); mpDrawCursor->setAlphaRate(1.0f); @@ -641,60 +641,60 @@ bool dMenu_DmapBg_c::dpdMove(s8 param_0, s8 param_1, s8 param_2, u8* param_3, u8 dMenu_DmapBg_c::~dMenu_DmapBg_c() { dComIfGp_getDmapResArchive()->removeResourceAll(); - delete mString; + JKR_DELETE(mString); if (mpMeterHaihai != NULL) { - delete mpMeterHaihai; + JKR_DELETE(mpMeterHaihai); mpMeterHaihai = NULL; } - delete mBaseScreen; + JKR_DELETE(mBaseScreen); mBaseScreen = NULL; - delete mFloorScreen; + JKR_DELETE(mFloorScreen); mFloorScreen = NULL; - delete mpBaseRoot; + JKR_DELETE(mpBaseRoot); mpBaseRoot = NULL; - delete mpFloorRoot; + JKR_DELETE(mpFloorRoot); mpFloorRoot = NULL; - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; for (int i = 0; i < 2; i++) { - delete mMapScreen[i]; + JKR_DELETE(mMapScreen[i]); mMapScreen[i] = NULL; - delete mpMapSpace[i]; + JKR_DELETE(mpMapSpace[i]); mpMapSpace[i] = NULL; - delete mpMapRoot[i]; + JKR_DELETE(mpMapRoot[i]); mpMapRoot[i] = NULL; } if (mpBlack != NULL) { - delete mpBlack; + JKR_DELETE(mpBlack); mpBlack = NULL; } for (int i = 0; i < 1; i++) { - delete field_0xd28[i]; + JKR_DELETE(field_0xd28[i]); } for (int i = 0; i < 2; i++) { - delete mpMapSpace[i]; + JKR_DELETE(mpMapSpace[i]); mpMapSpace[i] = NULL; } if (field_0xcf4 != NULL) { - delete field_0xcf4; + JKR_DELETE(field_0xcf4); field_0xcf4 = NULL; } if (field_0xcf8 != NULL) { - delete field_0xcf8; + JKR_DELETE(field_0xcf8); field_0xcf8 = NULL; } @@ -712,43 +712,43 @@ dMenu_DmapBg_c::~dMenu_DmapBg_c() { } if (mpBackTexture != NULL) { - delete mpBackTexture; + JKR_DELETE(mpBackTexture); mpBackTexture = NULL; } - delete mButtonScreen; + JKR_DELETE(mButtonScreen); mButtonScreen = NULL; if (mDecorateScreen != NULL) { - delete mDecorateScreen; + JKR_DELETE(mDecorateScreen); mDecorateScreen = NULL; } if (mpDecorateRoot != NULL) { - delete mpDecorateRoot; + JKR_DELETE(mpDecorateRoot); mpDecorateRoot = NULL; } - delete mpButtonRoot; + JKR_DELETE(mpButtonRoot); mpButtonRoot = NULL; for (int i = 0; i < 2; i++) { if (mpButtonAB[i] != NULL) { - delete mpButtonAB[i]; + JKR_DELETE(mpButtonAB[i]); mpButtonAB[i] = NULL; } if (mpButtonText[i] != NULL) { - delete mpButtonText[i]; + JKR_DELETE(mpButtonText[i]); mpButtonText[i] = NULL; } } - delete mpCButton; + JKR_DELETE(mpCButton); mpCButton = NULL; if (mpJButton != NULL) { - delete mpJButton; + JKR_DELETE(mpJButton); mpJButton = NULL; } @@ -964,7 +964,7 @@ void dMenu_DmapBg_c::update() { ResTIMG* mp_image = (ResTIMG*)mpArchive->getResource("tex/bg.bti"); JUT_ASSERT(2321, mp_image != NULL); - mpBackTexture = new J2DPicture(mp_image); + mpBackTexture = JKR_NEW J2DPicture(mp_image); JUT_ASSERT(2323, mpBackTexture != NULL); void* spec = mpArchive->getResource("spec/spec.dat"); @@ -1071,20 +1071,20 @@ void dMenu_Dmap_c::screenInit() { static u64 const key_tag[3] = {MULTI_CHAR('key_00'), MULTI_CHAR('key_01'), MULTI_CHAR('key_02')}; static u64 const item_tag[3] = {MULTI_CHAR('map000'), MULTI_CHAR('con000'), MULTI_CHAR('i_key_n')}; - field_0x10 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('floo_s_n'), 0, NULL); + field_0x10 = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('floo_s_n'), 0, NULL); for (int i = 0; i < 8; i++) { field_0x114[i] = 0.0f; - mSelFloor[i] = new CPaneMgr(mpDrawBg->mFloorScreen, floor_tag[i], 3, NULL); + mSelFloor[i] = JKR_NEW CPaneMgr(mpDrawBg->mFloorScreen, floor_tag[i], 3, NULL); JUT_ASSERT(2654, mSelFloor[i] != NULL); - mIconLinkPos[i] = new CPaneMgr(mpDrawBg->mFloorScreen, icon_tag[i], 0, NULL); + mIconLinkPos[i] = JKR_NEW CPaneMgr(mpDrawBg->mFloorScreen, icon_tag[i], 0, NULL); JUT_ASSERT(2657, mIconLinkPos[i] != NULL); - mIconBossPos[i] = new CPaneMgr(mpDrawBg->mFloorScreen, boss_tag[i], 0, NULL); + mIconBossPos[i] = JKR_NEW CPaneMgr(mpDrawBg->mFloorScreen, boss_tag[i], 0, NULL); JUT_ASSERT(2660, mIconBossPos[i] != NULL); } for (int i = 0; i < 2; i++) { - mStayIcon[i] = new CPaneMgr(mpDrawBg->mFloorScreen, stay_tag[i], 0, NULL); + mStayIcon[i] = JKR_NEW CPaneMgr(mpDrawBg->mFloorScreen, stay_tag[i], 0, NULL); JUT_ASSERT(2665, mStayIcon[i] != NULL); mStayIcon[i]->hide(); @@ -1137,19 +1137,19 @@ void dMenu_Dmap_c::screenInit() { iconMoveCalc(); Vec local_b0 = mSelFloor[getDefaultCurFloorPos()]->getGlobalVtxCenter(false, 0); mpDrawBg->mpDrawCursor->setPos(local_b0.x + field_0x104, local_b0.y, mSelFloor[getDefaultCurFloorPos()]->getPanePtr(), true); - field_0x94 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('item_s_n'), 0, NULL); - field_0x7c[0] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map_n'), 3, NULL); - field_0x7c[1] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con_n'), 3, NULL); - field_0x7c[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('key_n'), 3, NULL); - field_0x88[0] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map000'), 3, NULL); - field_0x88[1] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con000'), 3, NULL); + field_0x94 = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('item_s_n'), 0, NULL); + field_0x7c[0] = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map_n'), 3, NULL); + field_0x7c[1] = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con_n'), 3, NULL); + field_0x7c[2] = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('key_n'), 3, NULL); + field_0x88[0] = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('map000'), 3, NULL); + field_0x88[1] = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('con000'), 3, NULL); if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x11) { - field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('i_key_n'), 3, NULL); + field_0x88[2] = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('i_key_n'), 3, NULL); } else if (dStage_stagInfo_GetSaveTbl(dComIfGp_getStageStagInfo()) == 0x14) { - field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('lv5_k_n'), 3, NULL); + field_0x88[2] = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('lv5_k_n'), 3, NULL); } else { - field_0x88[2] = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('nor_k_n'), 3, NULL); + field_0x88[2] = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('nor_k_n'), 3, NULL); } for (int i = 0; i < 3; i++) { @@ -1269,7 +1269,7 @@ void dMenu_Dmap_c::screenInit() { } field_0x94->hide(); - field_0x98 = new CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('so_s_n'), 0, NULL); + field_0x98 = JKR_NEW CPaneMgr(mpDrawBg->mBaseScreen, MULTI_CHAR('so_s_n'), 0, NULL); field_0x98->hide(); } @@ -1407,7 +1407,7 @@ dMenu_Dmap_c::~dMenu_Dmap_c() { s32 iVar4 = field_0xe8->getTotalFreeSize(); if (mpDrawBg != NULL) { - delete mpDrawBg; + JKR_DELETE(mpDrawBg); mpDrawBg = NULL; } @@ -1420,57 +1420,57 @@ dMenu_Dmap_c::~dMenu_Dmap_c() { field_0xe8->getTotalFreeSize() - iVar4, field_0xe8->getTotalFreeSize()); if (mSelStick != NULL) { - delete mSelStick; + JKR_DELETE(mSelStick); } if (field_0x94 != NULL) { - delete field_0x94; + JKR_DELETE(field_0x94); } for (int i = 0; i < 8; i++) { if (mSelFloor[i] != NULL) { - delete mSelFloor[i]; + JKR_DELETE(mSelFloor[i]); mSelFloor[i] = NULL; } if (mIconLinkPos[i] != NULL) { - delete mIconLinkPos[i]; + JKR_DELETE(mIconLinkPos[i]); mIconLinkPos[i] = NULL; } if (mIconBossPos[i] != NULL) { - delete mIconBossPos[i]; + JKR_DELETE(mIconBossPos[i]); mIconBossPos[i] = NULL; } } for (int i = 0; i < 2; i++) { if (mStayIcon[i] != NULL) { - delete mStayIcon[i]; + JKR_DELETE(mStayIcon[i]); mStayIcon[i] = NULL; } } if (field_0x10 != NULL) { - delete field_0x10; + JKR_DELETE(field_0x10); } for (int i = 0; i < 3; i++) { if (field_0x7c[i] != NULL) { - delete field_0x7c[i]; + JKR_DELETE(field_0x7c[i]); field_0x7c[i] = NULL; } if (field_0x88[i] != NULL) { - delete field_0x88[i]; + JKR_DELETE(field_0x88[i]); field_0x88[i] = NULL; } } if (field_0x98 != NULL) { - delete field_0x98; + JKR_DELETE(field_0x98); } if (mMapCtrl != NULL) { mMapCtrl->_delete(); - delete mMapCtrl; + JKR_DELETE(mMapCtrl); } if (mpDresArchiveMount != NULL) { @@ -1631,7 +1631,7 @@ void dMenu_Dmap_c::_create() { JKRHeap* heap = mDoExt_setCurrentHeap(mDmapHeap); u32 sp28 = mDmapHeap->getTotalFreeSize(); - mMapCtrl = new dMenu_DmapMapCtrl_c(); + mMapCtrl = JKR_NEW dMenu_DmapMapCtrl_c(); JUT_ASSERT(3739, mMapCtrl != NULL); mCMessageNum = 0; @@ -1642,12 +1642,12 @@ void dMenu_Dmap_c::_create() { field_0x184 = false; } - mSelStick = new STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800); + mSelStick = JKR_NEW STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800); JUT_ASSERT(3753, mSelStick != NULL); mSelStick->setFirstWaitTime(8); u32 sp24 = field_0xe8->getTotalFreeSize(); - mpDrawBg = new dMenu_DmapBg_c(mDmapHeap, mpStick); + mpDrawBg = JKR_NEW dMenu_DmapBg_c(mDmapHeap, mpStick); JUT_ASSERT(3763, mpDrawBg != NULL); mItemTexBuf = (u8*)mDmapHeap->alloc(0xC00, 0x20); diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index e2f157ff88..eed52c00c7 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -291,11 +291,11 @@ void dMenu_DmapMap_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 param_3 void dMenu_DmapMap_c::_delete() { for (int i = 0; i < 2; i++) { if (mMapImage_p[i] != NULL) { - delete[] mMapImage_p[i]; + JKR_DELETE_ARRAY(mMapImage_p[i]); } if (mResTIMG[i] != NULL) { - delete[] mResTIMG[i]; + JKR_DELETE_ARRAY(mResTIMG[i]); } } } @@ -303,11 +303,11 @@ void dMenu_DmapMap_c::_delete() { void dMenu_DmapMap_c::setTexture(u16 param_0, u16 param_1, u16 param_2, u16 param_3) { for (int lp1 = 0; lp1 < 2; lp1++) { u32 var_r27 = GXGetTexBufferSize(param_0, param_1, 9, 0, 0); - mMapImage_p[lp1] = new (0x20) u8[var_r27]; + mMapImage_p[lp1] = JKR_NEW_ARGS (0x20) u8[var_r27]; JUT_ASSERT(1672, mMapImage_p[lp1] != NULL); mRend[lp1].init(mMapImage_p[lp1], param_0, param_1, param_2, param_3); - mResTIMG[lp1] = new (0x20) ResTIMG; + mResTIMG[lp1] = JKR_NEW_ARGS (0x20) ResTIMG; JUT_ASSERT(1687, mResTIMG[lp1] != NULL); mRend[lp1].makeResTIMG(mResTIMG[lp1], param_0, param_1, mMapImage_p[lp1], (u8*)dMdm_HIO_prm_res_dst_s::m_res, 30); } diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp index b71f933f6d..613f04f072 100644 --- a/src/d/d_menu_fishing.cpp +++ b/src/d/d_menu_fishing.cpp @@ -37,43 +37,43 @@ dMenu_Fishing_c::dMenu_Fishing_c(JKRExpHeap* i_heap, STControl* i_stick, CSTCont } dMenu_Fishing_c::~dMenu_Fishing_c() { - delete mpString; + JKR_DELETE(mpString); mpString = NULL; - delete mpBlackTex; + JKR_DELETE(mpBlackTex); mpBlackTex = NULL; - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; for (int i = 0; i < MAX_FINDABLE_FISHES; i++) { - delete mpFishParent[i]; + JKR_DELETE(mpFishParent[i]); mpFishParent[i] = NULL; for (int j = 0; j < MAX_FINDABLE_FISHES; j++) { - delete mpFishParts[j][i]; + JKR_DELETE(mpFishParts[j][i]); mpFishParts[j][i] = NULL; } } for (int i = 0; i < 2; i++) { - delete mpFishInfoParent[i]; + JKR_DELETE(mpFishInfoParent[i]); mpFishInfoParent[i] = NULL; } - delete mpIconScreen; + JKR_DELETE(mpIconScreen); mpIconScreen = NULL; for (int i = 0; i < 2; i++) { if (mpButtonAB[i]) { - delete mpButtonAB[i]; + JKR_DELETE(mpButtonAB[i]); mpButtonAB[i] = NULL; } if (mpButtonText[i]) { - delete mpButtonText[i]; + JKR_DELETE(mpButtonText[i]); mpButtonText[i] = NULL; } } @@ -91,7 +91,7 @@ dMenu_Fishing_c::~dMenu_Fishing_c() { } void dMenu_Fishing_c::_create() { - mpString = new dMsgString_c(); + mpString = JKR_NEW dMsgString_c(); screenSetBase(); screenSetDoIcon(); setHIO(true); @@ -163,7 +163,7 @@ int dMenu_Fishing_c::_open() { if (mpMount->sync()) { if (mpArchive == NULL) { mpArchive = (JKRArchive*)mpMount->getArchive(); - delete mpMount; + JKR_DELETE(mpMount); mpMount = NULL; _create(); } @@ -274,25 +274,25 @@ void dMenu_Fishing_c::screenSetBase() { }; ResTIMG* TIMG = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBlackTex = new J2DPicture(TIMG); + mpBlackTex = JKR_NEW J2DPicture(TIMG); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xFF)); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); mpScreen->setPriority("zelda_fish_window.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpScreen); - mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent->setAlphaRate(0.0f); for (int i = 0; i < MAX_FINDABLE_FISHES; i++) { - mpFishParent[i] = new CPaneMgr(mpScreen, fish_n[i], 0, NULL); - mpFishParts[0][i] = new CPaneMgr(mpScreen, fish_p0[i], 0, NULL); - mpFishParts[1][i] = new CPaneMgr(mpScreen, fish_p1[i], 0, NULL); - mpFishParts[2][i] = new CPaneMgr(mpScreen, fish_p2[i], 0, NULL); - mpFishParts[3][i] = new CPaneMgr(mpScreen, fish_p3[i], 0, NULL); - mpFishParts[4][i] = new CPaneMgr(mpScreen, fish_p4[i], 0, NULL); - mpFishParts[5][i] = new CPaneMgr(mpScreen, fish_p5[i], 0, NULL); + mpFishParent[i] = JKR_NEW CPaneMgr(mpScreen, fish_n[i], 0, NULL); + mpFishParts[0][i] = JKR_NEW CPaneMgr(mpScreen, fish_p0[i], 0, NULL); + mpFishParts[1][i] = JKR_NEW CPaneMgr(mpScreen, fish_p1[i], 0, NULL); + mpFishParts[2][i] = JKR_NEW CPaneMgr(mpScreen, fish_p2[i], 0, NULL); + mpFishParts[3][i] = JKR_NEW CPaneMgr(mpScreen, fish_p3[i], 0, NULL); + mpFishParts[4][i] = JKR_NEW CPaneMgr(mpScreen, fish_p4[i], 0, NULL); + mpFishParts[5][i] = JKR_NEW CPaneMgr(mpScreen, fish_p5[i], 0, NULL); } - mpFishInfoParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('info_blu'), 0, NULL); - mpFishInfoParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('info_red'), 0, NULL); + mpFishInfoParent[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('info_blu'), 0, NULL); + mpFishInfoParent[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('info_red'), 0, NULL); #if (VERSION == VERSION_GCN_JPN) || (VERSION == VERSION_WII_JPN) J2DTextBox* textBox = (J2DTextBox*)mpScreen->search(MULTI_CHAR('t_t00')); @@ -342,7 +342,7 @@ void dMenu_Fishing_c::screenSetDoIcon() { static const u64 text_a_tag[5] = {MULTI_CHAR('atext1_1'), MULTI_CHAR('atext1_2'), MULTI_CHAR('atext1_3'), MULTI_CHAR('atext1_4'), MULTI_CHAR('atext1_5')}; static const u64 text_b_tag[5] = {MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5')}; - mpIconScreen = new J2DScreen(); + mpIconScreen = JKR_NEW J2DScreen(); mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); for (int i = 0; i < 2; i++) { mpButtonAB[i] = NULL; diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 5c89256e06..aca7976c24 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -295,16 +295,16 @@ dMenu_Fmap_c::~dMenu_Fmap_c() { removeAreaData(); if (mpDraw2DBack != NULL) { - delete mpDraw2DBack; + JKR_DELETE(mpDraw2DBack); mpDraw2DBack = NULL; } if (mpDraw2DTop != NULL) { - delete mpDraw2DTop; + JKR_DELETE(mpDraw2DTop); mpDraw2DTop = NULL; } if (mpMenuFmapMap != NULL) { mpMenuFmapMap->_delete(); - delete mpMenuFmapMap; + JKR_DELETE(mpMenuFmapMap); mpMenuFmapMap = NULL; } @@ -337,12 +337,12 @@ dMenu_Fmap_c::~dMenu_Fmap_c() { void dMenu_Fmap_c::_create() { mpHeap->getTotalFreeSize(); - mpDraw2DBack = new dMenu_Fmap2DBack_c(); + mpDraw2DBack = JKR_NEW dMenu_Fmap2DBack_c(); JUT_ASSERT(594, mpDraw2DBack != NULL); mpDraw2DBack->setRegionCursor(dComIfGp_getNowLevel() - 1); - mpDraw2DTop = new dMenu_Fmap2DTop_c(mpHeap, mpStick); + mpDraw2DTop = JKR_NEW dMenu_Fmap2DTop_c(mpHeap, mpStick); JUT_ASSERT(599, mpDraw2DTop != NULL); - mpMenuFmapMap = new dMenu_FmapMap_c(); + mpMenuFmapMap = JKR_NEW dMenu_FmapMap_c(); JUT_ASSERT(603, mpMenuFmapMap != NULL); mpMenuFmapMap->_create(dMeter2Info_get2DWidth(), dMeter2Info_get2DHeight(), dMeter2Info_get2DWidth(), dMeter2Info_get2DHeight(), mpFmapMapRes); @@ -1998,7 +1998,7 @@ bool dMenu_Fmap_c::readWorldData(u8 i_regionNo) { } if (head != -1 && mpWorldData == NULL) { - mpWorldData = new dMenu_Fmap_world_data_c(mpRegionData[head]); + mpWorldData = JKR_NEW dMenu_Fmap_world_data_c(mpRegionData[head]); mpDraw2DBack->setWorldPosMinMax(mpWorldData->getWorldMinX(), mpWorldData->getWorldMinZ(), mpWorldData->getWorldMaxX(), mpWorldData->getWorldMaxZ()); } @@ -2098,7 +2098,7 @@ bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) { } if (bVar2) { - dMenu_Fmap_stage_data_c* stage_data = new dMenu_Fmap_stage_data_c(); + dMenu_Fmap_stage_data_c* stage_data = JKR_NEW dMenu_Fmap_stage_data_c(); if (mpStageData[i_regionNo - 1] == NULL) { mpStageData[i_regionNo - 1] = stage_data; } else { @@ -2139,7 +2139,7 @@ bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) { mSpotNum++; } - dMenuMapCommon_c::RoomData_c* room_data = new dMenuMapCommon_c::RoomData_c(); + dMenuMapCommon_c::RoomData_c* room_data = JKR_NEW dMenuMapCommon_c::RoomData_c(); if (mpRoomData[i_regionNo - 1] == NULL) { mpRoomData[i_regionNo - 1] = room_data; } else { @@ -2159,7 +2159,7 @@ bool dMenu_Fmap_c::readAreaData(u8 i_regionNo, bool i_isSelectedRegion) { } if (mpRegionData[i_regionNo - 1] == NULL) { - mpRegionData[i_regionNo - 1] = new dMenu_Fmap_region_data_c(i_regionNo, + mpRegionData[i_regionNo - 1] = JKR_NEW dMenu_Fmap_region_data_c(i_regionNo, mpStageData[i_regionNo - 1], mRegionOffsetX[i_regionNo - 1], mRegionOffsetZ[i_regionNo - 1]); @@ -2200,9 +2200,9 @@ bool dMenu_Fmap_c::readRoomData(char const* i_stageName, dMenu_Fmap_stage_data_c sprintf(room_path, "%s/room%d.dzs", i_stageName, room_nos[i]); if (readRoomDzsData(&dzs_data, 0x1500, room_path)) { - dMenu_Fmap_data_c* map_data = new dMenu_Fmap_data_c(); + dMenu_Fmap_data_c* map_data = JKR_NEW dMenu_Fmap_data_c(); dMenu_Fmap_room_data_c* room_data - = new dMenu_Fmap_room_data_c(room_nos[i], i_stageData, map_data); + = JKR_NEW dMenu_Fmap_room_data_c(room_nos[i], i_stageData, map_data); if (prev_room_data == NULL) { i_stageData->setFmapRoomDataTop(room_data); } else { @@ -2361,7 +2361,7 @@ bool dMenu_Fmap_c::removeAreaData() { if (mpWorldData != NULL) { if (mpWorldData != NULL) { - delete mpWorldData; + JKR_DELETE(mpWorldData); } mpWorldData = NULL; } @@ -2369,7 +2369,7 @@ bool dMenu_Fmap_c::removeAreaData() { for (int i = 0; i < 8; i++) { if (mpRegionData[i] != NULL) { if (mpRegionData[i] != NULL) { - delete mpRegionData[i]; + JKR_DELETE(mpRegionData[i]); } mpRegionData[i] = NULL; } @@ -2381,7 +2381,7 @@ bool dMenu_Fmap_c::removeAreaData() { dMenu_Fmap_stage_data_c* next_data = stage_data->getNextData(); removeRoomData(stage_data); if (stage_data != NULL) { - delete stage_data; + JKR_DELETE(stage_data); } stage_data = next_data; } @@ -2393,7 +2393,7 @@ bool dMenu_Fmap_c::removeAreaData() { if (data != NULL) { mpHeap->free(data); } - delete room_data; + JKR_DELETE(room_data); room_data = next_data; } } @@ -2425,9 +2425,9 @@ bool dMenu_Fmap_c::removeRoomData(dMenu_Fmap_stage_data_c* i_stageData) { mpHeap->free(dzs_data); } if (fmap_data != NULL) { - delete fmap_data; + JKR_DELETE(fmap_data); } - delete room_data; + JKR_DELETE(room_data); room_data = next_data; } return true; diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index 9963404887..0db1556123 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -150,7 +150,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { initiate(dComIfGp_getFmapResArchive()); - mpBackScreen = new J2DScreen(); + mpBackScreen = JKR_NEW J2DScreen(); JUT_ASSERT(238, mpBackScreen != NULL); bool fg = mpBackScreen->setPriority("zelda_map_screen_stone_base.blo", 0x20000, @@ -159,7 +159,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dPaneClass_showNullPane(mpBackScreen); - mpBaseScreen = new J2DScreen(); + mpBaseScreen = JKR_NEW J2DScreen(); JUT_ASSERT(248, mpBaseScreen != NULL) fg = mpBaseScreen->setPriority("zelda_map_screen_base.blo", 0x20000, @@ -174,27 +174,27 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { mAnmFrame = 0.0; - mpBaseRoot = new CPaneMgrAlphaMorf(mpBaseScreen, 'ROOT', 2, NULL); + mpBaseRoot = JKR_NEW CPaneMgrAlphaMorf(mpBaseScreen, 'ROOT', 2, NULL); JUT_ASSERT(264, mpBaseRoot != NULL); - mpMapArea = new CPaneMgr(mpBaseScreen, MULTI_CHAR('center_n'), 0, NULL); + mpMapArea = JKR_NEW CPaneMgr(mpBaseScreen, MULTI_CHAR('center_n'), 0, NULL); JUT_ASSERT(269, mpMapArea != NULL); - mpMapBlack = new CPaneMgr(mpBaseScreen, MULTI_CHAR('map_blak'), 0, NULL); + mpMapBlack = JKR_NEW CPaneMgr(mpBaseScreen, MULTI_CHAR('map_blak'), 0, NULL); JUT_ASSERT(273, mpMapBlack != NULL); - mpMeterHaihai = new dMeterHaihai_c(1); + mpMeterHaihai = JKR_NEW dMeterHaihai_c(1); JUT_ASSERT(277, mpMeterHaihai != NULL); ResTIMG* backTexResource = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBackTex = new J2DPicture(backTexResource); + mpBackTex = JKR_NEW J2DPicture(backTexResource); JUT_ASSERT(282, mpBackTex != NULL); mpBackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); mpBackTex->setAlpha(0); - mpPointScreen = new J2DScreen(); + mpPointScreen = JKR_NEW J2DScreen(); JUT_ASSERT(293, mpPointScreen != NULL); mpPointScreen->setPriority("zelda_field_map_point_cursor.blo", 0x20000, @@ -203,7 +203,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dPaneClass_showNullPane(mpPointScreen); - mpPointParent = new CPaneMgr(mpPointScreen, MULTI_CHAR('f_po_n'), 2, NULL); + mpPointParent = JKR_NEW CPaneMgr(mpPointScreen, MULTI_CHAR('f_po_n'), 2, NULL); JUT_ASSERT(301, mpPointParent != NULL); mpPointParent->scale(g_fmapHIO.mCursorScale, g_fmapHIO.mCursorScale); @@ -223,39 +223,39 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { } dMenu_Fmap2DBack_c::~dMenu_Fmap2DBack_c() { - delete mpBackScreen; + JKR_DELETE(mpBackScreen); mpBackScreen = NULL; - delete mpBaseScreen; + JKR_DELETE(mpBaseScreen); mpBaseScreen = NULL; - delete mpBaseAnm; + JKR_DELETE(mpBaseAnm); mpBaseAnm = NULL; - delete mpBaseRoot; + JKR_DELETE(mpBaseRoot); mpBaseRoot = NULL; - delete mpMapArea; + JKR_DELETE(mpMapArea); mpMapArea = NULL; - delete mpMapBlack; + JKR_DELETE(mpMapBlack); mpMapBlack = NULL; - delete mpMeterHaihai; + JKR_DELETE(mpMeterHaihai); mpMeterHaihai = NULL; - delete mpBackTex; + JKR_DELETE(mpBackTex); mpBackTex = NULL; - delete mpPointScreen; + JKR_DELETE(mpPointScreen); mpPointScreen = NULL; - delete mpPointParent; + JKR_DELETE(mpPointParent); mpPointParent = NULL; for (int i = 0; i < 8; i++) { if (mpAreaTex[i] != NULL) { - delete mpAreaTex[i]; + JKR_DELETE(mpAreaTex[i]); mpAreaTex[i] = NULL; } } @@ -433,7 +433,7 @@ void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_areaType, ResTIMG* i_timg, f32 i_ i_scale = 100.0f; } - mpAreaTex[i_areaType] = new J2DPicture(i_timg); + mpAreaTex[i_areaType] = JKR_NEW J2DPicture(i_timg); JUT_ASSERT(763, mpAreaTex[i_areaType] != NULL); mRegionOriginX[i_areaType] = i_originX; @@ -672,14 +672,14 @@ void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* outX, void dMenu_Fmap2DBack_c::setSpotPane(ResTIMG* i_timg) { if (mpSpotTexture == NULL) { - mpSpotTexture = new J2DPicture(i_timg); + mpSpotTexture = JKR_NEW J2DPicture(i_timg); JUT_ASSERT(1169, mpSpotTexture != NULL); } } void dMenu_Fmap2DBack_c::deleteSpotPane() { if (mpSpotTexture != NULL) { - delete mpSpotTexture; + JKR_DELETE(mpSpotTexture); mpSpotTexture = NULL; } } @@ -2163,7 +2163,7 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { mpPortalBin = NULL; mpScrnExplain = NULL; - mpTitleScreen = new J2DScreen(); + mpTitleScreen = JKR_NEW J2DScreen(); JUT_ASSERT(3872, mpTitleScreen != NULL); #if PLATFORM_GCN bool fg = mpTitleScreen->setPriority("zelda_map_screen_title.blo", 0x1020000, @@ -2175,7 +2175,7 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { JUT_ASSERT(3877, fg != false); dPaneClass_showNullPane(mpTitleScreen); - mpTitleRoot = new CPaneMgrAlphaMorf(mpTitleScreen, 'ROOT', 2, NULL); + mpTitleRoot = JKR_NEW CPaneMgrAlphaMorf(mpTitleScreen, 'ROOT', 2, NULL); JUT_ASSERT(3881, mpTitleRoot != NULL); #if PLATFORM_SHIELD for (int i = 0; i < 2; i++) { @@ -2189,43 +2189,43 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { mpTitleScreen->search(MULTI_CHAR('tri_Null'))->hide(); #endif #if PLATFORM_GCN - mpArrowLAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_04'), 0, NULL); - mpArrowLAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_05'), 0, NULL); - mpArrowRAlpha[0] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_06'), 0, NULL); - mpArrowRAlpha[1] = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_07'), 0, NULL); + mpArrowLAlpha[0] = JKR_NEW CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_04'), 0, NULL); + mpArrowLAlpha[1] = JKR_NEW CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_05'), 0, NULL); + mpArrowRAlpha[0] = JKR_NEW CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_06'), 0, NULL); + mpArrowRAlpha[1] = JKR_NEW CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('yaji_07'), 0, NULL); - mpDpadAlpha = new CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('juji_c_n'), 2, NULL); + mpDpadAlpha = JKR_NEW CPaneMgrAlpha(mpTitleScreen, MULTI_CHAR('juji_c_n'), 2, NULL); mpDpadAlpha->setAlphaRate(0.0f); - mpAnalogStickAlpha = new CPaneMgrAlpha(mpTitleScreen, 'as_n', 2, NULL); + mpAnalogStickAlpha = JKR_NEW CPaneMgrAlpha(mpTitleScreen, 'as_n', 2, NULL); mpAnalogStickAlpha->setAlphaRate(0.0f); - mpAnalogStick = new CPaneMgr(mpTitleScreen, 'as_n', 0, NULL); - mpDpad = new CPaneMgr(mpTitleScreen, MULTI_CHAR('juji_c_n'), 0, NULL); + mpAnalogStick = JKR_NEW CPaneMgr(mpTitleScreen, 'as_n', 0, NULL); + mpDpad = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('juji_c_n'), 0, NULL); #endif #if PLATFORM_SHIELD - mpButtonA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('abtn_n'), 2, NULL); + mpButtonA = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('abtn_n'), 2, NULL); JUT_ASSERT(3935, mpButtonA != NULL); - mpButtonB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('bbtn_n'), 2, NULL); + mpButtonB = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('bbtn_n'), 2, NULL); JUT_ASSERT(3938, mpButtonB != NULL); - mpButtonZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('j_scal_n'), 2, NULL); + mpButtonZ = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('j_scal_n'), 2, NULL); JUT_ASSERT(3941, mpButtonZ != NULL); - mpButtonTextA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('a_text_n'), 2, NULL); + mpButtonTextA = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('a_text_n'), 2, NULL); JUT_ASSERT(3953, mpButtonTextA != NULL); - mpButtonTextB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('b_text_n'), 2, NULL); + mpButtonTextB = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('b_text_n'), 2, NULL); JUT_ASSERT(3956, mpButtonTextB != NULL); - mpButtonTextZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('z_text_n'), 2, NULL); + mpButtonTextZ = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('z_text_n'), 2, NULL); JUT_ASSERT(3959, mpButtonTextZ != NULL); #else - mpButtonA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('abtn_n1'), 2, NULL); + mpButtonA = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('abtn_n1'), 2, NULL); JUT_ASSERT(3935, mpButtonA != NULL); - mpButtonB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('bbtn_n1'), 2, NULL); + mpButtonB = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('bbtn_n1'), 2, NULL); JUT_ASSERT(3938, mpButtonB != NULL); - mpButtonZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('zbtn_n1'), 2, NULL); + mpButtonZ = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('zbtn_n1'), 2, NULL); JUT_ASSERT(3941, mpButtonZ != NULL); - mpButtonTextA = new CPaneMgr(mpTitleScreen, MULTI_CHAR('a_text_n'), 2, NULL); + mpButtonTextA = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('a_text_n'), 2, NULL); JUT_ASSERT(3953, mpButtonTextA != NULL); - mpButtonTextB = new CPaneMgr(mpTitleScreen, MULTI_CHAR('b_text_n'), 2, NULL); + mpButtonTextB = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('b_text_n'), 2, NULL); JUT_ASSERT(3956, mpButtonTextB != NULL); - mpButtonTextZ = new CPaneMgr(mpTitleScreen, MULTI_CHAR('z_text_n'), 2, NULL); + mpButtonTextZ = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('z_text_n'), 2, NULL); JUT_ASSERT(3959, mpButtonTextZ != NULL); #endif mpButtonA->setAlphaRate(0.0f); @@ -2235,16 +2235,16 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { mpButtonTextB->setAlphaRate(0.0f); mpButtonTextZ->setAlphaRate(0.0f); - mpNamePane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('name_n'), 0, NULL); + mpNamePane = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('name_n'), 0, NULL); JUT_ASSERT(3970, mpNamePane != NULL); - mpSubPane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('sub_n_n'), 0, NULL); + mpSubPane = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('sub_n_n'), 0, NULL); JUT_ASSERT(3974, mpSubPane != NULL); if (dMeter2Info_getMapStatus() == 9) { mpNamePane->hide(); mpSubPane->hide(); } - mpContPane = new CPaneMgr(mpTitleScreen, MULTI_CHAR('cont_n'), 0, NULL); + mpContPane = JKR_NEW CPaneMgr(mpTitleScreen, MULTI_CHAR('cont_n'), 0, NULL); JUT_ASSERT(3984, mpContPane != NULL); mTitlePosX = mTitlePosY = 0.0f; @@ -2411,58 +2411,58 @@ dMenu_Fmap2DTop_c::dMenu_Fmap2DTop_c(JKRExpHeap* i_heap, STControl* i_stick) { dMenu_Fmap2DTop_c::~dMenu_Fmap2DTop_c() { deleteExplain(); - delete mpTitleScreen; + JKR_DELETE(mpTitleScreen); mpTitleScreen = NULL; - delete mpTitleRoot; + JKR_DELETE(mpTitleRoot); if (mpTitleRoot != NULL) { } - delete mpButtonA; + JKR_DELETE(mpButtonA); mpButtonA = NULL; - delete mpButtonB; + JKR_DELETE(mpButtonB); mpButtonB = NULL; - delete mpButtonZ; + JKR_DELETE(mpButtonZ); mpButtonZ = NULL; - delete mpButtonTextA; + JKR_DELETE(mpButtonTextA); mpButtonTextA = NULL; - delete mpButtonTextB; + JKR_DELETE(mpButtonTextB); mpButtonTextB = NULL; - delete mpButtonTextZ; + JKR_DELETE(mpButtonTextZ); mpButtonTextZ = NULL; if (mpDpadAlpha != NULL) { - delete mpDpadAlpha; + JKR_DELETE(mpDpadAlpha); mpDpadAlpha = NULL; } if (mpAnalogStickAlpha != NULL) { - delete mpAnalogStickAlpha; + JKR_DELETE(mpAnalogStickAlpha); mpAnalogStickAlpha = NULL; } - delete mpNamePane; + JKR_DELETE(mpNamePane); mpNamePane = NULL; - delete mpSubPane; + JKR_DELETE(mpSubPane); mpSubPane = NULL; if (mpAnalogStick != NULL) { - delete mpAnalogStick; + JKR_DELETE(mpAnalogStick); mpAnalogStick = NULL; } if (mpDpad != NULL) { - delete mpDpad; + JKR_DELETE(mpDpad); mpDpad = NULL; } - delete mpContPane; + JKR_DELETE(mpContPane); mpContPane = NULL; for (int i = 0; i < 2; i++) { if (mpArrowLAlpha[i] != NULL) { - delete mpArrowLAlpha[i]; + JKR_DELETE(mpArrowLAlpha[i]); if (mpArrowLAlpha[i] != NULL) { } } if (mpArrowRAlpha[i] != NULL) { - delete mpArrowRAlpha[i]; + JKR_DELETE(mpArrowRAlpha[i]); if (mpArrowRAlpha[i] != NULL) { } } } - delete mpAnm; + JKR_DELETE(mpAnm); mpAnm = NULL; } @@ -2780,7 +2780,7 @@ void dMenu_Fmap2DTop_c::set3DStickString(u32 param_0) { void dMenu_Fmap2DTop_c::createExplain(JKRExpHeap* i_heap, STControl* i_stick) { if (!mpScrnExplain) { JKRHeap* heap = mDoExt_setCurrentHeap(i_heap); - mpScrnExplain = new dMsgScrnExplain_c(i_stick, 0, false, 1); + mpScrnExplain = JKR_NEW dMsgScrnExplain_c(i_stick, 0, false, 1); JUT_ASSERT(4743, mpScrnExplain != NULL); mDoExt_setCurrentHeap(heap); } @@ -2788,7 +2788,7 @@ void dMenu_Fmap2DTop_c::createExplain(JKRExpHeap* i_heap, STControl* i_stick) { void dMenu_Fmap2DTop_c::deleteExplain() { if (mpScrnExplain) { - delete mpScrnExplain; + JKR_DELETE(mpScrnExplain); mpScrnExplain = NULL; } } diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp index fb51845497..471a4fe53f 100644 --- a/src/d/d_menu_fmap_map.cpp +++ b/src/d/d_menu_fmap_map.cpp @@ -489,11 +489,11 @@ void dMenu_FmapMap_c::_create(u16 i_texWidth, u16 i_texHeight, u16 param_2, u16 void dMenu_FmapMap_c::_delete() { if (mResTIMG != NULL) { - delete mResTIMG; + JKR_DELETE(mResTIMG); mResTIMG = NULL; } if (mMapImage_p != NULL) { - delete[] mMapImage_p; + JKR_DELETE_ARRAY(mMapImage_p); mMapImage_p = NULL; } } @@ -659,9 +659,9 @@ void dMenu_FmapMap_c::setTexture(u16 i_width, u16 i_height, u16 param_2, u16 par mMapImage_p = NULL; mResTIMG = NULL; int size = GXGetTexBufferSize(i_width, i_height, GX_TF_C8, 0, 0); - mMapImage_p = new (0x20) u8[size]; + mMapImage_p = JKR_NEW_ARGS (0x20) u8[size]; init(mMapImage_p, i_width, i_height, param_2, param_3); - mResTIMG = new (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_menu_insect.cpp b/src/d/d_menu_insect.cpp index 2e9b224217..f1348e6d5f 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -54,77 +54,77 @@ dMenu_Insect_c::dMenu_Insect_c(JKRExpHeap* i_heap, STControl* i_stick, CSTContro field_0xfb = 0xff; field_0xf7 = 1; ResTIMG* image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBlackTex = new J2DPicture(image); + mpBlackTex = JKR_NEW J2DPicture(image); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); field_0xfc = 0; - mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); + mpDrawCursor = JKR_NEW dSelect_cursor_c(2, 1.0f, NULL); mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.7f, 0.7f); mpDrawCursor->setAlphaRate(0.0f); mpDrawCursor->setScale(0.0f); mpDrawCursor->offPlayAnime(0); - mpSelect_c = new dMsgScrn3Select_c(); + mpSelect_c = JKR_NEW dMsgScrn3Select_c(); mpExpItemTex = (ResTIMG*)mpHeap->alloc(0xc00, 0x20); } dMenu_Insect_c::~dMenu_Insect_c() { - delete mpBlackTex; + JKR_DELETE(mpBlackTex); mpBlackTex = NULL; - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; - delete mpSelect_c; + JKR_DELETE(mpSelect_c); mpSelect_c = NULL; mpHeap->free(mpExpItemTex); mpExpItemTex = NULL; - delete mpString; + JKR_DELETE(mpString); mpString = NULL; - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; for (int i = 0; i < MAX_INSECT_NUM; i++) { - delete mpINSParent[i]; + JKR_DELETE(mpINSParent[i]); mpINSParent[i] = NULL; } - delete mpExpScreen; + JKR_DELETE(mpExpScreen); mpExpScreen = NULL; - delete mpExpParent; + JKR_DELETE(mpExpParent); mpExpParent = NULL; for (int i = 0; i < 2; i++) { - delete mpExpSubWin[i]; + JKR_DELETE(mpExpSubWin[i]); mpExpSubWin[i] = NULL; } - delete mpInfoText; + JKR_DELETE(mpInfoText); mpInfoText = NULL; - delete mpIconScreen; + JKR_DELETE(mpIconScreen); mpIconScreen = NULL; for (int i = 0; i < 2; i++) { if (mpButtonAB[i] != NULL) { - delete mpButtonAB[i]; + JKR_DELETE(mpButtonAB[i]); mpButtonAB[i] = NULL; } if (mpButtonText[i] != NULL) { - delete mpButtonText[i]; + JKR_DELETE(mpButtonText[i]); mpButtonText[i] = NULL; } } if (mpMount != NULL) { mpMount->getArchive()->unmount(); - delete mpMount; + JKR_DELETE(mpMount); mpMount = NULL; } @@ -137,7 +137,7 @@ dMenu_Insect_c::~dMenu_Insect_c() { } void dMenu_Insect_c::_create() { - mpString = new dMsgString_c(); + mpString = JKR_NEW dMsgString_c(); screenSetBase(); screenSetExplain(); screenSetDoIcon(); @@ -194,7 +194,7 @@ int dMenu_Insect_c::_open() { if (mpMount->sync() != 0) { if (mpArchive == NULL) { mpArchive = (JKRArchive*)mpMount->getArchive(); - delete mpMount; + JKR_DELETE(mpMount); mpMount = NULL; _create(); } @@ -450,13 +450,13 @@ void dMenu_Insect_c::screenSetBase() { MULTI_CHAR('ageha16'), MULTI_CHAR('ageha17'), MULTI_CHAR('ageha18'), MULTI_CHAR('ageha19'), MULTI_CHAR('ageha20'), MULTI_CHAR('ageha21'), MULTI_CHAR('ageha22'), MULTI_CHAR('ageha23'), }; - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); mpScreen->setPriority("zelda_gold_insects.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpScreen); - mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent->setAlphaRate(0.0f); for (int i = 0; i < MAX_INSECT_NUM; i++) { - mpINSParent[i] = new CPaneMgr(mpScreen, insect_tag[i], 0, NULL); + mpINSParent[i] = JKR_NEW CPaneMgr(mpScreen, insect_tag[i], 0, NULL); } for (int i = 0; i < 6; i++) { for (int j = 0; j < 4; j++) { @@ -486,23 +486,23 @@ void dMenu_Insect_c::screenSetBase() { } void dMenu_Insect_c::screenSetExplain() { - mpExpScreen = new J2DScreen(); + mpExpScreen = JKR_NEW J2DScreen(); mpExpScreen->setPriority("zelda_gold_insects_info.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpExpScreen); - mpExpParent = new CPaneMgr(mpExpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpExpParent = JKR_NEW CPaneMgr(mpExpScreen, MULTI_CHAR('n_all'), 2, NULL); mpExpParent->setAlphaRate(0.0f); - mpExpSubWin[0] = new CPaneMgr(mpExpScreen, MULTI_CHAR('in_win_n'), 0, NULL); - mpExpSubWin[1] = new CPaneMgr(mpExpScreen, MULTI_CHAR('w_d_mo_n'), 0, NULL); + mpExpSubWin[0] = JKR_NEW CPaneMgr(mpExpScreen, MULTI_CHAR('in_win_n'), 0, NULL); + mpExpSubWin[1] = JKR_NEW CPaneMgr(mpExpScreen, MULTI_CHAR('w_d_mo_n'), 0, NULL); if (field_0xf6 == 0) { mpExpSubWin[1]->hide(); } #if VERSION == VERSION_GCN_JPN - mpInfoText = new CPaneMgr(mpExpScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpInfoText = JKR_NEW CPaneMgr(mpExpScreen, MULTI_CHAR('mg_3line'), 0, NULL); mpExpScreen->search(MULTI_CHAR('n_e4line'))->hide(); field_0x5c = (J2DTextBox*)mpExpScreen->search(MULTI_CHAR('w_msg_jp')); mpExpScreen->search(MULTI_CHAR('ms_for_2'))->hide(); #else - mpInfoText = new CPaneMgr(mpExpScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpInfoText = JKR_NEW CPaneMgr(mpExpScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); mpExpScreen->search(MULTI_CHAR('n_3line'))->hide(); field_0x5c = (J2DTextBox*)mpExpScreen->search(MULTI_CHAR('ms_for_2')); mpExpScreen->search(MULTI_CHAR('w_msg_jp'))->hide(); @@ -526,7 +526,7 @@ void dMenu_Insect_c::screenSetDoIcon() { MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'), }; - mpIconScreen = new J2DScreen(); + mpIconScreen = JKR_NEW J2DScreen(); mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); for (int i = 0; i < 2; i++) { mpButtonAB[i] = 0; diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index a710bd8aba..40309ef778 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -92,21 +92,21 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi field_0x60[i] = 0; } field_0xdc = 0; - mpInfoString = new dMsgString_c(1); - mpKanteraMeter = new dKantera_icon_c(); - mpInfoScreen = new J2DScreen(); + mpInfoString = JKR_NEW dMsgString_c(1); + mpKanteraMeter = JKR_NEW dKantera_icon_c(); + mpInfoScreen = JKR_NEW J2DScreen(); mpInfoScreen->setPriority("zelda_item_screen_info.blo", 0x20000, mpArchive); - mpParent[0] = new CPaneMgr(mpInfoScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[0] = JKR_NEW CPaneMgr(mpInfoScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent[1] = NULL; - mpLabel = new CPaneMgr(mpInfoScreen, MULTI_CHAR('label_n'), 0, NULL); + mpLabel = JKR_NEW CPaneMgr(mpInfoScreen, MULTI_CHAR('label_n'), 0, NULL); mDescAlpha = 0.0f; field_0x78 = 0; mAlphaRatio = 201.0f; #if VERSION == VERSION_GCN_JPN - mpInfoText = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_text4'), 0, NULL); + mpInfoText = JKR_NEW CPaneMgr(mpInfoScreen, MULTI_CHAR('i_text4'), 0, NULL); mpInfoScreen->search(MULTI_CHAR('i_text1'))->hide(); #else - mpInfoText = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_text1'), 0, NULL); + mpInfoText = JKR_NEW CPaneMgr(mpInfoScreen, MULTI_CHAR('i_text1'), 0, NULL); mpInfoScreen->search(MULTI_CHAR('i_text4'))->hide(); #endif ((J2DTextBox*)(mpInfoText->getPanePtr()))->setFont(mDoExt_getMesgFont()); @@ -114,33 +114,33 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi mpInfoText->show(); for (int i = 0; i < 4; i++) { #if VERSION == VERSION_GCN_JPN - mpNameText[i] = new CPaneMgr(mpInfoScreen, name_tag[i], 0, NULL); + mpNameText[i] = JKR_NEW CPaneMgr(mpInfoScreen, name_tag[i], 0, NULL); mpInfoScreen->search(fame_tag[i])->hide(); #else - mpNameText[i] = new CPaneMgr(mpInfoScreen, fame_tag[i], 0, NULL); + mpNameText[i] = JKR_NEW CPaneMgr(mpInfoScreen, fame_tag[i], 0, NULL); mpInfoScreen->search(name_tag[i])->hide(); #endif ((J2DTextBox*)(mpNameText[i]->getPanePtr()))->setFont(mDoExt_getMesgFont()); ((J2DTextBox*)(mpNameText[i]->getPanePtr()))->setString(0x20, ""); } - mpInfoIcon = new CPaneMgr(mpInfoScreen, MULTI_CHAR('i_icon_p'), 0, NULL); + mpInfoIcon = JKR_NEW CPaneMgr(mpInfoScreen, MULTI_CHAR('i_icon_p'), 0, NULL); for (int i = 0; i < 4; i++) { mpExpItemTex[i] = (ResTIMG*)mpHeap->alloc(0xC00, 0x20); } - mpExpItemPane[0] = new J2DPicture( + mpExpItemPane[0] = JKR_NEW J2DPicture( MULTI_CHAR('i_icon_1'), JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); mpExpItemPane[0]->setBasePosition(J2DBasePosition_4); mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[0]); - mpExpItemPane[1] = new J2DPicture( + mpExpItemPane[1] = JKR_NEW J2DPicture( MULTI_CHAR('i_icon_2'), JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); mpExpItemPane[1]->setBasePosition(J2DBasePosition_4); mpInfoIcon->getPanePtr()->appendChild(mpExpItemPane[1]); - mpExpItemPane[2] = new J2DPicture( + mpExpItemPane[2] = JKR_NEW J2DPicture( MULTI_CHAR('i_icon_3'), JGeometry::TBox2(0.0f, 0.0f, mpInfoIcon->getInitSizeX(), mpInfoIcon->getInitSizeY()), ((J2DPicture*)(mpInfoIcon->getPanePtr()))->getTexture(0)->getTexInfo(), NULL); @@ -150,7 +150,7 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi ResTIMG* texResource = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( 'TIMG', dMeter2Info_getNumberTextureName(0)); for (int i = 0; i < 3; i++) { - mpItemNumTex[i] = new J2DPicture(texResource); + mpItemNumTex[i] = JKR_NEW J2DPicture(texResource); mpInfoScreen->search(MULTI_CHAR('info_n1'))->appendChild(mpItemNumTex[i]); mpItemNumTex[i]->move(i * 16.0f + (mpInfoIcon->getPosX() + mpInfoIcon->getSizeX() * 0.5f), mpInfoIcon->getPosY() + mpInfoIcon->getSizeY() - 3.0f); @@ -159,7 +159,7 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi if (param_3 == 1) { texResource = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBackTex = new J2DPicture(texResource); + mpBackTex = JKR_NEW J2DPicture(texResource); mpBackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); mpBackTex->setAlpha(0); } else { @@ -174,75 +174,75 @@ dMenu_ItemExplain_c::dMenu_ItemExplain_c(JKRExpHeap* i_heap, JKRArchive* i_archi } dMenu_ItemExplain_c::~dMenu_ItemExplain_c() { - delete mpInfoString; + JKR_DELETE(mpInfoString); mpInfoString = NULL; - delete mpInfoScreen; + JKR_DELETE(mpInfoScreen); mpInfoScreen = NULL; - delete mpKanteraMeter; + JKR_DELETE(mpKanteraMeter); mpKanteraMeter = NULL; for (int i = 0; i < 2; i++) { if (mpParent[i] != NULL) { - delete mpParent[i]; + JKR_DELETE(mpParent[i]); mpParent[i] = NULL; } } - delete mpLabel; + JKR_DELETE(mpLabel); mpLabel = NULL; - delete mpInfoText; + JKR_DELETE(mpInfoText); mpInfoText = NULL; for (int i = 0; i < 4; i++) { - delete mpNameText[i]; + JKR_DELETE(mpNameText[i]); mpNameText[i] = NULL; } if (field_0x74 != NULL) { - delete field_0x74; + JKR_DELETE(field_0x74); field_0x74 = NULL; } for (int i = 0; i < 2; i++) { if (field_0x44[i] != NULL) { - delete field_0x44[i]; + JKR_DELETE(field_0x44[i]); field_0x44[i] = NULL; } } if (field_0x50 != NULL) { - delete field_0x50; + JKR_DELETE(field_0x50); field_0x50 = NULL; } if (field_0x5c != NULL) { - delete field_0x5c; + JKR_DELETE(field_0x5c); field_0x5c = NULL; } if (field_0x14 != NULL) { - delete field_0x14; + JKR_DELETE(field_0x14); field_0x14 = NULL; } for (int i = 0; i < 4; i++) { if (field_0x28[i] != NULL) { - delete field_0x28[i]; + JKR_DELETE(field_0x28[i]); field_0x28[i] = NULL; } } for (int i = 0; i < 3; i++) { if (field_0x60[i] != NULL) { - delete field_0x60[i]; + JKR_DELETE(field_0x60[i]); field_0x60[i] = NULL; } } - delete mpInfoIcon; + JKR_DELETE(mpInfoIcon); mpInfoIcon = NULL; for (int i = 0; i < 4; i++) { @@ -265,17 +265,17 @@ dMenu_ItemExplain_c::~dMenu_ItemExplain_c() { } if (mpBackTex != NULL) { - delete mpBackTex; + JKR_DELETE(mpBackTex); mpBackTex = NULL; } if (mpArrow != NULL) { - delete mpArrow; + JKR_DELETE(mpArrow); mpArrow = NULL; } if (mpSelect_c != NULL) { - delete mpSelect_c; + JKR_DELETE(mpSelect_c); mpSelect_c = NULL; } diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index a82082677d..7d01d8c4d3 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -77,73 +77,73 @@ dMenu_Letter_c::dMenu_Letter_c(JKRExpHeap* i_heap, STControl* i_stick, CSTContro dMenu_Letter_c::~dMenu_Letter_c() { - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; - delete mpArrow; + JKR_DELETE(mpArrow); mpArrow = NULL; - delete mpString; + JKR_DELETE(mpString); mpString = NULL; - delete mpMenuScreen; + JKR_DELETE(mpMenuScreen); mpMenuScreen = NULL; - delete mpMenuDMYScreen; + JKR_DELETE(mpMenuDMYScreen); mpMenuDMYScreen = NULL; - delete mpBaseScreen; + JKR_DELETE(mpBaseScreen); mpBaseScreen = NULL; - delete mpSdwScreen; + JKR_DELETE(mpSdwScreen); mpSdwScreen = NULL; for (int i = 0; i < 2; i++) { - delete mpLetterScreen[i]; + JKR_DELETE(mpLetterScreen[i]); mpLetterScreen[i] = NULL; - delete field_0x2ec[i]; + JKR_DELETE(field_0x2ec[i]); field_0x2ec[i] = NULL; if (field_0x2f4[i] != NULL) { - delete field_0x2f4[i]; + JKR_DELETE(field_0x2f4[i]); field_0x2f4[i] = NULL; } - delete mpTextParent[i]; + JKR_DELETE(mpTextParent[i]); mpTextParent[i] = NULL; } - delete mpLineParent; + JKR_DELETE(mpLineParent); mpLineParent = NULL; - delete mpBlackTex; + JKR_DELETE(mpBlackTex); mpBlackTex = NULL; for (int i = 0; i < 3; i++) { - delete mpParent[i]; + JKR_DELETE(mpParent[i]); mpParent[i] = NULL; } for (int i = 0; i < 6; i++) { - delete mpLetterParent[i]; + JKR_DELETE(mpLetterParent[i]); mpLetterParent[i] = NULL; } - delete mpDMYParent; + JKR_DELETE(mpDMYParent); mpDMYParent = NULL; - delete mpIconScreen; + JKR_DELETE(mpIconScreen); mpIconScreen = NULL; for (int i = 0; i < 2; i++) { if (mpButtonAB[i] != NULL) { - delete mpButtonAB[i]; + JKR_DELETE(mpButtonAB[i]); mpButtonAB[i] = NULL; } if (mpButtonText[i] != NULL) { - delete mpButtonText[i]; + JKR_DELETE(mpButtonText[i]); mpButtonText[i] = NULL; } } @@ -162,7 +162,7 @@ dMenu_Letter_c::~dMenu_Letter_c() { } void dMenu_Letter_c::_create() { - mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); + mpDrawCursor = JKR_NEW dSelect_cursor_c(2, 1.0f, NULL); JUT_ASSERT(231, mpDrawCursor != NULL); // shield prod uses same values as GCN? #if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG @@ -174,10 +174,10 @@ void dMenu_Letter_c::_create() { mpDrawCursor->setScale(0.0f); mpDrawCursor->offPlayAnime(0); - mpString = new dMsgString_c(); + mpString = JKR_NEW dMsgString_c(); JUT_ASSERT(245, mpString != NULL); - mpArrow = new dMsgScrnArrow_c(); + mpArrow = JKR_NEW dMsgScrnArrow_c(); JUT_ASSERT(249, mpArrow != NULL); screenSetMenu(); @@ -310,7 +310,7 @@ int dMenu_Letter_c::_open() { if (mpMount->sync() != 0) { if (!mpArchive) { mpArchive = (JKRArchive*)mpMount->getArchive(); - delete mpMount; + JKR_DELETE(mpMount); mpMount = NULL; _create(); } @@ -751,12 +751,12 @@ void dMenu_Letter_c::screenSetMenu() { MULTI_CHAR('midoku_0'), MULTI_CHAR('midoku_1'), MULTI_CHAR('midoku_2'), MULTI_CHAR('midoku_3'), MULTI_CHAR('midoku_4'), MULTI_CHAR('midoku_5'), }; - mpMenuScreen = new J2DScreen(); + mpMenuScreen = JKR_NEW J2DScreen(); JUT_ASSERT(1146, mpMenuScreen != NULL); bool fg = mpMenuScreen->setPriority("zelda_letter_select_6menu.blo", 0x20000, mpArchive); JUT_ASSERT(1156, fg != false); dPaneClass_showNullPane(mpMenuScreen); - mpParent[0] = new CPaneMgr(mpMenuScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[0] = JKR_NEW CPaneMgr(mpMenuScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(1161, mpParent[0] != NULL); mpParent[0]->setAlphaRate(0.0f); for (int i = 0; i < 6; i++) { @@ -785,7 +785,7 @@ void dMenu_Letter_c::screenSetMenu() { } } for (int i = 0; i < 6; i++) { - mpLetterParent[i] = new CPaneMgr(mpMenuScreen, tag_letter[i], 0, NULL); + mpLetterParent[i] = JKR_NEW CPaneMgr(mpMenuScreen, tag_letter[i], 0, NULL); JUT_ASSERT(1212, mpLetterParent[i] != NULL); } for (int i = 0; i < 6; i++) { @@ -823,12 +823,12 @@ void dMenu_Letter_c::screenSetMenu() { field_0x338[i] = ((J2DTextBox*)field_0x34[1][i])->getWhite(); } } - mpMenuDMYScreen = new J2DScreen(); + mpMenuDMYScreen = JKR_NEW J2DScreen(); JUT_ASSERT(1270, mpMenuDMYScreen != NULL); fg = mpMenuDMYScreen->setPriority("zelda_letter_select_6menu.blo", 0x20000, mpArchive); JUT_ASSERT(1280, fg != false); dPaneClass_showNullPane(mpMenuDMYScreen); - mpDMYParent = new CPaneMgr(mpMenuDMYScreen, MULTI_CHAR('n_all'), 2, NULL); + mpDMYParent = JKR_NEW CPaneMgr(mpMenuDMYScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(1285, mpDMYParent != NULL); for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN @@ -877,13 +877,13 @@ void dMenu_Letter_c::screenSetBase() { MULTI_CHAR('pi_00'), MULTI_CHAR('pi_01'), MULTI_CHAR('pi_02'), MULTI_CHAR('pi_03'), MULTI_CHAR('pi_04'), MULTI_CHAR('pi_05'), MULTI_CHAR('pi_06'), MULTI_CHAR('pi_07'), MULTI_CHAR('pi_08'), }; - mpBaseScreen = new J2DScreen(); + mpBaseScreen = JKR_NEW J2DScreen(); JUT_ASSERT(1357, mpBaseScreen != NULL); bool fg = mpBaseScreen->setPriority("zelda_letter_select_base.blo", 0x20000, mpArchive); JUT_ASSERT(1361, fg != false); dPaneClass_showNullPane(mpBaseScreen); mpBaseScreen->search(MULTI_CHAR('wi_btn_n'))->hide(); - mpParent[1] = new CPaneMgr(mpBaseScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[1] = JKR_NEW CPaneMgr(mpBaseScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(1372, mpParent[1] != NULL); mpParent[1]->setAlphaRate(0.0f); #if VERSION == VERSION_GCN_JPN @@ -966,15 +966,15 @@ void dMenu_Letter_c::screenSetBase() { } void dMenu_Letter_c::screenSetShadow() { - mpSdwScreen = new J2DScreen(); + mpSdwScreen = JKR_NEW J2DScreen(); mpSdwScreen->setPriority("zelda_letter_select_shadow.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpSdwScreen); - mpParent[2] = new CPaneMgr(mpSdwScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[2] = JKR_NEW CPaneMgr(mpSdwScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent[2]->setAlphaRate(0.0f); } void dMenu_Letter_c::screenSetLetter() { - mpLetterScreen[0] = new J2DScreen(); + mpLetterScreen[0] = JKR_NEW J2DScreen(); JUT_ASSERT(1507, mpLetterScreen[0] != NULL); bool fg = mpLetterScreen[0]->setPriority("zelda_letter_window_base.blo", 0x20000, mpArchive); JUT_ASSERT(1511, fg != false); @@ -982,15 +982,15 @@ void dMenu_Letter_c::screenSetLetter() { #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('t3f_s'), 0, NULL); - field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3flin'), 0, NULL); - field_0x2f4[0] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3f_s'), 0, NULL); - field_0x2f4[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3f'), 0, NULL); + field_0x2ec[0] = JKR_NEW CPaneMgr(mpLetterScreen[0], MULTI_CHAR('t3f_s'), 0, NULL); + field_0x2ec[1] = JKR_NEW CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3flin'), 0, NULL); + field_0x2f4[0] = JKR_NEW CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3f_s'), 0, NULL); + field_0x2f4[1] = JKR_NEW CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3f'), 0, NULL); mpLetterScreen[0]->search('t4_s')->hide(); mpLetterScreen[0]->search(MULTI_CHAR('mg_e4lin'))->hide(); mpLetterScreen[0]->search('t3_s')->hide(); mpLetterScreen[0]->search(MULTI_CHAR('mg_3line'))->hide(); - mpLineParent = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('jp_fri_n'), 0, NULL); + mpLineParent = JKR_NEW CPaneMgr(mpLetterScreen[0], MULTI_CHAR('jp_fri_n'), 0, NULL); JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { static u64 const line_tag[12] = { @@ -1010,8 +1010,8 @@ void dMenu_Letter_c::screenSetLetter() { ((J2DTextBox*)field_0x2f4[0]->getPanePtr())->setLineSpace(((J2DTextBox*)field_0x2ec[0]->getPanePtr())->getLineSpace()); ((J2DTextBox*)field_0x2f4[1]->getPanePtr())->setLineSpace(((J2DTextBox*)field_0x2ec[1]->getPanePtr())->getLineSpace()); } else { - field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't3_s', 0, NULL); - field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3line'), 0, NULL); + field_0x2ec[0] = JKR_NEW CPaneMgr(mpLetterScreen[0], 't3_s', 0, NULL); + field_0x2ec[1] = JKR_NEW CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_3line'), 0, NULL); for (int i = 0; i < 2; i++) { field_0x2f4[i] = NULL; } @@ -1021,7 +1021,7 @@ void dMenu_Letter_c::screenSetLetter() { mpLetterScreen[0]->search(MULTI_CHAR('mg_3flin'))->hide(); mpLetterScreen[0]->search(MULTI_CHAR('mg_3f_s'))->hide(); mpLetterScreen[0]->search(MULTI_CHAR('mg_3f'))->hide(); - mpLineParent = new CPaneMgr(mpLetterScreen[0], 'jp_n', 0, NULL); + mpLineParent = JKR_NEW CPaneMgr(mpLetterScreen[0], 'jp_n', 0, NULL); JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { static u64 const line_tag[12] = { @@ -1045,8 +1045,8 @@ void dMenu_Letter_c::screenSetLetter() { MULTI_CHAR('line15'), MULTI_CHAR('line16'), MULTI_CHAR('line17'), MULTI_CHAR('line18'), MULTI_CHAR('line19'), MULTI_CHAR('line20'), }; - field_0x2ec[0] = new CPaneMgr(mpLetterScreen[0], 't4_s', 0, NULL); - field_0x2ec[1] = new CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_e4lin'), 0, NULL); + field_0x2ec[0] = JKR_NEW CPaneMgr(mpLetterScreen[0], 't4_s', 0, NULL); + field_0x2ec[1] = JKR_NEW CPaneMgr(mpLetterScreen[0], MULTI_CHAR('mg_e4lin'), 0, NULL); for (int i = 0; i < 2; i++) { field_0x2f4[i] = NULL; } @@ -1056,7 +1056,7 @@ void dMenu_Letter_c::screenSetLetter() { mpLetterScreen[0]->search(MULTI_CHAR('mg_3f'))->hide(); mpLetterScreen[0]->search('t3_s')->hide(); mpLetterScreen[0]->search(MULTI_CHAR('mg_3line'))->hide(); - mpLineParent = new CPaneMgr(mpLetterScreen[0], 'us_n', 0, NULL); + mpLineParent = JKR_NEW CPaneMgr(mpLetterScreen[0], 'us_n', 0, NULL); JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { if (line_tag[i] != 0) { @@ -1091,19 +1091,19 @@ void dMenu_Letter_c::screenSetLetter() { field_0x1e4[i]->setFont(mDoExt_getSubFont()); field_0x1e4[i]->setString(0x10, ""); } - mpLetterScreen[1] = new J2DScreen(); + mpLetterScreen[1] = JKR_NEW J2DScreen(); JUT_ASSERT(1627, mpLetterScreen[1] != NULL); fg = mpLetterScreen[1]->setPriority("zelda_letter_window_spot.blo", 0x20000, mpArchive); JUT_ASSERT(1631, fg != false); dPaneClass_showNullPane(mpLetterScreen[1]); for (int i = 0; i < 2; i++) { - mpTextParent[i] = new CPaneMgr(mpLetterScreen[i], MULTI_CHAR('n_all'), 2, NULL); + mpTextParent[i] = JKR_NEW CPaneMgr(mpLetterScreen[i], MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(1636, mpTextParent[i] != NULL); mpTextParent[i]->scale(0.0f, 0.0f); mpTextParent[i]->setAlphaRate(0.0f); } ResTIMG* local_30 = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBlackTex = new J2DPicture(local_30); + mpBlackTex = JKR_NEW J2DPicture(local_30); JUT_ASSERT(1644, mpBlackTex != NULL); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); mpBlackTex->setAlpha(0); @@ -1117,7 +1117,7 @@ void dMenu_Letter_c::screenSetDoIcon() { MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'), }; - mpIconScreen = new J2DScreen(); + mpIconScreen = JKR_NEW J2DScreen(); mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); for (int i = 0; i < 2; i++) { mpButtonAB[i] = NULL; diff --git a/src/d/d_menu_map_common.cpp b/src/d/d_menu_map_common.cpp index c0db6ddcd2..6af59de640 100644 --- a/src/d/d_menu_map_common.cpp +++ b/src/d/d_menu_map_common.cpp @@ -63,23 +63,23 @@ dMenuMapCommon_c::dMenuMapCommon_c() { dMenuMapCommon_c::~dMenuMapCommon_c() { for (int i = 0; i < ICON_MAX_e; i++) { if (mPictures[i] != NULL) { - delete mPictures[i]; + JKR_DELETE(mPictures[i]); mPictures[i] = NULL; } } if (mLightDropPic != NULL) { - delete mLightDropPic; + JKR_DELETE(mLightDropPic); mLightDropPic = NULL; } if (mpDrawCursor != NULL) { - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; } if (mpPortalIcon != NULL) { - delete mpPortalIcon; + JKR_DELETE(mpPortalIcon); mpPortalIcon = NULL; } } @@ -89,7 +89,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_boss_s_ci8_16_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_BOSS_e] = new J2DPicture(mp_image); + mPictures[ICON_BOSS_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_boss_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_BOSS_e]->append(mp_image, 0.0f); @@ -98,7 +98,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_boss_s_ci8_16_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_BOSS_GANON_e] = new J2DPicture(mp_image); + mPictures[ICON_BOSS_GANON_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_boss_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_BOSS_GANON_e]->append(mp_image, 0.0f); @@ -107,7 +107,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_enter_ci8_24_02.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_DUNGEON_ENTER_e] = new J2DPicture(mp_image); + mPictures[ICON_DUNGEON_ENTER_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_enter_ci8_02.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_DUNGEON_ENTER_e]->append(mp_image, 0.0f); @@ -116,7 +116,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_enter_s_ci8_24_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_LINK_ENTER_e] = new J2DPicture(mp_image); + mPictures[ICON_LINK_ENTER_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_enter_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LINK_ENTER_e]->append(mp_image, 0.0f); @@ -125,7 +125,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_warp_24_ci8_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_LV8_WARP_e] = new J2DPicture(mp_image); + mPictures[ICON_LV8_WARP_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_warp_32_ci8_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LV8_WARP_e]->append(mp_image, 0.0f); @@ -134,7 +134,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_box_s_ci8_24_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_TREASURE_CHEST_e] = new J2DPicture(mp_image); + mPictures[ICON_TREASURE_CHEST_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_box_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_TREASURE_CHEST_e]->append(mp_image, 0.0f); @@ -143,7 +143,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_gray_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_KEY_e] = new J2DPicture(mp_image); + mPictures[ICON_KEY_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_key_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_KEY_e]->append(mp_image, 0.0f); @@ -152,7 +152,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_YETO_e] = new J2DPicture(mp_image); + mPictures[ICON_YETO_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "st_yuki_M.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_YETO_e]->append(mp_image, 0.0f); @@ -161,7 +161,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_YETA_e] = new J2DPicture(mp_image); + mPictures[ICON_YETA_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "st_yuki_W.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_YETA_e]->append(mp_image, 0.0f); @@ -170,7 +170,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_yellow_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_GOLD_WOLF_e] = new J2DPicture(mp_image); + mPictures[ICON_GOLD_WOLF_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "st_gold_wolf.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_GOLD_WOLF_e]->append(mp_image, 0.0f); @@ -179,7 +179,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_MONKEY_e] = new J2DPicture(mp_image); + mPictures[ICON_MONKEY_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_monkey_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_MONKEY_e]->append(mp_image, 0.0f); @@ -188,7 +188,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_blue_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_OOCCOO_e] = new J2DPicture(mp_image); + mPictures[ICON_OOCCOO_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "ni_obacyan.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_OOCCOO_e]->append(mp_image, 0.0f); @@ -197,7 +197,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_blue_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_OOCCOO_JR_e] = new J2DPicture(mp_image); + mPictures[ICON_OOCCOO_JR_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "ni_obacyan.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_OOCCOO_JR_e]->append(mp_image, 0.0f); @@ -206,7 +206,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[8] = new J2DPicture(mp_image); + mPictures[8] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_zelda_map_icon_copy_stone_statue_snup_try_00_04.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[8]->append(mp_image, 0.0f); @@ -215,7 +215,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_link_s_ci8_24_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_LINK_e] = new J2DPicture(mp_image); + mPictures[ICON_LINK_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_link_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LINK_e]->append(mp_image, 0.0f); @@ -224,7 +224,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_penant_s_ci8_24_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_DUNGEON_WARP_e] = new J2DPicture(mp_image); + mPictures[ICON_DUNGEON_WARP_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_penant_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_DUNGEON_WARP_e]->append(mp_image, 0.0f); @@ -233,7 +233,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_black_32.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_LIGHT_DROP_e] = new J2DPicture(mp_image); + mPictures[ICON_LIGHT_DROP_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_black_32.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LIGHT_DROP_e]->append(mp_image, 0.0f); @@ -243,7 +243,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_hikari_no_shizuku_try_10_00_24x24.bti"); JUT_ASSERT(0, mp_image != NULL); - mLightDropPic = new J2DPicture(mp_image); + mLightDropPic = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_hikari_no_shizuku_try_10_00_24x24.bti"); JUT_ASSERT(0, mp_image != NULL); mLightDropPic->append(mp_image, 0.0f); @@ -253,7 +253,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_LIGHT_BALL_e] = new J2DPicture(mp_image); + mPictures[ICON_LIGHT_BALL_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_zelda_map_icon_hikari_ball_03.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LIGHT_BALL_e]->append(mp_image, 0.0f); @@ -262,7 +262,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_CANNON_BALL_e] = new J2DPicture(mp_image); + mPictures[ICON_CANNON_BALL_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_iron_ball_ci8_32_00.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_CANNON_BALL_e]->append(mp_image, 0.0f); @@ -271,7 +271,7 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_COACH_e] = new J2DPicture(mp_image); + mPictures[ICON_COACH_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_basha_ci8.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_COACH_e]->append(mp_image, 0.0f); @@ -280,18 +280,18 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_nijumaru_40x40_ind_01.bti"); JUT_ASSERT(0, mp_image != NULL); - mPictures[ICON_DESTINATION_e] = new J2DPicture(mp_image); + mPictures[ICON_DESTINATION_e] = JKR_NEW J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_nijumaru_40x40_ind_01.bti"); JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_DESTINATION_e]->append(mp_image, 0.0f); mPictures[ICON_DESTINATION_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_DESTINATION_e]->setInfluencedAlpha(false, false); - mpDrawCursor = new dSelect_cursor_c(4, 1.0f, NULL); + mpDrawCursor = JKR_NEW dSelect_cursor_c(4, 1.0f, NULL); JUT_ASSERT(0, mpDrawCursor != NULL); if (i_archive == dComIfGp_getFmapResArchive()) { - mpPortalIcon = new dSelect_cursor_c(5, 1.0f, i_archive); + mpPortalIcon = JKR_NEW dSelect_cursor_c(5, 1.0f, i_archive); JUT_ASSERT(0, mpPortalIcon != NULL); } } diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index b398a06789..3f9e0f88e3 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -102,15 +102,15 @@ void dMenu_Option_c::_create() { static const u8 l_msgNum2[2] = {8, 7}; mpFont = mDoExt_getMesgFont(); - mpString = new dMsgString_c(); + mpString = JKR_NEW dMsgString_c(); JUT_ASSERT(197, mpString != NULL); - mpMeterHaihai = new dMeterHaihai_c(3); + mpMeterHaihai = JKR_NEW dMeterHaihai_c(3); JUT_ASSERT(201, mpMeterHaihai); field_0x3f6 = 0; - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(205, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_option_select_menu.blo", 0x20000, mpArchive); @@ -128,41 +128,41 @@ void dMenu_Option_c::_create() { field_0x254[i]->setFont(mDoExt_getMesgFont()); field_0x254[i]->setString(0x20, ""); } - mpBackScreen = new J2DScreen(); + mpBackScreen = JKR_NEW J2DScreen(); JUT_ASSERT(246, mpBackScreen != NULL); fg = mpBackScreen->setPriority("zelda_option_base.blo", 0x20000, mpArchive); JUT_ASSERT(251, fg != false); mpBackScreen->search(MULTI_CHAR('wi_btn_n'))->hide(); field_0x27c = mpBackScreen->search(MULTI_CHAR('let_area')); - mpClipScreen = new J2DScreen(); + mpClipScreen = JKR_NEW J2DScreen(); JUT_ASSERT(265, mpClipScreen != NULL); fg = mpClipScreen->setPriority("zelda_option_menu_text.blo", 0x20000, mpArchive); JUT_ASSERT(269, fg != false); dPaneClass_showNullPane(mpClipScreen); mpClipScreen->setScissor(true); - mpShadowScreen = new J2DScreen(); + mpShadowScreen = JKR_NEW J2DScreen(); JUT_ASSERT(274, mpShadowScreen != NULL); fg = mpShadowScreen->setPriority("zelda_option_menu_shadow.blo", 0x20000, mpArchive); JUT_ASSERT(278, fg != false); dPaneClass_showNullPane(mpShadowScreen); mpShadowScreen->search(MULTI_CHAR('mw_n_5'))->hide(); - mpTVScreen = new J2DScreen(); + mpTVScreen = JKR_NEW J2DScreen(); JUT_ASSERT(287, mpTVScreen != NULL); fg = mpTVScreen->setPriority("zelda_option_check.blo", 0x20000, mpArchive); JUT_ASSERT(291, fg != false); dPaneClass_showNullPane(mpTVScreen); - mpTVButtonAB = new CPaneMgr(mpTVScreen, MULTI_CHAR('g_abtn_n'), 0, NULL); + mpTVButtonAB = JKR_NEW CPaneMgr(mpTVScreen, MULTI_CHAR('g_abtn_n'), 0, NULL); JUT_ASSERT(295, mpTVButtonAB != NULL); - mpTVButtonText = new CPaneMgr(mpTVScreen, MULTI_CHAR('a_text_n'), 0, NULL); + mpTVButtonText = JKR_NEW CPaneMgr(mpTVScreen, MULTI_CHAR('a_text_n'), 0, NULL); JUT_ASSERT(298, mpTVButtonText != NULL); mpTVScreen->search(MULTI_CHAR('g_abtn_n'))->hide(); - mpScreenIcon = new J2DScreen(); + mpScreenIcon = JKR_NEW J2DScreen(); JUT_ASSERT(325, mpScreenIcon != NULL); mpScreenIcon->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); for (int i = 0; i < 2; i++) { @@ -182,15 +182,15 @@ void dMenu_Option_c::_create() { setAButtonString(0x40C); setBButtonString(0x3F9); ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBlackTex = new J2DPicture(timg); + mpBlackTex = JKR_NEW J2DPicture(timg); JUT_ASSERT(402, mpBlackTex != NULL); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); mpBlackTex->setAlpha(0); field_0x374 = 0.0f; - mpWarning = new dFile_warning_c(mpArchive, 1); + mpWarning = JKR_NEW dFile_warning_c(mpArchive, 1); JUT_ASSERT(408, mpWarning != NULL); mpWarning->setFontColor(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0xc8, 0xc8, 0xc8, 0xff)); - mpSelectScreen = new J2DScreen(); + mpSelectScreen = JKR_NEW J2DScreen(); JUT_ASSERT(412, mpSelectScreen != NULL); fg = mpSelectScreen->setPriority("zelda_file_select_yes_no_window.blo", 0x1100000, mpArchive); JUT_ASSERT(416, fg != false); @@ -204,9 +204,9 @@ void dMenu_Option_c::_create() { field_0x28->searchUpdateMaterialID(mpSelectScreen); field_0x20->searchUpdateMaterialID(mpSelectScreen); for (int i = 0; i < 2; i++) { - mpYesNoSelBase_c[i] = new CPaneMgr(mpSelectScreen, l_tagName012[i], 0, NULL); + mpYesNoSelBase_c[i] = JKR_NEW CPaneMgr(mpSelectScreen, l_tagName012[i], 0, NULL); JUT_ASSERT(439, mpYesNoSelBase_c[i] != NULL); - mpYesNoTxt_c[i] = new CPaneMgr(mpSelectScreen, l_tagName013[i], 0, NULL); + mpYesNoTxt_c[i] = JKR_NEW CPaneMgr(mpSelectScreen, l_tagName013[i], 0, NULL); JUT_ASSERT(441, mpYesNoTxt_c[i] != NULL); J2DTextBox* yesNoTxt = (J2DTextBox*)mpYesNoTxt_c[i]->getPanePtr(); yesNoTxt->setFont(mDoExt_getMesgFont()); @@ -229,11 +229,11 @@ void dMenu_Option_c::_create() { field_0x3c4 = 0; for (int i = 0; i < 2; i++) { - mpYesNoCurWaku_c[i] = new CPaneMgr(mpSelectScreen, l_tagName9[i], 0, NULL); + mpYesNoCurWaku_c[i] = JKR_NEW CPaneMgr(mpSelectScreen, l_tagName9[i], 0, NULL); JUT_ASSERT(482, mpYesNoCurWaku_c[i] != NULL); - mpYesNoCurWakuG0_c[i] = new CPaneMgr(mpSelectScreen, l_tagName10[i], 0, NULL); + mpYesNoCurWakuG0_c[i] = JKR_NEW CPaneMgr(mpSelectScreen, l_tagName10[i], 0, NULL); JUT_ASSERT(484, mpYesNoCurWakuG0_c[i] != NULL); - mpYesNoCurWakuG1_c[i] = new CPaneMgr(mpSelectScreen, l_tagName11[i], 0, NULL); + mpYesNoCurWakuG1_c[i] = JKR_NEW CPaneMgr(mpSelectScreen, l_tagName11[i], 0, NULL); JUT_ASSERT(486, mpYesNoCurWakuG1_c[i] != NULL); mpYesNoCurWaku_c[i]->getPanePtr()->setAnimation(field_0x2c); mpYesNoCurWakuG0_c[i]->getPanePtr()->setAnimation(field_0x2c); @@ -291,91 +291,91 @@ void dMenu_Option_c::_create() { } void dMenu_Option_c::_delete() { - delete mpString; + JKR_DELETE(mpString); mpString = NULL; - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpMeterHaihai; + JKR_DELETE(mpMeterHaihai); mpMeterHaihai = NULL; - delete mpBackScreen; + JKR_DELETE(mpBackScreen); mpBackScreen = NULL; - delete mpClipScreen; + JKR_DELETE(mpClipScreen); mpClipScreen = NULL; - delete mpShadowScreen; + JKR_DELETE(mpShadowScreen); mpShadowScreen = NULL; - delete mpTVScreen; + JKR_DELETE(mpTVScreen); mpTVScreen = NULL; if (mpTVButtonAB != NULL) { - delete mpTVButtonAB; + JKR_DELETE(mpTVButtonAB); mpTVButtonAB = NULL; } if (mpTVButtonText != NULL) { - delete mpTVButtonText; + JKR_DELETE(mpTVButtonText); mpTVButtonText = NULL; } - delete mpScreenIcon; + JKR_DELETE(mpScreenIcon); mpScreenIcon = NULL; for (int i = 0; i < 2; i++) { if (mpButtonAB[i] != NULL) { - delete mpButtonAB[i]; + JKR_DELETE(mpButtonAB[i]); mpButtonAB[i] = NULL; } if (mpButtonText[i] != NULL) { - delete mpButtonText[i]; + JKR_DELETE(mpButtonText[i]); mpButtonText[i] = NULL; } } - delete mpBlackTex; + JKR_DELETE(mpBlackTex); mpBlackTex = NULL; - delete mpWarning; + JKR_DELETE(mpWarning); mpWarning = NULL; - delete mpSelectScreen; + JKR_DELETE(mpSelectScreen); mpSelectScreen = NULL; - delete field_0x24; + JKR_DELETE(field_0x24); field_0x24 = NULL; - delete field_0x28; + JKR_DELETE(field_0x28); field_0x28 = NULL; - delete field_0x20; + JKR_DELETE(field_0x20); field_0x20 = NULL; for (int i = 0; i < 2; i++) { - delete mpYesNoSelBase_c[i]; + JKR_DELETE(mpYesNoSelBase_c[i]); mpYesNoSelBase_c[i] = NULL; - delete mpYesNoTxt_c[i]; + JKR_DELETE(mpYesNoTxt_c[i]); mpYesNoTxt_c[i] = NULL; - delete mpYesNoCurWaku_c[i]; + JKR_DELETE(mpYesNoCurWaku_c[i]); mpYesNoCurWaku_c[i] = NULL; - delete mpYesNoCurWakuG0_c[i]; + JKR_DELETE(mpYesNoCurWakuG0_c[i]); mpYesNoCurWakuG0_c[i] = NULL; - delete mpYesNoCurWakuG1_c[i]; + JKR_DELETE(mpYesNoCurWakuG1_c[i]); mpYesNoCurWakuG1_c[i] = NULL; } - delete field_0x2c; + JKR_DELETE(field_0x2c); field_0x2c = NULL; - delete field_0x30; + JKR_DELETE(field_0x30); field_0x30 = NULL; if ( @@ -387,53 +387,53 @@ void dMenu_Option_c::_delete() { #endif ) ) { - delete mpStick; + JKR_DELETE(mpStick); mpStick = NULL; } - delete mpTitle; + JKR_DELETE(mpTitle); mpTitle = NULL; - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; for (int i = 0; i < 5; i++) { - delete mpParent[i]; + JKR_DELETE(mpParent[i]); mpParent[i] = NULL; } for (int i = 0; i < 5; i++) { - delete mpHaihaiPosL[i]; + JKR_DELETE(mpHaihaiPosL[i]); mpHaihaiPosL[i] = NULL; - delete mpHaihaiPosR[i]; + JKR_DELETE(mpHaihaiPosR[i]); mpHaihaiPosR[i] = NULL; } for (int i = 0; i < 6; i++) { - delete mpMenuNull[i]; + JKR_DELETE(mpMenuNull[i]); mpMenuNull[i] = NULL; - delete mpMenuPane[i]; + JKR_DELETE(mpMenuPane[i]); mpMenuPane[i] = NULL; if (mpMenuPaneC[i] != NULL) { - delete mpMenuPaneC[i]; + JKR_DELETE(mpMenuPaneC[i]); mpMenuPaneC[i] = NULL; } if (mpMenuPane2[i] != NULL) { - delete mpMenuPane2[i]; + JKR_DELETE(mpMenuPane2[i]); mpMenuPane2[i] = NULL; } if (mpMenuPane3[i] != NULL) { - delete mpMenuPane3[i]; + JKR_DELETE(mpMenuPane3[i]); mpMenuPane3[i] = NULL; } if (mpMenuPane32[i] != NULL) { - delete mpMenuPane32[i]; + JKR_DELETE(mpMenuPane32[i]); mpMenuPane32[i] = NULL; } } @@ -441,7 +441,7 @@ void dMenu_Option_c::_delete() { for (int i = 0; i < 6; i++) { for (int j = 0; j < 6; j++) { if (mpMenuText[i][j] != NULL) { - delete mpMenuText[i][j]; + JKR_DELETE(mpMenuText[i][j]); mpMenuText[i][j] = NULL; } } @@ -449,14 +449,14 @@ void dMenu_Option_c::_delete() { for (int i = 0; i < 4; i++) { if (field_0x1c0[i] != NULL) { - delete field_0x1c0[i]; + JKR_DELETE(field_0x1c0[i]); field_0x1c0[i] = NULL; } } for (int i = 0; i < 3; i++) { if (mpZButtonText[i] != NULL) { - delete mpZButtonText[i]; + JKR_DELETE(mpZButtonText[i]); mpZButtonText[i] = NULL; } } @@ -642,7 +642,7 @@ bool dMenu_Option_c::_open() { if (!dComIfGp_getOptionResArchive()) { dComIfGp_setOptionResArchive(mpMount->getArchive()); mpArchive = dComIfGp_getOptionResArchive(); - delete mpMount; + JKR_DELETE(mpMount); mpMount = NULL; _create(); } @@ -1423,7 +1423,7 @@ void dMenu_Option_c::screenSet() { }; #endif - mpTitle = new CPaneMgr(mpBackScreen, MULTI_CHAR('title_n'), 0, NULL); + mpTitle = JKR_NEW CPaneMgr(mpBackScreen, MULTI_CHAR('title_n'), 0, NULL); Vec pos = mpTitle->getGlobalVtxCenter(mpTitle->mPane, false, 0); mpWarning->mPosY = pos.y + g_drawHIO.mOptionScreen.mBackgroundPosY; for (int i = 0; i < 6; i++) { @@ -1440,21 +1440,21 @@ void dMenu_Option_c::screenSet() { field_0x2c8[1] = field_0x298[0]->getWhite(); field_0x2b8[0].a = 0xff; field_0x2b0[0].a = 0xff; - mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); + mpDrawCursor = JKR_NEW dSelect_cursor_c(2, 1.0f, NULL); mpDrawCursor->setAlphaRate(0.0f); mpDrawCursor->setScale(0.0f); mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f); mpDrawCursor->offPlayAnime(0); - mpParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); - mpParent[1] = new CPaneMgr(mpClipScreen, MULTI_CHAR('n_all'), 2, NULL); - mpParent[2] = new CPaneMgr(mpShadowScreen, 'nall', 2, NULL); - mpParent[3] = new CPaneMgr(mpTVScreen, MULTI_CHAR('n_all'), 2, NULL); - mpParent[4] = new CPaneMgr(mpBackScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[1] = JKR_NEW CPaneMgr(mpClipScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[2] = JKR_NEW CPaneMgr(mpShadowScreen, 'nall', 2, NULL); + mpParent[3] = JKR_NEW CPaneMgr(mpTVScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent[4] = JKR_NEW CPaneMgr(mpBackScreen, MULTI_CHAR('n_all'), 2, NULL); for (int i = 0; i < 6; i++) { - mpMenuNull[i] = new CPaneMgr(mpScreen, let_n[i], 0, NULL); - mpMenuPane[i] = new CPaneMgr(mpScreen, menu_n[i], 0, NULL); + mpMenuNull[i] = JKR_NEW CPaneMgr(mpScreen, let_n[i], 0, NULL); + mpMenuPane[i] = JKR_NEW CPaneMgr(mpScreen, menu_n[i], 0, NULL); if (menu2_n[i] != 0) { - mpMenuPaneC[i] = new CPaneMgr(mpScreen, menu2_n[i], 0, NULL); + mpMenuPaneC[i] = JKR_NEW CPaneMgr(mpScreen, menu2_n[i], 0, NULL); Vec pos = mpMenuPaneC[i]->getGlobalVtxCenter(mpMenuPaneC[i]->mPane, false, 0); field_0x344[i] = pos.x; field_0x35c[i] = pos.y; @@ -1473,24 +1473,24 @@ void dMenu_Option_c::screenSet() { field_0x408[i] = field_0x2d0[0][i]->getAlpha(); } for (int i = 0; i < 5; i++) { - mpHaihaiPosL[i] = new CPaneMgr(mpScreen, haihail_n[i], 0, NULL); - mpHaihaiPosR[i] = new CPaneMgr(mpScreen, haihair_n[i], 0, NULL); + mpHaihaiPosL[i] = JKR_NEW CPaneMgr(mpScreen, haihail_n[i], 0, NULL); + mpHaihaiPosR[i] = JKR_NEW CPaneMgr(mpScreen, haihair_n[i], 0, NULL); } for (int i = 0; i < 6; i++) { if (let2_n[i] != 0) { - mpMenuPane2[i] = new CPaneMgr(mpShadowScreen, let2_n[i], 0, NULL); + mpMenuPane2[i] = JKR_NEW CPaneMgr(mpShadowScreen, let2_n[i], 0, NULL); } else { mpMenuPane2[i] = NULL; } } for (int i = 0; i < 6; i++) { if (let2_n[i] != NULL) { - mpMenuPane3[i] = new CPaneMgr(mpClipScreen, let2_n[i], 0, NULL); + mpMenuPane3[i] = JKR_NEW CPaneMgr(mpClipScreen, let2_n[i], 0, NULL); } else { mpMenuPane3[i] = NULL; } if (menu3_n[i] != NULL) { - mpMenuPane32[i] = new CPaneMgr(mpClipScreen, menu3_n[i], 0, NULL); + mpMenuPane32[i] = JKR_NEW CPaneMgr(mpClipScreen, menu3_n[i], 0, NULL); } else { mpMenuPane32[i] = NULL; } @@ -1613,11 +1613,11 @@ void dMenu_Option_c::screenSet() { for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN paneResize(menut_0[i]); - mpMenuText[0][i] = new CPaneMgr(mpClipScreen, menut_0[i], 0, NULL); + mpMenuText[0][i] = JKR_NEW CPaneMgr(mpClipScreen, menut_0[i], 0, NULL); mpClipScreen->search(fenut_0[i])->hide(); #else paneResize(fenut_0[i]); - mpMenuText[0][i] = new CPaneMgr(mpClipScreen, fenut_0[i], 0, NULL); + mpMenuText[0][i] = JKR_NEW CPaneMgr(mpClipScreen, fenut_0[i], 0, NULL); mpClipScreen->search(menut_0[i])->hide(); #endif ((J2DTextBox*)(mpMenuText[0][i]->getPanePtr()))->setFont(mpFont); @@ -1627,11 +1627,11 @@ void dMenu_Option_c::screenSet() { for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN paneResize(menut_1[i]); - mpMenuText[1][i] = new CPaneMgr(mpClipScreen, menut_1[i], 0, NULL); + mpMenuText[1][i] = JKR_NEW CPaneMgr(mpClipScreen, menut_1[i], 0, NULL); mpClipScreen->search(fenut_1[i])->hide(); #else paneResize(fenut_1[i]); - mpMenuText[1][i] = new CPaneMgr(mpClipScreen, fenut_1[i], 0, NULL); + mpMenuText[1][i] = JKR_NEW CPaneMgr(mpClipScreen, fenut_1[i], 0, NULL); mpClipScreen->search(menut_1[i])->hide(); #endif mpMenuText[1][i]->show(); @@ -1642,11 +1642,11 @@ void dMenu_Option_c::screenSet() { for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN paneResize(menut_2[i]); - mpMenuText[2][i] = new CPaneMgr(mpClipScreen, menut_2[i], 0, NULL); + mpMenuText[2][i] = JKR_NEW CPaneMgr(mpClipScreen, menut_2[i], 0, NULL); mpClipScreen->search(fenut_2[i])->hide(); #else paneResize(fenut_2[i]); - mpMenuText[2][i] = new CPaneMgr(mpClipScreen, fenut_2[i], 0, NULL); + mpMenuText[2][i] = JKR_NEW CPaneMgr(mpClipScreen, fenut_2[i], 0, NULL); mpClipScreen->search(menut_2[i])->hide(); #endif mpMenuText[2][i]->show(); @@ -1657,11 +1657,11 @@ void dMenu_Option_c::screenSet() { for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN paneResize(menut_3[i]); - mpMenuText[3][i] = new CPaneMgr(mpClipScreen, menut_3[i], 0, NULL); + mpMenuText[3][i] = JKR_NEW CPaneMgr(mpClipScreen, menut_3[i], 0, NULL); mpClipScreen->search(fenut_3[i])->hide(); #else paneResize(fenut_3[i]); - mpMenuText[3][i] = new CPaneMgr(mpClipScreen, fenut_3[i], 0, NULL); + mpMenuText[3][i] = JKR_NEW CPaneMgr(mpClipScreen, fenut_3[i], 0, NULL); mpClipScreen->search(menut_3[i])->hide(); #endif mpMenuText[3][i]->show(); @@ -1672,11 +1672,11 @@ void dMenu_Option_c::screenSet() { for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN paneResize(menut_4[i]); - mpMenuText[4][i] = new CPaneMgr(mpClipScreen, menut_4[i], 0, NULL); + mpMenuText[4][i] = JKR_NEW CPaneMgr(mpClipScreen, menut_4[i], 0, NULL); mpClipScreen->search(fenut_4[i])->hide(); #else paneResize(fenut_4[i]); - mpMenuText[4][i] = new CPaneMgr(mpClipScreen, fenut_4[i], 0, NULL); + mpMenuText[4][i] = JKR_NEW CPaneMgr(mpClipScreen, fenut_4[i], 0, NULL); mpClipScreen->search(menut_4[i])->hide(); #endif mpMenuText[4][i]->show(); @@ -1721,7 +1721,7 @@ void dMenu_Option_c::screenSet() { } for (int i = 0; i < 3; i++) { if (z_tx[i] != NULL) { - mpZButtonText[i] = new CPaneMgr(mpBackScreen, z_tx[i], 2, NULL); + mpZButtonText[i] = JKR_NEW CPaneMgr(mpBackScreen, z_tx[i], 2, NULL); } else { mpZButtonText[i] = NULL; } diff --git a/src/d/d_menu_quit.cpp b/src/d/d_menu_quit.cpp index 6ad35a184b..238d5da1de 100644 --- a/src/d/d_menu_quit.cpp +++ b/src/d/d_menu_quit.cpp @@ -25,8 +25,8 @@ dMenu_Quit_c::dMenu_Quit_c() { } dMenu_Quit_c::~dMenu_Quit_c() { - delete mStick; - delete mpScrnExplain; + JKR_DELETE(mStick); + JKR_DELETE(mpScrnExplain); mpScrnExplain = NULL; } diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index de1a5ab3a0..e1fe677b9f 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -247,7 +247,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i setSelectItem(i, 0x43); } for (int j = 0; j < 3; j++) { - mpSelectItemTex[i][j] = new J2DPicture(mpSelectItemTexBuf[i][field_0x6be[i]][0]); + mpSelectItemTex[i][j] = JKR_NEW J2DPicture(mpSelectItemTexBuf[i][field_0x6be[i]][0]); mpSelectItemTex[i][j]->setBasePosition(J2DBasePosition_4); } field_0x548[i] = 0.0f; @@ -256,21 +256,21 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( 'TIMG', dMeter2Info_getNumberTextureName(0)); for (int i = 0; i < 3; i++) { - mpItemNumTex[i] = new J2DPicture(timg); + mpItemNumTex[i] = JKR_NEW J2DPicture(timg); } - mpKanteraMeter = new dKantera_icon_c(); - mpScreen = new J2DScreen(); + mpKanteraMeter = JKR_NEW dKantera_icon_c(); + mpScreen = JKR_NEW J2DScreen(); dPaneClass_setPriority(&mpResData[0], mpHeap, mpScreen, "SCRN/zelda_item_select_icon_message_ver2.blo", 0x20000, dComIfGp_getRingResArchive()); dPaneClass_showNullPane(mpScreen); - mpMessageParent = new CPaneMgrAlpha(mpScreen, MULTI_CHAR('n_all'), 2, NULL); - mpTextParent[0] = new CPaneMgr(mpScreen, 'r_n', 0, NULL); - mpTextParent[1] = new CPaneMgr(mpScreen, 'c_n', 2, NULL); + mpMessageParent = JKR_NEW CPaneMgrAlpha(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpTextParent[0] = JKR_NEW CPaneMgr(mpScreen, 'r_n', 0, NULL); + mpTextParent[1] = JKR_NEW CPaneMgr(mpScreen, 'c_n', 2, NULL); mpTextParent[1]->setAlphaRate(1.0f); mpTextParent[2] = NULL; - mpTextParent[3] = new CPaneMgr(mpScreen, MULTI_CHAR('c_sen_n'), 2, NULL); - mpTextParent[4] = new CPaneMgr(mpScreen, 'gr_n', 2, NULL); + mpTextParent[3] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('c_sen_n'), 2, NULL); + mpTextParent[4] = JKR_NEW CPaneMgr(mpScreen, 'gr_n', 2, NULL); mpTextParent[4]->hide(); for (int i = 5; i < 10; i++) { mpTextParent[i] = NULL; @@ -289,7 +289,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i dMeter2Info_readItemTexture(item, mpItemBuf[i][0], NULL, mpItemBuf[i][1], NULL, mpItemBuf[i][2], NULL, NULL, NULL, -1); for (int k = 0; k < i_textureNum; k++) { - mpItemTex[i][k] = new J2DPicture(mpItemBuf[i][k]); + mpItemTex[i][k] = JKR_NEW J2DPicture(mpItemBuf[i][k]); mpItemTex[i][k]->setBasePosition(J2DBasePosition_4); } dMeter2Info_setItemColor(item, mpItemTex[i][0], mpItemTex[i][1], mpItemTex[i][2], NULL); @@ -316,7 +316,7 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i mpScreen->search(MULTI_CHAR('x_btn_n'))->hide(); mpScreen->search(MULTI_CHAR('y_btn_n'))->hide(); } - mpString = new dMsgString_c(); + mpString = JKR_NEW dMsgString_c(); for (i = 0; i < 5; i++) { #if VERSION == VERSION_GCN_JPN J2DTextBox* fxy_TextBox = (J2DTextBox*)mpScreen->search(xy_text[i]); @@ -379,23 +379,23 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i } mpHeap->getTotalFreeSize(); timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBlackTex = new J2DPicture(timg); + mpBlackTex = JKR_NEW J2DPicture(timg); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); mpBlackTex->setAlpha(0); - mpSpotScreen = new J2DScreen(); + mpSpotScreen = JKR_NEW J2DScreen(); dPaneClass_setPriority(&mpResData[1], mpHeap, mpSpotScreen, "SCRN/zelda_item_select_icon3_spot.blo", 0x20000, dComIfGp_getRingResArchive()); dPaneClass_showNullPane(mpSpotScreen); - mpSpotParent = new CPaneMgrAlpha(mpSpotScreen, MULTI_CHAR('n_all'), 2, NULL); - mpCenterScreen = new J2DScreen(); + mpSpotParent = JKR_NEW CPaneMgrAlpha(mpSpotScreen, MULTI_CHAR('n_all'), 2, NULL); + mpCenterScreen = JKR_NEW J2DScreen(); dPaneClass_setPriority(&mpResData[2], mpHeap, mpCenterScreen, "SCRN/zelda_item_select_icon3_center_parts.blo", 0x20000, dComIfGp_getRingResArchive()); dPaneClass_showNullPane(mpCenterScreen); - mpCenterParent = new CPaneMgrAlpha(mpCenterScreen, MULTI_CHAR('center_n'), 2, NULL); - mpNameParent = new CPaneMgr(mpCenterScreen, MULTI_CHAR('label_n'), 1, NULL); - mpCircle = new CPaneMgr(mpCenterScreen, MULTI_CHAR('circle_n'), 2, NULL); + mpCenterParent = JKR_NEW CPaneMgrAlpha(mpCenterScreen, MULTI_CHAR('center_n'), 2, NULL); + mpNameParent = JKR_NEW CPaneMgr(mpCenterScreen, MULTI_CHAR('label_n'), 1, NULL); + mpCircle = JKR_NEW CPaneMgr(mpCenterScreen, MULTI_CHAR('circle_n'), 2, NULL); J2DTextBox* textBox[4]; #if VERSION == VERSION_GCN_JPN textBox[0] = (J2DTextBox*)mpCenterScreen->search(MULTI_CHAR('item_n04')); @@ -425,9 +425,9 @@ dMenu_Ring_c::dMenu_Ring_c(JKRExpHeap* i_heap, STControl* i_stick, CSTControl* i textBox[i]->setString(0x40, ""); } textCentering(); - mpDrawCursor = new dSelect_cursor_c(2, g_ringHIO.mCursorScale, dComIfGp_getMain2DArchive()); + mpDrawCursor = JKR_NEW dSelect_cursor_c(2, g_ringHIO.mCursorScale, dComIfGp_getMain2DArchive()); mpDrawCursor->setAlphaRate(1.0f); - mpItemExplain = new dMenu_ItemExplain_c(mpHeap, dComIfGp_getRingResArchive(), i_stick, true); + mpItemExplain = JKR_NEW dMenu_ItemExplain_c(mpHeap, dComIfGp_getRingResArchive(), i_stick, true); setRotate(); mpDrawCursor->setPos(mItemSlotPosX[0] + mCenterPosX, mItemSlotPosY[0] + mCenterPosY); if (dComIfGs_getItem(mItemSlots[0], false) != fpcNm_ITEM_NONE) { @@ -447,7 +447,7 @@ dMenu_Ring_c::~dMenu_Ring_c() { mpSelectItemTexBuf[i][j][k] = NULL; } if (mpSelectItemTex[i][j] != NULL) { - delete mpSelectItemTex[i][j]; + JKR_DELETE(mpSelectItemTex[i][j]); mpSelectItemTex[i][j] = NULL; } } @@ -455,23 +455,23 @@ dMenu_Ring_c::~dMenu_Ring_c() { for (int i = 0; i < 3; i++) { if (mpItemNumTex[i] != NULL) { - delete mpItemNumTex[i]; + JKR_DELETE(mpItemNumTex[i]); mpItemNumTex[i] = NULL; } } - delete mpKanteraMeter; + JKR_DELETE(mpKanteraMeter); mpKanteraMeter = NULL; - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpMessageParent; + JKR_DELETE(mpMessageParent); mpMessageParent = NULL; for (int i = 0; i < 10; i++) { if (mpTextParent[i] != NULL) { - delete mpTextParent[i]; + JKR_DELETE(mpTextParent[i]); mpTextParent[i] = NULL; } } @@ -479,7 +479,7 @@ dMenu_Ring_c::~dMenu_Ring_c() { for (int i = 0; i < MAX_ITEM_SLOTS; i++) { for (int j = 0; j < 3; j++) { if (mpItemTex[i][j] != NULL) { - delete mpItemTex[i][j]; + JKR_DELETE(mpItemTex[i][j]); mpItemTex[i][j] = NULL; } @@ -490,21 +490,21 @@ dMenu_Ring_c::~dMenu_Ring_c() { } } - delete mpString; + JKR_DELETE(mpString); mpString = NULL; mpHeap->getTotalFreeSize(); - delete mpBlackTex; + JKR_DELETE(mpBlackTex); mpBlackTex = NULL; - delete mpSpotScreen; + JKR_DELETE(mpSpotScreen); mpSpotScreen = NULL; - delete mpSpotParent; + JKR_DELETE(mpSpotParent); mpSpotParent = NULL; - delete mpCenterScreen; + JKR_DELETE(mpCenterScreen); mpCenterScreen = NULL; for (int i = 0; i < 3; i++) { @@ -514,19 +514,19 @@ dMenu_Ring_c::~dMenu_Ring_c() { } } - delete mpCenterParent; + JKR_DELETE(mpCenterParent); mpCenterParent = NULL; - delete mpNameParent; + JKR_DELETE(mpNameParent); mpNameParent = NULL; - delete mpCircle; + JKR_DELETE(mpCircle); mpCircle = NULL; - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; - delete mpItemExplain; + JKR_DELETE(mpItemExplain); mpItemExplain = NULL; dComIfGp_getRingResArchive()->removeResourceAll(); diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index 3298543599..5808d8377e 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -114,7 +114,7 @@ dMenu_save_c::dMenu_save_c() { } void dMenu_save_c::_create() { - stick = new STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000); + stick = JKR_NEW STControl(2, 2, 1, 1, 0.9f, 0.5f, 0, 0x2000); if (mUseType == TYPE_DEFAULT || mUseType == TYPE_WHITE_EVENT || mUseType == TYPE_BLACK_EVENT) { mpMount = @@ -136,7 +136,7 @@ void dMenu_save_c::_create() { break; } - mpScrnExplain = new dMsgScrnExplain_c(stick, var_r31, false, 0); + mpScrnExplain = JKR_NEW dMsgScrnExplain_c(stick, var_r31, false, 0); field_0x219d = 0; field_0x2190 = 0; field_0x2192 = 0; @@ -174,13 +174,13 @@ void dMenu_save_c::screenSet() { static u8 l_msgNum0[2] = {0x08, 0x07}; static u8 l_msgNum[2] = {0x54, 0x55}; - mSaveSel.Scr = new J2DScreen(); + mSaveSel.Scr = JKR_NEW J2DScreen(); mSaveSel.Scr->setPriority("zelda_file_select2.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(mSaveSel.Scr); mSaveSel.font[0] = mDoExt_getMesgFont(); mSaveSel.font[1] = mDoExt_getSubFont(); - mSaveSel.mMsgString = new dMsgString_c(); + mSaveSel.mMsgString = JKR_NEW dMsgString_c(); void* bck = JKRGetNameResource("zelda_file_select2.bck", mpArchive); field_0x40 = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load(bck); @@ -192,22 +192,22 @@ void dMenu_save_c::screenSet() { field_0x48->searchUpdateMaterialID(mSaveSel.Scr); field_0x4c->searchUpdateMaterialID(mSaveSel.Scr); - mpSelectMoveBase = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_move_n'), 0, NULL); + mpSelectMoveBase = JKR_NEW CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_move_n'), 0, NULL); field_0xa0 = mSaveSel.Scr->search(MULTI_CHAR('wmenu_n')); for (int i = 0; i < 3; i++) { - mpSelData[i] = new CPaneMgr(mSaveSel.Scr, l_tagName0[i], 0, NULL); + mpSelData[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName0[i], 0, NULL); } - mpNoYes[0] = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_no_n'), 0, NULL); - mpNoYes[1] = new CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_yes_n'), 0, NULL); + mpNoYes[0] = JKR_NEW CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_no_n'), 0, NULL); + mpNoYes[1] = JKR_NEW CPaneMgr(mSaveSel.Scr, MULTI_CHAR('w_yes_n'), 0, NULL); for (int i = 0; i < 2; i++) { #if VERSION == VERSION_GCN_JPN - mpNoYesTxt[i] = new CPaneMgr(mSaveSel.Scr, l_tagName000[i], 0, NULL); + mpNoYesTxt[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName000[i], 0, NULL); mSaveSel.Scr->search(l_tagName000U[i])->hide(); #else - mpNoYesTxt[i] = new CPaneMgr(mSaveSel.Scr, l_tagName000U[i], 0, NULL); + mpNoYesTxt[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName000U[i], 0, NULL); mSaveSel.Scr->search(l_tagName000[i])->hide(); #endif ((J2DTextBox*)mpNoYesTxt[i]->getPanePtr())->setFont(mSaveSel.font[0]); @@ -220,14 +220,14 @@ void dMenu_save_c::screenSet() { mSaveSel.Scr->search(MULTI_CHAR('Wi_btn_n'))->hide(); mSaveSel.Scr->search(MULTI_CHAR('GC_btn_n'))->show(); - mpBBtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_nbbtn'), 2, NULL); - mpABtnIcon = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_nabtn'), 2, NULL); + mpBBtnIcon = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_nbbtn'), 2, NULL); + mpABtnIcon = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_nabtn'), 2, NULL); #if VERSION == VERSION_GCN_JPN - mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_modo'), 2, NULL); - mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_kete'), 2, NULL); + mpBackTxt = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_modo'), 2, NULL); + mpConfirmTxt = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('w_kete'), 2, NULL); #else - mpBackTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('f_modo'), 2, NULL); - mpConfirmTxt = new CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('f_kete'), 2, NULL); + mpBackTxt = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('f_modo'), 2, NULL); + mpConfirmTxt = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, MULTI_CHAR('f_kete'), 2, NULL); #endif mpBackTxt->setAlpha(0); @@ -262,9 +262,9 @@ void dMenu_save_c::screenSet() { mFileWakuRotAnmFrame = 0; for (int i = 0; i < 3; i++) { - mpSelWakuMoyo[i] = new CPaneMgr(mSaveSel.Scr, l_tagName3[i], 0, NULL); - mpSelWakuGold[i] = new CPaneMgr(mSaveSel.Scr, l_tagName4[i], 0, NULL); - mpSelWakuGold2[i] = new CPaneMgr(mSaveSel.Scr, l_tagName5[i], 0, NULL); + mpSelWakuMoyo[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName3[i], 0, NULL); + mpSelWakuGold[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName4[i], 0, NULL); + mpSelWakuGold2[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName5[i], 0, NULL); mpSelWakuMoyo[i]->getPanePtr()->setAnimation(mpFileWakuAnm); mpSelWakuGold[i]->getPanePtr()->setAnimation(mpFileWakuAnm); @@ -274,9 +274,9 @@ void dMenu_save_c::screenSet() { } for (int i = 0; i < 2; i++) { - mNoYesBase[i] = new CPaneMgr(mSaveSel.Scr, l_tagName9[i], 0, NULL); - mNoYesGold[i] = new CPaneMgr(mSaveSel.Scr, l_tagName10[i], 0, NULL); - mNoYesGold2[i] = new CPaneMgr(mSaveSel.Scr, l_tagName11[i], 0, NULL); + mNoYesBase[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName9[i], 0, NULL); + mNoYesGold[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName10[i], 0, NULL); + mNoYesGold2[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName11[i], 0, NULL); mNoYesBase[i]->getPanePtr()->setAnimation(mpFileWakuAnm); mNoYesGold[i]->getPanePtr()->setAnimation(mpFileWakuAnm); @@ -304,7 +304,7 @@ void dMenu_save_c::screenSet() { field_0x164 = 0; for (int i = 0; i < 3; i++) { - mpBookWaku[i] = new CPaneMgr(mSaveSel.Scr, l_tagName12[i], 0, NULL); + mpBookWaku[i] = JKR_NEW CPaneMgr(mSaveSel.Scr, l_tagName12[i], 0, NULL); mpBookWaku[i]->getPanePtr()->setAnimation(field_0x150); mpBookWaku[i]->getPanePtr()->setAnimation(field_0x158); @@ -325,7 +325,7 @@ void dMenu_save_c::screenSet() { #endif for (int i = 0; i < 2; i++) { - mpHeaderTxtPane[i] = new CPaneMgrAlpha(mSaveSel.Scr, l_tagName21[i], 0, NULL); + mpHeaderTxtPane[i] = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, l_tagName21[i], 0, NULL); ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setFont(mSaveSel.font[0]); ((J2DTextBox*)mpHeaderTxtPane[i]->getPanePtr())->setString(0x100, ""); @@ -356,9 +356,9 @@ void dMenu_save_c::screenSet() { for (int i = 0; i < 2; i++) { #if VERSION == VERSION_GCN_JPN - mpErrTxtPane[i] = new CPaneMgrAlpha(mSaveSel.Scr, l_tagName20[i], 0, NULL); + mpErrTxtPane[i] = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, l_tagName20[i], 0, NULL); #else - mpErrTxtPane[i] = new CPaneMgrAlpha(mSaveSel.Scr, l_tagName20[i], 0, NULL); + mpErrTxtPane[i] = JKR_NEW CPaneMgrAlpha(mSaveSel.Scr, l_tagName20[i], 0, NULL); #endif ((J2DTextBox*)mpErrTxtPane[i]->getPanePtr())->setFont(mSaveSel.font[0]); @@ -382,7 +382,7 @@ void dMenu_save_c::screenSet() { mpErrTxtPane[mErrTxtType ^ 1]->setAlpha(0); mSelectedFile = dComIfGs_getDataNum(); - mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); + mSelIcon = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL); mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); Vec pos; @@ -402,13 +402,13 @@ void dMenu_save_c::screenSet() { mpHeaderTxtPane[1]->getPanePtr()->scale(1.0f, 1.0f); for (int i = 0; i < 3; i++) { - mFileInfo[i] = new dFile_info_c(mpArchive, 1); + mFileInfo[i] = JKR_NEW dFile_info_c(mpArchive, 1); mFileInfo[i]->setBasePane(mSaveSel.Scr->search(l_tagName13[i])); mpDataBase[i] = mFileInfo[i]->getDatBase(); mpNoDataBase[i] = mFileInfo[i]->getNoDatBase(); } - mWarning = new dFile_warning_c(mpArchive, 0); + mWarning = JKR_NEW dFile_warning_c(mpArchive, 0); } @@ -492,139 +492,139 @@ int dMenu_save_c::_close() { } void dMenu_save_c::_delete() { - delete stick; + JKR_DELETE(stick); if (mpScrnExplain != NULL) { - delete mpScrnExplain; + JKR_DELETE(mpScrnExplain); mpScrnExplain = NULL; } if (mSaveSel.mMsgString != NULL) { - delete mSaveSel.mMsgString; + JKR_DELETE(mSaveSel.mMsgString); } if (mSaveSel.Scr != NULL) { - delete mSaveSel.Scr; + JKR_DELETE(mSaveSel.Scr); } for (int i = 0; i < 3; i++) { if (mpSelWakuMoyo[i] != NULL) { - delete mpSelWakuMoyo[i]; + JKR_DELETE(mpSelWakuMoyo[i]); } if (mpSelWakuGold[i] != NULL) { - delete mpSelWakuGold[i]; + JKR_DELETE(mpSelWakuGold[i]); } if (mpSelWakuGold2[i] != NULL) { - delete mpSelWakuGold2[i]; + JKR_DELETE(mpSelWakuGold2[i]); } if (mpBookWaku[i] != NULL) { - delete mpBookWaku[i]; + JKR_DELETE(mpBookWaku[i]); } if (mpSelData[i] != NULL) { - delete mpSelData[i]; + JKR_DELETE(mpSelData[i]); } if (mFileInfo[i] != NULL) { - delete mFileInfo[i]; + JKR_DELETE(mFileInfo[i]); } } if (mpSelectMoveBase != NULL) { - delete mpSelectMoveBase; + JKR_DELETE(mpSelectMoveBase); } for (int i = 0; i < 2; i++) { if (mpNoYes[i] != NULL) { - delete mpNoYes[i]; + JKR_DELETE(mpNoYes[i]); } if (mNoYesBase[i] != NULL) { - delete mNoYesBase[i]; + JKR_DELETE(mNoYesBase[i]); } if (mNoYesGold[i] != NULL) { - delete mNoYesGold[i]; + JKR_DELETE(mNoYesGold[i]); } if (mNoYesGold2[i] != NULL) { - delete mNoYesGold2[i]; + JKR_DELETE(mNoYesGold2[i]); } if (mpHeaderTxtPane[i] != NULL) { - delete mpHeaderTxtPane[i]; + JKR_DELETE(mpHeaderTxtPane[i]); } if (mpErrTxtPane[i] != NULL) { - delete mpErrTxtPane[i]; + JKR_DELETE(mpErrTxtPane[i]); } if (mpNoYesTxt[i] != NULL) { - delete mpNoYesTxt[i]; + JKR_DELETE(mpNoYesTxt[i]); } } if (field_0x40 != NULL) { - delete field_0x40; + JKR_DELETE(field_0x40); } if (field_0x44 != NULL) { - delete field_0x44; + JKR_DELETE(field_0x44); } if (field_0x48 != NULL) { - delete field_0x48; + JKR_DELETE(field_0x48); } if (mpFileWakuAnm != NULL) { - delete mpFileWakuAnm; + JKR_DELETE(mpFileWakuAnm); } if (mpFileWakuRotAnm != NULL) { - delete mpFileWakuRotAnm; + JKR_DELETE(mpFileWakuRotAnm); } if (field_0x150 != NULL) { - delete field_0x150; + JKR_DELETE(field_0x150); } if (field_0x158 != NULL) { - delete field_0x158; + JKR_DELETE(field_0x158); } if (field_0x160 != NULL) { - delete field_0x160; + JKR_DELETE(field_0x160); } if (field_0x4c != NULL) { - delete field_0x4c; + JKR_DELETE(field_0x4c); } if (mpBBtnIcon != NULL) { - delete mpBBtnIcon; + JKR_DELETE(mpBBtnIcon); } if (mpABtnIcon != NULL) { - delete mpABtnIcon; + JKR_DELETE(mpABtnIcon); } if (mpBackTxt != NULL) { - delete mpBackTxt; + JKR_DELETE(mpBackTxt); } if (mpConfirmTxt != NULL) { - delete mpConfirmTxt; + JKR_DELETE(mpConfirmTxt); } if (mSelIcon != NULL) { - delete mSelIcon; + JKR_DELETE(mSelIcon); } if (mWarning != NULL) { - delete mWarning; + JKR_DELETE(mWarning); } mDoExt_removeMesgFont(); diff --git a/src/d/d_menu_skill.cpp b/src/d/d_menu_skill.cpp index a1c4e76a31..fb957edfa3 100644 --- a/src/d/d_menu_skill.cpp +++ b/src/d/d_menu_skill.cpp @@ -54,55 +54,55 @@ dMenu_Skill_c::dMenu_Skill_c(JKRExpHeap* i_heap, STControl* i_stcontrol, CSTCont } dMenu_Skill_c::~dMenu_Skill_c() { - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; - delete mpString; + JKR_DELETE(mpString); mpString = NULL; - delete mpMenuScreen; + JKR_DELETE(mpMenuScreen); mpMenuScreen = NULL; - delete mpLetterScreen; + JKR_DELETE(mpLetterScreen); mpLetterScreen = NULL; - delete mpTextPane; + JKR_DELETE(mpTextPane); mpTextPane = NULL; - delete mpExpName; + JKR_DELETE(mpExpName); mpExpName = NULL; - delete mpTextParent; + JKR_DELETE(mpTextParent); mpTextParent = NULL; - delete mpBlackTex; + JKR_DELETE(mpBlackTex); mpBlackTex = NULL; - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; for (int i = 0; i < 7; i++) { - delete mpLetterParent[i]; + JKR_DELETE(mpLetterParent[i]); mpLetterParent[i] = NULL; } - delete mpIconScreen; + JKR_DELETE(mpIconScreen); mpIconScreen = NULL; for (int i = 0; i < 2; i++) { if (mpButtonAB[i] != NULL) { - delete mpButtonAB[i]; + JKR_DELETE(mpButtonAB[i]); mpButtonAB[i] = NULL; } if (mpButtonText[i] != NULL) { - delete mpButtonText[i]; + JKR_DELETE(mpButtonText[i]); mpButtonText[i] = NULL; } } if (mpMount != NULL) { mpMount->getArchive()->unmount(); - delete mpMount; + JKR_DELETE(mpMount); mpMount = NULL; } @@ -113,12 +113,12 @@ dMenu_Skill_c::~dMenu_Skill_c() { } void dMenu_Skill_c::_create() { - mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); + mpDrawCursor = JKR_NEW dSelect_cursor_c(2, 1.0f, NULL); mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f); mpDrawCursor->setAlphaRate(0.0f); mpDrawCursor->setScale(0.0f); mpDrawCursor->offPlayAnime(0); - mpString = new dMsgString_c(); + mpString = JKR_NEW dMsgString_c(); screenSetMenu(); screenSetLetter(); screenSetDoIcon(); @@ -195,7 +195,7 @@ int dMenu_Skill_c::_open() { if (mpMount->sync() != 0) { if (!mpArchive) { mpArchive = (JKRArchive*)mpMount->getArchive(); - delete mpMount; + JKR_DELETE(mpMount); mpMount = NULL; _create(); } @@ -407,10 +407,10 @@ void dMenu_Skill_c::screenSetMenu() { MULTI_CHAR('maki_0'), MULTI_CHAR('maki_1'), MULTI_CHAR('maki_2'), MULTI_CHAR('maki_3'), MULTI_CHAR('maki_4'), MULTI_CHAR('maki_5'), MULTI_CHAR('maki_6'), }; - mpMenuScreen = new J2DScreen(); + mpMenuScreen = JKR_NEW J2DScreen(); mpMenuScreen->setPriority("zelda_ougi_window.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpMenuScreen); - mpParent = new CPaneMgr(mpMenuScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent = JKR_NEW CPaneMgr(mpMenuScreen, MULTI_CHAR('n_all'), 2, NULL); mpParent->setAlphaRate(0.0f); for (int i = 0; i < 7; i++) { #if VERSION == VERSION_GCN_JPN @@ -438,7 +438,7 @@ void dMenu_Skill_c::screenSetMenu() { } } for (int i = 0; i < 7; i++) { - mpLetterParent[i] = new CPaneMgr(mpMenuScreen, tag_letter[i], 0, NULL); + mpLetterParent[i] = JKR_NEW CPaneMgr(mpMenuScreen, tag_letter[i], 0, NULL); } for (int i = 0; i < 7; i++) { mpTagPicture[i][0] = (J2DPicture*)mpMenuScreen->search(tag_frame[i]); @@ -494,17 +494,17 @@ void dMenu_Skill_c::screenSetLetter() { MULTI_CHAR('f_item_4'), }; - mpLetterScreen = new J2DScreen(); + mpLetterScreen = JKR_NEW J2DScreen(); mpLetterScreen->setPriority("zelda_ougi_info.blo", 0x20000, mpArchive); dPaneClass_showNullPane(mpLetterScreen); #if VERSION == VERSION_GCN_JPN - mpTextPane = new CPaneMgr(mpLetterScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpTextPane = JKR_NEW CPaneMgr(mpLetterScreen, MULTI_CHAR('mg_3line'), 0, NULL); mpLetterScreen->search(MULTI_CHAR('n_e4line'))->hide(); #else - mpTextPane = new CPaneMgr(mpLetterScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpTextPane = JKR_NEW CPaneMgr(mpLetterScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); mpLetterScreen->search(MULTI_CHAR('n_3line'))->hide(); #endif - mpExpName = new CPaneMgr(mpLetterScreen, MULTI_CHAR('label_n'), 0, NULL); + mpExpName = JKR_NEW CPaneMgr(mpLetterScreen, MULTI_CHAR('label_n'), 0, NULL); J2DTextBox* paneFont = (J2DTextBox*)mpTextPane->getPanePtr(); paneFont->setFont(mDoExt_getMesgFont()); J2DTextBox* paneString = (J2DTextBox*)mpTextPane->getPanePtr(); @@ -520,10 +520,10 @@ void dMenu_Skill_c::screenSetLetter() { mpNameString[i]->setFont(mDoExt_getMesgFont()); mpNameString[i]->setString(0x40, ""); } - mpTextParent = new CPaneMgr(mpLetterScreen, MULTI_CHAR('n_all'), 2, NULL); + mpTextParent = JKR_NEW CPaneMgr(mpLetterScreen, MULTI_CHAR('n_all'), 2, NULL); mpTextParent->setAlphaRate(0.0f); ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBlackTex = new J2DPicture(timg); + mpBlackTex = JKR_NEW J2DPicture(timg); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); mpBlackTex->setAlpha(0); } @@ -535,7 +535,7 @@ void dMenu_Skill_c::screenSetDoIcon() { static const u64 text_b_tag[5] = { MULTI_CHAR('btext1_1'), MULTI_CHAR('btext1_2'), MULTI_CHAR('btext1_3'), MULTI_CHAR('btext1_4'), MULTI_CHAR('btext1_5'), }; - mpIconScreen = new J2DScreen(); + mpIconScreen = JKR_NEW J2DScreen(); mpIconScreen->setPriority("zelda_collect_soubi_do_icon_parts.blo", 0x20000, mpArchive); for (int i = 0; i < 2; i++) { mpButtonAB[i] = 0; diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index 860bb57323..d43d85d128 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1026,7 +1026,7 @@ void dMw_c::insect_close_proc() { void dMw_c::dMw_capture_create() { if (!dComIfGp_isPauseFlag() && mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(1996, mpCapture != NULL); mpCapture->setCaptureFlag(); } @@ -1035,7 +1035,7 @@ void dMw_c::dMw_capture_create() { void dMw_c::dMw_capture_delete() { if (dComIfGp_isPauseFlag()) { if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } dComIfGp_offPauseFlag(); @@ -1047,12 +1047,12 @@ void dMw_c::dMw_ring_create(u8 i_origin) { markMemSize(); dComIfGp_setHeapLockFlag(1); - mpMenuRing = new dMenu_Ring_c(mpHeap, mpStick, mpCStick, i_origin); + mpMenuRing = JKR_NEW dMenu_Ring_c(mpHeap, mpStick, mpCStick, i_origin); JUT_ASSERT(2038, mpMenuRing != NULL); mpMenuRing->_create(); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2043, mpCapture != NULL); } @@ -1062,12 +1062,12 @@ void dMw_c::dMw_ring_create(u8 i_origin) { bool dMw_c::dMw_ring_delete() { if (mpMenuRing != NULL) { mpMenuRing->_delete(); - delete mpMenuRing; + JKR_DELETE(mpMenuRing); mpMenuRing = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1078,7 +1078,7 @@ bool dMw_c::dMw_ring_delete() { void dMw_c::dMw_collect_create() { markMemSize(); - mpMenuCollect = new dMenu_Collect_c(mpHeap, mpStick, mpCStick); + mpMenuCollect = JKR_NEW dMenu_Collect_c(mpHeap, mpStick, mpCStick); JUT_ASSERT(2093, mpMenuCollect != NULL); mpMenuCollect->_create(); @@ -1092,7 +1092,7 @@ void dMw_c::dMw_collect_create() { bool dMw_c::dMw_collect_delete(bool) { if (mpMenuCollect != NULL) { mpMenuCollect->_delete(); - delete mpMenuCollect; + JKR_DELETE(mpMenuCollect); mpMenuCollect = NULL; } checkMemSize(); @@ -1118,12 +1118,12 @@ void dMw_c::dMw_fmap_create() { tmp = 3; } - mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, mFmapProcess, mFmapRegionCursor, + mpMenuFmap = JKR_NEW dMenu_Fmap_c(mpHeap, mpStick, mpCStick, mFmapProcess, mFmapRegionCursor, mFmapStageCursor, mFmapStageTransX, mFmapStageTransZ, tmp); JUT_ASSERT(2194, mpMenuFmap != NULL); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2200, mpCapture != NULL); } @@ -1144,12 +1144,12 @@ bool dMw_c::dMw_fmap_delete(bool param_0) { mFmapStageTransZ = mpMenuFmap->getStageTransZ(); mpMenuFmap->_delete(); - delete mpMenuFmap; + JKR_DELETE(mpMenuFmap); mpMenuFmap = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1162,7 +1162,7 @@ void dMw_c::dMw_dmap_create() { dComIfGp_setHeapLockFlag(3); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2294, mpCapture != NULL); } @@ -1179,7 +1179,7 @@ void dMw_c::dMw_dmap_create() { tmp = 0; } - mpMenuDmap = new dMenu_Dmap_c(mpHeap, mpStick, mpCStick, field_0x14C, tmp); + mpMenuDmap = JKR_NEW dMenu_Dmap_c(mpHeap, mpStick, mpCStick, field_0x14C, tmp); JUT_ASSERT(2314, mpMenuDmap != NULL); dMeter2Info_resetWarpStatus(); @@ -1193,12 +1193,12 @@ bool dMw_c::dMw_dmap_delete(bool param_0) { field_0x14C = mpMenuDmap->getZoomState(); - delete mpMenuDmap; + JKR_DELETE(mpMenuDmap); mpMenuDmap = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1209,7 +1209,7 @@ bool dMw_c::dMw_dmap_delete(bool param_0) { void dMw_c::dMw_save_create() { markMemSize(); - mpMenuSave = new dMenu_save_c(); + mpMenuSave = JKR_NEW dMenu_save_c(); JUT_ASSERT(2365, mpMenuSave != NULL); mpMenuSave->setUseType(1); @@ -1217,7 +1217,7 @@ void dMw_c::dMw_save_create() { mpMenuSave->initialize(); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2373, mpCapture != NULL); } } @@ -1225,12 +1225,12 @@ void dMw_c::dMw_save_create() { bool dMw_c::dMw_save_delete() { if (mpMenuSave != NULL) { mpMenuSave->_delete(); - delete mpMenuSave; + JKR_DELETE(mpMenuSave); mpMenuSave = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1241,11 +1241,11 @@ bool dMw_c::dMw_save_delete() { void dMw_c::dMw_option_create() { markMemSize(); - mpMenuOption = new dMenu_Option_c(dComIfGp_getCollectResArchive(), mpStick); + mpMenuOption = JKR_NEW dMenu_Option_c(dComIfGp_getCollectResArchive(), mpStick); JUT_ASSERT(2415, mpMenuOption != NULL); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2420, mpCapture != NULL); } } @@ -1256,12 +1256,12 @@ bool dMw_c::dMw_option_delete() { return false; } mpMenuOption->_delete(); - delete mpMenuOption; + JKR_DELETE(mpMenuOption); mpMenuOption = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1272,11 +1272,11 @@ bool dMw_c::dMw_option_delete() { void dMw_c::dMw_letter_create() { markMemSize(); - mpMenuLetter = new dMenu_Letter_c(mpHeap, mpStick, mpCStick); + mpMenuLetter = JKR_NEW dMenu_Letter_c(mpHeap, mpStick, mpCStick); JUT_ASSERT(2463, mpMenuLetter != NULL); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2467, mpCapture != NULL); } } @@ -1286,12 +1286,12 @@ bool dMw_c::dMw_letter_delete() { if (!mpMenuLetter->isSync()) { return false; } - delete mpMenuLetter; + JKR_DELETE(mpMenuLetter); mpMenuLetter = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1302,11 +1302,11 @@ bool dMw_c::dMw_letter_delete() { void dMw_c::dMw_fishing_create() { markMemSize(); - mpMenuFishing = new dMenu_Fishing_c(mpHeap, mpStick, mpCStick); + mpMenuFishing = JKR_NEW dMenu_Fishing_c(mpHeap, mpStick, mpCStick); JUT_ASSERT(2509, mpMenuFishing != NULL); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2513, mpCapture != NULL); } } @@ -1316,12 +1316,12 @@ bool dMw_c::dMw_fishing_delete() { if (!mpMenuFishing->isSync()) { return false; } - delete mpMenuFishing; + JKR_DELETE(mpMenuFishing); mpMenuFishing = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1332,11 +1332,11 @@ bool dMw_c::dMw_fishing_delete() { void dMw_c::dMw_skill_create() { markMemSize(); - mpMenuSkill = new dMenu_Skill_c(mpHeap, mpStick, mpCStick); + mpMenuSkill = JKR_NEW dMenu_Skill_c(mpHeap, mpStick, mpCStick); JUT_ASSERT(2555, mpMenuSkill != NULL); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2559, mpCapture != NULL); } } @@ -1346,12 +1346,12 @@ bool dMw_c::dMw_skill_delete() { if (!mpMenuSkill->isSync()) { return false; } - delete mpMenuSkill; + JKR_DELETE(mpMenuSkill); mpMenuSkill = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1362,11 +1362,11 @@ bool dMw_c::dMw_skill_delete() { void dMw_c::dMw_insect_create(u8 param_0) { markMemSize(); - mpMenuInsect = new dMenu_Insect_c(mpHeap, mpStick, mpCStick, param_0); + mpMenuInsect = JKR_NEW dMenu_Insect_c(mpHeap, mpStick, mpCStick, param_0); JUT_ASSERT(2601, mpMenuInsect != NULL); if (mpCapture == NULL) { - mpCapture = new dDlst_MENU_CAPTURE_c(); + mpCapture = JKR_NEW dDlst_MENU_CAPTURE_c(); JUT_ASSERT(2605, mpCapture != NULL); } } @@ -1376,12 +1376,12 @@ bool dMw_c::dMw_insect_delete() { if (!mpMenuInsect->isSync()) { return false; } - delete mpMenuInsect; + JKR_DELETE(mpMenuInsect); mpMenuInsect = NULL; } if (mpCapture != NULL) { - delete mpCapture; + JKR_DELETE(mpCapture); mpCapture = NULL; } @@ -1502,11 +1502,11 @@ void dMw_c::checkMemSize() { int dMw_c::_create() { mpHeap = dComIfGp_getExpHeap2D(); - mpStick = new STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800); + mpStick = JKR_NEW STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800); JUT_ASSERT(2967, mpStick != NULL); mpStick->setFirstWaitTime(8); - mpCStick = new CSTControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); + mpCStick = JKR_NEW CSTControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); JUT_ASSERT(2976, mpCStick != NULL); mpCStick->setWaitParm(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); @@ -1644,10 +1644,10 @@ int dMw_c::_draw() { int dMw_c::_delete() { JKRHeap* heap = mDoExt_getCurrentHeap(); - delete mpStick; + JKR_DELETE(mpStick); mpStick = NULL; - delete mpCStick; + JKR_DELETE(mpCStick); mpCStick = NULL; mDoExt_setCurrentHeap(mpHeap); diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index e4261c8d3e..b8788c43f4 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -182,7 +182,7 @@ int dMeter2_c::_create() { field_0x1ac = dMeter2Info_isUseButton(16); field_0x19a = 0; - mpMeterDraw = new dMeter2Draw_c(mpHeap); + mpMeterDraw = JKR_NEW dMeter2Draw_c(mpHeap); field_0x130 = mpMeterDraw->getNowLightDropRateCalc(); mpHeap->getTotalFreeSize(); @@ -221,7 +221,7 @@ int dMeter2_c::_create() { mpMap = NULL; if (dMeterMap_c::isEnableDispMapAndMapDispSizeTypeNo()) { - mpMap = new dMeterMap_c(mpMeterDraw->getMainScreenPtr()); + mpMap = JKR_NEW dMeterMap_c(mpMeterDraw->getMainScreenPtr()); } else { if (g_meter2_info.mMapStatus == 2) { g_meter2_info.mMapStatus = 0; @@ -360,30 +360,30 @@ int dMeter2_c::_delete() { mpHeap->getTotalFreeSize(); if (mpMap != NULL) { - delete mpMap; + JKR_DELETE(mpMap); mpMap = NULL; } mpHeap->getTotalFreeSize(); mDoExt_setCurrentHeap(mpSubHeap); if (mpSubContents != NULL) { - delete mpSubContents; + JKR_DELETE(mpSubContents); mpSubContents = NULL; } if (mpSubSubContents != NULL) { - delete mpSubSubContents; + JKR_DELETE(mpSubSubContents); mpSubSubContents = NULL; } mpHeap->getTotalFreeSize(); if (field_0x11c != NULL) { - delete field_0x11c; + JKR_DELETE(field_0x11c); field_0x11c = NULL; } mDoExt_setCurrentHeap(heap); - delete mpMeterDraw; + JKR_DELETE(mpMeterDraw); mpMeterDraw = NULL; fopMsgM_destroyExpHeap(mpSubHeap); @@ -398,7 +398,7 @@ int dMeter2_c::emphasisButtonDelete() { mpEmpButton->hideAll(); if (heap != NULL) { - delete mpEmpButton; + JKR_DELETE(mpEmpButton); mpEmpButton = NULL; heap->freeAll(); dComIfGp_offHeapLockFlag(8); @@ -2334,7 +2334,7 @@ void dMeter2_c::checkSubContents() { killSubContents(4); if (mSubContentType == 0) { - mpSubContents = new dScope_c(0); + mpSubContents = JKR_NEW dScope_c(0); mSubContentType = 4; } return; @@ -2346,7 +2346,7 @@ void dMeter2_c::checkSubContents() { if (mSubContentType == 0) { mpSubHeap->getTotalFreeSize(); - mpSubContents = new dMeterHakusha_c(mpMeterDraw->getMainScreenPtr()); + mpSubContents = JKR_NEW dMeterHakusha_c(mpMeterDraw->getMainScreenPtr()); mSubContentType = 1; } return; @@ -2357,8 +2357,8 @@ void dMeter2_c::checkSubContents() { killSubContents(5); if (mSubContentType == 0) { - mpSubContents = new dMeterHaihai_c(0); - mpSubSubContents = new dMeterString_c(dMeter2Info_getMeterStringType()); + mpSubContents = JKR_NEW dMeterHaihai_c(0); + mpSubSubContents = JKR_NEW dMeterString_c(dMeter2Info_getMeterStringType()); mSubContentType = 5; mSubContentsStringType = dMeter2Info_getMeterStringType(); } @@ -2366,14 +2366,14 @@ void dMeter2_c::checkSubContents() { killSubContents(2); if (mSubContentType == 0) { - mpSubContents = new dMeterHaihai_c(0); + mpSubContents = JKR_NEW dMeterHaihai_c(0); mSubContentType = 2; } } else if (dMeter2Info_getMeterStringType() != 0) { killSubContents(3); if (mSubContentType == 0) { - mpSubContents = new dMeterString_c(dMeter2Info_getMeterStringType()); + mpSubContents = JKR_NEW dMeterString_c(dMeter2Info_getMeterStringType()); mSubContentType = 3; } } else if (mSubContentType == 4) { @@ -2381,13 +2381,13 @@ void dMeter2_c::checkSubContents() { bool free_heap = false; if (mpSubContents != NULL && mpSubContents->isDead()) { - delete mpSubContents; + JKR_DELETE(mpSubContents); mpSubContents = NULL; free_heap = true; } if (mpSubSubContents != NULL && mpSubSubContents->isDead()) { - delete mpSubSubContents; + JKR_DELETE(mpSubSubContents); mpSubSubContents = NULL; free_heap = true; } @@ -2404,13 +2404,13 @@ void dMeter2_c::checkSubContents() { bool free_heap = false; if (mpSubContents != NULL) { - delete mpSubContents; + JKR_DELETE(mpSubContents); mpSubContents = NULL; free_heap = true; } if (mpSubSubContents != NULL) { - delete mpSubSubContents; + JKR_DELETE(mpSubSubContents); mpSubSubContents = NULL; free_heap = true; } @@ -2440,7 +2440,7 @@ void dMeter2_c::check2DContents() { field_0x108 = mDoExt_setCurrentHeap(dComIfGp_getSubHeap2D(8)); } - mpEmpButton = new dMeterButton_c(); + mpEmpButton = JKR_NEW dMeterButton_c(); } } else if (dComIfGp_isHeapLockFlag() == 5 && !dMeter2Info_isFloatingMessageVisible()) { if (!mpMeterDraw->isEmphasisA() && !mpMeterDraw->isEmphasisB() && @@ -2449,7 +2449,7 @@ void dMeter2_c::check2DContents() { !mpMeterDraw->isEmphasisS() && !mpMeterDraw->isEmphasisX() && !mpMeterDraw->isEmphasisY() && !mpMeterDraw->isEmphasisBin() && mpEmpButton->isClose()) { - delete mpEmpButton; + JKR_DELETE(mpEmpButton); mpEmpButton = NULL; dComIfGp_getSubHeap2D(8)->freeAll(); @@ -2987,13 +2987,13 @@ void dMeter2_c::killSubContents(u8 param_0) { bool free = false; if (mpSubContents != NULL) { - delete mpSubContents; + JKR_DELETE(mpSubContents); mpSubContents = NULL; free = true; } if (mpSubSubContents != NULL) { - delete mpSubSubContents; + JKR_DELETE(mpSubSubContents); mpSubSubContents = NULL; free = true; } diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index 80a1af9b98..7fbde8e660 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -44,7 +44,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { dMeter2Info_setMsgUnitResource(msg_unit_res); mDoExt_setCurrentHeap(heap); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image.blo", 0x20000, dComIfGp_getMain2DArchive()); JUT_ASSERT(0, fg != false); @@ -54,24 +54,24 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { field_0x73c = 0.0f; for (int i = 0; i < 2; i++) { - mpKanteraMeter[i] = new dKantera_icon_c(); + mpKanteraMeter[i] = JKR_NEW dKantera_icon_c(); JUT_ASSERT(0, mpKanteraMeter[i] != NULL); } - mpKanteraScreen = new J2DScreen(); + mpKanteraScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpKanteraScreen != NULL); fg = mpKanteraScreen->setPriority("zelda_game_image_kantera.blo", 0x20000, dComIfGp_getMain2DArchive()); JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpKanteraScreen); - mpPikariScreen = new J2DScreen(); + mpPikariScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpPikariScreen != NULL); fg = mpPikariScreen->setPriority("zelda_icon_pikari.blo", 0x20000, dComIfGp_getMain2DArchive()); JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpPikariScreen); - mpPikariParent = new CPaneMgr(mpPikariScreen, MULTI_CHAR('pika_n'), 0, NULL); + mpPikariParent = JKR_NEW CPaneMgr(mpPikariScreen, MULTI_CHAR('pika_n'), 0, NULL); JUT_ASSERT(0, mpPikariParent != NULL); mPikariBlack = static_cast(mpPikariScreen->search(MULTI_CHAR('pika00')))->getBlack(); mPikariWhite = static_cast(mpPikariScreen->search(MULTI_CHAR('pika00')))->getWhite(); @@ -86,7 +86,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { mPikariBpk->searchUpdateMaterialID(mpPikariScreen); playPikariBpkAnimation(1.0f); - mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(0, mpParent != NULL); static u64 const a_tag[] = {MULTI_CHAR('cont_at1'), MULTI_CHAR('cont_at2'), MULTI_CHAR('cont_at3'), MULTI_CHAR('cont_at4'), MULTI_CHAR('cont_at')}; @@ -96,29 +96,29 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { static u64 const y_tag[] = {MULTI_CHAR('cont_yt1'), MULTI_CHAR('cont_yt2'), MULTI_CHAR('cont_yt3'), MULTI_CHAR('cont_yt4'), MULTI_CHAR('cont_yt5')}; for (int i = 0; i < 5; i++) { - mpAText[i] = new CPaneMgr(mpScreen, a_tag[i], 0, NULL); + mpAText[i] = JKR_NEW CPaneMgr(mpScreen, a_tag[i], 0, NULL); JUT_ASSERT(0, mpAText[i] != NULL); static_cast(mpAText[i]->getPanePtr())->setString(64, ""); static_cast(mpAText[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); static_cast(mpAText[i]->getPanePtr()) ->setCharSpace(g_drawHIO.mButtonATextSpacing); - mpBText[i] = new CPaneMgr(mpScreen, b_tag[i], 0, NULL); + mpBText[i] = JKR_NEW CPaneMgr(mpScreen, b_tag[i], 0, NULL); JUT_ASSERT(0, mpBText[i] != NULL); static_cast(mpBText[i]->getPanePtr())->setString(64, ""); static_cast(mpBText[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); - mpXYText[i][2] = new CPaneMgr(mpScreen, z_tag[i], 0, NULL); + mpXYText[i][2] = JKR_NEW CPaneMgr(mpScreen, z_tag[i], 0, NULL); JUT_ASSERT(0, mpXYText[i][2] != NULL); static_cast(mpXYText[i][2]->getPanePtr())->setString(64, ""); static_cast(mpXYText[i][2]->getPanePtr())->setFont(mDoExt_getMesgFont()); - mpXYText[i][0] = new CPaneMgr(mpScreen, x_tag[i], 0, NULL); + mpXYText[i][0] = JKR_NEW CPaneMgr(mpScreen, x_tag[i], 0, NULL); JUT_ASSERT(0, mpXYText[i][0] != NULL); static_cast(mpXYText[i][0]->getPanePtr())->setString(64, ""); static_cast(mpXYText[i][0]->getPanePtr())->setFont(mDoExt_getMesgFont()); - mpXYText[i][1] = new CPaneMgr(mpScreen, y_tag[i], 0, NULL); + mpXYText[i][1] = JKR_NEW CPaneMgr(mpScreen, y_tag[i], 0, NULL); JUT_ASSERT(0, mpXYText[i][1] != NULL); static_cast(mpXYText[i][1]->getPanePtr())->setString(64, ""); static_cast(mpXYText[i][1]->getPanePtr())->setFont(mDoExt_getMesgFont()); @@ -151,127 +151,127 @@ dMeter2Draw_c::~dMeter2Draw_c() { dComIfGp_getMsgDtArchive(0)->removeResource(dMeter2Info_getMsgUnitResource()); dComIfGp_getItemIconArchive()->removeResourceAll(); - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpKanteraScreen; + JKR_DELETE(mpKanteraScreen); mpKanteraScreen = NULL; for (int i = 0; i < 2; i++) { - delete mpKanteraMeter[i]; + JKR_DELETE(mpKanteraMeter[i]); mpKanteraMeter[i] = NULL; } - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; - delete mpPikariScreen; + JKR_DELETE(mpPikariScreen); mpPikariScreen = NULL; - delete mpPikariParent; + JKR_DELETE(mpPikariParent); mpPikariParent = NULL; - delete mPikariBck; + JKR_DELETE(mPikariBck); mPikariBck = NULL; - delete mPikariBpk; + JKR_DELETE(mPikariBpk); mPikariBpk = NULL; for (int i = 0; i < 5; i++) { - delete mpAText[i]; + JKR_DELETE(mpAText[i]); mpAText[i] = NULL; - delete mpBText[i]; + JKR_DELETE(mpBText[i]); mpBText[i] = NULL; for (int j = 0; j < 3; j++) { - delete mpXYText[i][j]; + JKR_DELETE(mpXYText[i][j]); mpXYText[i][j] = NULL; } } - delete mpLifeParent; + JKR_DELETE(mpLifeParent); mpLifeParent = NULL; for (int i = 0; i < 20; i++) { - delete mpLifeParts[i]; + JKR_DELETE(mpLifeParts[i]); mpLifeParts[i] = NULL; - delete mpHeartMark[i]; + JKR_DELETE(mpHeartMark[i]); mpHeartMark[i] = NULL; - delete mpHeartBase[i]; + JKR_DELETE(mpHeartBase[i]); mpHeartBase[i] = NULL; - delete mpLifeTexture[i][0]; + JKR_DELETE(mpLifeTexture[i][0]); mpLifeTexture[i][0] = NULL; - delete mpLifeTexture[i][1]; + JKR_DELETE(mpLifeTexture[i][1]); mpLifeTexture[i][1] = NULL; } - delete mpBigHeart; + JKR_DELETE(mpBigHeart); mpBigHeart = NULL; - delete mpMagicParent; + JKR_DELETE(mpMagicParent); mpMagicParent = NULL; - delete mpMagicBase; + JKR_DELETE(mpMagicBase); mpMagicBase = NULL; - delete mpMagicFrameL; + JKR_DELETE(mpMagicFrameL); mpMagicFrameL = NULL; - delete mpMagicFrameR; + JKR_DELETE(mpMagicFrameR); mpMagicFrameR = NULL; for (int i = 0; i < 3; i++) { - delete mpOxygenBpk[i]; + JKR_DELETE(mpOxygenBpk[i]); mpOxygenBpk[i] = NULL; } - delete mpMagicMeter; + JKR_DELETE(mpMagicMeter); mpMagicMeter = NULL; for (int i = 0; i < 2; i++) { - delete mpSIParent[i]; + JKR_DELETE(mpSIParent[i]); mpSIParent[i] = NULL; } - delete mpLightDropParent; + JKR_DELETE(mpLightDropParent); mpLightDropParent = NULL; for (int i = 0; i < 16; i++) { for (int j = 0; j < 3; j++) { if (mpSIParts[i][j] != NULL) { - delete mpSIParts[i][j]; + JKR_DELETE(mpSIParts[i][j]); mpSIParts[i][j] = NULL; } } } - delete mpRupeeKeyParent; + JKR_DELETE(mpRupeeKeyParent); mpRupeeKeyParent = NULL; for (int i = 0; i < 4; i++) { - delete mpRupeeTexture[i][0]; + JKR_DELETE(mpRupeeTexture[i][0]); mpRupeeTexture[i][0] = NULL; - delete mpRupeeTexture[i][1]; + JKR_DELETE(mpRupeeTexture[i][1]); mpRupeeTexture[i][1] = NULL; } for (int i = 0; i < 3; i++) { - delete mpRupeeParent[i]; + JKR_DELETE(mpRupeeParent[i]); mpRupeeParent[i] = NULL; } for (int i = 0; i < 5; i++) { - delete mpKeyTexture[i]; + JKR_DELETE(mpKeyTexture[i]); mpKeyTexture[i] = NULL; } - delete mpKeyParent; + JKR_DELETE(mpKeyParent); mpKeyParent = NULL; for (int i = 0; i < 2; i++) { @@ -290,105 +290,105 @@ dMeter2Draw_c::~dMeter2Draw_c() { } } - delete mpItemB; + JKR_DELETE(mpItemB); mpItemB = NULL; mpItemBPane = NULL; for (int i = 0; i < 2; i++) { if (mpItemXY[i] != NULL) { - delete mpItemXY[i]; + JKR_DELETE(mpItemXY[i]); mpItemXY[i] = NULL; } } - delete mpItemR; + JKR_DELETE(mpItemR); mpItemR = NULL; for (int i = 0; i < 3; i++) { mpItemXYPane[i] = NULL; } - delete mpLightB; + JKR_DELETE(mpLightB); mpLightB = NULL; for (int i = 0; i < 3; i++) { if (mpLightXY[i] != NULL) { - delete mpLightXY[i]; + JKR_DELETE(mpLightXY[i]); mpLightXY[i] = NULL; } } - delete mpBTextA; + JKR_DELETE(mpBTextA); mpBTextA = NULL; - delete mpBTextB; + JKR_DELETE(mpBTextB); mpBTextB = NULL; for (int i = 0; i < 3; i++) { if (mpBTextXY[i] != NULL) { - delete mpBTextXY[i]; + JKR_DELETE(mpBTextXY[i]); mpBTextXY[i] = NULL; } } - delete mpTextA; + JKR_DELETE(mpTextA); mpTextA = NULL; - delete mpTextB; + JKR_DELETE(mpTextB); mpTextB = NULL; for (int i = 0; i < 3; i++) { - delete mpTextXY[i]; + JKR_DELETE(mpTextXY[i]); mpTextXY[i] = NULL; } - delete mpTextI; + JKR_DELETE(mpTextI); mpTextI = NULL; - delete mpTextM; + JKR_DELETE(mpTextM); mpTextM = NULL; for (int i = 0; i < 5; i++) { if (mpJujiI[i] != NULL) { - delete mpJujiI[i]; + JKR_DELETE(mpJujiI[i]); mpJujiI[i] = NULL; } if (mpJujiM[i] != NULL) { - delete mpJujiM[i]; + JKR_DELETE(mpJujiM[i]); mpJujiM[i] = NULL; } } - delete mpButtonParent; + JKR_DELETE(mpButtonParent); mpButtonParent = NULL; - delete mpButtonA; + JKR_DELETE(mpButtonA); mpButtonA = NULL; - delete mpButtonB; + JKR_DELETE(mpButtonB); mpButtonB = NULL; - delete mpButtonMidona; + JKR_DELETE(mpButtonMidona); mpButtonMidona = NULL; for (int i = 0; i < 3; i++) { - delete mpButtonXY[i]; + JKR_DELETE(mpButtonXY[i]); mpButtonXY[i] = NULL; } if (mpUzu != NULL) { - delete mpUzu; + JKR_DELETE(mpUzu); mpUzu = NULL; } - delete mpButtonCrossParent; + JKR_DELETE(mpButtonCrossParent); mpButtonCrossParent = NULL; for (int i = 0; i < 2; i++) { for (int j = 0; j < 3; j++) { if (mpItemNumTex[i][j] != NULL) { - delete mpItemNumTex[i][j]; + JKR_DELETE(mpItemNumTex[i][j]); mpItemNumTex[i][j] = NULL; } } @@ -396,7 +396,7 @@ dMeter2Draw_c::~dMeter2Draw_c() { for (int i = 0; i < 3; i++) { if (field_0x9c[i] != NULL) { - delete field_0x9c[i]; + JKR_DELETE(field_0x9c[i]); field_0x9c[i] = NULL; } } @@ -750,27 +750,27 @@ void dMeter2Draw_c::initLife() { MULTI_CHAR('hear_14'), MULTI_CHAR('hear_15'), MULTI_CHAR('hear_16'), MULTI_CHAR('hear_17'), MULTI_CHAR('hear_18'), MULTI_CHAR('hear_19'), }; - mpLifeParent = new CPaneMgr(mpScreen, MULTI_CHAR('heart_n'), 2, NULL); + mpLifeParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('heart_n'), 2, NULL); JUT_ASSERT(0, mpLifeParent != NULL); for (int i = 0; i < 20; i++) { - mpLifeParts[i] = new CPaneMgr(mpScreen, life_tag[i], 0, NULL); + mpLifeParts[i] = JKR_NEW CPaneMgr(mpScreen, life_tag[i], 0, NULL); JUT_ASSERT(0, mpLifeParts[i] != NULL); - mpHeartMark[i] = new CPaneMgr(mpScreen, mark_tag[i], 2, NULL); + mpHeartMark[i] = JKR_NEW CPaneMgr(mpScreen, mark_tag[i], 2, NULL); JUT_ASSERT(0, mpHeartMark[i] != NULL); - mpHeartBase[i] = new CPaneMgrAlpha(mpScreen, base_tag[i], 2, NULL); + mpHeartBase[i] = JKR_NEW CPaneMgrAlpha(mpScreen, base_tag[i], 2, NULL); JUT_ASSERT(0, mpHeartBase[i] != NULL); - mpLifeTexture[i][0] = new CPaneMgrAlpha(mpScreen, lifet1_tag[i], 0, NULL); + mpLifeTexture[i][0] = JKR_NEW CPaneMgrAlpha(mpScreen, lifet1_tag[i], 0, NULL); JUT_ASSERT(0, mpLifeTexture[i][0] != NULL); - mpLifeTexture[i][1] = new CPaneMgrAlpha(mpScreen, lifet2_tag[i], 0, NULL); + mpLifeTexture[i][1] = JKR_NEW CPaneMgrAlpha(mpScreen, lifet2_tag[i], 0, NULL); JUT_ASSERT(0, mpLifeTexture[i][1] != NULL); } - mpBigHeart = new CPaneMgr(mpScreen, MULTI_CHAR('bigh_n'), 2, NULL); + mpBigHeart = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('bigh_n'), 2, NULL); JUT_ASSERT(0, mpBigHeart != NULL); mpLifeParent->setAlphaRate(0.0f); @@ -791,20 +791,20 @@ void dMeter2Draw_c::initMagic() { field_0x550 = 0.0f; field_0x554 = 0.0f; - mpMagicParent = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('magic_n'), 2, NULL); + mpMagicParent = JKR_NEW CPaneMgr(mpKanteraScreen, MULTI_CHAR('magic_n'), 2, NULL); JUT_ASSERT(0, mpMagicParent != NULL); - mpMagicBase = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('mm_base'), 0, NULL); + mpMagicBase = JKR_NEW CPaneMgr(mpKanteraScreen, MULTI_CHAR('mm_base'), 0, NULL); JUT_ASSERT(0, mpMagicBase != NULL); - mpMagicFrameL = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('m_w_l_n'), 2, NULL); + mpMagicFrameL = JKR_NEW CPaneMgr(mpKanteraScreen, MULTI_CHAR('m_w_l_n'), 2, NULL); JUT_ASSERT(0, mpMagicFrameL != NULL); mpMagicFrameR = - new CPaneMgr(mpKanteraScreen, MULTI_CHAR('m_w_r_n'), 2, NULL); + JKR_NEW CPaneMgr(mpKanteraScreen, MULTI_CHAR('m_w_r_n'), 2, NULL); JUT_ASSERT(0, mpMagicFrameR != NULL); - mpMagicMeter = new CPaneMgr(mpKanteraScreen, MULTI_CHAR('mm_00'), 0, NULL); + mpMagicMeter = JKR_NEW CPaneMgr(mpKanteraScreen, MULTI_CHAR('mm_00'), 0, NULL); JUT_ASSERT(0, mpMagicMeter != NULL); OSInitFastCast(); @@ -851,7 +851,7 @@ void dMeter2Draw_c::initMagic() { } void dMeter2Draw_c::initLightDrop() { - mpLightDropParent = new CPaneMgr(mpScreen, MULTI_CHAR('s_tuta_n'), 2, NULL); + mpLightDropParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('s_tuta_n'), 2, NULL); JUT_ASSERT(0, mpLightDropParent != NULL); static u64 const tuta_0[] = { @@ -870,20 +870,20 @@ void dMeter2Draw_c::initLightDrop() { }; for (int i = 0; i < 16; i++) { - mpSIParts[i][0] = new CPaneMgr(mpScreen, tuta_0[i], 0, NULL); + mpSIParts[i][0] = JKR_NEW CPaneMgr(mpScreen, tuta_0[i], 0, NULL); JUT_ASSERT(0, mpSIParts[i][0] != NULL); - mpSIParts[i][1] = new CPaneMgr(mpScreen, tuta_1[i], 0, NULL); + mpSIParts[i][1] = JKR_NEW CPaneMgr(mpScreen, tuta_1[i], 0, NULL); JUT_ASSERT(0, mpSIParts[i][1] != NULL); - mpSIParts[i][2] = new CPaneMgr(mpScreen, tuta_2[i], 0, NULL); + mpSIParts[i][2] = JKR_NEW CPaneMgr(mpScreen, tuta_2[i], 0, NULL); JUT_ASSERT(0, mpSIParts[i][2] != NULL); } - mpSIParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('tuta_n'), 2, NULL); + mpSIParent[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('tuta_n'), 2, NULL); JUT_ASSERT(0, mpSIParent[0] != NULL); - mpSIParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('s_null'), 2, NULL); + mpSIParent[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('s_null'), 2, NULL); JUT_ASSERT(0, mpSIParent[1] != NULL); mpLightDropParent->setAlphaRate(0.0f); @@ -907,7 +907,7 @@ void dMeter2Draw_c::initLightDrop() { } void dMeter2Draw_c::initRupeeKey() { - mpRupeeKeyParent = new CPaneMgr(mpScreen, MULTI_CHAR('r_k_n'), 2, NULL); + mpRupeeKeyParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('r_k_n'), 2, NULL); JUT_ASSERT(0, mpRupeeKeyParent != NULL); field_0x718 = 1.0f; @@ -915,22 +915,22 @@ void dMeter2Draw_c::initRupeeKey() { static u64 const rupeet2_tag[] = {MULTI_CHAR('r_n_1'), MULTI_CHAR('r_n_2'), MULTI_CHAR('r_n_3'), MULTI_CHAR('r_n_4')}; for (int i = 0; i < 4; i++) { - mpRupeeTexture[i][0] = new CPaneMgr(mpScreen, rupeet1_tag[i], 0, NULL); + mpRupeeTexture[i][0] = JKR_NEW CPaneMgr(mpScreen, rupeet1_tag[i], 0, NULL); JUT_ASSERT(0, mpRupeeTexture[i][0] != NULL); mpRupeeTexture[i][0]->getPanePtr()->setBasePosition(J2DBasePosition_4); - mpRupeeTexture[i][1] = new CPaneMgr(mpScreen, rupeet2_tag[i], 0, NULL); + mpRupeeTexture[i][1] = JKR_NEW CPaneMgr(mpScreen, rupeet2_tag[i], 0, NULL); JUT_ASSERT(0, mpRupeeTexture[i][1] != NULL); mpRupeeTexture[i][1]->getPanePtr()->setBasePosition(J2DBasePosition_4); } - mpRupeeParent[0] = new CPaneMgr(mpScreen, MULTI_CHAR('rupi_n'), 2, NULL); + mpRupeeParent[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('rupi_n'), 2, NULL); JUT_ASSERT(0, mpRupeeParent[0] != NULL); - mpRupeeParent[1] = new CPaneMgr(mpScreen, MULTI_CHAR('moyou_rn'), 2, NULL); + mpRupeeParent[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('moyou_rn'), 2, NULL); JUT_ASSERT(0, mpRupeeParent[1] != NULL); - mpRupeeParent[2] = new CPaneMgr(mpScreen, MULTI_CHAR('moyou_ln'), 2, NULL); + mpRupeeParent[2] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('moyou_ln'), 2, NULL); JUT_ASSERT(0, mpRupeeParent[2] != NULL); mpRupeeParent[0]->setAlphaRate(0.0f); @@ -940,13 +940,13 @@ void dMeter2Draw_c::initRupeeKey() { static u64 const key_tag[] = {MULTI_CHAR('key_nul'), MULTI_CHAR('k_n_1_n'), MULTI_CHAR('k_n_2_n'), MULTI_CHAR('k_n_3_n'), MULTI_CHAR('k_n_4_n')}; for (int i = 0; i < 5; i++) { - mpKeyTexture[i] = new CPaneMgr(mpScreen, key_tag[i], 0, NULL); + mpKeyTexture[i] = JKR_NEW CPaneMgr(mpScreen, key_tag[i], 0, NULL); JUT_ASSERT(0, mpKeyTexture[i] != NULL); mpKeyTexture[i]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpKeyTexture[i]->hide(); } - mpKeyParent = new CPaneMgr(mpScreen, MULTI_CHAR('key_n'), 2, NULL); + mpKeyParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('key_n'), 2, NULL); JUT_ASSERT(0, mpKeyParent != NULL); mpKeyParent->setAlphaRate(0.0f); @@ -988,7 +988,7 @@ void dMeter2Draw_c::initButton() { } } - mpItemB = new CPaneMgr(mpScreen, MULTI_CHAR('b_itm_p'), 0, NULL); + mpItemB = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_itm_p'), 0, NULL); JUT_ASSERT(0, mpItemB != NULL); mpItemB->getPanePtr()->setBasePosition(J2DBasePosition_4); mpItemB->show(); @@ -1002,7 +1002,7 @@ void dMeter2Draw_c::initButton() { field_0x770 = 0xFF; field_0x771 = dComIfGs_getBButtonItemKey(); - mpItemBPane = new J2DPicture( + mpItemBPane = JKR_NEW J2DPicture( MULTI_CHAR('b_itm_pp'), JGeometry::TBox2(0.0f, 0.0f, mpItemB->getInitSizeX(), mpItemB->getInitSizeY()), static_cast(mpItemB->getPanePtr())->getTexture(0)->getTexInfo(), NULL); @@ -1010,12 +1010,12 @@ void dMeter2Draw_c::initButton() { mpItemBPane->setBasePosition(J2DBasePosition_4); mpItemB->getPanePtr()->appendChild(mpItemBPane); - mpItemXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_itm_p'), 0, NULL); + mpItemXY[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('x_itm_p'), 0, NULL); JUT_ASSERT(0, mpItemXY[0] != NULL); mpItemXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(0, mpItemXY[0]); - mpItemXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_itm_p'), 0, NULL); + mpItemXY[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('y_itm_p'), 0, NULL); JUT_ASSERT(0, mpItemXY[1] != NULL); mpItemXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(1, mpItemXY[1]); @@ -1023,7 +1023,7 @@ void dMeter2Draw_c::initButton() { mpItemR = NULL; mpBTextA = NULL; - mpItemXYPane[0] = new J2DPicture( + mpItemXYPane[0] = JKR_NEW J2DPicture( MULTI_CHAR('x_itm_pp'), JGeometry::TBox2(0.0f, 0.0f, mpItemXY[0]->getInitSizeX(), mpItemXY[0]->getInitSizeY()), static_cast(mpItemXY[0]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); @@ -1031,7 +1031,7 @@ void dMeter2Draw_c::initButton() { mpItemXYPane[0]->setBasePosition(J2DBasePosition_4); mpItemXY[0]->getPanePtr()->appendChild(mpItemXYPane[0]); - mpItemXYPane[1] = new J2DPicture( + mpItemXYPane[1] = JKR_NEW J2DPicture( MULTI_CHAR('y_itm_pp'), JGeometry::TBox2(0.0f, 0.0f, mpItemXY[1]->getInitSizeX(), mpItemXY[1]->getInitSizeY()), static_cast(mpItemXY[1]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); @@ -1039,12 +1039,12 @@ void dMeter2Draw_c::initButton() { mpItemXYPane[1]->setBasePosition(J2DBasePosition_4); mpItemXY[1]->getPanePtr()->appendChild(mpItemXYPane[1]); - mpItemR = new CPaneMgr(mpScreen, MULTI_CHAR('r_itm_p'), 0, NULL); + mpItemR = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('r_itm_p'), 0, NULL); JUT_ASSERT(0, mpItemR != NULL); mpItemR->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(2, mpItemR); - mpItemXYPane[2] = new J2DPicture( + mpItemXYPane[2] = JKR_NEW J2DPicture( MULTI_CHAR('r_itm_pp'), JGeometry::TBox2(0.0f, 0.0f, mpItemR->getInitSizeX(), mpItemR->getInitSizeY()), static_cast(mpItemR->getPanePtr())->getTexture(0)->getTexInfo(), NULL); @@ -1052,60 +1052,60 @@ void dMeter2Draw_c::initButton() { mpItemXYPane[2]->setBasePosition(J2DBasePosition_4); mpItemR->getPanePtr()->appendChild(mpItemXYPane[2]); - mpLightB = new CPaneMgr(mpScreen, MULTI_CHAR('b_light'), 0, NULL); + mpLightB = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_light'), 0, NULL); JUT_ASSERT(0, mpLightB != NULL); mpLightB->getPanePtr()->setBasePosition(J2DBasePosition_4); field_0x72c = 1.0f; mpLightB->hide(); - mpLightXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_light'), 0, NULL); + mpLightXY[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('x_light'), 0, NULL); JUT_ASSERT(0, mpLightXY[0] != NULL); mpLightXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[0]->hide(); - mpLightXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_light'), 0, NULL); + mpLightXY[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('y_light'), 0, NULL); JUT_ASSERT(0, mpLightXY[1] != NULL); mpLightXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[1]->hide(); - mpLightXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('r_light'), 0, NULL); + mpLightXY[2] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('r_light'), 0, NULL); JUT_ASSERT(0, mpLightXY[2] != NULL); mpLightXY[2]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[2]->hide(); - mpBTextA = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_a'), 0, NULL); + mpBTextA = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_text_a'), 0, NULL); JUT_ASSERT(0, mpBTextA != NULL); - mpBTextB = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_b'), 0, NULL); + mpBTextB = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_text_b'), 0, NULL); JUT_ASSERT(0, mpBTextB != NULL); - mpBTextXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_x'), 0, NULL); + mpBTextXY[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_text_x'), 0, NULL); JUT_ASSERT(0, mpBTextXY[0] != NULL); - mpBTextXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_y'), 0, NULL); + mpBTextXY[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_text_y'), 0, NULL); JUT_ASSERT(0, mpBTextXY[1] != NULL); mpBTextXY[2] = NULL; - mpTextA = new CPaneMgr(mpScreen, MULTI_CHAR('a_text_n'), 0, NULL); + mpTextA = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('a_text_n'), 0, NULL); JUT_ASSERT(0, mpTextA != NULL); - mpTextB = new CPaneMgr(mpScreen, MULTI_CHAR('b_text_n'), 0, NULL); + mpTextB = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_text_n'), 0, NULL); JUT_ASSERT(0, mpTextB != NULL); - mpTextXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('z_text_n'), 0, NULL); + mpTextXY[2] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('z_text_n'), 0, NULL); JUT_ASSERT(0, mpTextXY[2] != NULL); - mpTextXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('x_text_n'), 0, NULL); + mpTextXY[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('x_text_n'), 0, NULL); JUT_ASSERT(0, mpTextXY[0] != NULL); - mpTextXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('y_text_n'), 0, NULL); + mpTextXY[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('y_text_n'), 0, NULL); JUT_ASSERT(0, mpTextXY[1] != NULL); - mpTextI = new CPaneMgr(mpScreen, MULTI_CHAR('i_text_n'), 2, NULL); + mpTextI = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('i_text_n'), 2, NULL); JUT_ASSERT(0, mpTextI != NULL); - mpTextM = new CPaneMgr(mpScreen, MULTI_CHAR('m_text_n'), 2, NULL); + mpTextM = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('m_text_n'), 2, NULL); JUT_ASSERT(0, mpTextM != NULL); static u64 const juji_i_tag[] = {MULTI_CHAR('ju_ring4'), MULTI_CHAR('yaji_00'), MULTI_CHAR('yaji_01'), MULTI_CHAR('ju_ring2'), MULTI_CHAR('ju_ring4')}; @@ -1113,14 +1113,14 @@ void dMeter2Draw_c::initButton() { for (int i = 0; i < 5; i++) { if (juji_i_tag[i] != 0) { - mpJujiI[i] = new CPaneMgr(mpScreen, juji_i_tag[i], 0, NULL); + mpJujiI[i] = JKR_NEW CPaneMgr(mpScreen, juji_i_tag[i], 0, NULL); JUT_ASSERT(0, mpJujiI[i] != NULL); } else { mpJujiI[i] = NULL; } if (juji_m_tag[i] != 0) { - mpJujiM[i] = new CPaneMgr(mpScreen, juji_m_tag[i], 0, NULL); + mpJujiM[i] = JKR_NEW CPaneMgr(mpScreen, juji_m_tag[i], 0, NULL); JUT_ASSERT(0, mpJujiM[i] != NULL); } else { mpJujiM[i] = NULL; @@ -1130,40 +1130,40 @@ void dMeter2Draw_c::initButton() { mpTextXY[0]->hide(); mpTextXY[1]->hide(); - mpButtonParent = new CPaneMgr(mpScreen, MULTI_CHAR('cont_n'), 2, NULL); + mpButtonParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('cont_n'), 2, NULL); JUT_ASSERT(0, mpButtonParent != NULL); - mpButtonA = new CPaneMgr(mpScreen, MULTI_CHAR('abtn_n'), 2, NULL); + mpButtonA = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('abtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonA != NULL); - mpButtonB = new CPaneMgr(mpScreen, MULTI_CHAR('bbtn_n'), 2, NULL); + mpButtonB = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('bbtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonB != NULL); field_0x730 = 1.0f; - mpButtonMidona = new CPaneMgr(mpScreen, MULTI_CHAR('midona_n'), 2, NULL); + mpButtonMidona = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('midona_n'), 2, NULL); JUT_ASSERT(0, mpButtonMidona != NULL); mButtonZAlpha = 0.0f; field_0x724 = 0.0f; field_0x738 = 0.0f; field_0x740 = 0; - mpButtonXY[0] = new CPaneMgr(mpScreen, MULTI_CHAR('xbtn_n'), 2, NULL); + mpButtonXY[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('xbtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonXY[0] != NULL); - mpButtonXY[1] = new CPaneMgr(mpScreen, MULTI_CHAR('ybtn_n'), 2, NULL); + mpButtonXY[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('ybtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonXY[1] != NULL); - mpButtonXY[2] = new CPaneMgr(mpScreen, MULTI_CHAR('zbtn_n'), 2, NULL); + mpButtonXY[2] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('zbtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonXY[2] != NULL); - mpUzu = new CPaneMgrAlpha(mpScreen, MULTI_CHAR('uzu_n'), 2, NULL); + mpUzu = JKR_NEW CPaneMgrAlpha(mpScreen, MULTI_CHAR('uzu_n'), 2, NULL); JUT_ASSERT(0, mpUzu != NULL); ResTIMG* timg = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource( 'TIMG', dMeter2Info_getNumberTextureName(0)); for (int i = 0; i < 2; i++) { for (int j = 0; j < 3; j++) { - mpItemNumTex[i][j] = new J2DPicture(timg); + mpItemNumTex[i][j] = JKR_NEW J2DPicture(timg); JUT_ASSERT(0, mpItemNumTex[i][j] != NULL); } } @@ -1208,7 +1208,7 @@ void dMeter2Draw_c::initButton() { } void dMeter2Draw_c::initButtonCross() { - mpButtonCrossParent = new CPaneMgr(mpScreen, MULTI_CHAR('juji_n'), 2, NULL); + mpButtonCrossParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('juji_n'), 2, NULL); JUT_ASSERT(0, mpButtonCrossParent != NULL); static_cast(mpScreen->search(MULTI_CHAR('cont_ju0')))->setFont(mDoExt_getMesgFont()); diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 7d3513aade..12e1413acb 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -3498,11 +3498,11 @@ BOOL subJOREventCallbackListNode::JORAct(u32 param_1, const char* param_2) { file.close(); if (g_fmapHIO.mpArcData) { JKRUnmountArchive(g_fmapHIO.mpArcData); - delete g_fmapHIO.mpArcData; + JKR_DELETE(g_fmapHIO.mpArcData); g_fmapHIO.mpArcData = NULL; } JKRDecompress((u8*)g_fmapHIO.mpArcFile, (u8*)g_fmapHIO.mpDecompBuf, 0x46000, 0); - g_fmapHIO.mpArcData = new(mDoExt_getArchiveHeap(), 0) JKRMemArchive(g_fmapHIO.mpDecompBuf, 0x46000, JKRMEMBREAK_FLAG_UNKNOWN0); + g_fmapHIO.mpArcData = JKR_NEW_ARGS(mDoExt_getArchiveHeap(), 0) JKRMemArchive(g_fmapHIO.mpDecompBuf, 0x46000, JKRMEMBREAK_FLAG_UNKNOWN0); JUT_ASSERT(6413, g_fmapHIO.mpArcData != NULL); if (dComIfGp_isHeapLockFlag() == 2) { g_fmapHIO.field_0x2f9 = true; @@ -3951,13 +3951,13 @@ dMeter_fmapHIO_c::~dMeter_fmapHIO_c() { if (mpArcData != NULL) { JKRUnmountArchive(mpArcData); - delete mpArcData; + JKR_DELETE(mpArcData); mpArcData = NULL; } #if DEBUG if (mpEvtCallBack != NULL) { - delete mpEvtCallBack; + JKR_DELETE(mpEvtCallBack); mpEvtCallBack = NULL; } #endif @@ -4194,11 +4194,11 @@ void dMeter_fmapHIO_c::listenPropertyEvent(const JORPropertyEvent* property) { file.close(); if (mpArcData) { JKRUnmountArchive(mpArcData); - delete mpArcData; + JKR_DELETE(mpArcData); mpArcData = NULL; } JKRDecompress((u8*)mpArcFile, (u8*)mpDecompBuf, 0x46000, 0); - mpArcData = new(mDoExt_getArchiveHeap(), 0) JKRMemArchive(mpDecompBuf, 0x46000, JKRMEMBREAK_FLAG_UNKNOWN0); + mpArcData = JKR_NEW_ARGS(mDoExt_getArchiveHeap(), 0) JKRMemArchive(mpDecompBuf, 0x46000, JKRMEMBREAK_FLAG_UNKNOWN0); JUT_ASSERT(7429, mpArcData != NULL); if (dComIfGp_isHeapLockFlag() == 2) { field_0x2f9 = true; @@ -4221,13 +4221,13 @@ void dMeter_fmapHIO_c::createEvtCallBackObject() { if (mpEvtCallBack) { return; } - mpEvtCallBack = new subJOREventCallbackListNode(); + mpEvtCallBack = JKR_NEW subJOREventCallbackListNode(); JUT_ASSERT(7460, mpEvtCallBack != NULL) } void dMeter_fmapHIO_c::deleteEvtCallBackObject() { if (mpEvtCallBack) { - delete mpEvtCallBack; + JKR_DELETE(mpEvtCallBack); mpEvtCallBack = NULL; } } diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index a9bcd0f95d..7c88dc4ab0 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -438,171 +438,171 @@ int dMeterButton_c::_delete() { mpHeap->free(mpFishingTex); mpFishingTex = NULL; - delete mpButtonScreen; + JKR_DELETE(mpButtonScreen); mpButtonScreen = NULL; if (field_0x00c != NULL) { - delete field_0x00c; + JKR_DELETE(field_0x00c); field_0x00c = NULL; } - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; - delete mpButtonA; + JKR_DELETE(mpButtonA); mpButtonA = NULL; - delete mpButtonB; + JKR_DELETE(mpButtonB); mpButtonB = NULL; if (mpButtonR != NULL) { - delete mpButtonR; + JKR_DELETE(mpButtonR); mpButtonR = NULL; } if (mpButtonZ != NULL) { - delete mpButtonZ; + JKR_DELETE(mpButtonZ); mpButtonZ = NULL; } if (mpMidona != NULL) { - delete mpMidona; + JKR_DELETE(mpMidona); mpMidona = NULL; } for (int i = 0; i < 4; i++) { if (field_0x0fc[i] != NULL) { - delete field_0x0fc[i]; + JKR_DELETE(field_0x0fc[i]); field_0x0fc[i] = NULL; } } - delete mpButton3D; + JKR_DELETE(mpButton3D); mpButton3D = NULL; - delete mpButtonC; + JKR_DELETE(mpButtonC); mpButtonC = NULL; - delete mpButtonS; + JKR_DELETE(mpButtonS); mpButtonS = NULL; if (mpButtonX != NULL) { - delete mpButtonX; + JKR_DELETE(mpButtonX); mpButtonX = NULL; } if (mpButtonY != NULL) { - delete mpButtonY; + JKR_DELETE(mpButtonY); mpButtonY = NULL; } if (mpButtonNun != NULL) { - delete mpButtonNun; + JKR_DELETE(mpButtonNun); mpButtonNun = NULL; } if (mpButtonRemo != NULL) { - delete mpButtonRemo; + JKR_DELETE(mpButtonRemo); mpButtonRemo = NULL; } if (mpButtonRemo2 != NULL) { - delete mpButtonRemo2; + JKR_DELETE(mpButtonRemo2); mpButtonRemo2 = NULL; } if (mpButtonAR != NULL) { - delete mpButtonAR; + JKR_DELETE(mpButtonAR); mpButtonAR = NULL; } if (mpButton3DB != NULL) { - delete mpButton3DB; + JKR_DELETE(mpButton3DB); mpButton3DB = NULL; } if (mpButtonNURE != NULL) { - delete mpButtonNURE; + JKR_DELETE(mpButtonNURE); mpButtonNURE = NULL; } if (mpButtonReel != NULL) { - delete mpButtonReel; + JKR_DELETE(mpButtonReel); mpButtonReel = NULL; } if (mpButtonReel2 != NULL) { - delete mpButtonReel2; + JKR_DELETE(mpButtonReel2); mpButtonReel2 = NULL; } if (mpButtonAB != NULL) { - delete mpButtonAB; + JKR_DELETE(mpButtonAB); mpButtonAB = NULL; } if (mpButtonTate != NULL) { - delete mpButtonTate; + JKR_DELETE(mpButtonTate); mpButtonTate = NULL; } if (mpButtonNunZ != NULL) { - delete mpButtonNunZ; + JKR_DELETE(mpButtonNunZ); mpButtonNunZ = NULL; } if (mpButtonNunC != NULL) { - delete mpButtonNunC; + JKR_DELETE(mpButtonNunC); mpButtonNunC = NULL; } if (mpButtonBin != NULL) { - delete mpButtonBin; + JKR_DELETE(mpButtonBin); mpButtonBin = NULL; } for (int i = 0; i < 2; i++) { - delete mpText[i]; + JKR_DELETE(mpText[i]); mpText[i] = NULL; } - delete mpItem_c; + JKR_DELETE(mpItem_c); mpItem_c = NULL; if (field_0x080 != NULL) { - delete field_0x080; + JKR_DELETE(field_0x080); field_0x080 = NULL; } - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpFkAll_c; + JKR_DELETE(mpFkAll_c); mpFkAll_c = NULL; - delete mpFkRoot_c; + JKR_DELETE(mpFkRoot_c); mpFkRoot_c = NULL; - delete mpTextScreen; + JKR_DELETE(mpTextScreen); mpTextScreen = NULL; - delete mpTmRoot_c; + JKR_DELETE(mpTmRoot_c); mpTmRoot_c = NULL; for (int i = 0; i < 2; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; if (field_0x0ec[i] != NULL) { - delete field_0x0ec[i]; + JKR_DELETE(field_0x0ec[i]); field_0x0ec[i] = NULL; } } - delete mpString_c; + JKR_DELETE(mpString_c); mpString_c = NULL; - delete mpOutFont; + JKR_DELETE(mpOutFont); mpOutFont = NULL; dComIfGp_getMeterButtonArchive()->removeResourceAll(); @@ -997,7 +997,7 @@ void dMeterButton_c::screenInitButton() { OS_REPORT("enter dMeterButton_c::screenInitButton\n"); - mpButtonScreen = new J2DScreen(); + mpButtonScreen = JKR_NEW J2DScreen(); JUT_ASSERT(1830, mpButtonScreen != NULL); OS_REPORT("load zelda_game_image_button_info.blo"); @@ -1012,7 +1012,7 @@ void dMeterButton_c::screenInitButton() { dPaneClass_showNullPane(mpButtonScreen); field_0x00c = NULL; - mpParent = new CPaneMgr(mpButtonScreen, MULTI_CHAR('info_n'), 0, NULL); + mpParent = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('info_n'), 0, NULL); if (mpParent == NULL) OS_REPORT("[%s] %d\n", __FILE__, 1867); JUT_ASSERT(1868, mpParent != NULL); @@ -1037,7 +1037,7 @@ void dMeterButton_c::screenInitButton() { mParentCenterX = (608.0f / 2) - mpParent->getInitCenterPosX(); paneTrans(mpParent, mParentCenterX, 0.0f, 0xFF); - mpButtonA = new CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL); + mpButtonA = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL); if (mpButtonA == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1902); } @@ -1045,7 +1045,7 @@ void dMeterButton_c::screenInitButton() { mpButtonA->setAlphaRate(0.0f); mpButtonA->show(); - mpButtonB = new CPaneMgr(mpButtonScreen, MULTI_CHAR('bbtn_n'), 2, NULL); + mpButtonB = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('bbtn_n'), 2, NULL); if (mpButtonB == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1914); } @@ -1053,7 +1053,7 @@ void dMeterButton_c::screenInitButton() { mpButtonB->setAlphaRate(0.0f); mpButtonB->show(); - mpButtonR = new CPaneMgr(mpButtonScreen, MULTI_CHAR('rbtn_n'), 2, NULL); + mpButtonR = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('rbtn_n'), 2, NULL); if (mpButtonR == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1932); } @@ -1061,7 +1061,7 @@ void dMeterButton_c::screenInitButton() { mpButtonR->setAlphaRate(0.0f); mpButtonR->show(); - mpMidona = new CPaneMgr(mpButtonScreen, MULTI_CHAR('midona'), 0, NULL); + mpMidona = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('midona'), 0, NULL); JUT_ASSERT(1939, mpMidona != NULL); if (mpMidona == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1941); @@ -1078,7 +1078,7 @@ void dMeterButton_c::screenInitButton() { mpButtonScreen->search('zbtn')->show(); mpButtonScreen->search(MULTI_CHAR('z_btnl'))->show(); - mpButtonZ = new CPaneMgr(mpButtonScreen, MULTI_CHAR('zbtn_n'), 2, NULL); + mpButtonZ = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('zbtn_n'), 2, NULL); if (mpButtonZ == NULL) { OS_REPORT("[%s] %d\n", __FILE__, 1954); } @@ -1086,7 +1086,7 @@ void dMeterButton_c::screenInitButton() { mpButtonZ->setAlphaRate(0.0f); mpButtonZ->show(); - mpButton3D = new CPaneMgr(mpButtonScreen, MULTI_CHAR('asbtn_n'), 2, NULL); + mpButton3D = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('asbtn_n'), 2, NULL); JUT_ASSERT(1964, mpButton3D != NULL); mpButton3D->setAlphaRate(0.0f); mpButton3D->show(); @@ -1096,7 +1096,7 @@ void dMeterButton_c::screenInitButton() { mpButtonScreen->search(MULTI_CHAR('yaji_d_n'))->hide(); mpButtonScreen->search(MULTI_CHAR('yaji_r_n'))->hide(); - mpButtonC = new CPaneMgr(mpButtonScreen, MULTI_CHAR('cbtn_n'), 2, NULL); + mpButtonC = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('cbtn_n'), 2, NULL); JUT_ASSERT(1992, mpButtonC != NULL); mpButtonC->setAlphaRate(0.0f); mpButtonC->show(); @@ -1106,15 +1106,15 @@ void dMeterButton_c::screenInitButton() { mpButtonScreen->search(MULTI_CHAR('yaji_dn'))->hide(); mpButtonScreen->search(MULTI_CHAR('yaji_rn'))->hide(); - mpButtonS = new CPaneMgr(mpButtonScreen, MULTI_CHAR('sbtn_n'), 2, NULL); + mpButtonS = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('sbtn_n'), 2, NULL); JUT_ASSERT(2002, mpButtonS != NULL); mpButtonS->setAlphaRate(0.0f); - mpButtonX = new CPaneMgr(mpButtonScreen, MULTI_CHAR('xbtn_n'), 2, NULL); + mpButtonX = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('xbtn_n'), 2, NULL); JUT_ASSERT(2048, mpButtonX != NULL); mpButtonX->setAlphaRate(0.0f); - mpButtonY = new CPaneMgr(mpButtonScreen, MULTI_CHAR('ybtn_n'), 2, NULL); + mpButtonY = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('ybtn_n'), 2, NULL); JUT_ASSERT(2052, mpButtonY != NULL); mpButtonY->setAlphaRate(0.0f); @@ -1123,7 +1123,7 @@ void dMeterButton_c::screenInitButton() { mpButtonRemo2 = NULL; mpButtonAR = NULL; - mpButton3DB = new CPaneMgr(mpButtonScreen, MULTI_CHAR('as_b_n'), 2, NULL); + mpButton3DB = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('as_b_n'), 2, NULL); JUT_ASSERT(2060, mpButton3DB != NULL); mpButton3DB->setAlphaRate(0.0f); @@ -1135,19 +1135,19 @@ void dMeterButton_c::screenInitButton() { mpButtonNunZ = NULL; mpButtonNunC = NULL; - mpButtonBin = new CPaneMgr(mpButtonScreen, MULTI_CHAR('bottl_n'), 2, NULL); + mpButtonBin = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('bottl_n'), 2, NULL); JUT_ASSERT(2071, mpButtonBin != NULL); mpButtonBin->setAlphaRate(0.0f); - mpText[0] = new CPaneMgr(mpButtonScreen, MULTI_CHAR('text_n'), 2, NULL); + mpText[0] = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('text_n'), 2, NULL); JUT_ASSERT(2075, mpText[0] != NULL); mpText[0]->setAlphaRate(0.0f); - mpText[1] = new CPaneMgr(mpButtonScreen, MULTI_CHAR('text2_n'), 2, NULL); + mpText[1] = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('text2_n'), 2, NULL); JUT_ASSERT(2079, mpText[1] != NULL); mpText[1]->setAlphaRate(0.0f); - mpItem_c = new CPaneMgr(mpButtonScreen, MULTI_CHAR('fishing'), 0, NULL); + mpItem_c = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('fishing'), 0, NULL); JUT_ASSERT(2083, mpItem_c != NULL); mpItem_c->setAlphaRate(0.0f); @@ -1394,7 +1394,7 @@ void dMeterButton_c::screenInitButton() { } void dMeterButton_c::screenInitText() { - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(2442, mpScreen != NULL); OS_REPORT("enter dMeterButton_c::screenInitText(void)\n"); @@ -1411,7 +1411,7 @@ void dMeterButton_c::screenInitText() { JUT_ASSERT(2457, fg != false); dPaneClass_showNullPane(mpScreen); - mpFkAll_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpFkAll_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); OS_REPORT("[%s] %d\n", __FILE__, 2461); JUT_ASSERT(2462, mpFkAll_c != NULL); mpFkAll_c->setAlphaRate(0.0f); @@ -1422,11 +1422,11 @@ void dMeterButton_c::screenInitText() { g_MsgObject_HIO_c.mTextPosY + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y); OS_REPORT("[%s] %d\n", __FILE__, 2469); - mpFkRoot_c = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); + mpFkRoot_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(2472, mpFkRoot_c != NULL); OS_REPORT("[%s] %d\n", __FILE__, 2474); - mpTextScreen = new J2DScreen(); + mpTextScreen = JKR_NEW J2DScreen(); JUT_ASSERT(2478, mpTextScreen != NULL); OS_REPORT("[%s] %d\n", __FILE__, 2480); @@ -1440,26 +1440,26 @@ void dMeterButton_c::screenInitText() { dPaneClass_showNullPane(mpTextScreen); OS_REPORT("[%s] %d\n", __FILE__, 2496); - mpTmRoot_c = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_null'), 0, NULL); + mpTmRoot_c = JKR_NEW CPaneMgr(mpTextScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(2499, mpTmRoot_c != NULL); #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3flin'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTextScreen, MULTI_CHAR('t3f_s'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTextScreen, MULTI_CHAR('t3f_s'), 0, NULL); - field_0x0ec[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3f'), 0, NULL); + field_0x0ec[0] = JKR_NEW CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3f'), 0, NULL); - field_0x0ec[1] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); + field_0x0ec[1] = JKR_NEW CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); mpTextScreen->search(MULTI_CHAR('n_3line'))->hide(); mpTextScreen->search(MULTI_CHAR('n_3fline'))->show(); mpTextScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTextScreen, MULTI_CHAR('mg_3line'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTextScreen, 't3_s', 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTextScreen, 't3_s', 0, NULL); field_0x0ec[0] = NULL; field_0x0ec[1] = NULL; @@ -1470,10 +1470,10 @@ void dMeterButton_c::screenInitText() { mpTextScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - mpTm_c[0] = new CPaneMgr(mpTextScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTextScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(2504, mpTm_c[0] != NULL); - mpTm_c[1] = new CPaneMgr(mpTextScreen, 't4_s', 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTextScreen, 't4_s', 0, NULL); JUT_ASSERT(2507, mpTm_c[1] != NULL); field_0x0ec[0] = NULL; @@ -1512,12 +1512,12 @@ void dMeterButton_c::screenInitText() { field_0x4b6 = 0; field_0x4b4 = 0; - mpString_c = new dMsgString_c(); + mpString_c = JKR_NEW dMsgString_c(); JUT_ASSERT(2572, mpString_c != NULL); OS_REPORT("[%s] %d\n", __FILE__, 2574); - mpOutFont = new COutFont_c(0); + mpOutFont = JKR_NEW COutFont_c(0); JUT_ASSERT(2577, mpOutFont != NULL); mpOutFont->createPane(); diff --git a/src/d/d_meter_haihai.cpp b/src/d/d_meter_haihai.cpp index 5e6c9fd3e7..e51e0b070e 100644 --- a/src/d/d_meter_haihai.cpp +++ b/src/d/d_meter_haihai.cpp @@ -22,7 +22,7 @@ dMeterHaihai_c::~dMeterHaihai_c() { } int dMeterHaihai_c::_create() { - mpHaihaiScreen = new J2DScreen(); + mpHaihaiScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpHaihaiScreen != NULL); bool fg = @@ -30,7 +30,7 @@ int dMeterHaihai_c::_create() { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpHaihaiScreen); - mpParent = new CPaneMgr(mpHaihaiScreen, MULTI_CHAR('n_all'), 2, NULL); + mpParent = JKR_NEW CPaneMgr(mpHaihaiScreen, MULTI_CHAR('n_all'), 2, NULL); JUT_ASSERT(0, mpParent != NULL); OSInitFastCast(); @@ -256,19 +256,19 @@ void dMeterHaihai_c::setScale(f32 i_scaleFactor) { } int dMeterHaihai_c::_delete() { - delete mpHaihaiScreen; + JKR_DELETE(mpHaihaiScreen); mpHaihaiScreen = NULL; - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; - delete mpCursorBck; + JKR_DELETE(mpCursorBck); mpCursorBck = NULL; - delete mpCursorBtk; + JKR_DELETE(mpCursorBtk); mpCursorBtk = NULL; - delete mpCursorBpk; + JKR_DELETE(mpCursorBpk); mpCursorBpk = NULL; return 1; } diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp index 094ca82152..f87a689e7d 100644 --- a/src/d/d_meter_hakusha.cpp +++ b/src/d/d_meter_hakusha.cpp @@ -29,14 +29,14 @@ int dMeterHakusha_c::_create() { }; for (int i = 0; i < 6; i++) { - mpHakushaPos[i] = new CPaneMgr(field_0x004, haku_tag[i], 0, NULL); + mpHakushaPos[i] = JKR_NEW CPaneMgr(field_0x004, haku_tag[i], 0, NULL); JUT_ASSERT(0, mpHakushaPos[i] != NULL); } - mpHakushaParent = new CPaneMgr(field_0x004, MULTI_CHAR('hakunall'), 0, NULL); + mpHakushaParent = JKR_NEW CPaneMgr(field_0x004, MULTI_CHAR('hakunall'), 0, NULL); JUT_ASSERT(0, mpHakushaParent != NULL); - mpHakushaScreen = new J2DScreen(); + mpHakushaScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpHakushaScreen != NULL); bool fg = mpHakushaScreen->setPriority("zelda_game_image_hakusha_parts.blo", 0x20000, @@ -44,10 +44,10 @@ int dMeterHakusha_c::_create() { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpHakushaScreen); - mpHakushaOn = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_n'), 2, NULL); + mpHakushaOn = JKR_NEW CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_n'), 2, NULL); JUT_ASSERT(0, mpHakushaOn != NULL); - mpHakushaOff = new CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_b_n'), 2, NULL); + mpHakushaOff = JKR_NEW CPaneMgr(mpHakushaScreen, MULTI_CHAR('haku_b_n'), 2, NULL); JUT_ASSERT(0, mpHakushaOff != NULL); mpHakushaOn->setAlphaRate(0.0f); @@ -65,7 +65,7 @@ int dMeterHakusha_c::_create() { mHakushaNum = dMeter2Info_getHorseLifeCount(); - mpButtonScreen = new J2DScreen(); + mpButtonScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpButtonScreen != NULL); fg = mpButtonScreen->setPriority("zelda_game_image_hakusha_a_btn.blo", 0x20000, @@ -73,7 +73,7 @@ int dMeterHakusha_c::_create() { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpButtonScreen); - mpButtonA = new CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL); + mpButtonA = JKR_NEW CPaneMgr(mpButtonScreen, MULTI_CHAR('abtn_n'), 2, NULL); JUT_ASSERT(0, mpButtonA != NULL); mpButtonA->show(); mpButtonA->setAlphaRate(0.0f); @@ -153,28 +153,28 @@ void dMeterHakusha_c::draw() { int dMeterHakusha_c::_delete() { for (int i = 0; i < 6; i++) { - delete mpHakushaPos[i]; + JKR_DELETE(mpHakushaPos[i]); mpHakushaPos[i] = NULL; } mpHakushaParent->paneTrans(0.0f, 0.0f); mpHakushaParent->scale(1.0f, 1.0f); - delete mpHakushaParent; + JKR_DELETE(mpHakushaParent); mpHakushaParent = NULL; - delete mpHakushaScreen; + JKR_DELETE(mpHakushaScreen); mpHakushaScreen = NULL; - delete mpHakushaOn; + JKR_DELETE(mpHakushaOn); mpHakushaOn = NULL; - delete mpHakushaOff; + JKR_DELETE(mpHakushaOff); mpHakushaOff = NULL; - delete mpButtonScreen; + JKR_DELETE(mpButtonScreen); mpButtonScreen = NULL; - delete mpButtonA; + JKR_DELETE(mpButtonA); mpButtonA = NULL; return 1; } diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp index 08050a230d..37fd6adfd6 100644 --- a/src/d/d_meter_map.cpp +++ b/src/d/d_meter_map.cpp @@ -443,10 +443,10 @@ void dMeterMap_c::_create(J2DScreen* unused) { mSizeW = (s16)sizeX; mSizeH = (s16)sizeY; - mMap = new dMap_c(sizeX, sizeY, dispSizeW, dispSizeH); + mMap = JKR_NEW dMap_c(sizeX, sizeY, dispSizeW, dispSizeH); JUT_ASSERT(999, mMap != NULL); - mMapJ2DPicture = new J2DPicture(mMap->getResTIMGPointer()); + mMapJ2DPicture = JKR_NEW J2DPicture(mMap->getResTIMGPointer()); JUT_ASSERT(1002, mMapJ2DPicture != NULL); mIsCompass = dComIfGs_isDungeonItemCompass(); @@ -497,11 +497,11 @@ void dMeterMap_c::setDispPosInSide() { void dMeterMap_c::_delete() { if (mMapJ2DPicture != NULL) { - delete mMapJ2DPicture; + JKR_DELETE(mMapJ2DPicture); } if (mMap != NULL) { - delete mMap; + JKR_DELETE(mMap); } if (isEnableDispMapAndMapDispSizeTypeNo()) { diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp index 47002a7e6d..b877ca8704 100644 --- a/src/d/d_meter_string.cpp +++ b/src/d/d_meter_string.cpp @@ -46,7 +46,7 @@ int dMeterString_c::_create() { mpMapArchive = dComIfGp_getAllMapArchive(); } - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpMapArchive); @@ -57,13 +57,13 @@ int dMeterString_c::_create() { mpGetInBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load( JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive)); - mpParentPane = new CPaneMgr(mpScreen, MULTI_CHAR('get_in_n'), 2, NULL); + mpParentPane = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('get_in_n'), 2, NULL); JUT_ASSERT(0, mpParentPane != NULL); - mpRootPane = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 0, NULL); + mpRootPane = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 0, NULL); JUT_ASSERT(0, mpRootPane != NULL); - mpTextPane = new CPaneMgr(mpScreen, MULTI_CHAR('get_in'), 0, NULL); + mpTextPane = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('get_in'), 0, NULL); JUT_ASSERT(0, mpTextPane != NULL); static_cast(mpScreen->search(MULTI_CHAR('get_in_s')))->setFont(mDoExt_getMesgFont()); @@ -140,19 +140,19 @@ void dMeterString_c::draw() { } int dMeterString_c::_delete() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpGetInBck; + JKR_DELETE(mpGetInBck); mpGetInBck = NULL; - delete mpParentPane; + JKR_DELETE(mpParentPane); mpParentPane = NULL; - delete mpRootPane; + JKR_DELETE(mpRootPane); mpRootPane = NULL; - delete mpTextPane; + JKR_DELETE(mpTextPane); mpTextPane = NULL; if (field_0x28 != 0) { diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index 59562d9b15..804e91eb12 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -83,14 +83,14 @@ dMdl_c* dMdl_mng_c::entry(J3DModelData* i_modelData, u16 i_materialId, dKy_tevst dMdl_mng_c* dMdl_mng_c::m_myObj; void dMdl_mng_c::create() { - m_myObj = new dMdl_mng_c(); + m_myObj = JKR_NEW dMdl_mng_c(); } dMdl_c::~dMdl_c() {} void dMdl_mng_c::remove() { if (m_myObj != NULL) { - delete m_myObj; + JKR_DELETE(m_myObj); m_myObj = NULL; } } diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index eb9e9552f0..535c72a822 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -347,7 +347,7 @@ static u8 getPohNum() { } jmessage_tReference::jmessage_tReference() { - mpStick = new STControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); + mpStick = JKR_NEW STControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); JUT_ASSERT(518, mpStick != NULL); mpStick->setWaitParm(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x800); @@ -409,7 +409,7 @@ jmessage_tReference::jmessage_tReference() { } jmessage_tReference::~jmessage_tReference() { - delete mpStick; + JKR_DELETE(mpStick); mpStick = NULL; } diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index 920c35d2cf..d4853244d0 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -347,22 +347,22 @@ int dMsgObject_c::_create(msg_class* param_1) { changeGroup(0); mpOutFont = NULL; mpScrnDraw = NULL; - mpResCont = new JMessage::TResourceContainer(); + mpResCont = JKR_NEW JMessage::TResourceContainer(); JUT_ASSERT(1299, mpResCont != NULL); mpCtrl = dDemo_c::getMesgControl(); JUT_ASSERT(1302, mpCtrl != NULL); - mpRefer = new jmessage_tReference(); + mpRefer = JKR_NEW jmessage_tReference(); JUT_ASSERT(1305, mpRefer != NULL); mpRefer->setpStatus(¶m_1->mode); - mpSeqProc = new jmessage_tSequenceProcessor(mpRefer, mpCtrl); + mpSeqProc = JKR_NEW jmessage_tSequenceProcessor(mpRefer, mpCtrl); JUT_ASSERT(1310, mpSeqProc != NULL); - mpRenProc = new jmessage_tRenderingProcessor(mpRefer); + mpRenProc = JKR_NEW jmessage_tRenderingProcessor(mpRefer); JUT_ASSERT(1313, mpRenProc != NULL); mpRefer->setResourceContainer(mpResCont); mpCtrl->setSequenceProcessor(mpSeqProc); mpCtrl->setRenderingProcessor(mpRenProc); mpRefer->setObjectPtr(this); - field_0x124 = new JMessage::TParse(mpResCont); + field_0x124 = JKR_NEW JMessage::TParse(mpResCont); field_0x124->parse(mpMsgDt, 0); mpCtrl->reset(); mpCtrl->resetResourceCache(); @@ -395,7 +395,7 @@ int dMsgObject_c::_create(msg_class* param_1) { field_0x15c = 0; field_0x172 = 0; setStatusLocal(1); - mpMsgString = new dMsgString_c(); + mpMsgString = JKR_NEW dMsgString_c(); JUT_ASSERT(1366, mpMsgString != NULL); return 4; } @@ -550,27 +550,27 @@ int dMsgObject_c::_draw() { int dMsgObject_c::_delete() { mpResCont->destroyResource_all(); if (mpScrnDraw != NULL) { - delete mpScrnDraw; + JKR_DELETE(mpScrnDraw); mpScrnDraw = 0; } mpMsgDt = 0; mpMsgRes = 0; field_0x12c = 0; if (mpOutFont != NULL) { - delete mpOutFont; + JKR_DELETE(mpOutFont); mpOutFont = NULL; } - delete mpResCont; + JKR_DELETE(mpResCont); mpResCont = NULL; - delete mpRefer; + JKR_DELETE(mpRefer); mpRefer = NULL; - delete mpSeqProc; + JKR_DELETE(mpSeqProc); mpSeqProc = NULL; - delete mpRenProc; + JKR_DELETE(mpRenProc); mpRenProc = NULL; - delete field_0x124; + JKR_DELETE(field_0x124); field_0x124 = NULL; - delete mpMsgString; + JKR_DELETE(mpMsgString); mpMsgString = NULL; if (mpTalkHeap != NULL) { mpTalkHeap = NULL; @@ -1335,7 +1335,7 @@ void dMsgObject_c::talkStartInit() { bool local_98 = false; if (mpOutFont == NULL) { OS_REPORT("free size (0x%x)=====> %d\n", mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize()); - mpOutFont = new COutFont_c(0); + mpOutFont = JKR_NEW COutFont_c(0); JUT_ASSERT(3035, mpOutFont != NULL); mpOutFont->createPane(); mpRenProc->setOutFont(mpOutFont); @@ -1345,7 +1345,7 @@ void dMsgObject_c::talkStartInit() { switch (mFukiKind) { case 9: pRef = (jmessage_tReference*)mpRenProc->getReference(); - pData = new dMsgScrnItem_c(pRef->getFukiPosType(), pRef->getForm(), mpTalkHeap); + pData = JKR_NEW dMsgScrnItem_c(pRef->getFukiPosType(), pRef->getForm(), mpTalkHeap); JUT_ASSERT(3049, pData != NULL); mpScrnDraw = pData; break; @@ -1353,32 +1353,32 @@ void dMsgObject_c::talkStartInit() { if (mFukiKind == 15) { local_30 = mDoExt_getRubyFont(); } - pData = new dMsgScrnTree_c(local_30, mpTalkHeap); + pData = JKR_NEW dMsgScrnTree_c(local_30, mpTalkHeap); JUT_ASSERT(3061, pData != NULL); mpScrnDraw = pData; break; case 6: - pData = new dMsgScrnKanban_c(mpTalkHeap); + pData = JKR_NEW dMsgScrnKanban_c(mpTalkHeap); JUT_ASSERT(3069, pData != NULL); mpScrnDraw = pData; break; case 7: - pData = new dMsgScrnStaff_c(((jmessage_tReference*)mpRenProc->getReference())->getArrange()); + pData = JKR_NEW dMsgScrnStaff_c(((jmessage_tReference*)mpRenProc->getReference())->getArrange()); JUT_ASSERT(3083, pData != NULL); mpScrnDraw = pData; break; case 12: - pData = new dMsgScrnPlace_c(); + pData = JKR_NEW dMsgScrnPlace_c(); JUT_ASSERT(3092, pData != NULL); mpScrnDraw = pData; break; case 19: - pData = new dMsgScrnBoss_c(); + pData = JKR_NEW dMsgScrnBoss_c(); JUT_ASSERT(3100, pData != NULL); mpScrnDraw = pData; break; case 17: - pData = new dMsgScrnHowl_c(); + pData = JKR_NEW dMsgScrnHowl_c(); JUT_ASSERT(3108, pData != NULL); mpScrnDraw = pData; local_98 = true; @@ -1386,7 +1386,7 @@ void dMsgObject_c::talkStartInit() { case 1: case 5: pRef = (jmessage_tReference*)mpRenProc->getReference(); - pData = new dMsgScrnJimaku_c(pRef->getForm(), mpTalkHeap); + pData = JKR_NEW dMsgScrnJimaku_c(pRef->getForm(), mpTalkHeap); JUT_ASSERT(3119, pData != NULL); mpScrnDraw = pData; break; @@ -1395,11 +1395,11 @@ void dMsgObject_c::talkStartInit() { default: pRef = (jmessage_tReference*)mpRenProc->getReference(); if (mpRefer->getMsgID() == 0x2a5) { - pData = new dMsgScrnItem_c(0, pRef->getForm(), mpTalkHeap); + pData = JKR_NEW dMsgScrnItem_c(0, pRef->getForm(), mpTalkHeap); JUT_ASSERT(3131, pData != NULL); mpScrnDraw = pData; } else { - pData = new dMsgScrnTalk_c(pRef->getFukiPosType(), pRef->getForm(), mpTalkHeap); + pData = JKR_NEW dMsgScrnTalk_c(pRef->getFukiPosType(), pRef->getForm(), mpTalkHeap); JUT_ASSERT(3138, pData != NULL); mpScrnDraw = pData; local_98 = true; @@ -1508,11 +1508,11 @@ u16 dMsgObject_c::getStatusLocal() { void dMsgObject_c::delete_screen(bool param_1) { if (mpOutFont != NULL) { - delete mpOutFont; + JKR_DELETE(mpOutFont); mpOutFont = NULL; } if (mpScrnDraw != NULL) { - delete mpScrnDraw; + JKR_DELETE(mpScrnDraw); mpScrnDraw = NULL; if (param_1 && dComIfGp_isHeapLockFlag() == 5) { diff --git a/src/d/d_msg_out_font.cpp b/src/d/d_msg_out_font.cpp index 70ade423bb..4d15b069d3 100644 --- a/src/d/d_msg_out_font.cpp +++ b/src/d/d_msg_out_font.cpp @@ -39,7 +39,7 @@ COutFont_c::COutFont_c(u8 param_0) { field_0x242 = param_0; for (int i = 0; i < 35; i++) { - mpOfs[i] = new COutFontSet_c(); + mpOfs[i] = JKR_NEW COutFontSet_c(); } for (int i = 0; i < 70; i++) { @@ -56,7 +56,7 @@ COutFont_c::COutFont_c(u8 param_0) { COutFont_c::~COutFont_c() { for (int i = 0; i < 35; i++) { - delete mpOfs[i]; + JKR_DELETE(mpOfs[i]); mpOfs[i] = NULL; } @@ -65,7 +65,7 @@ COutFont_c::~COutFont_c() { for (int i = 0; i < 70; i++) { if (mpPane[i] != NULL) { - delete mpPane[i]; + JKR_DELETE(mpPane[i]); mpPane[i] = NULL; } } @@ -95,7 +95,7 @@ void COutFont_c::createPane() { img = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', getBtiName(i)); } - mpPane[i] = new J2DPicture(img); + mpPane[i] = JKR_NEW J2DPicture(img); switch (i) { case 0: mpPane[i]->setBlackWhite(JUtility::TColor(255, 255, 255, 0), diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index 525c619fe2..22572ef557 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -37,7 +37,7 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { MULTI_CHAR('sel_po02'), MULTI_CHAR('c_kahen'), MULTI_CHAR('c_cursor') }; - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_window_3menu.blo", 0x20000, dComIfGp_getMsgArchive(0)); @@ -62,11 +62,11 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mpAnmBtk->searchUpdateMaterialID(mpScreen); mBtkFrame = 0.0f; - mpSelectCursor = new dSelect_cursor_c(0, 1.0f, NULL); + mpSelectCursor = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL); JUT_ASSERT(0, mpSelectCursor != NULL); mpSelectCursor->setAlphaRate(0.0f); - mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('abc_n'), 0, NULL); + mpParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('abc_n'), 0, NULL); JUT_ASSERT(0, mpParent != NULL); for (int i = 0; i < 3; i++) { @@ -74,52 +74,52 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mCursorPos[i].y = 0.0f; mCursorPos[i].z = 0.0f; - mpSel_c[i] = new CPaneMgr(mpScreen, tag_name[i][0], 0, NULL); + mpSel_c[i] = JKR_NEW CPaneMgr(mpScreen, tag_name[i][0], 0, NULL); JUT_ASSERT(0, mpSel_c[i] != NULL); mpSel_c[i]->hide(); - mpSelCld_c[i] = new CPaneMgr(mpScreen, tag_name[i][1], 0, NULL); + mpSelCld_c[i] = JKR_NEW CPaneMgr(mpScreen, tag_name[i][1], 0, NULL); JUT_ASSERT(0, mpSelCld_c[i] != NULL); mpSelCld_c[i]->getPanePtr()->setAnimation(mpAnmBtk); - mpSelCldr_c[i] = new CPaneMgr(mpScreen, tag_name[i][2], 0, NULL); + mpSelCldr_c[i] = JKR_NEW CPaneMgr(mpScreen, tag_name[i][2], 0, NULL); JUT_ASSERT(0, mpSelCldr_c[i] != NULL); mpSelCldr_c[i]->getPanePtr()->setAnimation(mpAnmBtk); - mpSelCldm_c[i] = new CPaneMgr(mpScreen, tag_name[i][3], 0, NULL); + mpSelCldm_c[i] = JKR_NEW CPaneMgr(mpScreen, tag_name[i][3], 0, NULL); JUT_ASSERT(0, mpSelCldm_c[i] != NULL); mpSelCldm_c[i]->getPanePtr()->setAnimation(mpAnmBpk); for (int j = 0; j < 5; j++) { - mpSelCldw_c[j][i] = new CPaneMgr(mpScreen, tag_name[i][4 + j], 0, NULL); + mpSelCldw_c[j][i] = JKR_NEW CPaneMgr(mpScreen, tag_name[i][4 + j], 0, NULL); JUT_ASSERT(0, mpSelCldw_c[j][i] != NULL); } - mpSelPo_c[i] = new CPaneMgr(mpScreen, tag_name[i][9], 0, NULL); + mpSelPo_c[i] = JKR_NEW CPaneMgr(mpScreen, tag_name[i][9], 0, NULL); JUT_ASSERT(0, mpSelPo_c[i] != NULL); mpSelPo_c[i]->hide(); - mpKahen_c[i] = new CPaneMgr(mpScreen, tag_name[i][10], 0, NULL); + mpKahen_c[i] = JKR_NEW CPaneMgr(mpScreen, tag_name[i][10], 0, NULL); JUT_ASSERT(0, mpKahen_c[i] != NULL); - mpCursor_c[i] = new CPaneMgr(mpScreen, tag_name[i][11], 0, NULL); + mpCursor_c[i] = JKR_NEW CPaneMgr(mpScreen, tag_name[i][11], 0, NULL); JUT_ASSERT(0, mpCursor_c[i] != NULL); mCursorPos[i] = mpCursor_c[i]->getGlobalVtxCenter(true, 0); } #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_tf', 0, NULL); + mpTmSel_c[0] = JKR_NEW CPaneMgr(mpScreen, 'a_tf', 0, NULL); - mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_tf', 0, NULL); + mpTmSel_c[1] = JKR_NEW CPaneMgr(mpScreen, 'b_tf', 0, NULL); - mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_tf', 0, NULL); + mpTmSel_c[2] = JKR_NEW CPaneMgr(mpScreen, 'c_tf', 0, NULL); - mpTmrSel_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('a_tf_f'), 0, NULL); + mpTmrSel_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('a_tf_f'), 0, NULL); - mpTmrSel_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_tf_f'), 0, NULL); + mpTmrSel_c[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_tf_f'), 0, NULL); - mpTmrSel_c[2] = new CPaneMgr(mpScreen, MULTI_CHAR('c_tf_f'), 0, NULL); + mpTmrSel_c[2] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('c_tf_f'), 0, NULL); for (int i = 0; i < 3; i++) { ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, ""); @@ -142,11 +142,11 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mpScreen->search('b_t')->hide(); mpScreen->search('c_t')->hide(); } else { - mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_t', 0, NULL); + mpTmSel_c[0] = JKR_NEW CPaneMgr(mpScreen, 'a_t', 0, NULL); - mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_t', 0, NULL); + mpTmSel_c[1] = JKR_NEW CPaneMgr(mpScreen, 'b_t', 0, NULL); - mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_t', 0, NULL); + mpTmSel_c[2] = JKR_NEW CPaneMgr(mpScreen, 'c_t', 0, NULL); for (int i = 0; i < 3; i++) { ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, ""); @@ -168,13 +168,13 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mpScreen->search('c_t')->show(); } #else - mpTmSel_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('a_t_e'), 0, NULL); + mpTmSel_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('a_t_e'), 0, NULL); JUT_ASSERT(0, mpTmSel_c[0] != NULL); - mpTmSel_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('b_t_e'), 0, NULL); + mpTmSel_c[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('b_t_e'), 0, NULL); JUT_ASSERT(0, mpTmSel_c[1] != NULL); - mpTmSel_c[2] = new CPaneMgr(mpScreen, MULTI_CHAR('c_t_e'), 0, NULL); + mpTmSel_c[2] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('c_t_e'), 0, NULL); JUT_ASSERT(0, mpTmSel_c[2] != NULL); for (int i = 0; i < 3; i++) { @@ -218,57 +218,57 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { } dMsgScrn3Select_c::~dMsgScrn3Select_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpAnmBck; + JKR_DELETE(mpAnmBck); mpAnmBck = NULL; - delete mpAnmBpk; + JKR_DELETE(mpAnmBpk); mpAnmBpk = NULL; - delete mpAnmBtk; + JKR_DELETE(mpAnmBtk); mpAnmBtk = NULL; - delete mpSelectCursor; + JKR_DELETE(mpSelectCursor); mpSelectCursor = NULL; - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; for (int i = 0; i < 3; i++) { - delete mpSel_c[i]; + JKR_DELETE(mpSel_c[i]); mpSel_c[i] = NULL; - delete mpSelCld_c[i]; + JKR_DELETE(mpSelCld_c[i]); mpSelCld_c[i] = NULL; - delete mpSelCldr_c[i]; + JKR_DELETE(mpSelCldr_c[i]); mpSelCldr_c[i] = NULL; - delete mpSelCldm_c[i]; + JKR_DELETE(mpSelCldm_c[i]); mpSelCldm_c[i] = NULL; - delete mpTmSel_c[i]; + JKR_DELETE(mpTmSel_c[i]); mpTmSel_c[i] = NULL; - delete mpKahen_c[i]; + JKR_DELETE(mpKahen_c[i]); mpKahen_c[i] = NULL; - delete mpCursor_c[i]; + JKR_DELETE(mpCursor_c[i]); mpCursor_c[i] = NULL; if (mpTmrSel_c[i] != NULL) { - delete mpTmrSel_c[i]; + JKR_DELETE(mpTmrSel_c[i]); mpTmrSel_c[i] = NULL; } for (int j = 0; j < 5; j++) { - delete mpSelCldw_c[j][i]; + JKR_DELETE(mpSelCldw_c[j][i]); mpSelCldw_c[j][i] = NULL; } - delete mpSelPo_c[i]; + JKR_DELETE(mpSelPo_c[i]); mpSelPo_c[i] = NULL; } } diff --git a/src/d/d_msg_scrn_arrow.cpp b/src/d/d_msg_scrn_arrow.cpp index ba85ceea2f..7ee3b0503c 100644 --- a/src/d/d_msg_scrn_arrow.cpp +++ b/src/d/d_msg_scrn_arrow.cpp @@ -7,7 +7,7 @@ #include "d/d_pane_class.h" dMsgScrnArrow_c::dMsgScrnArrow_c() { - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_window_yajirushi.blo", 0x20000, dComIfGp_getMsgArchive(0)); @@ -25,10 +25,10 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpBpk->searchUpdateMaterialID(mpScreen); mBpkFrame = 0.0f; - mpParent_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); + mpParent_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); JUT_ASSERT(0, mpParent_c != NULL); - mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('ya_next'), 0, NULL); + mpArw_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('ya_next'), 0, NULL); JUT_ASSERT(0, mpArw_c != NULL); mpArw_c->hide(); @@ -36,7 +36,7 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen->search(MULTI_CHAR('yajnext'))->setAnimation(mpBpk); mpScreen->search(MULTI_CHAR('yajinexl'))->setAnimation(mpBpk); - mpDot_c = new CPaneMgr(mpScreen, MULTI_CHAR('ya_end'), 0, NULL); + mpDot_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('ya_end'), 0, NULL); JUT_ASSERT(0, mpDot_c != NULL); mpDot_c->hide(); @@ -45,22 +45,22 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { } dMsgScrnArrow_c::~dMsgScrnArrow_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpBck; + JKR_DELETE(mpBck); mpBck = NULL; - delete mpBpk; + JKR_DELETE(mpBpk); mpBpk = NULL; - delete mpParent_c; + JKR_DELETE(mpParent_c); mpParent_c = NULL; - delete mpArw_c; + JKR_DELETE(mpArw_c); mpArw_c = NULL; - delete mpDot_c; + JKR_DELETE(mpDot_c); mpDot_c = NULL; } diff --git a/src/d/d_msg_scrn_boss.cpp b/src/d/d_msg_scrn_boss.cpp index d2110e7cec..64141770b3 100644 --- a/src/d/d_msg_scrn_boss.cpp +++ b/src/d/d_msg_scrn_boss.cpp @@ -13,25 +13,25 @@ dMsgScrnBoss_c::dMsgScrnBoss_c() { init(); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); mpScreen->setPriority("zelda_boss_name.blo", 0x20000, dComIfGp_getMsgArchive(4)); dPaneClass_showNullPane(mpScreen); - mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBossNameScaleX, g_MsgObject_HIO_c.mBossNameScaleY); - mpFontParent = new CPaneMgr(mpScreen, MULTI_CHAR('s_font_n'), 0, NULL); + mpFontParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('s_font_n'), 0, NULL); mpFontParent->scale(g_MsgObject_HIO_c.mBossNameCharSizeX, g_MsgObject_HIO_c.mBossNameCharSizeY); mpFontParent->paneTrans(g_MsgObject_HIO_c.mBossNameCharPosX, g_MsgObject_HIO_c.mBossNameCharPosY); - mpBaseParent = new CPaneMgr(mpScreen, MULTI_CHAR('base_n'), 2, NULL); + mpBaseParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('base_n'), 2, NULL); mpBaseParent->scale(g_MsgObject_HIO_c.mBossNameBaseSizeX, g_MsgObject_HIO_c.mBossNameBaseSizeY); mpBaseParent->paneTrans(g_MsgObject_HIO_c.mBossNameBasePosX, g_MsgObject_HIO_c.mBossNameBasePosY); for (int i = 0; i < 7; i++) { - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getRubyFont()); #if VERSION != VERSION_GCN_JPN ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setCharSpace(1.0f); @@ -54,20 +54,20 @@ dMsgScrnBoss_c::dMsgScrnBoss_c() { } dMsgScrnBoss_c::~dMsgScrnBoss_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; - delete mpFontParent; + JKR_DELETE(mpFontParent); mpFontParent = NULL; - delete mpBaseParent; + JKR_DELETE(mpBaseParent); mpBaseParent = NULL; for (int i = 0; i < 7; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; } diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index 4c48a4b558..aeda4ecc34 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -47,14 +47,14 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs mKeyWaitTimer = 0; field_0x67 = param_3; - mpString_c = new dMsgString_c(); + mpString_c = JKR_NEW dMsgString_c(); JUT_ASSERT(79, mpString_c != NULL); - mpOutFont = new COutFont_c(0); + mpOutFont = JKR_NEW COutFont_c(0); JUT_ASSERT(83, mpOutFont != NULL); mpOutFont->createPane(); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(88, mpScreen != NULL); #if PLATFORM_GCN @@ -67,7 +67,7 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs JUT_ASSERT(98, fg != false); dPaneClass_showNullPane(mpScreen); - mpTxScreen = new J2DScreen(); + mpTxScreen = JKR_NEW J2DScreen(); JUT_ASSERT(102, mpTxScreen != NULL); field_0x48 = 608.0f; @@ -81,8 +81,8 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs JUT_ASSERT(119, fg != false); dPaneClass_showNullPane(mpTxScreen); - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, 't3_s', 0, NULL); JUT_ASSERT(127, mpTm_c[1] != NULL); mpTmr_c[0] = NULL; @@ -110,18 +110,18 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs field_0x50 = 0.0f; if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); - field_0x10[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); - field_0x10[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); + field_0x10[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); + field_0x10[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); mpTxScreen->search(MULTI_CHAR('n_3fline'))->show(); mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, 't3_s', 0, NULL); mpTmr_c[0] = NULL; mpTmr_c[1] = NULL; @@ -133,8 +133,8 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs #else field_0x50 = -10.0f; - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, 't4_s', 0, NULL); JUT_ASSERT(165, mpTm_c[1] != NULL); mpTmr_c[0] = NULL; @@ -177,18 +177,18 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs g_MsgObject_HIO_c.mTextPosX + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.x, g_MsgObject_HIO_c.mTextPosY + mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y); - mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); - mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); - mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); - mpRoot_c[0] = new CPaneMgr(mpScreen, 'ROOT', 2, NULL); + mpArw_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); + mpMg_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); + mpMg_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); + mpRoot_c[0] = JKR_NEW CPaneMgr(mpScreen, 'ROOT', 2, NULL); JUT_ASSERT(250, mpRoot_c[0] != NULL); - mpRoot_c[1] = new CPaneMgr(mpTxScreen, 'ROOT', 2, NULL); + mpRoot_c[1] = JKR_NEW CPaneMgr(mpTxScreen, 'ROOT', 2, NULL); JUT_ASSERT(253, mpRoot_c[1] != NULL); if (i_isUseBackTex == true) { ResTIMG* texResource = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBackTex = new J2DPicture(texResource); + mpBackTex = JKR_NEW J2DPicture(texResource); JUT_ASSERT(259, mpBackTex != NULL); mpBackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 0xff)); @@ -197,11 +197,11 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs mpBackTex = NULL; } - mpArrow_c = new dMsgScrnArrow_c(); + mpArrow_c = JKR_NEW dMsgScrnArrow_c(); JUT_ASSERT(269, mpArrow_c != NULL); if (i_stick != NULL) { - mpSelect_c = new dMsgScrn3Select_c(); + mpSelect_c = JKR_NEW dMsgScrn3Select_c(); JUT_ASSERT(274, mpSelect_c != NULL); } else { mpSelect_c = NULL; @@ -215,49 +215,49 @@ dMsgScrnExplain_c::dMsgScrnExplain_c(STControl* i_stick, u8 param_1, bool i_isUs } dMsgScrnExplain_c::~dMsgScrnExplain_c() { - delete mpString_c; + JKR_DELETE(mpString_c); mpString_c = NULL; - delete mpOutFont; + JKR_DELETE(mpOutFont); mpOutFont = NULL; - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpTxScreen; + JKR_DELETE(mpTxScreen); mpTxScreen = NULL; - delete mpArw_c; + JKR_DELETE(mpArw_c); mpArw_c = NULL; for (int i = 0; i < 2; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; if (mpTmr_c[i] != NULL) { - delete mpTmr_c[i]; + JKR_DELETE(mpTmr_c[i]); mpTmr_c[i] = NULL; } - delete mpMg_c[i]; + JKR_DELETE(mpMg_c[i]); mpMg_c[i] = NULL; - delete mpRoot_c[i]; + JKR_DELETE(mpRoot_c[i]); mpRoot_c[i] = NULL; } if (mpBackTex != NULL) { - delete mpBackTex; + JKR_DELETE(mpBackTex); mpBackTex = NULL; } if (mpArrow_c != NULL) { - delete mpArrow_c; + JKR_DELETE(mpArrow_c); mpArrow_c = NULL; } if (mpSelect_c) { - delete mpSelect_c; + JKR_DELETE(mpSelect_c); mpSelect_c = NULL; } diff --git a/src/d/d_msg_scrn_howl.cpp b/src/d/d_msg_scrn_howl.cpp index 473de9c350..58e70e84ff 100644 --- a/src/d/d_msg_scrn_howl.cpp +++ b/src/d/d_msg_scrn_howl.cpp @@ -54,25 +54,25 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { }; init(); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(61, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_wolf_howl.blo", 0x20000, dComIfGp_getMsgArchive(5)); JUT_ASSERT(73, fg != false); dPaneClass_showNullPane(mpScreen); mpScreen->search(MULTI_CHAR('line00'))->hide(); - mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); JUT_ASSERT(79, mpPmP_c != NULL); mpScreen->search('ag_n')->hide(); field_0x1994 = 0.0f; field_0x1998 = 0.0f; mpScreen->search(MULTI_CHAR('wi_btn_n'))->hide(); - mpButtonIcon[0] = new CPaneMgr(mpScreen, MULTI_CHAR('cbtn_n'), 2, NULL); + mpButtonIcon[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('cbtn_n'), 2, NULL); JUT_ASSERT(91, mpButtonIcon[0] != NULL); - mpButtonText[0] = new CPaneMgr(mpScreen, MULTI_CHAR('g_ltxt_n'), 2, NULL); + mpButtonText[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('g_ltxt_n'), 2, NULL); JUT_ASSERT(93, mpButtonText[0] != NULL); - mpButtonIcon[1] = new CPaneMgr(mpScreen, MULTI_CHAR('abt_n'), 2, NULL); + mpButtonIcon[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('abt_n'), 2, NULL); JUT_ASSERT(96, mpButtonIcon[1] != NULL); - mpButtonText[1] = new CPaneMgr(mpScreen, MULTI_CHAR('gr_txt_n'), 2, NULL); + mpButtonText[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('gr_txt_n'), 2, NULL); JUT_ASSERT(98, mpButtonText[1] != NULL); #if VERSION == VERSION_GCN_JPN J2DTextBox* piStack_19c = (J2DTextBox*)mpScreen->search(MULTI_CHAR('g_l_info')); @@ -138,9 +138,9 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { field_0x2136 = (350.0f / field_0x1980); field_0x2138 = 0; field_0x1984 = 255.0f / field_0x2136; - mpABase = new CPaneMgr(mpScreen, MULTI_CHAR('a_base'), 0, NULL); + mpABase = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('a_base'), 0, NULL); JUT_ASSERT(218, mpABase != NULL); - mpLineAll = new CPaneMgr(mpScreen, MULTI_CHAR('line_all'), 0, NULL); + mpLineAll = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('line_all'), 0, NULL); JUT_ASSERT(221, mpLineAll != NULL); f32 in_f31; for (int i = 0; i < 7; i++) { @@ -158,11 +158,11 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { f29); } for (int i = 0; i < 3; i++) { - mpLineH[i] = new CPaneMgr(mpScreen, ylinen_tag[i], 0, NULL); + mpLineH[i] = JKR_NEW CPaneMgr(mpScreen, ylinen_tag[i], 0, NULL); JUT_ASSERT(242, mpLineH[i] != NULL); } for (int i = 0; i < 7; i++) { - mpLineV[i] = new CPaneMgr(mpScreen, tlinen_tag[i], 2, NULL); + mpLineV[i] = JKR_NEW CPaneMgr(mpScreen, tlinen_tag[i], 2, NULL); JUT_ASSERT(247, mpLineV[i] != NULL); } Mtx mtx2; @@ -178,21 +178,21 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { field_0x27a4 = 1.0f; field_0x27a8 = 0.0f; ResTIMG const* res = (ResTIMG const*) dComIfGp_getMsgArchive(5)->getResource('TIMG', "tt_ginnouroko_s3tc.bti"); - mpDot = new J2DPicture(res); + mpDot = JKR_NEW J2DPicture(res); JUT_ASSERT(275, mpDot != NULL); mpDot->setWhite(JUtility::TColor(0xff, 0xff, 0x71, 0xff)); res = (ResTIMG const*)dComIfGp_getMsgArchive(5)->getResource('TIMG', "tt_black_32.bti"); - mpGuideDot = new J2DPicture(res); + mpGuideDot = JKR_NEW J2DPicture(res); JUT_ASSERT(280, mpGuideDot != NULL); mpGuideDot->setBlackWhite(((J2DPicture*)mpScreen->search(MULTI_CHAR('line00')))->getBlack(), ((J2DPicture*)mpScreen->search(MULTI_CHAR('line00')))->getWhite()); res = (ResTIMG const*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_iastarRR.bti"); - mpTopBall = new J2DPicture(res); + mpTopBall = JKR_NEW J2DPicture(res); JUT_ASSERT(287, mpTopBall != NULL); mpTopBall->setBlackWhite(g_MsgObject_HIO_c.mHowlHIO.mDotBlack, g_MsgObject_HIO_c.mHowlHIO.mDotWhite); ; for (int i = 0; i < 5; i++) { - mpTopBallTail[i] = new J2DPicture(res); + mpTopBallTail[i] = JKR_NEW J2DPicture(res); JUT_ASSERT(292, mpTopBallTail[i] != NULL); mpTopBallTail[i]->setBlackWhite(g_MsgObject_HIO_c.mHowlHIO.mDotBlack, g_MsgObject_HIO_c.mHowlHIO.mDotWhite); } @@ -203,7 +203,7 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { mCorrectLineMax = 0; field_0x2197 = 0; res = (ResTIMG const*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpWaveTex = new J2DPicture(res); + mpWaveTex = JKR_NEW J2DPicture(res); JUT_ASSERT(307, mpWaveTex != NULL); mpWaveTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 200, 0, 255)); mpWaveTex->setCornerColor( @@ -220,41 +220,41 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { } dMsgScrnHowl_c::~dMsgScrnHowl_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; for (int i = 0; i < 2; i++) { - delete mpButtonIcon[i]; + JKR_DELETE(mpButtonIcon[i]); mpButtonIcon[i] = NULL; - delete mpButtonText[i]; + JKR_DELETE(mpButtonText[i]); mpButtonText[i] = NULL; } for (int i = 0; i < 3; i++) { - delete mpLineH[i]; + JKR_DELETE(mpLineH[i]); mpLineH[i] = NULL; } for (int i = 0; i < 7; i++) { - delete mpLineV[i]; + JKR_DELETE(mpLineV[i]); mpLineV[i] = NULL; } - delete mpABase; + JKR_DELETE(mpABase); mpABase = NULL; - delete mpLineAll; + JKR_DELETE(mpLineAll); mpLineAll = NULL; - delete mpDot; + JKR_DELETE(mpDot); mpDot = NULL; - delete mpGuideDot; + JKR_DELETE(mpGuideDot); mpGuideDot = NULL; - delete mpTopBall; + JKR_DELETE(mpTopBall); mpTopBall = NULL; for (int i = 0; i < 5; i++) { - delete mpTopBallTail[i]; + JKR_DELETE(mpTopBallTail[i]); mpTopBallTail[i] = NULL; } - delete mpWaveTex; + JKR_DELETE(mpWaveTex); mpWaveTex = NULL; dComIfGp_getMsgArchive(5)->removeResourceAll();; } diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index 4010c56443..69dfbbcc14 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -108,7 +108,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { if (isOugiID()) { JKRReadIdxResource(mpItemTex[0], 0xc00, 0x3d, dComIfGp_getItemIconArchive()); field_0x0e0[0] = (ResTIMG*)mpItemTex[0]; - mpItemPane[0] = new J2DPicture(field_0x0e0[0]); + mpItemPane[0] = JKR_NEW J2DPicture(field_0x0e0[0]); JUT_ASSERT(148, mpItemPane[0] != NULL); } else { int texNum = @@ -116,7 +116,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { (J2DPicture*)NULL, mpItemTex[2], (J2DPicture*)NULL, NULL, (J2DPicture*)NULL, uStack_60); for (int i = 0; i < texNum; i++) { field_0x0e0[i] = (ResTIMG*)mpItemTex[i]; - mpItemPane[i] = new J2DPicture(field_0x0e0[i]); + mpItemPane[i] = JKR_NEW J2DPicture(field_0x0e0[i]); JUT_ASSERT(165, mpItemPane[i] != NULL); } dMeter2Info_setItemColor( @@ -128,12 +128,12 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } #endif } - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(188, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_item_get_window.blo", 0x1020000, dComIfGp_getMsgArchive(3)); JUT_ASSERT(195, fg != false); dPaneClass_showNullPane(mpScreen); - mpTxScreen = new J2DScreen(); + mpTxScreen = JKR_NEW J2DScreen(); JUT_ASSERT(199, mpTxScreen != NULL); fg = mpTxScreen->setPriority("zelda_item_get_window_text.blo", 0x20000, dComIfGp_getMsgArchive(3)); JUT_ASSERT(206, fg != false); @@ -156,11 +156,11 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { mpItemPane[i]->setBasePosition(J2DBasePosition_4); } } - mpArrow_c = new dMsgScrnArrow_c(); + mpArrow_c = JKR_NEW dMsgScrnArrow_c(); JUT_ASSERT(280, mpArrow_c != NULL); - mpSelect_c = new dMsgScrn3Select_c(); + mpSelect_c = JKR_NEW dMsgScrn3Select_c(); JUT_ASSERT(284, mpSelect_c != NULL); - mpLight_c = new dMsgScrnLight_c(3, param_2); + mpLight_c = JKR_NEW dMsgScrnLight_c(3, param_2); JUT_ASSERT(288, mpLight_c != NULL); void* mpBuf = field_0x138->alloc(0x106a, 0x20); JUT_ASSERT(291, mpBuf != NULL); @@ -174,11 +174,11 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { field_0x188[i] = g_MsgObject_HIO_c.mBoxPos[i][3]; } field_0x194 = 0.0f; - mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); + mpArw_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); JUT_ASSERT(306, mpArw_c != NULL); - mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); + mpMg_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(309, mpMg_c[0] != NULL); - mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); + mpMg_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(312, mpMg_c[1] != NULL); OSInitFastCast(); fukiPosCalc(param_1); @@ -192,51 +192,51 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { field_0x12c[1]->searchUpdateMaterialID(mpScreen); field_0x154[1] = 0.0f; field_0x19d = false; - mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); JUT_ASSERT(389, mpPmP_c != NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxItemScaleX, g_MsgObject_HIO_c.mBoxItemScaleY); #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); JUT_ASSERT(407, mpTm_c[0] != NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); JUT_ASSERT(410, mpTm_c[1] != NULL); - mpTm_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_w'), 0, NULL); + mpTm_c[2] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_w'), 0, NULL); JUT_ASSERT(413, mpTm_c[2] != NULL); - mpTmr_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); + mpTmr_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); JUT_ASSERT(416, mpTmr_c[0] != NULL); - mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); + mpTmr_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); JUT_ASSERT(419, mpTmr_c[1] != NULL); - mpTmr_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_w'), 0, NULL); + mpTmr_c[2] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_w'), 0, NULL); JUT_ASSERT(422, mpTmr_c[2] != NULL); mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); mpTxScreen->search(MULTI_CHAR('n_3fline'))->show(); mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); JUT_ASSERT(407, mpTm_c[0] != NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, 't3_s', 0, NULL); JUT_ASSERT(410, mpTm_c[1] != NULL); - mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3_w', 0, NULL); + mpTm_c[2] = JKR_NEW CPaneMgr(mpTxScreen, 't3_w', 0, NULL); JUT_ASSERT(413, mpTm_c[2] != NULL); mpTxScreen->search(MULTI_CHAR('n_3line'))->show(); mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(407, mpTm_c[0] != NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, 't4_s', 0, NULL); JUT_ASSERT(410, mpTm_c[1] != NULL); - mpTm_c[2] = new CPaneMgr(mpTxScreen, 't4_w', 0, NULL); + mpTm_c[2] = JKR_NEW CPaneMgr(mpTxScreen, 't4_w', 0, NULL); JUT_ASSERT(413, mpTm_c[2] != NULL); mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); mpTxScreen->search(MULTI_CHAR('n_3fline'))->hide(); @@ -298,45 +298,45 @@ dMsgScrnItem_c::~dMsgScrnItem_c() { mpItemTex[i] = NULL; } if (mpItemPane[i] != NULL) { - delete mpItemPane[i]; + JKR_DELETE(mpItemPane[i]); mpItemPane[i] = NULL; } } - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpTxScreen; + JKR_DELETE(mpTxScreen); mpTxScreen = NULL; - delete mpArrow_c; + JKR_DELETE(mpArrow_c); mpArrow_c = NULL; - delete mpSelect_c; + JKR_DELETE(mpSelect_c); mpSelect_c = NULL; - delete mpLight_c; + JKR_DELETE(mpLight_c); mpLight_c = NULL; if (mCharInfoPtr != 0) { field_0x138->free(mCharInfoPtr); mCharInfoPtr = NULL; } - delete mpArw_c; + JKR_DELETE(mpArw_c); mpArw_c = NULL; for (int i = 0; i < 2; i++) { - delete mpMg_c[i]; + JKR_DELETE(mpMg_c[i]); mpMg_c[i] = NULL; } for (int i = 0; i < 1; i++) { - delete field_0x118[i]; + JKR_DELETE(field_0x118[i]); field_0x118[i] = NULL; } for (int i = 0; i < 2; i++) { - delete field_0x12c[i]; + JKR_DELETE(field_0x12c[i]); field_0x12c[i] = NULL; } - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; for (int i = 0; i < 3; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; if (mpTmr_c[i] != NULL) { - delete mpTmr_c[i]; + JKR_DELETE(mpTmr_c[i]); mpTmr_c[i] = NULL; } } diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index d76ae68141..afe68b8f58 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -23,7 +23,7 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { init(); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_jimaku_message_text.blo", 0x20000, @@ -31,7 +31,7 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); - mpLight_c = new dMsgScrnLight_c(0, param_0); + mpLight_c = JKR_NEW dMsgScrnLight_c(0, param_0); JUT_ASSERT(0, mpLight_c != NULL); void* mpBuf = heap->alloc(0x106A, 0x20); @@ -39,7 +39,7 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { memset(mpBuf, 0, 0x106A); mCharInfoPtr = (CharInfo_c*)mpBuf; - mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 3, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 3, NULL); JUT_ASSERT(0, mpPmP_c != NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mSubtitleScaleX, g_MsgObject_HIO_c.mSubtitleScaleY); field_0xcc = g_MsgObject_HIO_c.mBoxPos[0][5]; @@ -47,28 +47,28 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_3flin'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('t3f_s'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('t3f_s'), 0, NULL); - mpTmr_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_3f'), 0, NULL); - mpTmr_c[1] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); + mpTmr_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_3f'), 0, NULL); + mpTmr_c[1] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); mpScreen->search(MULTI_CHAR('n_3line'))->hide(); mpScreen->search(MULTI_CHAR('n_3fline'))->show(); mpScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_3line'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpScreen, 't3_s', 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpScreen, 't3_s', 0, NULL); mpScreen->search(MULTI_CHAR('n_3line'))->show(); mpScreen->search(MULTI_CHAR('n_3fline'))->hide(); mpScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - mpTm_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(0, mpTm_c[0] != NULL); - mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpScreen, 't4_s', 0, NULL); JUT_ASSERT(0, mpTm_c[1] != NULL); mpScreen->search(MULTI_CHAR('n_3line'))->hide(); @@ -129,10 +129,10 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { } dMsgScrnJimaku_c::~dMsgScrnJimaku_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpLight_c; + JKR_DELETE(mpLight_c); mpLight_c = NULL; if (mCharInfoPtr != NULL) { @@ -140,15 +140,15 @@ dMsgScrnJimaku_c::~dMsgScrnJimaku_c() { mCharInfoPtr = NULL; } - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; for (int i = 0; i < 2; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; if (mpTmr_c[i] != NULL) { - delete mpTmr_c[i]; + JKR_DELETE(mpTmr_c[i]); mpTmr_c[i] = NULL; } } diff --git a/src/d/d_msg_scrn_kanban.cpp b/src/d/d_msg_scrn_kanban.cpp index 681986c25a..a9edbef7df 100644 --- a/src/d/d_msg_scrn_kanban.cpp +++ b/src/d/d_msg_scrn_kanban.cpp @@ -23,7 +23,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { s32 uVar14 = field_0xd4->getTotalFreeSize(); init(); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(43, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_kanban_stone_a.blo", 0x1020000, dComIfGp_getMsgArchive(2)); @@ -39,7 +39,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { field_0xd0->searchUpdateMaterialID(mpScreen); field_0xd8 = 0.0f; - mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_size'), 2, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_size'), 2, NULL); JUT_ASSERT(60, mpPmP_c != NULL); mpPmP_c->getPanePtr()->setAnimation(field_0xcc); @@ -48,10 +48,10 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { mpPmP_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); - mpBack_c = new CPaneMgr(mpScreen, MULTI_CHAR('back_b'), 0, NULL); + mpBack_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('back_b'), 0, NULL); JUT_ASSERT(68, mpBack_c != NULL); - mpSpot_c = new CPaneMgr(mpScreen, MULTI_CHAR('spot00'), 0, NULL); + mpSpot_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('spot00'), 0, NULL); JUT_ASSERT(72, mpSpot_c != NULL); mpSpot_c->getPanePtr()->setAnimation(field_0xd0); @@ -61,7 +61,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { if (dComIfGs_getOptRuby() != 0) { static u64 const t_tag[3] = {MULTI_CHAR('mg_3line'), 't3_w', 't3_s'}; for (int i = 0; i < 3; i++) { - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); } @@ -73,10 +73,10 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { static u64 const tr_tag[3] = {MULTI_CHAR('mg_3f'), MULTI_CHAR('mg_3f_w'), MULTI_CHAR('mg_3f_s')}; for (int i = 0; i < 3; i++) { - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag_2[i], 0, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag_2[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); - mpTmr_c[i] = new CPaneMgr(mpScreen, tr_tag[i], 0, NULL); + mpTmr_c[i] = JKR_NEW CPaneMgr(mpScreen, tr_tag[i], 0, NULL); ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); } @@ -88,7 +88,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { static u64 const t_tag[3] = {MULTI_CHAR('mg_e4lin'), 'f4_w', 't4_s'}; for (int i = 0; i < 3; i++) { - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], 0, NULL); JUT_ASSERT(81, mpTm_c[i] != NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); } @@ -129,29 +129,29 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { } dMsgScrnKanban_c::~dMsgScrnKanban_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete field_0xcc; + JKR_DELETE(field_0xcc); field_0xcc = NULL; - delete field_0xd0; + JKR_DELETE(field_0xd0); field_0xd0 = NULL; - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; - delete mpBack_c; + JKR_DELETE(mpBack_c); mpBack_c = NULL; - delete mpSpot_c; + JKR_DELETE(mpSpot_c); mpSpot_c = NULL; for (int i = 0; i < 3; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; if (mpTmr_c[i] != NULL) { - delete mpTmr_c[i]; + JKR_DELETE(mpTmr_c[i]); mpTmr_c[i] = NULL; } } diff --git a/src/d/d_msg_scrn_light.cpp b/src/d/d_msg_scrn_light.cpp index 55872b72fb..4635a8e680 100644 --- a/src/d/d_msg_scrn_light.cpp +++ b/src/d/d_msg_scrn_light.cpp @@ -126,7 +126,7 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { g_MsgScrnLight_HIO_c.updateColor(i_colorType); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_message_window_text_light.blo", 0x20000, dComIfGp_getMain2DArchive()); @@ -143,7 +143,7 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { mpBpk->searchUpdateMaterialID(mpScreen); mBpkFrame = 0.0f; - mpParent_c = new CPaneMgr(mpScreen, MULTI_CHAR('moya00'), 0, NULL); + mpParent_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('moya00'), 0, NULL); JUT_ASSERT(0, mpParent_c != NULL); mpParent_c->getPanePtr()->setAnimation(mpBck); @@ -155,16 +155,16 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { dMsgScrnLight_c::~dMsgScrnLight_c() { l_lightCount--; - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpBck; + JKR_DELETE(mpBck); mpBck = NULL; - delete mpBpk; + JKR_DELETE(mpBpk); mpBpk = NULL; - delete mpParent_c; + JKR_DELETE(mpParent_c); mpParent_c = NULL; } diff --git a/src/d/d_msg_scrn_place.cpp b/src/d/d_msg_scrn_place.cpp index c9c76484c6..881852c259 100644 --- a/src/d/d_msg_scrn_place.cpp +++ b/src/d/d_msg_scrn_place.cpp @@ -27,7 +27,7 @@ dMsgScrnPlace_c::dMsgScrnPlace_c() { mScaleX = 0.0f; } - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); #if VERSION == VERSION_GCN_JPN mpScreen->setPriority("zelda_stage_title.blo", 0x20000, dComIfGp_getMsgArchive(4)); #else @@ -35,23 +35,23 @@ dMsgScrnPlace_c::dMsgScrnPlace_c() { #endif dPaneClass_showNullPane(mpScreen); - mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mStageTitleScaleX, g_MsgObject_HIO_c.mStageTitleScaleY); - mpFontParent = new CPaneMgr(mpScreen, MULTI_CHAR('s_font_n'), 0, NULL); + mpFontParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('s_font_n'), 0, NULL); mpFontParent->scale(g_MsgObject_HIO_c.mStageTitleCharSizeX, g_MsgObject_HIO_c.mStageTitleCharSizeY); mpFontParent->paneTrans(g_MsgObject_HIO_c.mStageTitleCharPosX, g_MsgObject_HIO_c.mStageTitleCharPosY - mScaleX); - mpBaseParent = new CPaneMgr(mpScreen, MULTI_CHAR('base_n'), 2, NULL); + mpBaseParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('base_n'), 2, NULL); mpBaseParent->scale(g_MsgObject_HIO_c.mStageTitleBaseSizeX, g_MsgObject_HIO_c.mStageTitleBaseSizeY); mpBaseParent->paneTrans(g_MsgObject_HIO_c.mStageTitleBasePosX, g_MsgObject_HIO_c.mStageTitleBasePosY - mScaleY); for (int i = 0; i < 7; i++) { - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getRubyFont()); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x80, ""); #if VERSION != VERSION_GCN_JPN @@ -76,20 +76,20 @@ dMsgScrnPlace_c::dMsgScrnPlace_c() { } dMsgScrnPlace_c::~dMsgScrnPlace_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; - delete mpFontParent; + JKR_DELETE(mpFontParent); mpFontParent = NULL; - delete mpBaseParent; + JKR_DELETE(mpBaseParent); mpBaseParent = NULL; for (int i = 0; i < 7; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; } diff --git a/src/d/d_msg_scrn_staff.cpp b/src/d/d_msg_scrn_staff.cpp index d0cd861250..0db404862e 100644 --- a/src/d/d_msg_scrn_staff.cpp +++ b/src/d/d_msg_scrn_staff.cpp @@ -21,16 +21,16 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) { field_0xd0 = 0.0f; field_0xcc = 0.0f; - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); mpScreen->setPriority("zelda_staff_roll.blo", 0x20000, dComIfGp_getMsgArchive(6)); dPaneClass_showNullPane(mpScreen); - mpPmP_c = new CPaneMgr(mpScreen, 'ROOT', 2, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, 'ROOT', 2, NULL); mpScreen->search(MULTI_CHAR('left_n'))->hide(); mpScreen->search(MULTI_CHAR('right_n'))->hide(); for (int i = 0; i < 6; i++) { - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], NULL, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], NULL, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, ""); } @@ -52,14 +52,14 @@ dMsgScrnStaff_c::dMsgScrnStaff_c(u8 unused) { } dMsgScrnStaff_c::~dMsgScrnStaff_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; for (int i = 0; i < 6; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = 0; } diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index a95db2b969..2b6c51aab0 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -26,13 +26,13 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { field_0xe4 = dComIfGp_getSubHeap2D(7); } init(); - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(70, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_message_window_new.blo", 0x20000, dComIfGp_getMsgArchive(1)); JUT_ASSERT(77, fg != false); dPaneClass_showNullPane(mpScreen); - mpTxScreen = new J2DScreen(); + mpTxScreen = JKR_NEW J2DScreen(); JUT_ASSERT(81, mpTxScreen != NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { fg = mpTxScreen->setPriority("zelda_message_window_text_seirei.blo", 0x20000, @@ -43,10 +43,10 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } JUT_ASSERT(90, fg != false); dPaneClass_showNullPane(mpTxScreen); - mpArrow_c = new dMsgScrnArrow_c(); + mpArrow_c = JKR_NEW dMsgScrnArrow_c(); JUT_ASSERT(95, mpArrow_c != NULL); if (dComIfGp_isHeapLockFlag() != 3) { - mpSelect_c = new dMsgScrn3Select_c(); + mpSelect_c = JKR_NEW dMsgScrn3Select_c(); JUT_ASSERT(100, mpSelect_c != NULL); } else { mpSelect_c = NULL; @@ -67,7 +67,7 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { break; } - mpLight_c = new dMsgScrnLight_c(uVar22, param_2); + mpLight_c = JKR_NEW dMsgScrnLight_c(uVar22, param_2); JUT_ASSERT(123, mpLight_c != NULL); void* mpBuf = field_0xe4->alloc(0x106a, 0x20); JUT_ASSERT(126, mpBuf != NULL); @@ -87,11 +87,11 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { mpScreen->search(MULTI_CHAR('mg_null'))->move( mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.x + g_MsgObject_HIO_c.mTextPosX, mpScreen->search(MULTI_CHAR('mg_null'))->getBounds().i.y + g_MsgObject_HIO_c.mTextPosY); - mpArw_c = new CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); + mpArw_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('set_ya_n'), 0, NULL); JUT_ASSERT(147, mpArw_c != NULL); - mpMg_c[0] = new CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); + mpMg_c[0] = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(150, mpMg_c[0] != NULL); - mpMg_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); + mpMg_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_null'), 0, NULL); JUT_ASSERT(153, mpMg_c[1] != NULL); OSInitFastCast(); @@ -101,42 +101,42 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { field_0xf4 = -10.0f; #endif fukiPosCalc(param_1); - mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 3, NULL); JUT_ASSERT(176, mpPmP_c != NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY); #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptRuby() == 0) { - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3flin'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s'), 0, NULL); - mpTmr_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); + mpTmr_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f'), 0, NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { - mpTm_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s1'), 0, NULL); - mpTm_c[3] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s2'), 0, NULL); - mpTm_c[4] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s3'), 0, NULL); - mpTm_c[5] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s4'), 0, NULL); - mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s1'), 0, NULL); - mpTmr_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s2'), 0, NULL); + mpTm_c[2] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s1'), 0, NULL); + mpTm_c[3] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s2'), 0, NULL); + mpTm_c[4] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s3'), 0, NULL); + mpTm_c[5] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3f_s4'), 0, NULL); + mpTmr_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s1'), 0, NULL); + mpTmr_c[2] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s2'), 0, NULL); } else { - mpTmr_c[1] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); + mpTmr_c[1] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3f_s'), 0, NULL); } mpTxScreen->search(MULTI_CHAR('n_3line'))->hide(); mpTxScreen->search(MULTI_CHAR('n_3fline'))->show(); mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } else { - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_3line'), 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, 't3_s', 0, NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { - mpTm_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s1'), 0, NULL); + mpTm_c[2] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s1'), 0, NULL); JUT_ASSERT(189, mpTm_c[2] != NULL); - mpTm_c[3] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s2'), 0, NULL); + mpTm_c[3] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s2'), 0, NULL); JUT_ASSERT(191, mpTm_c[3] != NULL); - mpTm_c[4] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s3'), 0, NULL); + mpTm_c[4] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s3'), 0, NULL); JUT_ASSERT(193, mpTm_c[4] != NULL); - mpTm_c[5] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s4'), 0, NULL); + mpTm_c[5] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t3_s4'), 0, NULL); JUT_ASSERT(193, mpTm_c[5] != NULL); } @@ -145,19 +145,19 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { mpTxScreen->search(MULTI_CHAR('n_e4line'))->hide(); } #else - mpTm_c[0] = new CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); + mpTm_c[0] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('mg_e4lin'), 0, NULL); JUT_ASSERT(182, mpTm_c[0] != NULL); - mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); + mpTm_c[1] = JKR_NEW CPaneMgr(mpTxScreen, 't4_s', 0, NULL); JUT_ASSERT(185, mpTm_c[1] != NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { - mpTm_c[2] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s1'), 0, NULL); + mpTm_c[2] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s1'), 0, NULL); JUT_ASSERT(189, mpTm_c[2] != NULL); - mpTm_c[3] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s2'), 0, NULL); + mpTm_c[3] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s2'), 0, NULL); JUT_ASSERT(191, mpTm_c[3] != NULL); - mpTm_c[4] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s3'), 0, NULL); + mpTm_c[4] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s3'), 0, NULL); JUT_ASSERT(193, mpTm_c[4] != NULL); - mpTm_c[5] = new CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s4'), 0, NULL); + mpTm_c[5] = JKR_NEW CPaneMgr(mpTxScreen, MULTI_CHAR('t4_s4'), 0, NULL); JUT_ASSERT(193, mpTm_c[5] != NULL); } @@ -244,37 +244,37 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } dMsgScrnTalk_c::~dMsgScrnTalk_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete mpTxScreen; + JKR_DELETE(mpTxScreen); mpTxScreen = NULL; - delete mpArrow_c; + JKR_DELETE(mpArrow_c); mpArrow_c = NULL; if (mpSelect_c != NULL) { - delete mpSelect_c; + JKR_DELETE(mpSelect_c); mpSelect_c = NULL; } - delete mpLight_c; + JKR_DELETE(mpLight_c); mpLight_c = NULL; if (mCharInfoPtr != NULL) { field_0xe4->free(mCharInfoPtr); mCharInfoPtr = NULL; } - delete mpArw_c; + JKR_DELETE(mpArw_c); mpArw_c = NULL; for (int i = 0; i < 2; i++) { - delete mpMg_c[i]; + JKR_DELETE(mpMg_c[i]); mpMg_c[i] = NULL; } - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; for (int i = 0; i < 6; i++) { if (mpTm_c[i] != NULL) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; } if (mpTmr_c[i] != NULL) { - delete mpTmr_c[i]; + JKR_DELETE(mpTmr_c[i]); mpTmr_c[i] = NULL; } } diff --git a/src/d/d_msg_scrn_tree.cpp b/src/d/d_msg_scrn_tree.cpp index eb29b1e266..0dee41ef5a 100644 --- a/src/d/d_msg_scrn_tree.cpp +++ b/src/d/d_msg_scrn_tree.cpp @@ -25,7 +25,7 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { field_0x54 = param_0; } - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); mpScreen->setPriority("zelda_kanban_wood_a.blo", 0x1020000, dComIfGp_getMsgArchive(2)); dPaneClass_showNullPane(mpScreen); @@ -44,15 +44,15 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { field_0xd4->searchUpdateMaterialID(mpScreen); field_0xe0 = 0.0f; - mpPmP_c = new CPaneMgr(mpScreen, MULTI_CHAR('n_size'), 2, NULL); + mpPmP_c = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_size'), 2, NULL); mpPmP_c->getPanePtr()->setAnimation(field_0xcc); field_0xcc->setFrame(1.0f); mpPmP_c->getPanePtr()->animationTransform(); mpPmP_c->getPanePtr()->setAnimation((J2DAnmTransform*)NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxWoodScaleX, g_MsgObject_HIO_c.mBoxWoodScaleY); - field_0xc4 = new CPaneMgr(mpScreen, MULTI_CHAR('back_b'), 0, NULL); - field_0xc8 = new CPaneMgr(mpScreen, MULTI_CHAR('spot00'), 0, NULL); + field_0xc4 = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('back_b'), 0, NULL); + field_0xc8 = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('spot00'), 0, NULL); field_0xc8->getPanePtr()->setAnimation(field_0xd0); mpScreen->search(MULTI_CHAR('white_m'))->setAnimation(field_0xd4); @@ -62,7 +62,7 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { for (int i = 0; i < 3; i++) { static u64 const t_tag[3] = {MULTI_CHAR('mg_3line'), 't3_w', 't3_s'}; - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(field_0x54); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x210, ""); } @@ -75,11 +75,11 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { static u64 const t_tag[3] = {MULTI_CHAR('t3fline'), MULTI_CHAR('t3f_w'), MULTI_CHAR('t3f_s')}; static u64 const tr_tag[3] = {MULTI_CHAR('mg_3f'), MULTI_CHAR('mg_3f_w'), MULTI_CHAR('mg_3f_s')}; - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(field_0x54); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x210, ""); - mpTmr_c[i] = new CPaneMgr(mpScreen, tr_tag[i], 0, NULL); + mpTmr_c[i] = JKR_NEW CPaneMgr(mpScreen, tr_tag[i], 0, NULL); ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setFont(field_0x54); ((J2DTextBox*)mpTmr_c[i]->getPanePtr())->setString(0x210, ""); } @@ -92,7 +92,7 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { for (int i = 0; i < 3; i++) { static u64 const t_tag[3] = {MULTI_CHAR('mg_e4lin'), 'f4_w', 't4_s'}; - mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); + mpTm_c[i] = JKR_NEW CPaneMgr(mpScreen, t_tag[i], 0, NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(field_0x54); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setString(0x200, ""); } @@ -132,33 +132,33 @@ dMsgScrnTree_c::dMsgScrnTree_c(JUTFont* param_0, JKRExpHeap* param_1) { } dMsgScrnTree_c::~dMsgScrnTree_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; - delete field_0xcc; + JKR_DELETE(field_0xcc); field_0xcc = NULL; - delete field_0xd0; + JKR_DELETE(field_0xd0); field_0xd0 = NULL; - delete field_0xd4; + JKR_DELETE(field_0xd4); field_0xd4 = NULL; - delete mpPmP_c; + JKR_DELETE(mpPmP_c); mpPmP_c = NULL; - delete field_0xc4; + JKR_DELETE(field_0xc4); field_0xc4 = NULL; - delete field_0xc8; + JKR_DELETE(field_0xc8); field_0xc8 = NULL; for (int i = 0; i < 3; i++) { - delete mpTm_c[i]; + JKR_DELETE(mpTm_c[i]); mpTm_c[i] = NULL; if (mpTmr_c[i]) { - delete mpTmr_c[i]; + JKR_DELETE(mpTmr_c[i]); mpTmr_c[i] = NULL; } } diff --git a/src/d/d_msg_string.cpp b/src/d/d_msg_string.cpp index 8d4e29dd40..c180093010 100644 --- a/src/d/d_msg_string.cpp +++ b/src/d/d_msg_string.cpp @@ -6,20 +6,20 @@ dMsgString_c::dMsgString_c() { field_0x28 = 0; - mpOutFont = new COutFont_c(field_0x28); + mpOutFont = JKR_NEW COutFont_c(field_0x28); mpOutFont->createPane(); getResource(); } dMsgString_c::dMsgString_c(u8 param_0) { field_0x28 = param_0; - mpOutFont = new COutFont_c(field_0x28); + mpOutFont = JKR_NEW COutFont_c(field_0x28); mpOutFont->createPane(); getResource(); } dMsgString_c::~dMsgString_c() { - delete mpOutFont; + JKR_DELETE(mpOutFont); mpOutFont = NULL; } diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index 2e3124e6bd..77116c97ba 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -14,17 +14,17 @@ dMsgStringBase_c::dMsgStringBase_c() { field_0x20 = 0; getResource(); - mpResCont = new JMessage::TResourceContainer(); + mpResCont = JKR_NEW JMessage::TResourceContainer(); JUT_ASSERT(33, mpResCont != NULL); - mpCtrl = new jmessage_string_tControl(); + mpCtrl = JKR_NEW jmessage_string_tControl(); JUT_ASSERT(36, mpCtrl != NULL); - mpRefer = new jmessage_string_tReference(); + mpRefer = JKR_NEW jmessage_string_tReference(); JUT_ASSERT(39, mpRefer != NULL); - mpSeqProc = new jmessage_string_tSequenceProcessor(mpRefer, mpCtrl); + mpSeqProc = JKR_NEW jmessage_string_tSequenceProcessor(mpRefer, mpCtrl); JUT_ASSERT(42, mpSeqProc != NULL); - mpRenProc = new jmessage_string_tRenderingProcessor(mpRefer); + mpRenProc = JKR_NEW jmessage_string_tRenderingProcessor(mpRefer); JUT_ASSERT(45, mpRenProc != NULL); - mpParse = new JMessage::TParse(mpResCont); + mpParse = JKR_NEW JMessage::TParse(mpResCont); JUT_ASSERT(48, mpParse != NULL); mpRefer->setResourceContainer(mpResCont); mpCtrl->setSequenceProcessor(mpSeqProc); @@ -36,17 +36,17 @@ dMsgStringBase_c::dMsgStringBase_c() { dMsgStringBase_c::~dMsgStringBase_c() { mpResCont->destroyResource_all(); - delete mpResCont; + JKR_DELETE(mpResCont); mpResCont = NULL; - delete mpCtrl; + JKR_DELETE(mpCtrl); mpCtrl = NULL; - delete mpRefer; + JKR_DELETE(mpRefer); mpRefer = NULL; - delete mpSeqProc; + JKR_DELETE(mpSeqProc); mpSeqProc = NULL; - delete mpRenProc; + JKR_DELETE(mpRenProc); mpRenProc = NULL; - delete mpParse; + JKR_DELETE(mpParse); mpParse = NULL; void* iVar1 = dMeter2Info_getMsgResource(); diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 091ad29232..ff9ce0ecc2 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -103,32 +103,32 @@ dName_c::dName_c(J2DPane* pane) { } dName_c::~dName_c() { - delete stick; - delete nameIn.NameInScr; + JKR_DELETE(stick); + JKR_DELETE(nameIn.NameInScr); mDoExt_removeMesgFont(); for (int i = 0; i < 8; i++) { - delete mNameCursor[i]; + JKR_DELETE(mNameCursor[i]); } for (int i = 0; i < 65; i++) { - delete mMojiIcon[i]; + JKR_DELETE(mMojiIcon[i]); } for (int i = 0; i < 4; i++) { if (mMenuIcon[i] != NULL) { - delete mMenuIcon[i]; + JKR_DELETE(mMenuIcon[i]); } } - delete mCursorColorKey; - delete mCursorTexKey; - delete mSelIcon; + JKR_DELETE(mCursorColorKey); + JKR_DELETE(mCursorTexKey); + JKR_DELETE(mSelIcon); archive->removeResourceAll(); } void dName_c::_create() { - stick = new STControl(5, 2, 2, 1, 0.9f, 0.5f, 0, 0x800); + stick = JKR_NEW STControl(5, 2, 2, 1, 0.9f, 0.5f, 0, 0x800); stick->setFirstWaitTime(5); nameIn.font = mDoExt_getMesgFont(); g_nmHIO.field_0x4 = -1; @@ -1344,7 +1344,7 @@ void dName_c::screenSet() { MULTI_CHAR('s__n_00'), MULTI_CHAR('s__n_01'), MULTI_CHAR('s__n_02'), MULTI_CHAR('s__n_03'), MULTI_CHAR('s__n_04'), MULTI_CHAR('s__n_05'), MULTI_CHAR('s__n_06'), MULTI_CHAR('s__n_07'), }; - nameIn.NameInScr = new J2DScreen(); + nameIn.NameInScr = JKR_NEW J2DScreen(); JUT_ASSERT(0, nameIn.NameInScr != NULL); archive = dComIfGp_getNameResArchive(); @@ -1401,7 +1401,7 @@ void dName_c::screenSet() { mMenuText[i] = NULL; } else { #endif - mMenuIcon[i] = new CPaneMgr(nameIn.NameInScr, l_menu_icon_tag[i], 1, NULL); + mMenuIcon[i] = JKR_NEW CPaneMgr(nameIn.NameInScr, l_menu_icon_tag[i], 1, NULL); char buf[16]; fopMsgM_messageGet(buf, l_menu_msg[i]); @@ -1428,7 +1428,7 @@ void dName_c::screenSet() { mMojiPane = nameIn.NameInScr->search(MULTI_CHAR('moji_n')); for (u32 i = 0; i < 65; i++) { - mMojiIcon[i] = new CPaneMgr(nameIn.NameInScr, l_tagName[i], 2, NULL); + mMojiIcon[i] = JKR_NEW CPaneMgr(nameIn.NameInScr, l_tagName[i], 2, NULL); ((J2DTextBox*)mMojiIcon[i]->getPanePtr())->setFont(nameIn.font); ((J2DTextBox*)mMojiIcon[i]->getPanePtr())->setString(72, ""); mMojiText[i] = ((J2DTextBox*)mMojiIcon[i]->getPanePtr())->getStringPtr(); @@ -1436,7 +1436,7 @@ void dName_c::screenSet() { J2DPane* nameTagPane[8]; for (int i = 0; i < 8; i++) { - mNameCursor[i] = new CPaneMgrAlpha(nameIn.NameInScr, l_nameCurTagName[i], 2, NULL); + mNameCursor[i] = JKR_NEW CPaneMgrAlpha(nameIn.NameInScr, l_nameCurTagName[i], 2, NULL); nameTagPane[i] = nameIn.NameInScr->search(l_nameTagName[i]); ((J2DTextBox*)nameTagPane[i])->setFont(nameIn.font); ((J2DTextBox*)nameTagPane[i])->setString(72, ""); @@ -1481,7 +1481,7 @@ void dName_c::screenSet() { mCharColumn = 0; mCharRow = 0; - mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); + mSelIcon = JKR_NEW dSelect_cursor_c(0, 1.0f, NULL); JUT_ASSERT(0, mSelIcon != NULL); mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f); diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 21abd58cdd..e7cf70264d 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -226,7 +226,7 @@ static int dOvlpFd2_Delete(dOvlpFd2_c* i_this) { } static int dOvlpFd2_Create(void* i_this) { - new (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 8911220768..04f8bced7d 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -224,7 +224,7 @@ static int dOvlpFd3_Delete(dOvlpFd3_c* i_this) { } static int dOvlpFd3_Create(void* i_this) { - new (i_this) dOvlpFd3_c(); + JKR_NEW_ARGS (i_this) dOvlpFd3_c(); return cPhs_COMPLEATE_e; } diff --git a/src/d/d_particle.cpp b/src/d/d_particle.cpp index e1396ca94a..0b93d85bff 100644 --- a/src/d/d_particle.cpp +++ b/src/d/d_particle.cpp @@ -632,14 +632,14 @@ void dPa_modelEcallBack::setup(JPABaseEmitter* i_emitter, cXyz const* param_1, c } void dPa_modelEcallBack::create(u8 param_0) { - mModel = new model_c[param_0]; + mModel = JKR_NEW model_c[param_0]; struct_80450E9C = param_0; struct_80450E9D = 0; } void dPa_modelEcallBack::remove() { if (mModel != NULL) { - delete [] mModel; + JKR_DELETE_ARRAY(mModel); mModel = NULL; } } @@ -767,7 +767,7 @@ JPABaseEmitter* dPa_simpleEcallBack::create(JPAEmitterManager* param_0, u16 id, field_0xa = param_2; mID = id; field_0xe = 0x20; - mData = new dPa_simpleData_c[field_0xe]; + mData = JKR_NEW dPa_simpleData_c[field_0xe]; JUT_ASSERT(1747, mData != NULL); createEmitter(param_0); return mEmitter; @@ -1202,10 +1202,10 @@ void dPa_control_c::createCommon(void const* param_0) { #endif mHeap = mDoExt_createSolidHeapFromSystem(0, 0); JUT_ASSERT(2518, mHeap != NULL); - mCommonResMng = new (mHeap, 0) JPAResourceManager(param_0, mHeap); + mCommonResMng = JKR_NEW_ARGS (mHeap, 0) JPAResourceManager(param_0, mHeap); JUT_ASSERT(2521, mCommonResMng != NULL); mCommonResMng->swapTexture(mDoGph_gInf_c::getFrameBufferTimg(), "dummy"); - mEmitterMng = new (mHeap, 0) JPAEmitterManager(3000, 250, *(JKRHeap**)this, 0x13, 2); + mEmitterMng = JKR_NEW_ARGS (mHeap, 0) JPAEmitterManager(3000, 250, *(JKRHeap**)this, 0x13, 2); JUT_ASSERT(2531, mEmitterMng != NULL); mEmitterMng->entryResourceManager(mCommonResMng, 0); JKRHeap* prevHeap = mDoExt_setCurrentHeap(mHeap); @@ -1227,7 +1227,7 @@ void dPa_control_c::createCommon(void const* param_0) { void dPa_control_c::createRoomScene() { mSceneHeap = mDoExt_createSolidHeapFromGame(0, 0); JUT_ASSERT(2573, mSceneHeap != NULL); - mSceneResMng = new (mSceneHeap, 0) JPAResourceManager(m_sceneRes, mSceneHeap); + mSceneResMng = JKR_NEW_ARGS (mSceneHeap, 0) JPAResourceManager(m_sceneRes, mSceneHeap); JUT_ASSERT(2576, mSceneResMng != NULL); mSceneResMng->swapTexture(mDoGph_gInf_c::getFrameBufferTimg(), "dummy"); mEmitterMng->entryResourceManager(mSceneResMng, 1); diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 14c07106bd..07b17722df 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -32,7 +32,7 @@ dRes_info_c::dRes_info_c() { dRes_info_c::~dRes_info_c() { if (mDMCommand != NULL) { - delete mDMCommand; + JKR_DELETE(mDMCommand); mDMCommand = NULL; } else if (mArchive != NULL) { deleteArchiveRes(); @@ -139,7 +139,7 @@ static void addWarpMaterial(J3DModelData* i_modelData) { u16 textureNum = texture->getNum(); texture->addResTIMG(1, resTimg - textureNum); - J3DTexMtx* newTexMtx = new J3DTexMtx(l_texMtxInfo); + J3DTexMtx* newTexMtx = JKR_NEW J3DTexMtx(l_texMtxInfo); JUT_ASSERT(0x11D, newTexMtx != NULL); for (u16 i = 0; i < i_modelData->getMaterialNum(); i++) { @@ -280,7 +280,7 @@ J3DModelData* dRes_info_c::loaderBasicBmd(u32 i_tag, void* i_data) { material->getColorChan(0)->setLightMask(lightMask); material->change(); - J3DMaterialAnm* materialAnm = new J3DMaterialAnm(); + J3DMaterialAnm* materialAnm = JKR_NEW J3DMaterialAnm(); if (materialAnm == NULL) { return NULL; } @@ -310,7 +310,7 @@ int dRes_info_c::loadResource() { JUT_ASSERT(0x2C5, mRes == NULL); s32 countFile = mArchive->countFile(); - mRes = new void*[countFile]; + mRes = JKR_NEW void*[countFile]; if (mRes == NULL) { OSReport_Error("<%s.arc> setRes: res pointer buffer nothing !!\n", mArchiveName); return -1; @@ -379,7 +379,7 @@ int dRes_info_c::loadResource() { J3DMaterial* material_p = modelData->getMaterialNodePointer(k); material_p->change(); - J3DMaterialAnm* materialAnm = new J3DMaterialAnm(); + J3DMaterialAnm* materialAnm = JKR_NEW J3DMaterialAnm(); if (materialAnm == NULL) { return -1; } @@ -454,7 +454,7 @@ int dRes_info_c::loadResource() { bas = NULL; } - mDoExt_transAnmBas* transAnmBas = new mDoExt_transAnmBas(bas); + mDoExt_transAnmBas* transAnmBas = JKR_NEW mDoExt_transAnmBas(bas); if (transAnmBas == NULL) { return -1; } @@ -550,7 +550,7 @@ int dRes_info_c::setRes() { mArchive = mDMCommand->getArchive(); heap = mDMCommand->getHeap(); - delete mDMCommand; + JKR_DELETE(mDMCommand); mDMCommand = NULL; if (mArchive == NULL) { @@ -897,7 +897,7 @@ int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32 return 0; } - JKRMemArchive* memArchive = new JKRMemArchive(i_archiveRes, i_bufferSize, JKRMEMBREAK_FLAG_UNKNOWN0); + JKRMemArchive* memArchive = JKR_NEW JKRMemArchive(i_archiveRes, i_bufferSize, JKRMEMBREAK_FLAG_UNKNOWN0); if (memArchive == NULL || !memArchive->isMounted()) { return 0; } diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index 0291ac5463..6665dd8578 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -58,12 +58,12 @@ static execFunc l_execFunc[16] = { dLog_HIO_c::dLog_HIO_c() {} void dScnLogo_c::preLoad_dyl_create() { - m_preLoad_dylPhase = new request_of_phase_process_class[14]; + m_preLoad_dylPhase = JKR_NEW request_of_phase_process_class[14]; memset(m_preLoad_dylPhase, 0, sizeof(request_of_phase_process_class) * 14); } void dScnLogo_c::preLoad_dyl_remove() { - delete[] m_preLoad_dylPhase; + JKR_DELETE_ARRAY(m_preLoad_dylPhase); } static s16 const l_preLoad_dylKeyTbl[14] = { @@ -428,14 +428,14 @@ dScnLogo_c::~dScnLogo_c() { mDoRst_reset(0, 0x80000000, 0); } - delete mNintendoLogo; - delete mWarning; - delete mWarningStart; - delete mDolbyLogo; - delete mProgressiveChoice; - delete mProgressiveYes; - delete mProgressiveNo; - delete mProgressiveSel; + JKR_DELETE(mNintendoLogo); + JKR_DELETE(mWarning); + JKR_DELETE(mWarningStart); + JKR_DELETE(mDolbyLogo); + JKR_DELETE(mProgressiveChoice); + JKR_DELETE(mProgressiveYes); + JKR_DELETE(mProgressiveNo); + JKR_DELETE(mProgressiveSel); #if VERSION == VERSION_GCN_PAL mpPalLogoResCommand->getArchive()->removeResourceAll(); @@ -653,7 +653,7 @@ int dScnLogo_c::create() { void dScnLogo_c::logoInitGC() { ResTIMG* nintendoImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 4); - mNintendoLogo = new dDlst_2D_c(nintendoImg, 117, 154, 376, 104, 255); + mNintendoLogo = JKR_NEW dDlst_2D_c(nintendoImg, 117, 154, 376, 104, 255); #if VERSION == VERSION_GCN_JPN mNintendoLogo->getPicture()->setWhite(JUtility::TColor(0, 70, 255, 255)); #else @@ -661,7 +661,7 @@ void dScnLogo_c::logoInitGC() { #endif ResTIMG* dolbyImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 3); - mDolbyLogo = new dDlst_2D_c(dolbyImg, 189, 150, 232, 112, 255); + mDolbyLogo = JKR_NEW dDlst_2D_c(dolbyImg, 189, 150, 232, 112, 255); #if VERSION == VERSION_GCN_PAL u8 language = getPalLanguage(); @@ -726,46 +726,46 @@ void dScnLogo_c::logoInitGC() { }; ResTIMG* warningImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', warning[language]); - mWarning = new dDlst_2D_c(warningImg, 0, 0, FB_WIDTH, FB_HEIGHT, 255); + mWarning = JKR_NEW dDlst_2D_c(warningImg, 0, 0, FB_WIDTH, FB_HEIGHT, 255); ResTIMG* warnStartImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', warningPs[language]); - mWarningStart = new dDlst_2D_c(warnStartImg, 0, 359, FB_WIDTH, 48, 255); + mWarningStart = JKR_NEW dDlst_2D_c(warnStartImg, 0, 359, FB_WIDTH, 48, 255); ResTIMG* progChoiceImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', choice[language]); - mProgressiveChoice = new dDlst_2D_c(progChoiceImg, 113, 143, 416, 210, 255); + mProgressiveChoice = JKR_NEW dDlst_2D_c(progChoiceImg, 113, 143, 416, 210, 255); ResTIMG* progYesImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', yes[language]); - mProgressiveYes = new dDlst_2D_c(progYesImg, 121, 352, 200, 72, 255); + mProgressiveYes = JKR_NEW dDlst_2D_c(progYesImg, 121, 352, 200, 72, 255); mProgressiveYes->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); ResTIMG* progNoImg = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', no[language]); - mProgressiveNo = new dDlst_2D_c(progNoImg, 320, 352, 200, 72, 255); + mProgressiveNo = JKR_NEW dDlst_2D_c(progNoImg, 320, 352, 200, 72, 255); mProgressiveNo->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); mProgressivePro = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', prog[language]); mProgressiveInter = (ResTIMG*)mpPalLogoResCommand->getArchive()->getResource('DAT ', intr[language]); - mProgressiveSel = new dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); + mProgressiveSel = JKR_NEW dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); #else ResTIMG* warningImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 10); - mWarning = new dDlst_2D_c(warningImg, 0, 0, FB_WIDTH, FB_HEIGHT, 255); + mWarning = JKR_NEW dDlst_2D_c(warningImg, 0, 0, FB_WIDTH, FB_HEIGHT, 255); ResTIMG* warnStartImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 11); - mWarningStart = new dDlst_2D_c(warnStartImg, 0, 359, FB_WIDTH, 48, 255); + mWarningStart = JKR_NEW dDlst_2D_c(warnStartImg, 0, 359, FB_WIDTH, 48, 255); ResTIMG* progChoiceImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 5); - mProgressiveChoice = new dDlst_2D_c(progChoiceImg, 113, 281, 416, 72, 255); + mProgressiveChoice = JKR_NEW dDlst_2D_c(progChoiceImg, 113, 281, 416, 72, 255); ResTIMG* progYesImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 9); - mProgressiveYes = new dDlst_2D_c(progYesImg, 211, 372, 80, 32, 255); + mProgressiveYes = JKR_NEW dDlst_2D_c(progYesImg, 211, 372, 80, 32, 255); mProgressiveYes->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); ResTIMG* progNoImg = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 7); - mProgressiveNo = new dDlst_2D_c(progNoImg, 350, 372, 80, 32, 255); + mProgressiveNo = JKR_NEW dDlst_2D_c(progNoImg, 350, 372, 80, 32, 255); mProgressiveNo->getPicture()->setWhite(JUtility::TColor(160, 160, 160, 255)); mProgressivePro = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 8); mProgressiveInter = (ResTIMG*)dComIfG_getObjectRes(LOGO_ARC, 6); - mProgressiveSel = new dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); + mProgressiveSel = JKR_NEW dDlst_2D_c(mProgressivePro, 153, 309, 336, 88, 255); #endif } @@ -872,7 +872,7 @@ void dScnLogo_c::dvdDataLoad() { static int dScnLogo_Create(scene_class* i_this) { printf("[DIAG] dScnLogo_Create: entry i_this=%p\n", i_this); fflush(stdout); - return (new (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_menu.cpp b/src/d/d_s_menu.cpp index bc7414f8e4..0371e3db4b 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -1472,7 +1472,7 @@ int dScnMenu_Delete(dScnMenu_c* i_this) { "dScnMenu_Delete():\n"; JUTDbPrint::getManager()->changeFont(JFWSystem::getSystemFont()); - delete i_this->font; + JKR_DELETE(i_this->font); JKRFree(i_this->info); JKRFree(i_this->fontRes); @@ -1582,7 +1582,7 @@ int phase_2(dScnMenu_c* i_this) { } if (l_groupPoint == NULL) { - l_groupPoint = new s8[menu_info->num]; + l_groupPoint = JKR_NEW s8[menu_info->num]; JUT_ASSERT(3252, l_groupPoint != NULL); if (mDoExt_getSafeZeldaHeapSize() >= 0) { @@ -1610,15 +1610,15 @@ int phase_2(dScnMenu_c* i_this) { category_info->data = (menu_category_data_class*)((uintptr_t)category_info->data + (uintptr_t)menu_info); i_this->current_category = menu_info->stage_data[l_cursolID].field_0x43; - delete i_this->command; + JKR_DELETE(i_this->command); u8 sp8 = search(menu_info); i_this->fontRes = (ResFONT*)i_this->fontCommand->getMemAddress(); - delete i_this->fontCommand; + JKR_DELETE(i_this->fontCommand); if (i_this->fontRes != NULL) { - i_this->font = new myFontClass(i_this->fontRes, NULL); + i_this->font = JKR_NEW myFontClass(i_this->fontRes, NULL); if (i_this->font != NULL) { JUTDbPrint::getManager()->changeFont(i_this->font); } diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index a59d7d2d06..d252d3eda9 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -71,7 +71,7 @@ s32 dScnName_c::create() { field_0x1d0 = (JKRExpHeap*)mDoExt_setCurrentHeap(mHeap); dRes_info_c* res = dComIfG_getObjectResInfo("fileSel"); - dFs_c = new dFile_select_c(res->getArchive()); + dFs_c = JKR_NEW dFile_select_c(res->getArchive()); #if VERSION == VERSION_GCN_PAL for (int i = 0; i < 5; i++); @@ -84,7 +84,7 @@ s32 dScnName_c::create() { dComIfGs_setNoFile(0); } - mBrightCheck = new dBrightCheck_c(res->getArchive()); + mBrightCheck = JKR_NEW dBrightCheck_c(res->getArchive()); field_0x420 = 0; g_snHIO.field_0x4 = -1; @@ -191,8 +191,8 @@ s32 dScnName_c::draw() { } dScnName_c::~dScnName_c() { - delete dFs_c; - delete mBrightCheck; + JKR_DELETE(dFs_c); + JKR_DELETE(mBrightCheck); dComIfG_deleteObjectResMain("fileSel"); mHeap->destroy(); @@ -318,7 +318,7 @@ static int dScnName_Delete(dScnName_c* i_this) { } static int dScnName_Create(scene_class* i_this) { - new (i_this) dScnName_c(); + JKR_NEW_ARGS (i_this) dScnName_c(); return static_cast(i_this)->create(); } diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index 5e6e97467d..7c80cdbca8 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -624,7 +624,7 @@ static int phase_4(dScnPly_c* i_this) { mDoGph_gInf_c::setTickRate((OS_BUS_CLOCK / 4) / 30); g_envHIO.field_0x4 = -1; g_save_bit_HIO.field_0x4 = -1; - new (dComIfGp_getAttention()) dAttention_c(dComIfGp_getPlayer(0), 0); + JKR_NEW_ARGS (dComIfGp_getAttention()) dAttention_c(dComIfGp_getPlayer(0), 0); dComIfGp_getVibration().Init(); daYkgr_c::init(); diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index cc46c06654..d19eba8ef0 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -394,7 +394,7 @@ static int phase_2(room_of_scene_class* i_this) { #if DEBUG void* mpat = dComIfGp_roomControl_getStatusRoomDt(roomNo)->getMapPath(); if (mpat != NULL) { - dBgp_c* bgp = new dBgp_c(); + dBgp_c* bgp = JKR_NEW dBgp_c(); JUT_ASSERT(786, bgp != NULL); bgp->create(roomNo, mpat); diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index c81267f174..3e2c18131d 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -42,13 +42,13 @@ dScope_c::dScope_c(u8 param_0) : field_0x58(-1), field_0x5c(-1) { } } - mpWipeTex = new J2DPicture(mp_image); + mpWipeTex = JKR_NEW J2DPicture(mp_image); mpWipeTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); mWidth = mp_image->width; mHeight = mp_image->height; mp_image = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); - mpBlackTex = new J2DPicture(mp_image); + mpBlackTex = JKR_NEW J2DPicture(mp_image); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); mScale = 3.0f; mAlpha = 0.0f; @@ -61,45 +61,45 @@ dScope_c::dScope_c(u8 param_0) : field_0x58(-1), field_0x5c(-1) { dScope_c::~dScope_c() { if (mHawkEyeScrn != NULL) { - delete mHawkEyeScrn; + JKR_DELETE(mHawkEyeScrn); mHawkEyeScrn = NULL; } if (mHawkEyeRootPane != NULL) { - delete mHawkEyeRootPane; + JKR_DELETE(mHawkEyeRootPane); mHawkEyeRootPane = NULL; } for (int i = 0; i < 3; i++) { if (mHawkEyePanes[i] != NULL) { - delete mHawkEyePanes[i]; + JKR_DELETE(mHawkEyePanes[i]); mHawkEyePanes[i] = NULL; } } if (mZoomInOutScrn != NULL) { - delete mZoomInOutScrn; + JKR_DELETE(mZoomInOutScrn); mZoomInOutScrn = NULL; } if (mZoomInOutRootPane != NULL) { - delete mZoomInOutRootPane; + JKR_DELETE(mZoomInOutRootPane); mZoomInOutRootPane = NULL; } for (int i = 0; i < 3; i++) { for (int j = 0; j < 2; j++) { if (mZoomInOutPanes[i][j] != NULL) { - delete mZoomInOutPanes[i][j]; + JKR_DELETE(mZoomInOutPanes[i][j]); mZoomInOutPanes[i][j] = NULL; } } } - delete mpWipeTex; + JKR_DELETE(mpWipeTex); mpWipeTex = NULL; - delete mpBlackTex; + JKR_DELETE(mpBlackTex); mpBlackTex = NULL; dMeter2Info_setScopeZoomPointer(0); diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index cd2a5c0af2..c5489519d7 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -53,7 +53,7 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) "", }; - mpCursorHIO = new dSelect_cursorHIO_c(); + mpCursorHIO = JKR_NEW dSelect_cursorHIO_c(); mpCursorHIO->field_0x4 = -1; mNameIdx = 0; field_0xb6 = param_0; @@ -91,7 +91,7 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) param_2 = dComIfGp_getMain2DArchive(); } - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); mpScreen->setPriority(blo_name[mNameIdx], 0x20000, param_2); dPaneClass_showNullPane(mpScreen); @@ -101,13 +101,13 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) switch(mNameIdx) { case 0: { - mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpPaneMgr = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpPaneMgr->hide(); mpPaneMgr->setAlpha(0); static u64 const corner_tag[4] = {MULTI_CHAR('l_u_null'), MULTI_CHAR('l_d_null'), MULTI_CHAR('r_u_null'), MULTI_CHAR('r_d_null')}; for (int i = 0; i< 4; i++) { - field_0x1C[i] = new CPaneMgr(mpScreen, corner_tag[i], 0, NULL); + field_0x1C[i] = JKR_NEW CPaneMgr(mpScreen, corner_tag[i], 0, NULL); field_0x94[i] = mpScreen->search(corner_tag[i])->getTranslateX(); field_0xa4[i] = mpScreen->search(corner_tag[i])->getTranslateY(); field_0x74[i] = field_0x94[i]; @@ -119,16 +119,16 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) field_0x18 = NULL; } break; case 1: - mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); + mpPaneMgr = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all'), 2, NULL); mpPaneMgr->hide(); mpPaneMgr->setAlpha(0); mpPaneMgr->scale(param_1, param_1); - field_0x14 = new CPaneMgr(mpScreen, MULTI_CHAR('sel_po00'), 0, NULL); + field_0x14 = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('sel_po00'), 0, NULL); field_0x14->hide(); - field_0x18 = new CPaneMgr(mpScreen, MULTI_CHAR('n_all2'), 2, NULL); + field_0x18 = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('n_all2'), 2, NULL); break; case 2: - mpPaneMgr = new CPaneMgr(mpScreen, 'Null', 2, NULL); + mpPaneMgr = JKR_NEW CPaneMgr(mpScreen, 'Null', 2, NULL); mpPaneMgr->hide(); mpPaneMgr->setAlpha(0); mpPaneMgr->scale(param_1, param_1); @@ -136,7 +136,7 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) field_0x18 = NULL; break; case 3: - mpPaneMgr = new CPaneMgr(mpScreen, MULTI_CHAR('batsu'), 2, NULL); + mpPaneMgr = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('batsu'), 2, NULL); mpPaneMgr->hide(); mpPaneMgr->setAlpha(0); mpPaneMgr->scale(param_1, param_1); @@ -197,46 +197,46 @@ dSelect_cursor_c::dSelect_cursor_c(u8 param_0, f32 param_1, JKRArchive* param_2) dSelect_cursor_c::~dSelect_cursor_c() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; if (mpPaneMgr) { - delete mpPaneMgr; + JKR_DELETE(mpPaneMgr); mpPaneMgr = NULL; } for (int i = 0; i < 4; i++) { if (field_0x1C[i]) { - delete field_0x1C[i]; + JKR_DELETE(field_0x1C[i]); field_0x1C[i] = NULL; } } if (field_0x14) { - delete field_0x14; + JKR_DELETE(field_0x14); field_0x14 = NULL; } if (field_0x18) { - delete field_0x18; + JKR_DELETE(field_0x18); field_0x18 = NULL; } if (mpSelectIcon) { - delete mpSelectIcon; + JKR_DELETE(mpSelectIcon); mpSelectIcon = NULL; } if (field_0x30) { - delete field_0x30; + JKR_DELETE(field_0x30); field_0x30 = NULL; } for (int i = 0; i < 2; i++) { if (field_0x34[i]) { - delete field_0x34[i]; + JKR_DELETE(field_0x34[i]); field_0x34[i] = NULL; } } if (field_0x2C) { - delete field_0x2C; + JKR_DELETE(field_0x2C); field_0x2C = NULL; } if (mpCursorHIO) { - delete mpCursorHIO; + JKR_DELETE(mpCursorHIO); mpCursorHIO = NULL; } } diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index 155e010da1..5d939ef123 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -122,11 +122,11 @@ void dShopSystem_c::initShopSystem() { dShopSystem_camera_count = 0; if (mpStick == NULL) { - mpStick = new STControl(); + mpStick = JKR_NEW STControl(); } if (mpDrawCursor == NULL) { - mpDrawCursor = new dSelect_cursor_c(1, 1.0f, NULL); + mpDrawCursor = JKR_NEW dSelect_cursor_c(1, 1.0f, NULL); mpDrawCursor->setParam(1.0f, 1.0f, 0.1f, 0.7f, 0.7f); } @@ -1387,12 +1387,12 @@ void dShopSystem_c::setSoldOutItemHide() { void dShopSystem_c::deleteObject() { if (mpStick != NULL) { - delete mpStick; + JKR_DELETE(mpStick); mpStick = NULL; } if (mpDrawCursor != NULL) { - delete mpDrawCursor; + JKR_DELETE(mpDrawCursor); mpDrawCursor = NULL; } } diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index 22d3b156fb..a8ffc08c60 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -426,7 +426,7 @@ bool dStage_roomControl_c::resetArchiveBank(int i_bank) { void dStage_roomControl_c::roomDzs_c::create(u8 i_num) { JUT_ASSERT(1112, !m_num && 0 < i_num && i_num < 64); - m_dzs = new (mDoExt_getArchiveHeap(), -4) void*[i_num]; + m_dzs = JKR_NEW_ARGS (mDoExt_getArchiveHeap(), -4) void*[i_num]; JUT_ASSERT(1114, m_dzs != NULL); if (m_dzs != NULL) { @@ -448,7 +448,7 @@ void dStage_roomControl_c::roomDzs_c::remove() { } dzs++; } - delete[] m_dzs; + JKR_DELETE_ARRAY(m_dzs); m_num = 0; } } diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index df66f37589..3cd0047bcc 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -43,7 +43,7 @@ int dTimer_c::_create() { if (mp_heap != NULL) { mp_heap->getTotalFreeSize(); - mp_tm_scrn = new dDlst_TimerScrnDraw_c(); + mp_tm_scrn = JKR_NEW dDlst_TimerScrnDraw_c(); JUT_ASSERT(0, mp_tm_scrn != NULL); if (appen->timer_mode == 10) { @@ -298,7 +298,7 @@ int dTimer_c::_delete() { mp_heap->getTotalFreeSize(); mp_tm_scrn->deleteScreen(); - delete mp_tm_scrn; + JKR_DELETE(mp_tm_scrn); mp_tm_scrn = NULL; fopMsgM_destroyExpHeap(mp_heap); @@ -591,7 +591,7 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { setShowType(3); - mpGetInScreen = new J2DScreen(); + mpGetInScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpGetInScreen != NULL); bool fg = mpGetInScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpArchive); @@ -602,13 +602,13 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { mpGetInBck = (J2DAnmTransform*)J2DAnmLoaderDataBase::load( JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpArchive)); - mpGetInParent = new CPaneMgr(mpGetInScreen, MULTI_CHAR('get_in_n'), 2, NULL); + mpGetInParent = JKR_NEW CPaneMgr(mpGetInScreen, MULTI_CHAR('get_in_n'), 2, NULL); JUT_ASSERT(0, mpGetInParent != NULL); - mpGetInRoot = new CPaneMgr(mpGetInScreen, MULTI_CHAR('n_all'), 0, NULL); + mpGetInRoot = JKR_NEW CPaneMgr(mpGetInScreen, MULTI_CHAR('n_all'), 0, NULL); JUT_ASSERT(0, mpGetInRoot != NULL); - mpGetInText = new CPaneMgr(mpGetInScreen, MULTI_CHAR('get_in'), 0, NULL); + mpGetInText = JKR_NEW CPaneMgr(mpGetInScreen, MULTI_CHAR('get_in'), 0, NULL); JUT_ASSERT(0, mpGetInText != NULL); static_cast(mpGetInScreen->search(MULTI_CHAR('get_in_s')))->setFont(mDoExt_getMesgFont()); @@ -630,7 +630,7 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { } void dDlst_TimerScrnDraw_c::setScreenBase() { - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image_cow_game.blo", 0x20000, mpArchive); @@ -639,15 +639,15 @@ void dDlst_TimerScrnDraw_c::setScreenBase() { mpParent = NULL; - mpCowParent = new CPaneMgr(mpScreen, MULTI_CHAR('cow_n'), 2, NULL); + mpCowParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('cow_n'), 2, NULL); JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); - mpTimeParent = new CPaneMgr(mpScreen, MULTI_CHAR('time_n'), 2, NULL); + mpTimeParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('time_n'), 2, NULL); JUT_ASSERT(0, mpTimeParent != NULL); mpTimeParent->setAlphaRate(0.0f); - mpImageParent = new CPaneMgr(mpScreen, MULTI_CHAR('cow_i_n'), 2, NULL); + mpImageParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('cow_i_n'), 2, NULL); JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); @@ -676,23 +676,23 @@ void dDlst_TimerScrnDraw_c::setScreenBase() { } void dDlst_TimerScrnDraw_c::setScreenBoatRace() { - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image_zora_kawakudari.blo", 0x20000, mpArchive); JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); - mpParent = new CPaneMgr(mpScreen, MULTI_CHAR('ta_co_n'), 2, NULL); + mpParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('ta_co_n'), 2, NULL); JUT_ASSERT(0, mpParent != NULL); - mpCowParent = new CPaneMgr(mpScreen, MULTI_CHAR('num_n'), 2, NULL); + mpCowParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('num_n'), 2, NULL); JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; - mpImageParent = new CPaneMgr(mpScreen, MULTI_CHAR('target_n'), 2, NULL); + mpImageParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('target_n'), 2, NULL); JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); @@ -718,7 +718,7 @@ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { } void dDlst_TimerScrnDraw_c::setScreenRider() { - mpScreen = new J2DScreen(); + mpScreen = JKR_NEW J2DScreen(); JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image_rider.blo", 0x20000, mpArchive); @@ -727,13 +727,13 @@ void dDlst_TimerScrnDraw_c::setScreenRider() { mpParent = NULL; - mpCowParent = new CPaneMgr(mpScreen, MULTI_CHAR('num_n'), 2, NULL); + mpCowParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('num_n'), 2, NULL); JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; - mpImageParent = new CPaneMgr(mpScreen, MULTI_CHAR('rid_i_n'), 2, NULL); + mpImageParent = JKR_NEW CPaneMgr(mpScreen, MULTI_CHAR('rid_i_n'), 2, NULL); JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); @@ -781,42 +781,42 @@ void dDlst_TimerScrnDraw_c::hideDenominator() { } void dDlst_TimerScrnDraw_c::deleteScreen() { - delete mpScreen; + JKR_DELETE(mpScreen); mpScreen = NULL; if (mpParent != NULL) { - delete mpParent; + JKR_DELETE(mpParent); mpParent = NULL; } if (mpTimeParent != NULL) { - delete mpTimeParent; + JKR_DELETE(mpTimeParent); mpTimeParent = NULL; } if (mpCowParent != NULL) { - delete mpCowParent; + JKR_DELETE(mpCowParent); mpCowParent = NULL; } if (mpImageParent != NULL) { - delete mpImageParent; + JKR_DELETE(mpImageParent); mpImageParent = NULL; } - delete mpGetInScreen; + JKR_DELETE(mpGetInScreen); mpGetInScreen = NULL; - delete mpGetInBck; + JKR_DELETE(mpGetInBck); mpGetInBck = NULL; - delete mpGetInParent; + JKR_DELETE(mpGetInParent); mpGetInParent = NULL; - delete mpGetInRoot; + JKR_DELETE(mpGetInRoot); mpGetInRoot = NULL; - delete mpGetInText; + JKR_DELETE(mpGetInText); mpGetInText = NULL; } diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index b6083b6294..11b7be86f3 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -11,7 +11,7 @@ static bool data_80450680 = true; dTres_c::typeGroupData_c* dTres_c::mTypeGroupData; int dTres_c::createWork() { - mTypeGroupData = new dTres_c::typeGroupData_c[0x40]; + mTypeGroupData = JKR_NEW dTres_c::typeGroupData_c[0x40]; return 1; } diff --git a/src/dolphin/os/OSMutex.cpp b/src/dolphin/os/OSMutex.cpp index 9ec3197cb1..55d8ccb52f 100644 --- a/src/dolphin/os/OSMutex.cpp +++ b/src/dolphin/os/OSMutex.cpp @@ -12,6 +12,8 @@ #include #include +#include "JSystem/JKernel/JKRHeap.h" + // ============================================================================ // Malloc-based allocator to bypass JKRHeap operator new/delete // Without this, side-table allocations call operator new -> JKRHeap::alloc @@ -45,7 +47,7 @@ template std::unique_ptr> make_malloc_unique(Args&&... args) { void* mem = std::malloc(sizeof(T)); if (!mem) throw std::bad_alloc(); - T* obj = new (mem) T(std::forward(args)...); + T* obj = JKR_NEW_ARGS (mem) T(std::forward(args)...); return std::unique_ptr>(obj); } diff --git a/src/dolphin/os/OSThread.cpp b/src/dolphin/os/OSThread.cpp index 96ef2bcfff..2d19139272 100644 --- a/src/dolphin/os/OSThread.cpp +++ b/src/dolphin/os/OSThread.cpp @@ -16,6 +16,8 @@ #include #include +#include "JSystem/JKernel/JKRHeap.h" + // ============================================================================ // Malloc-based allocator to bypass JKRHeap operator new/delete // ============================================================================ @@ -47,7 +49,7 @@ template std::unique_ptr> make_malloc_unique(Args&&... args) { void* mem = std::malloc(sizeof(T)); if (!mem) throw std::bad_alloc(); - T* obj = new (mem) T(std::forward(args)...); + T* obj = JKR_NEW_ARGS (mem) T(std::forward(args)...); return std::unique_ptr>(obj); } diff --git a/src/f_ap/f_ap_game.cpp b/src/f_ap/f_ap_game.cpp index 2db1399d2b..b0b9fba898 100644 --- a/src/f_ap/f_ap_game.cpp +++ b/src/f_ap/f_ap_game.cpp @@ -655,7 +655,7 @@ void fapGm_HIO_c::listenPropertyEvent(const JORPropertyEvent* property) { mDoExt_destroySolidHeap(heap); JKRFree(model_buffer); - delete[] bdlData; + JKR_DELETE_ARRAY(bdlData); } } break; diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index dfc784a8eb..c8a8566313 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -18,17 +18,17 @@ interface_of_controller_pad mDoCPd_c::m_debugCpadInfo[4]; void mDoCPd_c::create() { #if PLATFORM_GCN || PLATFORM_SHIELD - m_gamePad[0] = new JUTGamePad(JUTGamePad::EPort1); + m_gamePad[0] = JKR_NEW JUTGamePad(JUTGamePad::EPort1); #endif if (DEBUG || mDoMain::developmentMode != 0) { #if PLATFORM_WII - m_gamePad[0] = new JUTGamePad(JUTGamePad::EPort1); + m_gamePad[0] = JKR_NEW JUTGamePad(JUTGamePad::EPort1); #endif - m_gamePad[1] = new JUTGamePad(JUTGamePad::EPort2); - m_gamePad[2] = new JUTGamePad(JUTGamePad::EPort3); - m_gamePad[3] = new JUTGamePad(JUTGamePad::EPort4); + m_gamePad[1] = JKR_NEW JUTGamePad(JUTGamePad::EPort2); + m_gamePad[2] = JKR_NEW JUTGamePad(JUTGamePad::EPort3); + m_gamePad[3] = JKR_NEW JUTGamePad(JUTGamePad::EPort4); } else { #if PLATFORM_WII m_gamePad[0] = NULL; diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index 999e01bb38..cc40ed4475 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -187,7 +187,7 @@ mDoDvdThd_callback_c::mDoDvdThd_callback_c(mDoDvdThd_callback_func pFunc, void* mDoDvdThd_callback_c* mDoDvdThd_callback_c::create(mDoDvdThd_callback_func pFunc, void* pData) { mDoDvdThd_callback_c* callCmd = - new (mDoExt_getCommandHeap(), -4) mDoDvdThd_callback_c(pFunc, pData); + JKR_NEW_ARGS (mDoExt_getCommandHeap(), -4) mDoDvdThd_callback_c(pFunc, pData); if (callCmd != NULL) { mDoDvdThd::l_param.addition(callCmd); if (mDoDvdThd::DVDLogoMode) { @@ -218,12 +218,12 @@ mDoDvdThd_mountArchive_c::mDoDvdThd_mountArchive_c(u8 param_0) { mDoDvdThd_mountArchive_c* mDoDvdThd_mountArchive_c::create(char const* pArchivePath, u8 mountDirection, JKRHeap* pHeap) { mDoDvdThd_mountArchive_c* mountArcCmd = - new (mDoExt_getCommandHeap(), -4) mDoDvdThd_mountArchive_c(mountDirection); + JKR_NEW_ARGS (mDoExt_getCommandHeap(), -4) mDoDvdThd_mountArchive_c(mountDirection); if (mountArcCmd != NULL) { mountArcCmd->mEntryNumber = my_DVDConvertPathToEntrynum(pArchivePath); if (mountArcCmd->mEntryNumber == -1) { mountArcCmd->mIsDone = true; - delete mountArcCmd; + JKR_DELETE(mountArcCmd); mountArcCmd = NULL; } else { mountArcCmd->mHeap = pHeap; @@ -262,10 +262,10 @@ s32 mDoDvdThd_mountArchive_c::execute() { #endif if (mMountDirection == 0) { memArchive = - new (heap, 0) JKRMemArchive(mEntryNumber, JKRArchive::MOUNT_DIRECTION_HEAD); + JKR_NEW_ARGS (heap, 0) JKRMemArchive(mEntryNumber, JKRArchive::MOUNT_DIRECTION_HEAD); } else { memArchive = - new (heap, -4) JKRMemArchive(mEntryNumber, JKRArchive::MOUNT_DIRECTION_TAIL); + JKR_NEW_ARGS (heap, -4) JKRMemArchive(mEntryNumber, JKRArchive::MOUNT_DIRECTION_TAIL); } if (memArchive != NULL && memArchive->isMounted()) { mArchive = memArchive; @@ -281,7 +281,7 @@ s32 mDoDvdThd_mountArchive_c::execute() { OSReport_Error("mDoDvdThd_mountArchive_c::execute マウント失敗\n"); OS_REPORT_ERROR("Name = %s\n", mDoDvdHack::ConvertEntrynumToName(mEntryNumber)); if (memArchive) { - delete memArchive; + JKR_DELETE(memArchive); } memArchive = NULL; #if PLATFORM_GCN @@ -326,9 +326,9 @@ s32 mDoDvdThd_mountAramArchive_c::execute() { BOOL result = FALSE; if (!mArchive) { if (mMountDirection == 0) { - mArchive = new (heap, 0x20) JKRAramArchive(); + mArchive = JKR_NEW_ARGS (heap, 0x20) JKRAramArchive(); } else { - mArchive = new (heap, -0x20) JKRAramArchive(); + mArchive = JKR_NEW_ARGS (heap, -0x20) JKRAramArchive(); } #if DEBUG if (mDoDvdThd::verbose) { @@ -373,12 +373,12 @@ mDoDvdThd_mountXArchive_c* mDoDvdThd_mountXArchive_c::create(char const* pArchiv JKRArchive::EMountMode mountMode, JKRHeap* pHeap) { mDoDvdThd_mountXArchive_c* mountXArcCmd = - new (mDoExt_getCommandHeap(), -4) mDoDvdThd_mountXArchive_c(mountDirection, mountMode); + JKR_NEW_ARGS (mDoExt_getCommandHeap(), -4) mDoDvdThd_mountXArchive_c(mountDirection, mountMode); if (mountXArcCmd != NULL) { mountXArcCmd->mEntryNum = my_DVDConvertPathToEntrynum(pArchivePath); if (mountXArcCmd->mEntryNum == -1) { mountXArcCmd->mIsDone = true; - delete mountXArcCmd; + JKR_DELETE(mountXArcCmd); mountXArcCmd = NULL; } else { mountXArcCmd->mHeap = pHeap; @@ -457,12 +457,12 @@ mDoDvdThd_toMainRam_c::mDoDvdThd_toMainRam_c(u8 param_0) { mDoDvdThd_toMainRam_c* mDoDvdThd_toMainRam_c::create(char const* pArchivePath, u8 mountDirection, JKRHeap* pHeap) { mDoDvdThd_toMainRam_c* toMainRAMCmd = - new (mDoExt_getCommandHeap(), -4) mDoDvdThd_toMainRam_c(mountDirection); + JKR_NEW_ARGS (mDoExt_getCommandHeap(), -4) mDoDvdThd_toMainRam_c(mountDirection); if (toMainRAMCmd != NULL) { toMainRAMCmd->mEntryNum = my_DVDConvertPathToEntrynum(pArchivePath); if (toMainRAMCmd->mEntryNum == -1) { toMainRAMCmd->mIsDone = true; - delete toMainRAMCmd; + JKR_DELETE(toMainRAMCmd); toMainRAMCmd = NULL; } else { toMainRAMCmd->mHeap = pHeap; diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index f987697d28..0fa716d117 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -210,7 +210,7 @@ int mDoExt_bckAnm::init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_ra JUT_ASSERT(614, (i_modify || isCurrentSolidHeap()) && i_bck != NULL); mAnmTransform = i_bck; if (!i_modify) { - mAnm = new J3DMtxCalcAnimation, J3DMtxCalcJ3DSysInitMaya>(mAnmTransform); + mAnm = JKR_NEW J3DMtxCalcAnimation, J3DMtxCalcJ3DSysInitMaya>(mAnmTransform); if (!mAnm) { return 0; } @@ -422,8 +422,8 @@ static void dummy2() { J3DTevSwapModeTable tevSwapModeTable; J3DIndTexOrder indTexOrder; - J3DIndTexMtx* indTexMtx = new J3DIndTexMtx(); - J3DIndTexCoordScale* indTexCoordScale = new J3DIndTexCoordScale(); + J3DIndTexMtx* indTexMtx = JKR_NEW J3DIndTexMtx(); + J3DIndTexCoordScale* indTexCoordScale = JKR_NEW J3DIndTexCoordScale(); J3DColorBlock* colorBlock = NULL; colorBlock->setColorChanNum((u8)NULL); colorBlock->setMatColor(0, gxColor); @@ -503,7 +503,7 @@ static void dummy2() { int mDoExt_invisibleModel::create(J3DModel* i_model, u8 param_1) { J3DModelData* model_data = i_model->getModelData(); - mpPackets = new mDoExt_invJntPacket[model_data->getJointNum()]; + mpPackets = JKR_NEW mDoExt_invJntPacket[model_data->getJointNum()]; if (mpPackets == NULL) { return 0; } @@ -1311,18 +1311,18 @@ int mDoExt_McaMorf::create(J3DModelData* modelData, mDoExt_McaMorfCallBack1_c* c } } if (param_8) { - mpSound = new mDoExt_zelAnime(); + mpSound = JKR_NEW mDoExt_zelAnime(); if (!mpSound) { goto cleanup; } } setAnm(anmTransform, param_4, 0.0f, param_5, param_6, param_7, param_9); mPrevMorf = -1.0f; - mpTransformInfo = new J3DTransformInfo[modelData->getJointNum()]; + mpTransformInfo = JKR_NEW J3DTransformInfo[modelData->getJointNum()]; if (!mpTransformInfo) { goto cleanup; } - mpQuat = new Quaternion[modelData->getJointNum()]; + mpQuat = JKR_NEW Quaternion[modelData->getJointNum()]; if (mpQuat) { J3DTransformInfo* info = mpTransformInfo; Quaternion* quat = mpQuat; @@ -1569,9 +1569,9 @@ int mDoExt_McaMorfSO::create(J3DModelData* i_modelData, mDoExt_McaMorfCallBack1_ setAnm(param_3, param_4, 0.0f, param_5, param_6, param_7); mPrevMorf = -1.0f; - mpTransformInfo = new J3DTransformInfo[i_modelData->getJointNum()]; + mpTransformInfo = JKR_NEW J3DTransformInfo[i_modelData->getJointNum()]; if (mpTransformInfo != NULL) { - mpQuat = new Quaternion[i_modelData->getJointNum()]; + mpQuat = JKR_NEW Quaternion[i_modelData->getJointNum()]; if (mpQuat != NULL) { J3DTransformInfo* transInfo_p = mpTransformInfo; @@ -1853,13 +1853,13 @@ mDoExt_McaMorf2::~mDoExt_McaMorf2() { setAnm(param_3, param_4, 0.0f, param_5, 0.0f, param_6, param_7, param_8); mPrevMorf = -1.0f; - mpTransformInfo = new J3DTransformInfo[param_0->getJointNum()]; + mpTransformInfo = JKR_NEW J3DTransformInfo[param_0->getJointNum()]; if (mpTransformInfo == NULL) { ERROR_EXIT(); return 0; } - mpQuat = new Quaternion[param_0->getJointNum()]; + mpQuat = JKR_NEW Quaternion[param_0->getJointNum()]; if (mpQuat == NULL) { ERROR_EXIT(); return 0; @@ -2248,13 +2248,13 @@ void mDoExt_invJntPacket::draw() { } int mDoExt_3Dline_c::init(u16 param_0, int param_1, BOOL param_2) { - field_0x0 = new cXyz[param_0]; + field_0x0 = JKR_NEW cXyz[param_0]; if (field_0x0 == NULL) { return 0; } if (param_1 != 0) { - field_0x4 = new f32[param_0]; + field_0x4 = JKR_NEW f32[param_0]; if (field_0x4 == NULL) { return 0; } @@ -2264,33 +2264,33 @@ int mDoExt_3Dline_c::init(u16 param_0, int param_1, BOOL param_2) { int sp20 = param_0 * 2; - field_0x8 = new cXyz[sp20]; + field_0x8 = JKR_NEW cXyz[sp20]; if (field_0x8 == NULL) { return 0; } - field_0xc = new cXyz[sp20]; + field_0xc = JKR_NEW cXyz[sp20]; if (field_0xc == NULL) { return 0; } - field_0x10 = new mDoExt_3Dline_field_0x10_c[sp20]; + field_0x10 = JKR_NEW mDoExt_3Dline_field_0x10_c[sp20]; if (field_0x10 == NULL) { return 0; } - field_0x14 = new mDoExt_3Dline_field_0x10_c[sp20]; + field_0x14 = JKR_NEW mDoExt_3Dline_field_0x10_c[sp20]; if (field_0x14 == NULL) { return 0; } if (param_2) { - field_0x18 = new mDoExt_3Dline_field_0x18_c[sp20]; + field_0x18 = JKR_NEW mDoExt_3Dline_field_0x18_c[sp20]; if (field_0x18 == NULL) { return 0; } - field_0x1c = new mDoExt_3Dline_field_0x18_c[sp20]; + field_0x1c = JKR_NEW mDoExt_3Dline_field_0x18_c[sp20]; if (field_0x1c == NULL) { return 0; } @@ -2313,7 +2313,7 @@ int mDoExt_3DlineMat0_c::init(u16 param_0, u16 param_1, int param_2) { field_0x10 = param_0; field_0x12 = param_1; - field_0x18 = new mDoExt_3Dline_c[param_0]; + field_0x18 = JKR_NEW mDoExt_3Dline_c[param_0]; if (field_0x18 == NULL) { return 0; } @@ -2619,7 +2619,7 @@ void mDoExt_3DlineMat0_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* pa int mDoExt_3DlineMat1_c::init(u16 param_0, u16 param_1, ResTIMG* param_2, int param_3) { mNumLines = param_0; field_0x32 = param_1; - mpLines = new mDoExt_3Dline_c[param_0]; + mpLines = JKR_NEW mDoExt_3Dline_c[param_0]; if (mpLines == NULL) { return 0; } @@ -3561,7 +3561,7 @@ static void mDoExt_initFontCommon(JUTFont** mDoExt_font_p, ResFONT** mDoExt_resf JUT_ASSERT_MSG(7144, *mDoExt_resfont != NULL, "mDoExt_resfont != 0"); if (param_5 == 0) { u32 cacheSize = JUTCacheFont::calcCacheSize(param_7, param_6); - JUTCacheFont* cacheFont = new (param_2, 0) JUTCacheFont(*mDoExt_resfont, cacheSize, param_2); + JUTCacheFont* cacheFont = JKR_NEW_ARGS (param_2, 0) JUTCacheFont(*mDoExt_resfont, cacheSize, param_2); if (cacheFont->isValid()) { // "Allocated %d bytes for font cache buffer size" OS_REPORT("\nキャッシュフォントバッファサイズとして %d バイト確保しました\n", cacheSize); @@ -3577,7 +3577,7 @@ static void mDoExt_initFontCommon(JUTFont** mDoExt_font_p, ResFONT** mDoExt_resf JKRRemoveResource(*mDoExt_resfont, NULL); *mDoExt_resfont = NULL; } else { - *mDoExt_font = new JUTResFont(*mDoExt_resfont, param_2); + *mDoExt_font = JKR_NEW JUTResFont(*mDoExt_resfont, param_2); // "Allocated %d bytes for the font buffer size" OS_REPORT("\nフォントバッファサイズとして %d バイト確保しました\n", JKRGetMemBlockSize(param_2, *mDoExt_font)); @@ -3587,7 +3587,7 @@ static void mDoExt_initFontCommon(JUTFont** mDoExt_font_p, ResFONT** mDoExt_resf if (*mDoExt_font != NULL && !(*mDoExt_font)->isValid()) { // "Failed to create cache font class" OSReport_FatalError("\nキャッシュフォントクラス作成に失敗しました\n"); - delete *mDoExt_font; + JKR_DELETE(*mDoExt_font); *mDoExt_font = NULL; } JUT_ASSERT_MSG(7183, *mDoExt_font != NULL, "mDoExt_font != 0"); @@ -3625,7 +3625,7 @@ void mDoExt_removeMesgFont() { mDoExt_font0_getCount--; JUT_ASSERT(7241, mDoExt_font0_getCount > 0); if (mDoExt_font0_getCount == 0) { - delete mDoExt_font0; + JKR_DELETE(mDoExt_font0); mDoExt_font0 = NULL; if (mDoExt_resfont0 != NULL) { #if REGION_JPN @@ -3691,7 +3691,7 @@ void mDoExt_removeSubFont() { mDoExt_font2_getCount--; JUT_ASSERT(7357, mDoExt_font2_getCount > 0); if (mDoExt_font2_getCount == 0) { - delete mDoExt_font2; + JKR_DELETE(mDoExt_font2); mDoExt_font2 = NULL; if (mDoExt_resfont2 != NULL) { JKRFree(mDoExt_resfont2); @@ -3703,7 +3703,7 @@ void mDoExt_removeSubFont() { J3DModel* mDoExt_J3DModel__create(J3DModelData* i_modelData, u32 i_modelFlag, u32 i_differedDlistFlag) { if (i_modelData != NULL) { - J3DModel* model = new J3DModel(); + J3DModel* model = JKR_NEW J3DModel(); if (model != NULL) { #if DEBUG @@ -3798,7 +3798,7 @@ void DummyCheckHeap::setHeap(JKRHeap* heap) { int DummyCheckHeap_init() { JUT_ASSERT(7634, dch == NULL); - dch = new((JKRHeap*)mDoExt_getZeldaHeap(), 0) DummyCheckHeap(); + dch = JKR_NEW_ARGS((JKRHeap*)mDoExt_getZeldaHeap(), 0) DummyCheckHeap(); if (dch == NULL) { return false; } diff --git a/src/m_Do/m_Do_ext2.cpp b/src/m_Do/m_Do_ext2.cpp index 9d4c18228f..2d913cb2ef 100644 --- a/src/m_Do/m_Do_ext2.cpp +++ b/src/m_Do/m_Do_ext2.cpp @@ -21,9 +21,9 @@ FixedMemoryCheck::FixedMemoryCheck(u32* param_1, u32 size, JKRHeap* heap) { FixedMemoryCheck* FixedMemoryCheck::easyCreate(void* param_1, u32 size) { JKRHeap* heap = JKRGetRootHeap2(); - FixedMemoryCheck* memCheck = new (heap, 0) FixedMemoryCheck((u32*)param_1, size, heap); + FixedMemoryCheck* memCheck = JKR_NEW_ARGS (heap, 0) FixedMemoryCheck((u32*)param_1, size, heap); if (!memCheck) { - memCheck = new (JKRGetSystemHeap(), 0) FixedMemoryCheck((u32*)param_1, size, NULL); + memCheck = JKR_NEW_ARGS (JKRGetSystemHeap(), 0) FixedMemoryCheck((u32*)param_1, size, NULL); } if (memCheck) { memCheck->alloc(); diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index 5046090942..477cd36399 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -295,7 +295,7 @@ void mDoGph_gInf_c::create() { JFWDisplay::getManager()->setDrawDoneMethod(JFWDisplay::UNK_METHOD_1); - JUTFader* faderPtr = new JUTFader(0, 0, JUTVideo::getManager()->getRenderMode()->fbWidth, + JUTFader* faderPtr = JKR_NEW JUTFader(0, 0, JUTVideo::getManager()->getRenderMode()->fbWidth, JUTVideo::getManager()->getRenderMode()->efbHeight, JUtility::TColor(0, 0, 0, 0)); JUT_ASSERT(352, faderPtr != NULL); diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp index 2811cff7b1..a20e939949 100644 --- a/src/m_Do/m_Do_machine.cpp +++ b/src/m_Do/m_Do_machine.cpp @@ -962,7 +962,7 @@ int mDoMch_Create() { JKRSetAramTransferBuffer(NULL, 0x2000, JKRGetSystemHeap()); JKRThreadSwitch::createManager(NULL); { // Fakematch to fix stack on debug, unsure where this block is supposed to go - JKRThread* thread = new JKRThread(OSGetCurrentThread(), 0); + JKRThread* thread = JKR_NEW JKRThread(OSGetCurrentThread(), 0); } JUTConsole* sysConsole = JFWSystem::getSystemConsole(); diff --git a/src/revolution/homebuttonLib/HBMBase.cpp b/src/revolution/homebuttonLib/HBMBase.cpp index f7666506cc..e73a7b1200 100644 --- a/src/revolution/homebuttonLib/HBMBase.cpp +++ b/src/revolution/homebuttonLib/HBMBase.cpp @@ -141,7 +141,7 @@ namespace homebutton { void* pvVar4 = MEMAllocFromAllocator(&sSoundAllocator, sizeof(nw4hbm::snd::NandSoundArchive)); if (pvVar4 != NULL) { - mpNandSoundArchive = new (pvVar4) nw4hbm::snd::NandSoundArchive(); + mpNandSoundArchive = JKR_NEW_ARGS (pvVar4) nw4hbm::snd::NandSoundArchive(); } NW4HBM_ASSERT(LN(3941, 3884), mpNandSoundArchive); @@ -261,7 +261,7 @@ namespace homebutton { void HomeButton::createInstance(const HBMDataInfo* pHBInfo) { if (void* pMem = HBMAllocMem(sizeof(*spHomeButtonObj))) { - spHomeButtonObj = new (pMem) HomeButton(pHBInfo); + spHomeButtonObj = JKR_NEW_ARGS (pMem) HomeButton(pHBInfo); } } @@ -509,7 +509,7 @@ namespace homebutton { set_text(); if (void* pMem = HBMAllocMem(sizeof(*mpResAccessor))) { - mpResAccessor = new (pMem) nw4hbm::lyt::ArcResourceAccessor(); + mpResAccessor = JKR_NEW_ARGS (pMem) nw4hbm::lyt::ArcResourceAccessor(); } NW4HBM_ASSERT(623, mpResAccessor); @@ -518,7 +518,7 @@ namespace homebutton { if (!mpHBInfo->cursor) { for (i = 0; i < (int)ARRAY_SIZE(mpCursorLayout); i++) { if (void* pMem = HBMAllocMem(sizeof(*mpCursorLayout)[i])) { - mpCursorLayout[i] = new (pMem) nw4hbm::lyt::Layout(); + mpCursorLayout[i] = JKR_NEW_ARGS (pMem) nw4hbm::lyt::Layout(); } NW4HBM_ASSERT(635, mpCursorLayout[i]); @@ -530,7 +530,7 @@ namespace homebutton { } if (void* pMem = HBMAllocMem(sizeof(*mpLayout))) { - mpLayout = new (pMem) nw4hbm::lyt::Layout(); + mpLayout = JKR_NEW_ARGS (pMem) nw4hbm::lyt::Layout(); } { @@ -546,7 +546,7 @@ namespace homebutton { NW4HBM_ASSERT_CHECK_NULL(665, lpaRes); if (void* pMem = HBMAllocMem(sizeof(*mpAnmController)[i])) { - mpAnmController[i] = new (pMem) GroupAnmController(); + mpAnmController[i] = JKR_NEW_ARGS (pMem) GroupAnmController(); } NW4HBM_ASSERT(671, mpAnmController[i]); @@ -578,7 +578,7 @@ namespace homebutton { NW4HBM_ASSERT_CHECK_NULL(697, lpaRes); if (void* pMem = HBMAllocMem(sizeof(*mpGroupAnmController)[i])) { - mpGroupAnmController[i] = new (pMem) GroupAnmController(); + mpGroupAnmController[i] = JKR_NEW_ARGS (pMem) GroupAnmController(); } NW4HBM_ASSERT(703, mpGroupAnmController[i]); @@ -611,7 +611,7 @@ namespace homebutton { NW4HBM_ASSERT_CHECK_NULL(729, lpaRes); if (void* pMem = HBMAllocMem(sizeof(*mpPairGroupAnmController)[i])) { - mpPairGroupAnmController[i] = new (pMem) GroupAnmController(); + mpPairGroupAnmController[i] = JKR_NEW_ARGS (pMem) GroupAnmController(); } NW4HBM_ASSERT(735, mpPairGroupAnmController[i]); @@ -636,14 +636,14 @@ namespace homebutton { } if (void* pMem = HBMAllocMem(sizeof(*mpHomeButtonEventHandler))) { - mpHomeButtonEventHandler = new (pMem) HomeButtonEventHandler(this); + mpHomeButtonEventHandler = JKR_NEW_ARGS (pMem) HomeButtonEventHandler(this); } NW4HBM_ASSERT(758, mpHomeButtonEventHandler); if (void* pMem = HBMAllocMem(sizeof(*mpPaneManager))) { mpPaneManager = - new (pMem) gui::PaneManager(mpHomeButtonEventHandler, NULL, spAllocator); + JKR_NEW_ARGS (pMem) gui::PaneManager(mpHomeButtonEventHandler, NULL, spAllocator); } NW4HBM_ASSERT(765, mpPaneManager); @@ -658,12 +658,12 @@ namespace homebutton { } if (void* pMem = HBMAllocMem(sizeof(*mpRemoteSpk))) { - mpRemoteSpk = new (pMem) RemoteSpk(mpHBInfo->spkSeBuf); + mpRemoteSpk = JKR_NEW_ARGS (pMem) RemoteSpk(mpHBInfo->spkSeBuf); } for (i = 0; i < WPAD_MAX_CONTROLLERS; i++) { if (void* pMem = HBMAllocMem(sizeof(*mpController)[i])) { - mpController[i] = new (pMem) Controller(i, mpRemoteSpk); + mpController[i] = JKR_NEW_ARGS (pMem) Controller(i, mpRemoteSpk); } } @@ -2832,7 +2832,7 @@ namespace homebutton { void* buffer = MEMAllocFromAllocator(&sSoundAllocator, sizeof(nw4hbm::snd::SoundArchivePlayer)); if (buffer != NULL) { - mpSoundArchivePlayer = new (buffer) nw4hbm::snd::SoundArchivePlayer(); + mpSoundArchivePlayer = JKR_NEW_ARGS (buffer) nw4hbm::snd::SoundArchivePlayer(); } NW4HBM_ASSERT(LN(3752, 3695), mpSoundArchivePlayer); @@ -2848,14 +2848,14 @@ namespace homebutton { buffer = MEMAllocFromAllocator(&sSoundAllocator, sizeof(nw4hbm::snd::SoundHandle)); if (buffer != NULL) { - mpSoundHandle = new (buffer) nw4hbm::snd::SoundHandle(); + mpSoundHandle = JKR_NEW_ARGS (buffer) nw4hbm::snd::SoundHandle(); } NW4HBM_ASSERT(LN(3777, 3720), mpSoundHandle); if (bCreateSoundHeap) { buffer = MEMAllocFromAllocator(&sSoundAllocator, sizeof(nw4hbm::snd::SoundHeap)); if (buffer != NULL) { - mpSoundHeap = new (buffer) nw4hbm::snd::SoundHeap(); + mpSoundHeap = JKR_NEW_ARGS (buffer) nw4hbm::snd::SoundHeap(); } NW4HBM_ASSERT(LN(3786, 3729), mpSoundHeap); diff --git a/src/revolution/homebuttonLib/HBMGUIManager.cpp b/src/revolution/homebuttonLib/HBMGUIManager.cpp index 0cb856cbdf..5e90a5af3a 100644 --- a/src/revolution/homebuttonLib/HBMGUIManager.cpp +++ b/src/revolution/homebuttonLib/HBMGUIManager.cpp @@ -89,7 +89,7 @@ namespace homebutton { if (mpAllocator) { MEMFreeToAllocator(mpAllocator, p); } else { - delete static_cast(p); + JKR_DELETE(static_cast(p)); } } } @@ -109,9 +109,9 @@ namespace homebutton { if (mpAllocator) { void* p = MEMAllocFromAllocator(mpAllocator, sizeof(IDToComponent)); - nw4hbm::ut::List_Append(&mIDToComponent, new (p) IDToComponent(uID, pComponent)); + nw4hbm::ut::List_Append(&mIDToComponent, JKR_NEW_ARGS (p) IDToComponent(uID, pComponent)); } else { - nw4hbm::ut::List_Append(&mIDToComponent, new IDToComponent(uID, pComponent)); + nw4hbm::ut::List_Append(&mIDToComponent, JKR_NEW IDToComponent(uID, pComponent)); } } @@ -132,7 +132,7 @@ namespace homebutton { if (mpAllocator) { MEMFreeToAllocator(mpAllocator, p); } else { - delete p; + JKR_DELETE(p); } } @@ -220,8 +220,8 @@ namespace homebutton { MEMFreeToAllocator(mpAllocator, pPaneToComponent->mpComponent); MEMFreeToAllocator(mpAllocator, pPaneToComponent); } else { - delete pPaneToComponent->mpComponent; - delete pPaneToComponent; + JKR_DELETE(pPaneToComponent->mpComponent); + JKR_DELETE(pPaneToComponent); } } } @@ -251,11 +251,11 @@ namespace homebutton { void* p1 = MEMAllocFromAllocator(mpAllocator, sizeof(*pPaneComponent)); void* p2 = MEMAllocFromAllocator(mpAllocator, sizeof(*pPaneToComponent)); - pPaneComponent = new (p1) PaneComponent(suIDCounter); - pPaneToComponent = new (p2) PaneToComponent(&(*it), pPaneComponent); + pPaneComponent = JKR_NEW_ARGS (p1) PaneComponent(suIDCounter); + pPaneToComponent = JKR_NEW_ARGS (p2) PaneToComponent(&(*it), pPaneComponent); } else { - pPaneComponent = new PaneComponent(suIDCounter); - pPaneToComponent = new PaneToComponent(&(*it), pPaneComponent); + pPaneComponent = JKR_NEW PaneComponent(suIDCounter); + pPaneToComponent = JKR_NEW PaneToComponent(&(*it), pPaneComponent); } nw4hbm::ut::List_Append(&mPaneToComponent, pPaneToComponent); @@ -306,8 +306,8 @@ namespace homebutton { MEMFreeToAllocator(mpAllocator, pPaneToComponent->mpComponent); MEMFreeToAllocator(mpAllocator, pPaneToComponent); } else { - delete pPaneToComponent->mpComponent; - delete pPaneToComponent; + JKR_DELETE(pPaneToComponent->mpComponent); + JKR_DELETE(pPaneToComponent); } walkInChildrenDel(it->GetChildList()); diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp index f142b9ff51..0a0540dd81 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_animation.cpp @@ -323,7 +323,7 @@ namespace nw4hbm { std::memset(mAnimLinkAry, 0, sizeof(*mAnimLinkAry) * pRes->animContNum); for (u16 i = 0; i < pRes->animContNum; i++) { - new (&mAnimLinkAry[i]) AnimationLink(); + JKR_NEW_ARGS (&mAnimLinkAry[i]) AnimationLink(); } } } diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp index c8a0835765..6021a5508d 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_group.cpp @@ -45,7 +45,7 @@ namespace nw4hbm { void Group::AppendPane(Pane* pPane) { if (void* pMem = Layout::AllocMemory(sizeof(detail::PaneLink))) { - detail::PaneLink* pPaneLink = new (pMem) detail::PaneLink(); + detail::PaneLink* pPaneLink = JKR_NEW_ARGS (pMem) detail::PaneLink(); pPaneLink->mTarget = pPane; mPaneLinkList.PushBack(pPaneLink); diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp index 53f7566427..d7c80ad2f7 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_layout.cpp @@ -23,7 +23,7 @@ namespace { void* pMem = Layout::AllocMemory(sizeof(T)); if (pMem) { - return new (pMem) T(); + return JKR_NEW_ARGS (pMem) T(); } else { NW4R_DB_WARNING(47, false, "can't alloc memory."); return NULL; @@ -35,7 +35,7 @@ namespace { void* pMem = Layout::AllocMemory(sizeof(T)); if (pMem) { - return new (pMem) T(p1); + return JKR_NEW_ARGS (pMem) T(p1); } else { return NULL; } @@ -46,7 +46,7 @@ namespace { void* pMem = Layout::AllocMemory(sizeof(T)); if (pMem) { - return new (pMem) T(p1, p2); + return JKR_NEW_ARGS (pMem) T(p1, p2); } else { return NULL; } diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp index 5d1d522523..ca7672a86e 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_picture.cpp @@ -32,7 +32,7 @@ namespace nw4hbm { const res::Material* pResMaterial = detail::ConvertOffsToPtr( resBlockSet.pMaterialList, matOffsTbl[pResPic->materialIdx]); - mpMaterial = new (pMemMaterial) Material(pResMaterial, resBlockSet); + mpMaterial = JKR_NEW_ARGS (pMemMaterial) Material(pResMaterial, resBlockSet); } } diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp index d7bb8f9050..f22a3eddd8 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_textBox.cpp @@ -252,7 +252,7 @@ namespace nw4hbm { resBlockSet.pResAccessor->GetResource('font', fontName, NULL)) { if (void* pMemFont = Layout::AllocMemory(sizeof(ut::ResFont))) { - ut::ResFont* pResFont = new (pMemFont) ut::ResFont(); + ut::ResFont* pResFont = JKR_NEW_ARGS (pMemFont) ut::ResFont(); bool bSuccess = pResFont->SetResource(fontRes); if (!bSuccess) { @@ -273,7 +273,7 @@ namespace nw4hbm { const res::Material* pResMaterial = detail::ConvertOffsToPtr( resBlockSet.pMaterialList, matOffsTbl[pBlock->materialIdx]); - mpMaterial = new (pMemMaterial) Material(pResMaterial, resBlockSet); + mpMaterial = JKR_NEW_ARGS (pMemMaterial) Material(pResMaterial, resBlockSet); } } diff --git a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp index 294e5ca820..36b8aa957e 100644 --- a/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp +++ b/src/revolution/homebuttonLib/nw4hbm/lyt/lyt_window.cpp @@ -232,7 +232,7 @@ namespace nw4hbm { const res::Material* pResMaterial = detail::ConvertOffsToPtr( resBlockSet.pMaterialList, matOffsTbl[pResContent->materialIdx]); - mpMaterial = new (pMemMaterial) Material(pResMaterial, resBlockSet); + mpMaterial = JKR_NEW_ARGS (pMemMaterial) Material(pResMaterial, resBlockSet); } mFrameNum = 0; @@ -260,7 +260,7 @@ namespace nw4hbm { matOffsTbl[pResWindowFrame->materialIdx]); mFrames[i].pMaterial = - new (pMemMaterial) Material(pResMaterial, resBlockSet); + JKR_NEW_ARGS (pMemMaterial) Material(pResMaterial, resBlockSet); } } } diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h b/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h index 69054fc90d..3b29443c7a 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/InstancePool.h @@ -38,7 +38,7 @@ namespace nw4hbm { return NULL; } - return new (ptr) T; + return JKR_NEW_ARGS (ptr) T; } void Free(T* obj) { diff --git a/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h b/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h index 9649d6920b..403c7167f8 100644 --- a/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h +++ b/src/revolution/homebuttonLib/nw4hbm/snd/SoundInstanceManager.h @@ -39,7 +39,7 @@ namespace nw4hbm { void* ptr = mPool.Alloc(); if (ptr != NULL) { - sound = new (ptr) T(this); + sound = JKR_NEW_ARGS (ptr) T(this); } else { if (mPriorityList.IsEmpty()) { return NULL; @@ -57,7 +57,7 @@ namespace nw4hbm { ptr = mPool.Alloc(); NW4HBM_ASSERT_CHECK_NULL(114, ptr); - sound = new (ptr) T(this); + sound = JKR_NEW_ARGS (ptr) T(this); } InsertPriorityList(sound, priority);