From 9eea9289b1c4316d5856d1cb9602ee463d7de989 Mon Sep 17 00:00:00 2001 From: LagoLunatic Date: Sun, 28 Sep 2025 16:11:07 -0400 Subject: [PATCH] Fix JUT_ASSERT and several other macros (#2711) * Fix JUT_ASSERT to be a nested define * Switch names that appear in asserts to be constants instead of defines * Replace `0` in asserts with `NULL` or `FALSE` * Fix fpclassify * Fix ARRAY_SIZE * Use G_CM3D_F_INF * More fixes for fpclassify * Remove FLOAT_LABEL * Remove incorrect FLAG_ON macro * Remove UNK_BSS macro * Silence clangd unused header warning for PCH --- include/JSystem/JAudio2/JAISoundHandles.h | 2 +- include/JSystem/JAudio2/JASGadget.h | 2 +- include/JSystem/JAudio2/JASTrack.h | 4 +- include/JSystem/JAudio2/JAUStreamAramMgr.h | 2 +- include/JSystem/JGadget/linklist.h | 8 +- include/JSystem/JGadget/search.h | 2 +- include/JSystem/JGadget/std-memory.h | 2 +- include/JSystem/JGadget/std-vector.h | 2 +- include/JSystem/JHostIO/JORServer.h | 4 +- include/JSystem/JKernel/JKRArchive.h | 6 +- include/JSystem/JMessage/control.h | 4 +- include/JSystem/JMessage/processor.h | 8 +- include/JSystem/JMessage/resource.h | 4 +- include/JSystem/JStudio/JStudio/ctb.h | 2 +- .../JSystem/JStudio/JStudio/functionvalue.h | 4 +- .../JSystem/JStudio/JStudio/jstudio-control.h | 22 +-- .../JSystem/JStudio/JStudio_JAudio2/control.h | 2 +- .../JStudio/JStudio_JParticle/control.h | 4 +- .../JSystem/JStudio/JStudio_JStage/control.h | 2 +- include/JSystem/JUtility/JUTAssert.h | 4 +- include/JSystem/JUtility/JUTResFont.h | 3 +- include/d/actor/d_a_formation_mng.h | 6 +- include/d/actor/d_a_obj_boumato.h | 2 +- include/d/actor/d_a_obj_itamato.h | 2 +- include/d/actor/d_a_obj_sekizoa.h | 2 +- include/d/actor/d_a_tag_kmsg.h | 2 +- include/d/d_demo.h | 6 +- include/d/d_save.h | 57 +++---- include/d/d_stage.h | 96 +++++------ include/global.h | 11 +- src/JSystem/JAudio2/JASBNKParser.cpp | 10 +- src/JSystem/JAudio2/JASBasicWaveBank.cpp | 6 +- src/JSystem/JAudio2/JASHeapCtrl.cpp | 6 +- src/JSystem/JAudio2/JAUSectionHeap.cpp | 14 +- src/JSystem/JFramework/JFWSystem.cpp | 2 +- src/JSystem/JHostIO/JORServer.cpp | 4 +- src/JSystem/JKernel/JKRAramArchive.cpp | 2 +- src/JSystem/JKernel/JKRArchivePub.cpp | 6 +- src/JSystem/JKernel/JKRDvdArchive.cpp | 2 +- src/JSystem/JKernel/JKRHeap.cpp | 2 +- src/JSystem/JKernel/JKRSolidHeap.cpp | 2 +- src/JSystem/JKernel/JKRThread.cpp | 2 +- src/JSystem/JMessage/control.cpp | 6 +- src/JSystem/JMessage/processor.cpp | 42 ++--- src/JSystem/JMessage/resource.cpp | 20 +-- src/JSystem/JParticle/JPAEmitterManager.cpp | 4 +- src/JSystem/JStudio/JStudio/ctb.cpp | 14 +- src/JSystem/JStudio/JStudio/functionvalue.cpp | 14 +- .../JStudio/JStudio/jstudio-control.cpp | 10 +- .../JStudio/JStudio/jstudio-object.cpp | 14 +- .../JStudio/JStudio/stb-data-parse.cpp | 2 +- .../JStudio/JStudio_JAudio2/control.cpp | 2 +- .../JStudio/JStudio_JAudio2/object-sound.cpp | 34 ++-- .../JStudio/JStudio_JParticle/control.cpp | 2 +- .../JStudio_JParticle/object-particle.cpp | 36 ++--- .../JStudio/JStudio_JStage/control.cpp | 8 +- .../JStudio/JStudio_JStage/object-actor.cpp | 30 ++-- .../JStudio/JStudio_JStage/object-camera.cpp | 26 +-- .../JStudio/JStudio_JStage/object-light.cpp | 10 +- src/JSystem/JStudio/JStudio_JStage/object.cpp | 4 +- src/JSystem/JUtility/JUTConsole.cpp | 12 +- src/JSystem/JUtility/JUTResFont.cpp | 2 - .../MSL/MSL_C/MSL_Common/Include/float.h | 18 ++- src/SSystem/SComponent/c_cc_d.cpp | 7 +- src/SSystem/SComponent/c_cc_s.cpp | 16 +- src/SSystem/SComponent/c_m3d_g_aab.cpp | 4 +- src/SSystem/SComponent/c_xyz.cpp | 2 +- src/Z2AudioLib/Z2SpeechMgr2.cpp | 2 +- src/d/actor/d_a_L7demo_dr.cpp | 4 +- src/d/actor/d_a_L7low_dr.cpp | 4 +- src/d/actor/d_a_L7op_demo_dr.cpp | 4 +- src/d/actor/d_a_alink.cpp | 40 ++--- src/d/actor/d_a_alink_bottle.inc | 4 +- src/d/actor/d_a_alink_damage.inc | 2 +- src/d/actor/d_a_alink_demo.inc | 8 +- src/d/actor/d_a_alink_hang.inc | 4 +- src/d/actor/d_a_alink_swindow.inc | 2 +- src/d/actor/d_a_alink_whistle.inc | 2 +- src/d/actor/d_a_alink_wolf.inc | 16 +- src/d/actor/d_a_alldie.cpp | 2 +- src/d/actor/d_a_andsw.cpp | 2 +- src/d/actor/d_a_andsw2.cpp | 2 +- src/d/actor/d_a_arrow.cpp | 2 +- src/d/actor/d_a_b_bh.cpp | 6 +- src/d/actor/d_a_b_bq.cpp | 4 +- src/d/actor/d_a_b_dr.cpp | 26 +-- src/d/actor/d_a_b_dre.cpp | 4 +- src/d/actor/d_a_b_ds.cpp | 36 ++--- src/d/actor/d_a_b_gg.cpp | 6 +- src/d/actor/d_a_b_gm.cpp | 4 +- src/d/actor/d_a_b_gnd.cpp | 12 +- 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 | 26 +-- src/d/actor/d_a_b_ob.cpp | 4 +- src/d/actor/d_a_b_oh.cpp | 2 +- src/d/actor/d_a_b_oh2.cpp | 2 +- src/d/actor/d_a_b_tn.cpp | 2 +- src/d/actor/d_a_b_yo.cpp | 2 +- src/d/actor/d_a_b_yo_ice.cpp | 2 +- src/d/actor/d_a_b_zant.cpp | 12 +- src/d/actor/d_a_b_zant_magic.cpp | 2 +- src/d/actor/d_a_b_zant_mobile.cpp | 6 +- src/d/actor/d_a_b_zant_sima.cpp | 2 +- src/d/actor/d_a_balloon_2D.cpp | 6 +- src/d/actor/d_a_bd.cpp | 2 +- src/d/actor/d_a_bg.cpp | 4 +- src/d/actor/d_a_bg_obj.cpp | 12 +- src/d/actor/d_a_boomerang.cpp | 12 +- src/d/actor/d_a_bullet.cpp | 8 +- src/d/actor/d_a_canoe.cpp | 4 +- src/d/actor/d_a_coach_2D.cpp | 4 +- src/d/actor/d_a_coach_fire.cpp | 2 +- src/d/actor/d_a_cow.cpp | 2 +- src/d/actor/d_a_crod.cpp | 2 +- src/d/actor/d_a_cstaF.cpp | 8 +- src/d/actor/d_a_cstatue.cpp | 10 +- src/d/actor/d_a_demo00.cpp | 12 +- src/d/actor/d_a_demo_item.cpp | 2 +- src/d/actor/d_a_disappear.cpp | 2 +- src/d/actor/d_a_dmidna.cpp | 2 +- src/d/actor/d_a_do.cpp | 2 +- src/d/actor/d_a_door_boss.cpp | 2 +- src/d/actor/d_a_door_bossL1.cpp | 16 +- src/d/actor/d_a_door_bossL5.cpp | 10 +- src/d/actor/d_a_door_dbdoor00.cpp | 2 +- src/d/actor/d_a_door_knob00.cpp | 12 +- src/d/actor/d_a_door_mbossL1.cpp | 22 +-- src/d/actor/d_a_door_push.cpp | 2 +- src/d/actor/d_a_door_shutter.cpp | 24 +-- src/d/actor/d_a_door_spiral.cpp | 2 +- src/d/actor/d_a_dshutter.cpp | 2 +- src/d/actor/d_a_e_ai.cpp | 4 +- src/d/actor/d_a_e_arrow.cpp | 4 +- src/d/actor/d_a_e_ba.cpp | 2 +- src/d/actor/d_a_e_bee.cpp | 2 +- src/d/actor/d_a_e_bg.cpp | 18 +-- src/d/actor/d_a_e_bi.cpp | 2 +- src/d/actor/d_a_e_bi_leaf.cpp | 4 +- src/d/actor/d_a_e_bs.cpp | 2 +- src/d/actor/d_a_e_bu.cpp | 4 +- src/d/actor/d_a_e_bug.cpp | 8 +- src/d/actor/d_a_e_cr.cpp | 2 +- src/d/actor/d_a_e_cr_egg.cpp | 4 +- src/d/actor/d_a_e_db.cpp | 4 +- src/d/actor/d_a_e_db_leaf.cpp | 2 +- src/d/actor/d_a_e_dd.cpp | 2 +- src/d/actor/d_a_e_df.cpp | 4 +- src/d/actor/d_a_e_dk.cpp | 6 +- src/d/actor/d_a_e_dn.cpp | 14 +- src/d/actor/d_a_e_dt.cpp | 2 +- src/d/actor/d_a_e_fb.cpp | 2 +- src/d/actor/d_a_e_fk.cpp | 4 +- src/d/actor/d_a_e_fm.cpp | 8 +- src/d/actor/d_a_e_fs.cpp | 2 +- src/d/actor/d_a_e_fz.cpp | 6 +- src/d/actor/d_a_e_ga.cpp | 6 +- src/d/actor/d_a_e_gb.cpp | 6 +- src/d/actor/d_a_e_ge.cpp | 4 +- src/d/actor/d_a_e_gi.cpp | 8 +- src/d/actor/d_a_e_gm.cpp | 8 +- src/d/actor/d_a_e_gob.cpp | 10 +- src/d/actor/d_a_e_gs.cpp | 2 +- src/d/actor/d_a_e_hb.cpp | 4 +- src/d/actor/d_a_e_hb_leaf.cpp | 2 +- src/d/actor/d_a_e_hm.cpp | 2 +- src/d/actor/d_a_e_hp.cpp | 10 +- src/d/actor/d_a_e_hz.cpp | 14 +- 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 | 2 +- src/d/actor/d_a_e_kk.cpp | 10 +- src/d/actor/d_a_e_kr.cpp | 8 +- src/d/actor/d_a_e_mb.cpp | 2 +- src/d/actor/d_a_e_md.cpp | 4 +- src/d/actor/d_a_e_mf.cpp | 12 +- src/d/actor/d_a_e_mk.cpp | 4 +- src/d/actor/d_a_e_mk_bo.cpp | 2 +- src/d/actor/d_a_e_mm.cpp | 4 +- src/d/actor/d_a_e_mm_mt.cpp | 4 +- src/d/actor/d_a_e_ms.cpp | 2 +- src/d/actor/d_a_e_nest.cpp | 2 +- src/d/actor/d_a_e_nz.cpp | 2 +- src/d/actor/d_a_e_oc.cpp | 16 +- src/d/actor/d_a_e_oct_bg.cpp | 4 +- src/d/actor/d_a_e_ot.cpp | 2 +- src/d/actor/d_a_e_ph.cpp | 10 +- src/d/actor/d_a_e_pm.cpp | 2 +- src/d/actor/d_a_e_po.cpp | 24 +-- src/d/actor/d_a_e_pz.cpp | 8 +- src/d/actor/d_a_e_rb.cpp | 4 +- src/d/actor/d_a_e_rd.cpp | 20 +-- src/d/actor/d_a_e_rdb.cpp | 4 +- src/d/actor/d_a_e_rdy.cpp | 2 +- src/d/actor/d_a_e_s1.cpp | 8 +- src/d/actor/d_a_e_sb.cpp | 8 +- src/d/actor/d_a_e_sf.cpp | 4 +- src/d/actor/d_a_e_sg.cpp | 4 +- src/d/actor/d_a_e_sh.cpp | 2 +- src/d/actor/d_a_e_sm.cpp | 4 +- src/d/actor/d_a_e_sm2.cpp | 2 +- src/d/actor/d_a_e_st.cpp | 4 +- src/d/actor/d_a_e_st_line.cpp | 2 +- src/d/actor/d_a_e_sw.cpp | 8 +- src/d/actor/d_a_e_th.cpp | 2 +- src/d/actor/d_a_e_th_ball.cpp | 6 +- src/d/actor/d_a_e_tk.cpp | 2 +- src/d/actor/d_a_e_tk2.cpp | 2 +- src/d/actor/d_a_e_tk_ball.cpp | 2 +- src/d/actor/d_a_e_tt.cpp | 4 +- src/d/actor/d_a_e_vt.cpp | 10 +- src/d/actor/d_a_e_warpappear.cpp | 4 +- src/d/actor/d_a_e_wb.cpp | 4 +- src/d/actor/d_a_e_ws.cpp | 4 +- src/d/actor/d_a_e_ww.cpp | 32 ++-- src/d/actor/d_a_e_yc.cpp | 2 +- src/d/actor/d_a_e_yd.cpp | 2 +- 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 | 2 +- src/d/actor/d_a_e_yk.cpp | 2 +- src/d/actor/d_a_e_ym.cpp | 4 +- src/d/actor/d_a_e_ym_tag.cpp | 2 +- src/d/actor/d_a_e_ymb.cpp | 8 +- src/d/actor/d_a_e_yr.cpp | 10 +- src/d/actor/d_a_e_zh.cpp | 18 +-- src/d/actor/d_a_e_zm.cpp | 4 +- src/d/actor/d_a_e_zs.cpp | 2 +- src/d/actor/d_a_econt.cpp | 2 +- src/d/actor/d_a_ep.cpp | 6 +- src/d/actor/d_a_formation_mng.cpp | 6 +- src/d/actor/d_a_fr.cpp | 2 +- src/d/actor/d_a_grass.cpp | 2 +- src/d/actor/d_a_guard_mng.cpp | 4 +- src/d/actor/d_a_hitobj.cpp | 2 +- src/d/actor/d_a_horse.cpp | 12 +- src/d/actor/d_a_hozelda.cpp | 2 +- src/d/actor/d_a_itembase.cpp | 14 +- src/d/actor/d_a_izumi_gate.cpp | 2 +- src/d/actor/d_a_kago.cpp | 12 +- src/d/actor/d_a_kytag00.cpp | 2 +- src/d/actor/d_a_kytag01.cpp | 2 +- src/d/actor/d_a_kytag02.cpp | 2 +- src/d/actor/d_a_kytag03.cpp | 2 +- src/d/actor/d_a_kytag04.cpp | 4 +- src/d/actor/d_a_kytag05.cpp | 2 +- src/d/actor/d_a_kytag06.cpp | 2 +- src/d/actor/d_a_kytag07.cpp | 2 +- src/d/actor/d_a_kytag08.cpp | 4 +- src/d/actor/d_a_kytag09.cpp | 2 +- src/d/actor/d_a_kytag10.cpp | 2 +- src/d/actor/d_a_kytag11.cpp | 2 +- src/d/actor/d_a_kytag12.cpp | 2 +- src/d/actor/d_a_kytag13.cpp | 2 +- src/d/actor/d_a_kytag14.cpp | 2 +- src/d/actor/d_a_kytag15.cpp | 2 +- src/d/actor/d_a_kytag16.cpp | 2 +- src/d/actor/d_a_kytag17.cpp | 2 +- src/d/actor/d_a_mant.cpp | 2 +- src/d/actor/d_a_mg_fish.cpp | 2 +- src/d/actor/d_a_mg_fshop.cpp | 2 +- src/d/actor/d_a_mg_rod.cpp | 20 +-- src/d/actor/d_a_midna.cpp | 2 +- src/d/actor/d_a_mirror.cpp | 6 +- src/d/actor/d_a_movie_player.cpp | 10 +- src/d/actor/d_a_myna.cpp | 2 +- src/d/actor/d_a_nbomb.cpp | 8 +- src/d/actor/d_a_ni.cpp | 4 +- src/d/actor/d_a_no_chg_room.cpp | 4 +- src/d/actor/d_a_npc.cpp | 36 ++--- src/d/actor/d_a_npc2.cpp | 2 +- src/d/actor/d_a_npc3.cpp | 4 +- src/d/actor/d_a_npc4.cpp | 10 +- src/d/actor/d_a_npc_aru.cpp | 12 +- src/d/actor/d_a_npc_ash.cpp | 2 +- src/d/actor/d_a_npc_ashB.cpp | 4 +- src/d/actor/d_a_npc_bans.cpp | 4 +- src/d/actor/d_a_npc_besu.cpp | 18 +-- src/d/actor/d_a_npc_blue_ns.cpp | 4 +- src/d/actor/d_a_npc_bou.cpp | 26 +-- src/d/actor/d_a_npc_bouS.cpp | 4 +- src/d/actor/d_a_npc_cd.cpp | 4 +- src/d/actor/d_a_npc_cd2.cpp | 22 +-- src/d/actor/d_a_npc_cdn3.cpp | 14 +- src/d/actor/d_a_npc_chat.cpp | 2 +- src/d/actor/d_a_npc_chin.cpp | 2 +- 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 | 24 +-- src/d/actor/d_a_npc_df.cpp | 2 +- src/d/actor/d_a_npc_doc.cpp | 4 +- src/d/actor/d_a_npc_doorboy.cpp | 16 +- src/d/actor/d_a_npc_drainSol.cpp | 2 +- src/d/actor/d_a_npc_du.cpp | 2 +- src/d/actor/d_a_npc_fairy.cpp | 4 +- src/d/actor/d_a_npc_fairy_seirei.cpp | 4 +- src/d/actor/d_a_npc_fguard.cpp | 2 +- src/d/actor/d_a_npc_fish.cpp | 2 +- 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 | 6 +- src/d/actor/d_a_npc_grd.cpp | 2 +- src/d/actor/d_a_npc_grm.cpp | 2 +- src/d/actor/d_a_npc_grmc.cpp | 4 +- src/d/actor/d_a_npc_gro.cpp | 2 +- src/d/actor/d_a_npc_grr.cpp | 6 +- src/d/actor/d_a_npc_grs.cpp | 2 +- src/d/actor/d_a_npc_grz.cpp | 12 +- src/d/actor/d_a_npc_guard.cpp | 2 +- src/d/actor/d_a_npc_gwolf.cpp | 6 +- src/d/actor/d_a_npc_hanjo.cpp | 16 +- src/d/actor/d_a_npc_henna.cpp | 4 +- src/d/actor/d_a_npc_henna0.cpp | 2 +- src/d/actor/d_a_npc_hoz.cpp | 2 +- src/d/actor/d_a_npc_impal.cpp | 2 +- src/d/actor/d_a_npc_inko.cpp | 2 +- src/d/actor/d_a_npc_ins.cpp | 28 ++-- src/d/actor/d_a_npc_jagar.cpp | 4 +- src/d/actor/d_a_npc_kakashi.cpp | 4 +- src/d/actor/d_a_npc_kasi_hana.cpp | 8 +- src/d/actor/d_a_npc_kasi_kyu.cpp | 6 +- src/d/actor/d_a_npc_kasi_mich.cpp | 6 +- src/d/actor/d_a_npc_kdk.cpp | 2 +- src/d/actor/d_a_npc_kkri.cpp | 6 +- src/d/actor/d_a_npc_kn.cpp | 14 +- src/d/actor/d_a_npc_kn_base.inc | 6 +- src/d/actor/d_a_npc_kn_teach02.inc | 2 +- src/d/actor/d_a_npc_knj.cpp | 2 +- src/d/actor/d_a_npc_kolin.cpp | 8 +- 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_lf.cpp | 2 +- src/d/actor/d_a_npc_lud.cpp | 4 +- src/d/actor/d_a_npc_maro.cpp | 68 ++++---- src/d/actor/d_a_npc_midp.cpp | 4 +- src/d/actor/d_a_npc_mk.cpp | 2 +- src/d/actor/d_a_npc_moi.cpp | 4 +- src/d/actor/d_a_npc_moir.cpp | 40 ++--- src/d/actor/d_a_npc_myna2.cpp | 4 +- src/d/actor/d_a_npc_ne.cpp | 2 +- src/d/actor/d_a_npc_p2.cpp | 2 +- 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_passer.cpp | 2 +- src/d/actor/d_a_npc_passer2.cpp | 2 +- src/d/actor/d_a_npc_post.cpp | 4 +- src/d/actor/d_a_npc_pouya.cpp | 4 +- src/d/actor/d_a_npc_prayer.cpp | 18 +-- src/d/actor/d_a_npc_raca.cpp | 6 +- src/d/actor/d_a_npc_rafrel.cpp | 46 +++--- src/d/actor/d_a_npc_saru.cpp | 6 +- src/d/actor/d_a_npc_seib.cpp | 6 +- src/d/actor/d_a_npc_seic.cpp | 4 +- src/d/actor/d_a_npc_seid.cpp | 4 +- src/d/actor/d_a_npc_seira.cpp | 2 +- src/d/actor/d_a_npc_seira2.cpp | 2 +- src/d/actor/d_a_npc_seirei.cpp | 4 +- src/d/actor/d_a_npc_shad.cpp | 70 ++++---- src/d/actor/d_a_npc_shaman.cpp | 4 +- src/d/actor/d_a_npc_shoe.cpp | 18 +-- src/d/actor/d_a_npc_shop0.cpp | 6 +- src/d/actor/d_a_npc_shop_maro.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 | 2 +- src/d/actor/d_a_npc_taro.cpp | 42 ++--- src/d/actor/d_a_npc_the.cpp | 2 +- src/d/actor/d_a_npc_theB.cpp | 2 +- src/d/actor/d_a_npc_tk.cpp | 8 +- src/d/actor/d_a_npc_tkc.cpp | 2 +- src/d/actor/d_a_npc_tkj.cpp | 8 +- src/d/actor/d_a_npc_tkj2.cpp | 2 +- src/d/actor/d_a_npc_tks.cpp | 88 +++++----- src/d/actor/d_a_npc_toby.cpp | 6 +- src/d/actor/d_a_npc_tr.cpp | 2 +- src/d/actor/d_a_npc_uri.cpp | 4 +- src/d/actor/d_a_npc_worm.cpp | 6 +- src/d/actor/d_a_npc_wrestler.cpp | 10 +- src/d/actor/d_a_npc_yamid.cpp | 6 +- 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 | 2 +- src/d/actor/d_a_npc_ykm.cpp | 38 ++--- src/d/actor/d_a_npc_ykw.cpp | 12 +- src/d/actor/d_a_npc_zanb.cpp | 4 +- src/d/actor/d_a_npc_zant.cpp | 4 +- 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 | 8 +- src/d/actor/d_a_npc_zrc.cpp | 4 +- src/d/actor/d_a_npc_zrz.cpp | 2 +- src/d/actor/d_a_obj_Lv5Key.cpp | 4 +- src/d/actor/d_a_obj_Turara.cpp | 2 +- src/d/actor/d_a_obj_TvCdlst.cpp | 2 +- src/d/actor/d_a_obj_Y_taihou.cpp | 2 +- src/d/actor/d_a_obj_amiShutter.cpp | 4 +- src/d/actor/d_a_obj_ari.cpp | 2 +- src/d/actor/d_a_obj_automata.cpp | 8 +- src/d/actor/d_a_obj_avalanche.cpp | 6 +- src/d/actor/d_a_obj_balloon.cpp | 4 +- src/d/actor/d_a_obj_barDesk.cpp | 2 +- src/d/actor/d_a_obj_batta.cpp | 4 +- src/d/actor/d_a_obj_bbox.cpp | 2 +- src/d/actor/d_a_obj_bed.cpp | 8 +- src/d/actor/d_a_obj_bemos.cpp | 26 +-- src/d/actor/d_a_obj_bhashi.cpp | 8 +- src/d/actor/d_a_obj_bhbridge.cpp | 6 +- src/d/actor/d_a_obj_bk_leaf.cpp | 2 +- src/d/actor/d_a_obj_bkdoor.cpp | 2 +- src/d/actor/d_a_obj_bky_rock.cpp | 4 +- src/d/actor/d_a_obj_bmWindow.cpp | 4 +- src/d/actor/d_a_obj_bmshutter.cpp | 2 +- src/d/actor/d_a_obj_bombf.cpp | 2 +- src/d/actor/d_a_obj_bosswarp.cpp | 2 +- src/d/actor/d_a_obj_boumato.cpp | 8 +- src/d/actor/d_a_obj_brakeeff.cpp | 2 +- src/d/actor/d_a_obj_brg.cpp | 6 +- src/d/actor/d_a_obj_bsGate.cpp | 2 +- src/d/actor/d_a_obj_bubblePilar.cpp | 6 +- src/d/actor/d_a_obj_burnbox.cpp | 4 +- src/d/actor/d_a_obj_carry.cpp | 22 +-- src/d/actor/d_a_obj_catdoor.cpp | 2 +- src/d/actor/d_a_obj_cb.cpp | 4 +- src/d/actor/d_a_obj_cblock.cpp | 10 +- src/d/actor/d_a_obj_cboard.cpp | 2 +- src/d/actor/d_a_obj_cdoor.cpp | 2 +- src/d/actor/d_a_obj_chandelier.cpp | 2 +- src/d/actor/d_a_obj_chest.cpp | 2 +- src/d/actor/d_a_obj_cho.cpp | 2 +- src/d/actor/d_a_obj_cowdoor.cpp | 2 +- src/d/actor/d_a_obj_crope.cpp | 4 +- src/d/actor/d_a_obj_crvfence.cpp | 6 +- src/d/actor/d_a_obj_crvgate.cpp | 2 +- src/d/actor/d_a_obj_crvhahen.cpp | 2 +- src/d/actor/d_a_obj_crvlh_down.cpp | 4 +- src/d/actor/d_a_obj_crvlh_up.cpp | 4 +- src/d/actor/d_a_obj_crvsteel.cpp | 4 +- src/d/actor/d_a_obj_crystal.cpp | 2 +- src/d/actor/d_a_obj_cwall.cpp | 8 +- src/d/actor/d_a_obj_damCps.cpp | 2 +- src/d/actor/d_a_obj_dan.cpp | 4 +- src/d/actor/d_a_obj_digholl.cpp | 2 +- src/d/actor/d_a_obj_digplace.cpp | 2 +- src/d/actor/d_a_obj_digsnow.cpp | 6 +- src/d/actor/d_a_obj_dmelevator.cpp | 2 +- src/d/actor/d_a_obj_drop.cpp | 2 +- src/d/actor/d_a_obj_dust.cpp | 4 +- src/d/actor/d_a_obj_eff.cpp | 2 +- src/d/actor/d_a_obj_enemy_create.cpp | 2 +- src/d/actor/d_a_obj_fallobj.cpp | 4 +- src/d/actor/d_a_obj_fan.cpp | 4 +- src/d/actor/d_a_obj_fchain.cpp | 2 +- src/d/actor/d_a_obj_fireWood.cpp | 2 +- src/d/actor/d_a_obj_fireWood2.cpp | 2 +- src/d/actor/d_a_obj_firepillar.cpp | 2 +- src/d/actor/d_a_obj_firepillar2.cpp | 8 +- src/d/actor/d_a_obj_flag.cpp | 6 +- src/d/actor/d_a_obj_flag2.cpp | 8 +- src/d/actor/d_a_obj_flag3.cpp | 6 +- src/d/actor/d_a_obj_fmobj.cpp | 2 +- src/d/actor/d_a_obj_food.cpp | 6 +- src/d/actor/d_a_obj_fw.cpp | 4 +- src/d/actor/d_a_obj_gadget.cpp | 4 +- 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 | 4 +- src/d/actor/d_a_obj_geyser.cpp | 8 +- src/d/actor/d_a_obj_glowSphere.cpp | 4 +- src/d/actor/d_a_obj_gm.cpp | 2 +- src/d/actor/d_a_obj_goGate.cpp | 2 +- src/d/actor/d_a_obj_gomikabe.cpp | 6 +- src/d/actor/d_a_obj_gpTaru.cpp | 8 +- src/d/actor/d_a_obj_gra2.cpp | 10 +- src/d/actor/d_a_obj_gra2_soldier.inc | 2 +- src/d/actor/d_a_obj_graWall.cpp | 2 +- src/d/actor/d_a_obj_gra_rock.cpp | 6 +- src/d/actor/d_a_obj_grave_stone.cpp | 2 +- src/d/actor/d_a_obj_groundwater.cpp | 6 +- src/d/actor/d_a_obj_grz_rock.cpp | 2 +- src/d/actor/d_a_obj_h_saku.cpp | 2 +- src/d/actor/d_a_obj_hakai_brl.cpp | 6 +- src/d/actor/d_a_obj_hakai_ftr.cpp | 4 +- src/d/actor/d_a_obj_hasu2.cpp | 2 +- src/d/actor/d_a_obj_hata.cpp | 2 +- src/d/actor/d_a_obj_hb.cpp | 4 +- src/d/actor/d_a_obj_hbombkoya.cpp | 2 +- src/d/actor/d_a_obj_heavySw.cpp | 2 +- src/d/actor/d_a_obj_hfuta.cpp | 4 +- src/d/actor/d_a_obj_hhashi.cpp | 8 +- src/d/actor/d_a_obj_hsTarget.cpp | 2 +- src/d/actor/d_a_obj_ice_l.cpp | 4 +- src/d/actor/d_a_obj_ice_s.cpp | 4 +- src/d/actor/d_a_obj_iceblock.cpp | 10 +- src/d/actor/d_a_obj_iceleaf.cpp | 16 +- src/d/actor/d_a_obj_ihasi.cpp | 2 +- src/d/actor/d_a_obj_ikada.cpp | 2 +- src/d/actor/d_a_obj_inobone.cpp | 2 +- src/d/actor/d_a_obj_ita.cpp | 2 +- src/d/actor/d_a_obj_itamato.cpp | 4 +- src/d/actor/d_a_obj_item.cpp | 8 +- src/d/actor/d_a_obj_ito.cpp | 4 +- src/d/actor/d_a_obj_kabuto.cpp | 2 +- src/d/actor/d_a_obj_kag.cpp | 6 +- src/d/actor/d_a_obj_kage.cpp | 2 +- src/d/actor/d_a_obj_kago.cpp | 10 +- src/d/actor/d_a_obj_kaisou.cpp | 2 +- src/d/actor/d_a_obj_kamakiri.cpp | 6 +- src/d/actor/d_a_obj_kanban2.cpp | 14 +- src/d/actor/d_a_obj_kantera.cpp | 2 +- src/d/actor/d_a_obj_katatsumuri.cpp | 4 +- src/d/actor/d_a_obj_kazeneko.cpp | 6 +- src/d/actor/d_a_obj_kbacket.cpp | 8 +- src/d/actor/d_a_obj_kbox.cpp | 6 +- src/d/actor/d_a_obj_key.cpp | 6 +- src/d/actor/d_a_obj_keyhole.cpp | 10 +- src/d/actor/d_a_obj_kgate.cpp | 10 +- src/d/actor/d_a_obj_ki.cpp | 2 +- src/d/actor/d_a_obj_kiPot.cpp | 2 +- src/d/actor/d_a_obj_kita.cpp | 4 +- src/d/actor/d_a_obj_kjgjs.cpp | 2 +- src/d/actor/d_a_obj_kkanban.cpp | 2 +- src/d/actor/d_a_obj_klift00.cpp | 8 +- src/d/actor/d_a_obj_knBullet.cpp | 2 +- src/d/actor/d_a_obj_kshutter.cpp | 10 +- src/d/actor/d_a_obj_ktOnFire.cpp | 2 +- src/d/actor/d_a_obj_kuwagata.cpp | 2 +- src/d/actor/d_a_obj_kwheel00.cpp | 4 +- src/d/actor/d_a_obj_kwheel01.cpp | 4 +- src/d/actor/d_a_obj_kznkarm.cpp | 8 +- src/d/actor/d_a_obj_ladder.cpp | 4 +- src/d/actor/d_a_obj_laundry.cpp | 2 +- src/d/actor/d_a_obj_laundry_rope.cpp | 2 +- src/d/actor/d_a_obj_lbox.cpp | 4 +- src/d/actor/d_a_obj_life_container.cpp | 2 +- src/d/actor/d_a_obj_lp.cpp | 4 +- src/d/actor/d_a_obj_lv1Candle00.cpp | 2 +- src/d/actor/d_a_obj_lv1Candle01.cpp | 2 +- src/d/actor/d_a_obj_lv2Candle.cpp | 2 +- src/d/actor/d_a_obj_lv3Candle.cpp | 2 +- src/d/actor/d_a_obj_lv3Water.cpp | 2 +- src/d/actor/d_a_obj_lv3Water2.cpp | 4 +- src/d/actor/d_a_obj_lv3WaterB.cpp | 6 +- src/d/actor/d_a_obj_lv3saka00.cpp | 2 +- src/d/actor/d_a_obj_lv3waterEff.cpp | 2 +- src/d/actor/d_a_obj_lv4CandleDemoTag.cpp | 2 +- src/d/actor/d_a_obj_lv4CandleTag.cpp | 2 +- src/d/actor/d_a_obj_lv4EdShutter.cpp | 2 +- src/d/actor/d_a_obj_lv4Gate.cpp | 2 +- src/d/actor/d_a_obj_lv4HsTarget.cpp | 2 +- src/d/actor/d_a_obj_lv4PoGate.cpp | 2 +- src/d/actor/d_a_obj_lv4RailWall.cpp | 4 +- src/d/actor/d_a_obj_lv4SlideWall.cpp | 4 +- src/d/actor/d_a_obj_lv4bridge.cpp | 2 +- src/d/actor/d_a_obj_lv4chandelier.cpp | 8 +- src/d/actor/d_a_obj_lv4digsand.cpp | 6 +- src/d/actor/d_a_obj_lv4floor.cpp | 2 +- src/d/actor/d_a_obj_lv4gear.cpp | 4 +- src/d/actor/d_a_obj_lv4prelvtr.cpp | 2 +- src/d/actor/d_a_obj_lv4prwall.cpp | 2 +- src/d/actor/d_a_obj_lv4sand.cpp | 6 +- src/d/actor/d_a_obj_lv5FloorBoard.cpp | 4 +- src/d/actor/d_a_obj_lv5IceWall.cpp | 6 +- src/d/actor/d_a_obj_lv5SwIce.cpp | 4 +- src/d/actor/d_a_obj_lv5ychndlr.cpp | 6 +- src/d/actor/d_a_obj_lv5yiblltray.cpp | 8 +- src/d/actor/d_a_obj_lv6ChangeGate.cpp | 2 +- src/d/actor/d_a_obj_lv6FurikoTrap.cpp | 2 +- src/d/actor/d_a_obj_lv6Lblock.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_lv6TogeRoll.cpp | 2 +- src/d/actor/d_a_obj_lv6TogeTrap.cpp | 2 +- src/d/actor/d_a_obj_lv6bemos.cpp | 16 +- src/d/actor/d_a_obj_lv6bemos2.cpp | 20 +-- src/d/actor/d_a_obj_lv6egate.cpp | 2 +- src/d/actor/d_a_obj_lv6elevta.cpp | 2 +- src/d/actor/d_a_obj_lv6swturn.cpp | 2 +- src/d/actor/d_a_obj_lv7BsGate.cpp | 2 +- src/d/actor/d_a_obj_lv7PropellerY.cpp | 2 +- src/d/actor/d_a_obj_lv7bridge.cpp | 2 +- src/d/actor/d_a_obj_lv8KekkaiTrap.cpp | 2 +- src/d/actor/d_a_obj_lv8Lift.cpp | 4 +- src/d/actor/d_a_obj_lv8OptiLift.cpp | 4 +- src/d/actor/d_a_obj_lv8UdFloor.cpp | 2 +- src/d/actor/d_a_obj_lv9SwShutter.cpp | 2 +- src/d/actor/d_a_obj_magLift.cpp | 2 +- src/d/actor/d_a_obj_magLiftRot.cpp | 2 +- src/d/actor/d_a_obj_magne_arm.cpp | 2 +- src/d/actor/d_a_obj_maki.cpp | 2 +- src/d/actor/d_a_obj_master_sword.cpp | 2 +- src/d/actor/d_a_obj_mato.cpp | 2 +- src/d/actor/d_a_obj_metalbox.cpp | 2 +- src/d/actor/d_a_obj_mgate.cpp | 2 +- src/d/actor/d_a_obj_mhole.cpp | 10 +- src/d/actor/d_a_obj_mie.cpp | 10 +- src/d/actor/d_a_obj_mirror_6pole.cpp | 2 +- src/d/actor/d_a_obj_mirror_chain.cpp | 100 +----------- src/d/actor/d_a_obj_mirror_sand.cpp | 2 +- src/d/actor/d_a_obj_mirror_screw.cpp | 2 +- src/d/actor/d_a_obj_mirror_table.cpp | 2 +- src/d/actor/d_a_obj_movebox.cpp | 10 +- src/d/actor/d_a_obj_msima.cpp | 6 +- src/d/actor/d_a_obj_mvstair.cpp | 4 +- src/d/actor/d_a_obj_myogan.cpp | 2 +- src/d/actor/d_a_obj_nagaisu.cpp | 2 +- src/d/actor/d_a_obj_nameplate.cpp | 2 +- src/d/actor/d_a_obj_nan.cpp | 6 +- src/d/actor/d_a_obj_ndoor.cpp | 4 +- src/d/actor/d_a_obj_nougu.cpp | 4 +- src/d/actor/d_a_obj_octhashi.cpp | 4 +- src/d/actor/d_a_obj_oiltubo.cpp | 8 +- src/d/actor/d_a_obj_onsen.cpp | 2 +- src/d/actor/d_a_obj_onsenFire.cpp | 2 +- src/d/actor/d_a_obj_onsenTaru.cpp | 6 +- src/d/actor/d_a_obj_ornament_cloth.cpp | 6 +- src/d/actor/d_a_obj_pdoor.cpp | 4 +- src/d/actor/d_a_obj_pdtile.cpp | 4 +- src/d/actor/d_a_obj_pdwall.cpp | 2 +- src/d/actor/d_a_obj_picture.cpp | 2 +- src/d/actor/d_a_obj_pillar.cpp | 8 +- src/d/actor/d_a_obj_pleaf.cpp | 8 +- src/d/actor/d_a_obj_poCandle.cpp | 2 +- src/d/actor/d_a_obj_poFire.cpp | 2 +- src/d/actor/d_a_obj_poTbox.cpp | 2 +- src/d/actor/d_a_obj_prop.cpp | 2 +- src/d/actor/d_a_obj_pumpkin.cpp | 4 +- src/d/actor/d_a_obj_rcircle.cpp | 2 +- src/d/actor/d_a_obj_rfHole.cpp | 4 +- src/d/actor/d_a_obj_rgate.cpp | 12 +- src/d/actor/d_a_obj_riverrock.cpp | 4 +- src/d/actor/d_a_obj_rock.cpp | 2 +- src/d/actor/d_a_obj_rope_bridge.cpp | 8 +- src/d/actor/d_a_obj_rotBridge.cpp | 2 +- src/d/actor/d_a_obj_rotTrap.cpp | 2 +- src/d/actor/d_a_obj_roten.cpp | 4 +- src/d/actor/d_a_obj_rstair.cpp | 8 +- src/d/actor/d_a_obj_rw.cpp | 2 +- src/d/actor/d_a_obj_sWallShutter.cpp | 4 +- src/d/actor/d_a_obj_saidan.cpp | 2 +- src/d/actor/d_a_obj_sakuita.cpp | 8 +- src/d/actor/d_a_obj_sakuita_rope.cpp | 12 +- src/d/actor/d_a_obj_scannon.cpp | 16 +- src/d/actor/d_a_obj_scannon_crs.cpp | 8 +- src/d/actor/d_a_obj_scannon_ten.cpp | 8 +- src/d/actor/d_a_obj_sekidoor.cpp | 2 +- src/d/actor/d_a_obj_sekizo.cpp | 2 +- src/d/actor/d_a_obj_sekizoa.cpp | 2 +- src/d/actor/d_a_obj_shield.cpp | 2 +- src/d/actor/d_a_obj_sm_door.cpp | 2 +- src/d/actor/d_a_obj_smallkey.cpp | 2 +- src/d/actor/d_a_obj_smgdoor.cpp | 4 +- src/d/actor/d_a_obj_smoke.cpp | 2 +- src/d/actor/d_a_obj_smtile.cpp | 2 +- src/d/actor/d_a_obj_smw_stone.cpp | 2 +- src/d/actor/d_a_obj_snowEffTag.cpp | 2 +- src/d/actor/d_a_obj_snow_soup.cpp | 2 +- src/d/actor/d_a_obj_so.cpp | 4 +- src/d/actor/d_a_obj_spinLift.cpp | 4 +- src/d/actor/d_a_obj_ss_base.cpp | 2 +- src/d/actor/d_a_obj_ss_drink.cpp | 8 +- src/d/actor/d_a_obj_ss_item.cpp | 6 +- src/d/actor/d_a_obj_stairBlock.cpp | 4 +- src/d/actor/d_a_obj_stick.cpp | 8 +- src/d/actor/d_a_obj_stone.cpp | 10 +- src/d/actor/d_a_obj_stoneMark.cpp | 2 +- src/d/actor/d_a_obj_stopper.cpp | 2 +- src/d/actor/d_a_obj_stopper2.cpp | 2 +- src/d/actor/d_a_obj_suisya.cpp | 2 +- src/d/actor/d_a_obj_sw.cpp | 4 +- src/d/actor/d_a_obj_swBallA.cpp | 6 +- src/d/actor/d_a_obj_swBallB.cpp | 6 +- src/d/actor/d_a_obj_swBallC.cpp | 6 +- src/d/actor/d_a_obj_swLight.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_sword.cpp | 2 +- src/d/actor/d_a_obj_swpropeller.cpp | 2 +- src/d/actor/d_a_obj_swpush.cpp | 6 +- src/d/actor/d_a_obj_swpush2.cpp | 2 +- src/d/actor/d_a_obj_swpush5.cpp | 6 +- src/d/actor/d_a_obj_swspinner.cpp | 6 +- src/d/actor/d_a_obj_swturn.cpp | 4 +- src/d/actor/d_a_obj_syRock.cpp | 6 +- src/d/actor/d_a_obj_szbridge.cpp | 4 +- src/d/actor/d_a_obj_taFence.cpp | 2 +- src/d/actor/d_a_obj_table.cpp | 2 +- src/d/actor/d_a_obj_takaraDai.cpp | 2 +- src/d/actor/d_a_obj_tatigi.cpp | 6 +- src/d/actor/d_a_obj_ten.cpp | 4 +- src/d/actor/d_a_obj_testcube.cpp | 2 +- src/d/actor/d_a_obj_tgake.cpp | 2 +- src/d/actor/d_a_obj_thashi.cpp | 2 +- src/d/actor/d_a_obj_thdoor.cpp | 4 +- src/d/actor/d_a_obj_timeFire.cpp | 2 +- src/d/actor/d_a_obj_timer.cpp | 2 +- src/d/actor/d_a_obj_tks.cpp | 16 +- src/d/actor/d_a_obj_tmoon.cpp | 2 +- src/d/actor/d_a_obj_toaru_maki.cpp | 4 +- src/d/actor/d_a_obj_toby.cpp | 12 +- src/d/actor/d_a_obj_tobyhouse.cpp | 14 +- src/d/actor/d_a_obj_togeTrap.cpp | 6 +- src/d/actor/d_a_obj_tombo.cpp | 8 +- src/d/actor/d_a_obj_tornado.cpp | 2 +- src/d/actor/d_a_obj_tornado2.cpp | 2 +- src/d/actor/d_a_obj_tp.cpp | 4 +- src/d/actor/d_a_obj_treesh.cpp | 4 +- src/d/actor/d_a_obj_twGate.cpp | 4 +- src/d/actor/d_a_obj_udoor.cpp | 4 +- src/d/actor/d_a_obj_usaku.cpp | 2 +- src/d/actor/d_a_obj_vground.cpp | 2 +- src/d/actor/d_a_obj_volcball.cpp | 4 +- src/d/actor/d_a_obj_volcbom.cpp | 20 +-- src/d/actor/d_a_obj_warp_kbrg.cpp | 18 +-- src/d/actor/d_a_obj_warp_obrg.cpp | 12 +- src/d/actor/d_a_obj_waterGate.cpp | 4 +- src/d/actor/d_a_obj_waterPillar.cpp | 4 +- src/d/actor/d_a_obj_waterfall.cpp | 2 +- src/d/actor/d_a_obj_wchain.cpp | 2 +- src/d/actor/d_a_obj_wdStick.cpp | 6 +- src/d/actor/d_a_obj_web0.cpp | 2 +- src/d/actor/d_a_obj_web1.cpp | 2 +- src/d/actor/d_a_obj_well_cover.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_wood_pendulum.cpp | 2 +- src/d/actor/d_a_obj_wood_statue.cpp | 2 +- src/d/actor/d_a_obj_wsword.cpp | 2 +- src/d/actor/d_a_obj_yel_bag.cpp | 10 +- src/d/actor/d_a_obj_yobikusa.cpp | 2 +- src/d/actor/d_a_obj_yousei.cpp | 8 +- src/d/actor/d_a_obj_ystone.cpp | 2 +- src/d/actor/d_a_obj_zcloth.cpp | 2 +- src/d/actor/d_a_obj_zdoor.cpp | 2 +- src/d/actor/d_a_obj_zrTurara.cpp | 2 +- src/d/actor/d_a_obj_zrTuraraRock.cpp | 2 +- src/d/actor/d_a_obj_zraMark.cpp | 6 +- src/d/actor/d_a_obj_zra_freeze.cpp | 2 +- src/d/actor/d_a_obj_zra_rock.cpp | 2 +- src/d/actor/d_a_passer_mng.cpp | 4 +- src/d/actor/d_a_path_line.cpp | 2 +- src/d/actor/d_a_peru.cpp | 4 +- src/d/actor/d_a_player.cpp | 2 +- src/d/actor/d_a_ppolamp.cpp | 8 +- src/d/actor/d_a_scene_exit.cpp | 2 +- src/d/actor/d_a_scene_exit2.cpp | 2 +- src/d/actor/d_a_set_bgobj.cpp | 2 +- src/d/actor/d_a_shop_item.cpp | 2 +- src/d/actor/d_a_skip_2D.cpp | 2 +- src/d/actor/d_a_spinner.cpp | 4 +- src/d/actor/d_a_sq.cpp | 2 +- src/d/actor/d_a_startAndGoal.cpp | 4 +- src/d/actor/d_a_suspend.cpp | 2 +- src/d/actor/d_a_swBall.cpp | 2 +- src/d/actor/d_a_swLBall.cpp | 2 +- src/d/actor/d_a_swTime.cpp | 2 +- src/d/actor/d_a_swc00.cpp | 2 +- src/d/actor/d_a_swhit0.cpp | 4 +- src/d/actor/d_a_tag_CstaSw.cpp | 2 +- src/d/actor/d_a_tag_Lv6Gate.cpp | 2 +- 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_ajnot.cpp | 2 +- src/d/actor/d_a_tag_allmato.cpp | 12 +- src/d/actor/d_a_tag_arena.cpp | 2 +- src/d/actor/d_a_tag_assistance.cpp | 2 +- src/d/actor/d_a_tag_attack_item.cpp | 2 +- src/d/actor/d_a_tag_attention.cpp | 2 +- src/d/actor/d_a_tag_bottle_item.cpp | 2 +- src/d/actor/d_a_tag_camera.cpp | 2 +- src/d/actor/d_a_tag_chgrestart.cpp | 2 +- src/d/actor/d_a_tag_chkpoint.cpp | 2 +- src/d/actor/d_a_tag_csw.cpp | 6 +- src/d/actor/d_a_tag_escape.cpp | 2 +- src/d/actor/d_a_tag_event.cpp | 2 +- src/d/actor/d_a_tag_evt.cpp | 2 +- src/d/actor/d_a_tag_evtarea.cpp | 2 +- src/d/actor/d_a_tag_evtmsg.cpp | 2 +- src/d/actor/d_a_tag_firewall.cpp | 2 +- src/d/actor/d_a_tag_gra.cpp | 2 +- src/d/actor/d_a_tag_gstart.cpp | 2 +- src/d/actor/d_a_tag_guard.cpp | 2 +- src/d/actor/d_a_tag_hinit.cpp | 2 +- src/d/actor/d_a_tag_hjump.cpp | 2 +- src/d/actor/d_a_tag_howl.cpp | 2 +- src/d/actor/d_a_tag_hstop.cpp | 2 +- src/d/actor/d_a_tag_instruction.cpp | 2 +- src/d/actor/d_a_tag_kago_fall.cpp | 2 +- src/d/actor/d_a_tag_kmsg.cpp | 10 +- src/d/actor/d_a_tag_lantern.cpp | 4 +- src/d/actor/d_a_tag_lightball.cpp | 2 +- src/d/actor/d_a_tag_lv2prchk.cpp | 2 +- src/d/actor/d_a_tag_lv5soup.cpp | 2 +- src/d/actor/d_a_tag_lv6CstaSw.cpp | 2 +- src/d/actor/d_a_tag_magne.cpp | 2 +- src/d/actor/d_a_tag_mhint.cpp | 2 +- src/d/actor/d_a_tag_mist.cpp | 2 +- src/d/actor/d_a_tag_mmsg.cpp | 2 +- src/d/actor/d_a_tag_msg.cpp | 4 +- src/d/actor/d_a_tag_mstop.cpp | 2 +- src/d/actor/d_a_tag_mwait.cpp | 2 +- src/d/actor/d_a_tag_myna2.cpp | 2 +- src/d/actor/d_a_tag_myna_light.cpp | 2 +- src/d/actor/d_a_tag_pachi.cpp | 2 +- src/d/actor/d_a_tag_poFire.cpp | 2 +- src/d/actor/d_a_tag_push.cpp | 2 +- src/d/actor/d_a_tag_qs.cpp | 2 +- src/d/actor/d_a_tag_ret_room.cpp | 2 +- src/d/actor/d_a_tag_river_back.cpp | 2 +- src/d/actor/d_a_tag_rmbit_sw.cpp | 2 +- src/d/actor/d_a_tag_schedule.cpp | 2 +- src/d/actor/d_a_tag_setBall.cpp | 2 +- src/d/actor/d_a_tag_setrestart.cpp | 2 +- src/d/actor/d_a_tag_shop_camera.cpp | 2 +- src/d/actor/d_a_tag_shop_item.cpp | 2 +- src/d/actor/d_a_tag_smk_emt.cpp | 2 +- src/d/actor/d_a_tag_spinner.cpp | 2 +- src/d/actor/d_a_tag_sppath.cpp | 2 +- src/d/actor/d_a_tag_spring.cpp | 2 +- src/d/actor/d_a_tag_ss_drink.cpp | 2 +- src/d/actor/d_a_tag_statue_evt.cpp | 2 +- src/d/actor/d_a_tag_stream.cpp | 2 +- src/d/actor/d_a_tag_telop.cpp | 2 +- src/d/actor/d_a_tag_theB_hint.cpp | 2 +- src/d/actor/d_a_tag_wara_howl.cpp | 2 +- src/d/actor/d_a_tag_watchge.cpp | 2 +- src/d/actor/d_a_tag_waterfall.cpp | 2 +- src/d/actor/d_a_tag_wljump.cpp | 2 +- src/d/actor/d_a_tag_yami.cpp | 2 +- src/d/actor/d_a_talk.cpp | 2 +- src/d/actor/d_a_tbox.cpp | 28 ++-- src/d/actor/d_a_tbox2.cpp | 6 +- src/d/actor/d_a_tboxSw.cpp | 2 +- src/d/actor/d_a_title.cpp | 4 +- src/d/actor/d_a_vrbox.cpp | 2 +- src/d/actor/d_a_vrbox2.cpp | 10 +- src/d/actor/d_a_warp_bug.cpp | 2 +- src/d/actor/d_a_ykgr.cpp | 2 +- src/d/actor/d_flower.inc | 2 +- src/d/d_a_horse_static.cpp | 2 +- src/d/d_a_item_static.cpp | 2 +- src/d/d_a_itembase_static.cpp | 2 +- src/d/d_a_obj.cpp | 4 +- src/d/d_a_shop_item_static.cpp | 2 +- src/d/d_att_dist.cpp | 2 +- src/d/d_attention.cpp | 8 +- src/d/d_bg_parts.cpp | 2 +- src/d/d_bg_pc.cpp | 2 +- src/d/d_bg_plc.cpp | 6 +- src/d/d_bg_s.cpp | 4 +- src/d/d_bg_s_acch.cpp | 36 ++--- src/d/d_bg_s_chk.cpp | 2 +- src/d/d_bg_s_gnd_chk.cpp | 2 +- src/d/d_bg_s_lin_chk.cpp | 27 +++- src/d/d_bg_s_movebg_actor.cpp | 2 +- src/d/d_bg_s_roof_chk.cpp | 4 +- src/d/d_bg_s_sph_chk.cpp | 2 +- src/d/d_bg_s_spl_grp_chk.cpp | 4 +- src/d/d_bg_s_wtr_chk.cpp | 2 +- src/d/d_bg_w.cpp | 14 +- src/d/d_bg_w_base.cpp | 2 +- src/d/d_bg_w_kcol.cpp | 8 +- src/d/d_bg_w_sv.cpp | 2 +- src/d/d_bomb.cpp | 2 +- src/d/d_bright_check.cpp | 6 +- src/d/d_cam_param.cpp | 2 +- src/d/d_camera.cpp | 16 +- src/d/d_cc_d.cpp | 2 +- src/d/d_cc_mass_s.cpp | 14 +- src/d/d_cc_s.cpp | 2 +- src/d/d_cc_uty.cpp | 2 +- src/d/d_com_inf_actor.cpp | 2 +- src/d/d_com_inf_game.cpp | 6 +- src/d/d_debug_viewer.cpp | 2 +- src/d/d_demo.cpp | 40 ++--- src/d/d_door_param2.cpp | 2 +- src/d/d_drawlist.cpp | 4 +- src/d/d_envse.cpp | 2 +- src/d/d_error_msg.cpp | 2 +- src/d/d_ev_camera.cpp | 2 +- src/d/d_event.cpp | 20 +-- src/d/d_event_data.cpp | 24 +-- src/d/d_event_debug.cpp | 2 +- src/d/d_event_lib.cpp | 2 +- src/d/d_event_manager.cpp | 16 +- src/d/d_eye_hl.cpp | 2 +- src/d/d_file_sel_info.cpp | 4 +- src/d/d_file_sel_warning.cpp | 8 +- src/d/d_file_select.cpp | 54 +++---- src/d/d_gameover.cpp | 8 +- src/d/d_home_button.cpp | 2 +- src/d/d_insect.cpp | 2 +- src/d/d_item.cpp | 2 +- src/d/d_item_data.cpp | 2 +- src/d/d_jnt_col.cpp | 2 +- src/d/d_k_wmark.cpp | 4 +- src/d/d_k_wpillar.cpp | 2 +- src/d/d_kankyo.cpp | 22 +-- src/d/d_kankyo_data.cpp | 2 +- src/d/d_kankyo_rain.cpp | 6 +- src/d/d_kankyo_wether.cpp | 4 +- src/d/d_kantera_icon_meter.cpp | 2 +- src/d/d_ky_thunder.cpp | 2 +- src/d/d_kyeff.cpp | 2 +- src/d/d_kyeff2.cpp | 2 +- src/d/d_lib.cpp | 6 +- src/d/d_map.cpp | 28 ++-- src/d/d_map_path.cpp | 2 +- src/d/d_map_path_dmap.cpp | 8 +- src/d/d_map_path_fmap.cpp | 2 +- src/d/d_menu_calibration.cpp | 2 +- src/d/d_menu_collect.cpp | 2 +- src/d/d_menu_dmap.cpp | 64 ++++---- src/d/d_menu_dmap_map.cpp | 38 ++--- src/d/d_menu_fishing.cpp | 2 +- src/d/d_menu_fmap.cpp | 2 +- src/d/d_menu_fmap2D.cpp | 24 +-- src/d/d_menu_fmap_map.cpp | 2 +- src/d/d_menu_insect.cpp | 2 +- src/d/d_menu_item_explain.cpp | 2 +- src/d/d_menu_letter.cpp | 36 ++--- src/d/d_menu_map_common.cpp | 94 +++++------ src/d/d_menu_option.cpp | 2 +- src/d/d_menu_ring.cpp | 2 +- src/d/d_menu_save.cpp | 2 +- src/d/d_menu_skill.cpp | 2 +- src/d/d_menu_window.cpp | 46 +++--- src/d/d_menu_window_HIO.cpp | 2 +- src/d/d_meter2.cpp | 2 +- src/d/d_meter2_draw.cpp | 150 +++++++++--------- src/d/d_meter2_info.cpp | 14 +- src/d/d_meter_HIO.cpp | 2 +- src/d/d_meter_button.cpp | 54 +++---- src/d/d_meter_haihai.cpp | 6 +- src/d/d_meter_hakusha.cpp | 16 +- src/d/d_meter_map.cpp | 2 +- src/d/d_meter_string.cpp | 10 +- src/d/d_model.cpp | 2 +- src/d/d_msg_class.cpp | 4 +- src/d/d_msg_flow.cpp | 36 ++--- src/d/d_msg_object.cpp | 36 ++--- src/d/d_msg_out_font.cpp | 2 +- src/d/d_msg_scrn_3select.cpp | 30 ++-- src/d/d_msg_scrn_arrow.cpp | 10 +- src/d/d_msg_scrn_base.cpp | 2 +- src/d/d_msg_scrn_boss.cpp | 2 +- src/d/d_msg_scrn_explain.cpp | 2 +- src/d/d_msg_scrn_howl.cpp | 32 ++-- src/d/d_msg_scrn_item.cpp | 52 +++--- src/d/d_msg_scrn_jimaku.cpp | 14 +- src/d/d_msg_scrn_kanban.cpp | 12 +- src/d/d_msg_scrn_light.cpp | 6 +- src/d/d_msg_scrn_place.cpp | 2 +- src/d/d_msg_scrn_staff.cpp | 2 +- src/d/d_msg_scrn_talk.cpp | 42 ++--- src/d/d_msg_scrn_tree.cpp | 2 +- src/d/d_msg_string.cpp | 2 +- src/d/d_msg_string_base.cpp | 14 +- src/d/d_msg_unit.cpp | 2 +- src/d/d_name.cpp | 10 +- src/d/d_npc_lib.cpp | 2 +- src/d/d_ovlp_fade.cpp | 4 +- src/d/d_ovlp_fade2.cpp | 2 +- src/d/d_ovlp_fade3.cpp | 2 +- src/d/d_pane_class.cpp | 2 +- src/d/d_pane_class_alpha.cpp | 2 +- src/d/d_pane_class_ex.cpp | 2 +- src/d/d_particle_copoly.cpp | 2 +- src/d/d_particle_name.cpp | 2 +- src/d/d_path.cpp | 2 +- src/d/d_resorce.cpp | 24 +-- src/d/d_s_logo.cpp | 4 +- src/d/d_s_menu.cpp | 12 +- src/d/d_s_name.cpp | 2 +- src/d/d_s_play.cpp | 6 +- src/d/d_s_room.cpp | 2 +- src/d/d_s_title.cpp | 2 +- src/d/d_save.cpp | 6 +- src/d/d_save_HIO.cpp | 2 +- src/d/d_save_init.cpp | 2 +- src/d/d_scope.cpp | 2 +- src/d/d_select_cursor.cpp | 2 +- src/d/d_select_icon.cpp | 2 +- src/d/d_shop_camera.cpp | 2 +- src/d/d_shop_item_ctrl.cpp | 2 +- src/d/d_shop_system.cpp | 2 +- src/d/d_simple_model.cpp | 8 +- src/d/d_spline_path.cpp | 2 +- src/d/d_stage.cpp | 20 +-- src/d/d_timer.cpp | 36 ++--- src/d/d_tresure.cpp | 2 +- src/d/d_vib_pattern.cpp | 2 +- src/d/d_vibration.cpp | 2 +- src/f_op/f_op_actor.cpp | 2 +- src/f_op/f_op_actor_mng.cpp | 36 ++--- src/f_op/f_op_msg_mng.cpp | 2 +- src/f_pc/f_pc_deletor.cpp | 2 +- src/f_pc/f_pc_manager.cpp | 4 +- src/m_Do/m_Do_ext.cpp | 30 ++-- src/m_Do/m_Do_graphic.cpp | 2 +- 1008 files changed, 3172 insertions(+), 3237 deletions(-) diff --git a/include/JSystem/JAudio2/JAISoundHandles.h b/include/JSystem/JAudio2/JAISoundHandles.h index f1274ceb3d..f754e4976c 100644 --- a/include/JSystem/JAudio2/JAISoundHandles.h +++ b/include/JSystem/JAudio2/JAISoundHandles.h @@ -19,7 +19,7 @@ public: bool isSoundAttached() const { return sound_ != NULL; } JAISound* operator->() const { - JUT_ASSERT(58, sound_ != 0); + JUT_ASSERT(58, sound_ != NULL); return sound_; } diff --git a/include/JSystem/JAudio2/JASGadget.h b/include/JSystem/JAudio2/JASGadget.h index 5408daf19a..b48b234b2a 100644 --- a/include/JSystem/JAudio2/JASGadget.h +++ b/include/JSystem/JAudio2/JASGadget.h @@ -17,7 +17,7 @@ public: JASGlobalInstance(bool param_1) { if (param_1) { - JUT_ASSERT(186, sInstance == 0); + JUT_ASSERT(186, sInstance == NULL); sInstance = (T*)this; } } diff --git a/include/JSystem/JAudio2/JASTrack.h b/include/JSystem/JAudio2/JASTrack.h index 3691975556..884f09b3d7 100644 --- a/include/JSystem/JAudio2/JASTrack.h +++ b/include/JSystem/JAudio2/JASTrack.h @@ -17,8 +17,6 @@ namespace JASDsp { extern const u32 FILTER_MODE_IIR; }; -#define MAX_CHILDREN 16 - /** * @ingroup jsystem-jaudio * @@ -126,6 +124,8 @@ struct JASTrack : public JASPoolAllocObject_MultiThreaded { static JASDefaultBankTable sDefaultBankTable; static TList sTrackList; + static const int MAX_CHILDREN = 16; + JASSeqCtrl* getSeqCtrl() { return &mSeqCtrl; } u16 getPort(u32 param_0) const { return mTrackPort.get(param_0); } void setPort(u32 param_0, u16 param_1) { mTrackPort.set(param_0, param_1); } diff --git a/include/JSystem/JAudio2/JAUStreamAramMgr.h b/include/JSystem/JAudio2/JAUStreamAramMgr.h index 9ce6f094c1..9f2c6b1cb5 100644 --- a/include/JSystem/JAudio2/JAUStreamAramMgr.h +++ b/include/JSystem/JAudio2/JAUStreamAramMgr.h @@ -28,7 +28,7 @@ public: JASHeap* heap = &mHeaps[0]; // should probably be mHeaps[i] but that doesn't match heap->free(); if (!heap) { - JUT_ASSERT(47, 0); + JUT_ASSERT(47, FALSE); } } } diff --git a/include/JSystem/JGadget/linklist.h b/include/JSystem/JGadget/linklist.h index 864f2b6dd2..8fdbe6518f 100644 --- a/include/JSystem/JGadget/linklist.h +++ b/include/JSystem/JGadget/linklist.h @@ -191,19 +191,19 @@ struct TLinkList : public TNodeLinkList { }; static TLinkListNode* Element_toNode(T* p) { - JUT_ASSERT(0x2F1, p!=0); + JUT_ASSERT(0x2F1, p!=NULL); return reinterpret_cast(reinterpret_cast(p) - I); } static const TLinkListNode* Element_toNode(const T* p) { - JUT_ASSERT(0x2F6, p!=0); + JUT_ASSERT(0x2F6, p!=NULL); return reinterpret_cast(reinterpret_cast(p) - I); } static T* Element_toValue(TLinkListNode* p) { - JUT_ASSERT(0x2FB, p!=0); + JUT_ASSERT(0x2FB, p!=NULL); return reinterpret_cast(reinterpret_cast(p) + I); } static const T* Element_toValue(const TLinkListNode* p) { - JUT_ASSERT(0x300, p!=0); + JUT_ASSERT(0x300, p!=NULL); return reinterpret_cast(reinterpret_cast(p) + I); } diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h index 1fdd846dde..e4c5c538b7 100644 --- a/include/JSystem/JGadget/search.h +++ b/include/JSystem/JGadget/search.h @@ -25,7 +25,7 @@ struct TExpandStride_ { //! Target: toValueFromIndex__7JGadgetFiPCPFdd_dUlRCPFdd_d_RCPFdd_d template inline const T& toValueFromIndex(int idx, const T* pValue, u32 count, const T& fallback) { - JUT_ASSERT(200, pValue!=0); + JUT_ASSERT(200, pValue!=NULL); u32 index = idx; if (index >= count) { return fallback; diff --git a/include/JSystem/JGadget/std-memory.h b/include/JSystem/JGadget/std-memory.h index e80124dbdc..477da2a9ef 100644 --- a/include/JSystem/JGadget/std-memory.h +++ b/include/JSystem/JGadget/std-memory.h @@ -23,7 +23,7 @@ struct TAllocator { } void destroy(T* p) { - JUT_ASSERT(68, p!=0); + JUT_ASSERT(68, p!=NULL); } /* 0x0 */ u8 mAllocator; diff --git a/include/JSystem/JGadget/std-vector.h b/include/JSystem/JGadget/std-vector.h index 7732a2861d..8bcc499e7a 100644 --- a/include/JSystem/JGadget/std-vector.h +++ b/include/JSystem/JGadget/std-vector.h @@ -125,7 +125,7 @@ struct TVector { u32 capacity() { return mCapacity; } u32 GetSize_extend_(u32 count) { - JUT_ASSERT(0x22B, pfnExtend_!=0); + JUT_ASSERT(0x22B, pfnExtend_!=NULL); u32 oldSize = size(); u32 neededNewSpace = oldSize + count; diff --git a/include/JSystem/JHostIO/JORServer.h b/include/JSystem/JHostIO/JORServer.h index 3f28539e45..99fdf51f9d 100644 --- a/include/JSystem/JHostIO/JORServer.h +++ b/include/JSystem/JHostIO/JORServer.h @@ -56,12 +56,12 @@ public: void releaseMCTX(JORMContext*); void appendEventCallbackListNode(JOREventCallbackListNode* p) { - JUT_ASSERT(256, p!=0); + JUT_ASSERT(256, p!=NULL); m_eventCallbackList.Push_front(p); } void removeEventCallbackListNode(JOREventCallbackListNode* p) { - JUT_ASSERT(257, p!=0); + JUT_ASSERT(257, p!=NULL); m_eventCallbackList.Remove(p); } diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h index a7538c53ed..234e8a5390 100644 --- a/include/JSystem/JKernel/JKRArchive.h +++ b/include/JSystem/JKernel/JKRArchive.h @@ -202,12 +202,12 @@ public: static JKRCompression convertAttrToCompressionType(u32 attr) { #define JKRARCHIVE_ATTR_COMPRESSION 0x04 -#define JKRARCHIVE_ATTR_YAY0 0x80 +#define JKRARCHIVE_ATTR_YAZ0 0x80 JKRCompression compression; - if (FLAG_ON(attr, JKRARCHIVE_ATTR_COMPRESSION)) { + if (!(attr & JKRARCHIVE_ATTR_COMPRESSION)) { compression = COMPRESSION_NONE; - } else if (!FLAG_ON(attr, JKRARCHIVE_ATTR_YAY0)) { + } else if (attr & JKRARCHIVE_ATTR_YAZ0) { compression = COMPRESSION_YAZ0; } else { compression = COMPRESSION_YAY0; diff --git a/include/JSystem/JMessage/control.h b/include/JSystem/JMessage/control.h index 1b32722bd5..f832b95e71 100644 --- a/include/JSystem/JMessage/control.h +++ b/include/JSystem/JMessage/control.h @@ -36,8 +36,8 @@ struct TControl { } int setMessageCode_inReset_(const TProcessor* pProcessor, u16 u16GroupID, u16 u16Index) { - JUT_ASSERT(138, pEntry_==0); - JUT_ASSERT(139, pszText_update_current_==0); + JUT_ASSERT(138, pEntry_==NULL); + JUT_ASSERT(139, pszText_update_current_==NULL); JUT_ASSERT(140, oStack_renderingProcessor_.empty()); if (!setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) { diff --git a/include/JSystem/JMessage/processor.h b/include/JSystem/JMessage/processor.h index d67378ea78..1f470b78ca 100644 --- a/include/JSystem/JMessage/processor.h +++ b/include/JSystem/JMessage/processor.h @@ -20,7 +20,7 @@ struct TReference { /* 802A7B40 */ virtual const char* do_word(u32) const; int on_parseCharacter(const char** ppszText) const { - JUT_ASSERT(97, pcResource_!=0); + JUT_ASSERT(97, pcResource_!=NULL); return pcResource_->parseCharacter(ppszText); } @@ -46,7 +46,7 @@ struct TProcessor { pResourceCache_(NULL), pszCurrent_(NULL) { - JUT_ASSERT(584, pReference_!=0); + JUT_ASSERT(584, pReference_!=NULL); } typedef bool (*pfnProcess_func)(TProcessor*); @@ -175,7 +175,7 @@ struct TProcessor { void on_character(int iCharacter) { do_character(iCharacter); } const char* on_message_limited(u16 u16Index) const { - JUT_ASSERT(482, pResourceCache_!=0); + JUT_ASSERT(482, pResourceCache_!=NULL); return pResourceCache_->getMessageText_messageIndex(u16Index); } @@ -190,7 +190,7 @@ struct TProcessor { } int setBegin_messageEntryText(const TProcessor* pProcessor, const void* pEntry, const char* pszText) { - JUT_ASSERT(306, pProcessor!=0); + JUT_ASSERT(306, pProcessor!=NULL); setBegin_messageEntryText(pProcessor->getResourceCache(), pEntry, pszText); return 1; } diff --git a/include/JSystem/JMessage/resource.h b/include/JSystem/JMessage/resource.h index 26fb74f2b6..a9c23e011b 100644 --- a/include/JSystem/JMessage/resource.h +++ b/include/JSystem/JMessage/resource.h @@ -41,7 +41,7 @@ struct TResource { } char* getMessageText_messageEntry(const void* pEntry) const { - JUT_ASSERT(141, pEntry!=0); + JUT_ASSERT(141, pEntry!=NULL); return pMessageText_ + *(int*)pEntry; } @@ -124,7 +124,7 @@ struct TResourceContainer { /* 802A90F0 */ void setEncoding_(u8 e); int parseCharacter(const char** ppszText) const { - JUT_ASSERT(330, pfnParseCharacter_!=0); + JUT_ASSERT(330, pfnParseCharacter_!=NULL); return pfnParseCharacter_(ppszText); } diff --git a/include/JSystem/JStudio/JStudio/ctb.h b/include/JSystem/JStudio/JStudio/ctb.h index d45b3e74bc..5f832af9c5 100644 --- a/include/JSystem/JStudio/JStudio/ctb.h +++ b/include/JSystem/JStudio/JStudio/ctb.h @@ -11,7 +11,7 @@ namespace ctb { struct TObject : public object::TObject_ID { TObject(const void* id, u32 size, const void* param_2) : object::TObject_ID(id, size) { pData_ = param_2; - JUT_ASSERT(82, pData_!=0); + JUT_ASSERT(82, pData_!=NULL); } /* 80280F18 */ virtual ~TObject() = 0; virtual int getScheme() const = 0; diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h index 2d9430287b..5e430e199c 100644 --- a/include/JSystem/JStudio/JStudio/functionvalue.h +++ b/include/JSystem/JStudio/JStudio/functionvalue.h @@ -338,7 +338,7 @@ public: f32 operator*() { #ifdef DEBUG - JUT_ASSERT(947, pf_!=0); + JUT_ASSERT(947, pf_!=NULL); #endif return *pf_; } @@ -451,7 +451,7 @@ public: f32 operator*() { #ifdef DEBUG - JUT_ASSERT(1098, pf_!=0); + JUT_ASSERT(1098, pf_!=NULL); #endif return *pf_; } diff --git a/include/JSystem/JStudio/JStudio/jstudio-control.h b/include/JSystem/JStudio/JStudio/jstudio-control.h index 8a2e85bd9f..18bdb16e89 100644 --- a/include/JSystem/JStudio/JStudio/jstudio-control.h +++ b/include/JSystem/JStudio/JStudio/jstudio-control.h @@ -123,13 +123,13 @@ public: CMtxP transformOnSet_getMatrix() const { return mTransformOnSet_Matrix; } void transformOnSet_transformTranslation(const Vec& rSrc, Vec* pDst) const { - JUT_ASSERT(226, pDst!=0); + JUT_ASSERT(226, pDst!=NULL); JUT_ASSERT(227, &rSrc!=pDst); MTXMultVec(transformOnSet_getMatrix(), &rSrc, pDst); } void transformOnSet_transformRotation(const Vec& rSrc, Vec* pDst) const { - JUT_ASSERT(232, pDst!=0); + JUT_ASSERT(232, pDst!=NULL); JUT_ASSERT(233, &rSrc!=pDst); pDst->x = rSrc.x; pDst->y = rSrc.y + mTransformOnSet_RotationY; @@ -137,7 +137,7 @@ public: } void transformOnSet_transformScaling(const Vec& rSrc, Vec* pDst) const { - JUT_ASSERT(240, pDst!=0); + JUT_ASSERT(240, pDst!=NULL); JUT_ASSERT(241, &rSrc!=pDst); *pDst = rSrc; } @@ -176,20 +176,20 @@ public: CMtxP transformOnGet_getMatrix() const { return mTransformOnGet_Matrix; } void transformOnGet_transformTranslation(const Vec& rSrc, Vec* pDst) const { - JUT_ASSERT(296, pDst!=0); + JUT_ASSERT(296, pDst!=NULL); JUT_ASSERT(297, &rSrc!=pDst); MTXMultVec(transformOnGet_getMatrix(), &rSrc, pDst); } void transformOnGet_transformDirection(const Vec& rSrc, Vec* pDst) const { - JUT_ASSERT(316, pDst!=0); + JUT_ASSERT(316, pDst!=NULL); JUT_ASSERT(317, &rSrc!=pDst); MTXMultVecSR(transformOnGet_getMatrix(), &rSrc, pDst); } void transformOnGet_transform(TTransform_position_direction* param_1, TTransform_position_direction* pDst) const { - JUT_ASSERT(289, pDst!=0); + JUT_ASSERT(289, pDst!=NULL); transformOnGet_transformTranslation(param_1->position, &pDst->position); transformOnGet_transformDirection(param_1->direction, &pDst->direction); } @@ -220,7 +220,7 @@ public: } void transformOnGet_transformRotation(const Vec& rSrc, Vec* pDst) const { - JUT_ASSERT(302, pDst!=0); + JUT_ASSERT(302, pDst!=NULL); JUT_ASSERT(303, &rSrc!=pDst); pDst->x = rSrc.x; pDst->y = rSrc.y + mTransformOnGet_RotationY; @@ -228,14 +228,14 @@ public: } void transformOnGet_transformScaling(const Vec& rSrc, Vec* pDst) const { - JUT_ASSERT(310, pDst!=0); + JUT_ASSERT(310, pDst!=NULL); JUT_ASSERT(311, &rSrc!=pDst); *pDst = rSrc; } void transformOnGet_transform(TTransform_translation_rotation_scaling* param_1, TTransform_translation_rotation_scaling* pDst) const { - JUT_ASSERT(263, pDst!=0); + JUT_ASSERT(263, pDst!=NULL); transformOnGet_transformTranslation(param_1->translation, &pDst->translation); transformOnGet_transformRotation(param_1->rotation, &pDst->rotation); transformOnGet_transformScaling(param_1->scaling, &pDst->scaling); @@ -252,14 +252,14 @@ public: } void transformOnSet_transformDirection(const Vec& rSrc, Vec* pDst) const { - JUT_ASSERT(246, pDst!=0); + JUT_ASSERT(246, pDst!=NULL); JUT_ASSERT(247, &rSrc!=pDst); MTXMultVecSR(transformOnSet_getMatrix(), &rSrc, pDst); } void transformOnSet_transform(TTransform_position_direction* param_1, TTransform_position_direction* pDst) const { - JUT_ASSERT(219, pDst!=0); + JUT_ASSERT(219, pDst!=NULL); transformOnSet_transformTranslation(param_1->position, &pDst->position); transformOnSet_transformDirection(param_1->direction, &pDst->direction); } diff --git a/include/JSystem/JStudio/JStudio_JAudio2/control.h b/include/JSystem/JStudio/JStudio_JAudio2/control.h index b67f8193ae..7671c6a1c0 100644 --- a/include/JSystem/JStudio/JStudio_JAudio2/control.h +++ b/include/JSystem/JStudio/JStudio_JAudio2/control.h @@ -15,7 +15,7 @@ struct TCreateObject : public JStudio::TCreateObject { pJAISoundStarter_ = p_soundStarter; pJSGSystem_ = p_system; mPermit_onExit_notEnd = false; - JUT_ASSERT(45, pJAISoundStarter_!=0); + JUT_ASSERT(45, pJAISoundStarter_!=NULL); } /* 8028D550 */ virtual ~TCreateObject(); diff --git a/include/JSystem/JStudio/JStudio_JParticle/control.h b/include/JSystem/JStudio/JStudio_JParticle/control.h index 725751b844..26231aadcf 100644 --- a/include/JSystem/JStudio/JStudio_JParticle/control.h +++ b/include/JSystem/JStudio/JStudio_JParticle/control.h @@ -14,7 +14,7 @@ struct TCreateObject : public JStudio::TCreateObject { pJPAEmitterManager_ = p_emitMgr; pJSGSystem_ = p_system; mPermit_onExit_notEnd = false; - JUT_ASSERT(48, pJPAEmitterManager_!=0); + JUT_ASSERT(48, pJPAEmitterManager_!=NULL); } /* 8028E3A0 */ virtual ~TCreateObject(); @@ -42,7 +42,7 @@ struct TAdaptor_particle : public JStudio::TAdaptor_particle { TJPACallback_emitter_(TAdaptor_particle* param_1) { pThis_ = param_1; pOld = NULL; - JUT_ASSERT(113, pThis_!=0); + JUT_ASSERT(113, pThis_!=NULL); } /* 8028ECC0 */ virtual void execute(JPABaseEmitter*); /* 8028F060 */ virtual void executeAfter(JPABaseEmitter*); diff --git a/include/JSystem/JStudio/JStudio_JStage/control.h b/include/JSystem/JStudio/JStudio_JStage/control.h index 86ed98c0be..80ec31af0f 100644 --- a/include/JSystem/JStudio/JStudio_JStage/control.h +++ b/include/JSystem/JStudio/JStudio_JStage/control.h @@ -17,7 +17,7 @@ typedef JStudio::TObject* (*ObjCreateFuncT)(const JStudio::stb::data::TParse_TBl struct TCreateObject : public JStudio::TCreateObject { TCreateObject(const JStage::TSystem* pSystem) { pJSGSystem_ = pSystem; - JUT_ASSERT(42, pJSGSystem_!=0); + JUT_ASSERT(42, pJSGSystem_!=NULL); } /* 80289B00 */ virtual ~TCreateObject(); diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index c33f590944..e951fe4f98 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -4,8 +4,10 @@ #include "dolphin/os.h" #ifdef DEBUG +#define JUT_SHOW_ASSERT(LINE, COND) JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND) + #define JUT_ASSERT(LINE, COND) \ - (COND) ? (void)0 : (JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, #COND), OSPanic(__FILE__, LINE, "Halt")); + (COND) ? (void)0 : (JUT_SHOW_ASSERT(LINE, COND), OSPanic(__FILE__, LINE, "Halt")); #define JUT_ASSERT_MSG(LINE, COND, MSG) \ (COND) ? (void)0 : (JUTAssertion::showAssert(JUTAssertion::getSDevice(), __FILE__, LINE, MSG), OSPanic(__FILE__, LINE, "Halt")); diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h index 50246d87a0..1d22086992 100644 --- a/include/JSystem/JUtility/JUTResFont.h +++ b/include/JSystem/JUtility/JUTResFont.h @@ -57,7 +57,8 @@ public: initialize_state(); } - static IsLeadByte_func const saoAboutEncoding_[3]; + static const int suAboutEncoding_ = 3; + static IsLeadByte_func const saoAboutEncoding_[suAboutEncoding_]; // some types uncertain, may need to be fixed /* 0x1C */ int mWidth; diff --git a/include/d/actor/d_a_formation_mng.h b/include/d/actor/d_a_formation_mng.h index bebe53b07e..ca30048a90 100644 --- a/include/d/actor/d_a_formation_mng.h +++ b/include/d/actor/d_a_formation_mng.h @@ -78,7 +78,7 @@ struct daFmtMng_Path_c { } else { field_0x4 = decIndex(field_0x4); } - field_0x8 = 1000000000.0f; + field_0x8 = G_CM3D_F_INF; } void setNextPoint(cXyz *param_1) { @@ -175,7 +175,7 @@ struct daFmtMng_c : public fopAc_ac_c { int getEndTime() { return (fopAcM_GetParam(this) >> 24) & 0xff; } void callExecute() { - JUT_ASSERT(680, mAction != 0); + JUT_ASSERT(680, mAction != NULL); (this->*(mAction[1]))(); } @@ -203,7 +203,7 @@ struct daFmtMng_c : public fopAc_ac_c { } void callInit() { - JUT_ASSERT(667, mAction != 0) + JUT_ASSERT(667, mAction != NULL) (this->*(*mAction))(); } diff --git a/include/d/actor/d_a_obj_boumato.h b/include/d/actor/d_a_obj_boumato.h index fb21b132a3..c00e4e4913 100644 --- a/include/d/actor/d_a_obj_boumato.h +++ b/include/d/actor/d_a_obj_boumato.h @@ -66,7 +66,7 @@ public: cXyz sp2C; cXyz sp20; - JUT_ASSERT(164, 0 != arrow_p); + JUT_ASSERT(164, NULL != arrow_p); if (field_0xa38 != 0) { return 0; diff --git a/include/d/actor/d_a_obj_itamato.h b/include/d/actor/d_a_obj_itamato.h index 960bab0240..e1ca42e6dd 100644 --- a/include/d/actor/d_a_obj_itamato.h +++ b/include/d/actor/d_a_obj_itamato.h @@ -36,7 +36,7 @@ public: cXyz sp2C; cXyz sp20; - JUT_ASSERT(170, 0 != arrow_p); + JUT_ASSERT(170, NULL != arrow_p); if (field_0xa16 != 0 || health == 0) { return 0; diff --git a/include/d/actor/d_a_obj_sekizoa.h b/include/d/actor/d_a_obj_sekizoa.h index 1f4ffad748..b9a7a4fff2 100644 --- a/include/d/actor/d_a_obj_sekizoa.h +++ b/include/d/actor/d_a_obj_sekizoa.h @@ -132,7 +132,7 @@ public: void setWolfHowling() { if (mType != 0) { fopAc_ac_c* actor_p = mActorMngrs[3].getActorP(); - JUT_ASSERT(0x1A3, 0 != actor_p); + JUT_ASSERT(0x1A3, NULL != actor_p); ((daObj_Sekizoa_c*)actor_p)->setWolfHowling(); } else { diff --git a/include/d/actor/d_a_tag_kmsg.h b/include/d/actor/d_a_tag_kmsg.h index 4639001fa0..a235bbd09d 100644 --- a/include/d/actor/d_a_tag_kmsg.h +++ b/include/d/actor/d_a_tag_kmsg.h @@ -90,7 +90,7 @@ public: f32 getAttnPosOffset() { u32 attnPosOffset = (fopAcM_GetParam(this) & 0xff0000) >> 0x10; if (attnPosOffset == 0xff) { - return 1000000000.0f; + return G_CM3D_F_INF; } else { return attnPosOffset; } diff --git a/include/d/d_demo.h b/include/d/d_demo.h index 89e85620dd..ce72547a31 100644 --- a/include/d/d_demo.h +++ b/include/d/d_demo.h @@ -86,11 +86,11 @@ public: /* 80038098 */ virtual ~dDemo_actor_c(); /* 800387EC */ virtual void JSGSetData(u32, void const*, u32); /* 8003A05C */ virtual s32 JSGFindNodeID(char const* param_0) const { - JUT_ASSERT(0, mModel != 0); + JUT_ASSERT(0, mModel != NULL); return mModel->getModelData()->getJointName()->getIndex(param_0); } /* 8003A088 */ virtual bool JSGGetNodeTransformation(u32 param_0, Mtx param_1) const { - JUT_ASSERT(0, mModel != 0); + JUT_ASSERT(0, mModel != NULL); cMtx_copy(mModel->getAnmMtx((u16)param_0), param_1); return true; } @@ -375,7 +375,7 @@ public: static jmessage_tControl* getMesgControl() { return m_mesgControl; } static dDemo_camera_c* getCamera() { - JUT_ASSERT(0, m_object != 0); + JUT_ASSERT(0, m_object != NULL); return m_object->getActiveCamera(); } diff --git a/include/d/d_save.h b/include/d/d_save.h index 56fb73e6a1..d83a7e35d9 100644 --- a/include/d/d_save.h +++ b/include/d/d_save.h @@ -9,35 +9,36 @@ #include "JSystem/JUtility/JUTAssert.h" #include "JSystem/JHostIO/JORReflexible.h" -#define DEFAULT_SELECT_ITEM_INDEX 0 -#define MAX_SELECT_ITEM 4 -#define SELECT_ITEM_NUM 2 -#define MAX_EQUIPMENT 6 -#define MAX_EVENTS 256 -#define MAX_ITEM_SLOTS 24 -#define LIGHT_DROP_STAGE 4 -#define LETTER_INFO_BIT 64 -#define MAX_INSECT_NUM 24 -#define MAX_VISIBLE_HEARTPIECES 4 -#define MAX_POH_NUM 100 -#define TBOX_MAX 64 -#define DSV_MEMBIT_ENUM_MAX 8 -#define ITEM_MAX_DAN 128 -#define SWITCH_ZONE_MAX 0x20 -#define SWITCH_ONE_ZONE_MAX 0x10 -#define ITEM_ZONE_MAX 0x20 -#define ITEM_ONE_ZONE_MAX 0x10 -#define QUEST_LOG_SIZE 0xA94 -#define QUIVER_MAX 30 -#define BIG_QUIVER_MAX 60 -#define GIANT_QUIVER_MAX 100 -#define WALLET_MAX 300 -#define BIG_WALLET_MAX 600 -#define GIANT_WALLET_MAX 1000 -#define MAX_FINDABLE_FISHES 6 -#define ITEM_XY_MAX_DUMMY 8 -#define ITEM_BIT_MAX 0x100 +static const int DEFAULT_SELECT_ITEM_INDEX = 0; +static const int MAX_SELECT_ITEM = 4; +static const int SELECT_ITEM_NUM = 2; +static const int MAX_EQUIPMENT = 6; +static const int MAX_EVENTS = 256; +static const int MAX_ITEM_SLOTS = 24; +static const int LIGHT_DROP_STAGE = 4; +static const int LETTER_INFO_BIT = 64; +static const int MAX_INSECT_NUM = 24; +static const int MAX_VISIBLE_HEARTPIECES = 4; +static const int MAX_POH_NUM = 100; +static const int TBOX_MAX = 64; +static const int DSV_MEMBIT_ENUM_MAX = 8; +static const int ITEM_MAX_DAN = 128; +static const int SWITCH_ZONE_MAX = 0x20; +static const int SWITCH_ONE_ZONE_MAX = 0x10; +static const int ITEM_ZONE_MAX = 0x20; +static const int ITEM_ONE_ZONE_MAX = 0x10; +static const int QUEST_LOG_SIZE = 0xA94; +static const int QUIVER_MAX = 30; +static const int BIG_QUIVER_MAX = 60; +static const int GIANT_QUIVER_MAX = 100; +static const int WALLET_MAX = 300; +static const int BIG_WALLET_MAX = 600; +static const int GIANT_WALLET_MAX = 1000; +static const int MAX_FINDABLE_FISHES = 6; + +static const int ITEM_BIT_MAX = 0x100; +static const int ITEM_XY_MAX_DUMMY = 8; enum ButtonIndexes { /* 0 */ A_BUTTON, diff --git a/include/d/d_stage.h b/include/d/d_stage.h index 18949a251a..d027dc9941 100644 --- a/include/d/d_stage.h +++ b/include/d/d_stage.h @@ -581,22 +581,22 @@ public: (void)i_LightVecInfo; dStage_SetErrorStage(); OSReport("stage non LightVec data !!\n"); - JUT_ASSERT(3003, 0); + JUT_ASSERT(3003, FALSE); } /* vt[43] */ virtual stage_pure_lightvec_info_class* getLightVecInfo(void) const { OSReport("stage non LightVec data !!\n"); - JUT_ASSERT(3007, 0); + JUT_ASSERT(3007, FALSE); return NULL; } /* vt[44] */ virtual void setLightVecInfoNum(int i_LightVecInfoNum) { (void)i_LightVecInfoNum; dStage_SetErrorStage(); OSReport("stage non LightVecNum data !!\n"); - JUT_ASSERT(3014, 0); + JUT_ASSERT(3014, FALSE); } /* vt[45] */ virtual int getLightVecInfoNum(void) const { OSReport("stage non LightVecNum data !!\n"); - JUT_ASSERT(3018, 0); + JUT_ASSERT(3018, FALSE); return NULL; } /* vt[40] */ virtual void setPlightNumInfo(int i_PlightNumInfo) { mPlightNumInfo = i_PlightNumInfo; } @@ -623,22 +623,22 @@ public: (void)list; dStage_SetErrorStage(); OSReport("stage non filelist2 data!\n"); - JUT_ASSERT(3123, 0); + JUT_ASSERT(3123, FALSE); } /* vt[65] */ virtual dStage_FileList2_dt_c* getFileList2Info(void) const { OSReport("stage non filelist2 data!\n"); - JUT_ASSERT(3127, 0); + JUT_ASSERT(3127, FALSE); return NULL; } /* vt[66] */ virtual void setFileListInfo(dStage_FileList_dt_c* list) { (void)list; dStage_SetErrorStage(); OSReport("stage non filelist data!\n"); - JUT_ASSERT(3138, 0); + JUT_ASSERT(3138, FALSE); } /* vt[67] */ virtual dStage_FileList_dt_c* getFileListInfo(void) const { OSReport("stage non filelist data!\n"); - JUT_ASSERT(3142, 0); + JUT_ASSERT(3142, FALSE); return NULL; } /* vt[68] */ virtual void setFloorInfo(dStage_FloorInfo_c* i_FloorInfo) { mFloorInfo = i_FloorInfo; } @@ -656,11 +656,11 @@ public: (void)lbnk; dStage_SetErrorStage(); OSReport("stage non Lbnk data!\n"); - JUT_ASSERT(3231, 0); + JUT_ASSERT(3231, FALSE); } /* vt[80] */ virtual dStage_Lbnk_c* getLbnk(void) const { OSReport("stage non Lbnk data!\n"); - JUT_ASSERT(3238, 0); + JUT_ASSERT(3238, FALSE); return NULL; } /* vt[81] */ virtual void setTresure(stage_tresure_class* i_Tresure) { mTresure = i_Tresure; } @@ -741,11 +741,11 @@ public: (void)i_Room; dStage_SetErrorRoom(); OSReport("Room non room data !!\n"); - JUT_ASSERT(2095, 0); + JUT_ASSERT(2095, FALSE); } virtual roomRead_class* getRoom(void) const { OSReport("Room non room data !!\n"); - JUT_ASSERT(2100, 0); + JUT_ASSERT(2100, FALSE); return NULL; } virtual void setMapInfo(stage_map_info_class* i_MapInfo) { mMapInfo = i_MapInfo; } @@ -757,33 +757,33 @@ public: (void)i_PaletteInfo; dStage_SetErrorRoom(); OSReport("Room non palet data !!\n"); - JUT_ASSERT(2126, 0); + JUT_ASSERT(2126, FALSE); } virtual stage_palette_info_class* getPaletteInfo(void) const { OSReport("Room non palet data !!\n"); - JUT_ASSERT(2130, 0); + JUT_ASSERT(2130, FALSE); return NULL; } virtual void setPselectInfo(stage_pselect_info_class* i_PselectInfo) { (void)i_PselectInfo; dStage_SetErrorRoom(); OSReport("Room non pselect data !!\n"); - JUT_ASSERT(2137, 0); + JUT_ASSERT(2137, FALSE); } virtual stage_pselect_info_class* getPselectInfo(void) const { OSReport("Room non pselect data !!\n"); - JUT_ASSERT(2141, 0); + JUT_ASSERT(2141, FALSE); return NULL; } virtual void setEnvrInfo(stage_envr_info_class* i_EnvrInfo) { (void)i_EnvrInfo; dStage_SetErrorRoom(); OSReport("Room non envr data !!\n"); - JUT_ASSERT(2148, 0); + JUT_ASSERT(2148, FALSE); } virtual stage_envr_info_class* getEnvrInfo(void) const { OSReport("Room non envr data !!\n"); - JUT_ASSERT(2152, 0); + JUT_ASSERT(2152, FALSE); return NULL; } virtual void setVrboxInfo(stage_vrbox_info_class* i_VrboxInfo) { mVrboxInfo = i_VrboxInfo; } @@ -794,44 +794,44 @@ public: (void)i_PlightInfo; dStage_SetErrorRoom(); OSReport("Room non plight data !!\n"); - JUT_ASSERT(2174, 0); + JUT_ASSERT(2174, FALSE); } virtual stage_plight_info_class* getPlightInfo(void) const { OSReport("Room non plight data !!\n"); - JUT_ASSERT(2178, 0); + JUT_ASSERT(2178, FALSE); return NULL; } virtual void setPaletteNumInfo(int i_PaletteNumInfo) { (void)i_PaletteNumInfo; dStage_SetErrorRoom(); OSReport("Room non palette num data !!\n"); - JUT_ASSERT(2186, 0); + JUT_ASSERT(2186, FALSE); } virtual int getPaletteNumInfo(void) const { OSReport("Room non palette num data !!\n"); - JUT_ASSERT(2190, 0); + JUT_ASSERT(2190, FALSE); return NULL; } virtual void setPselectNumInfo(int i_PselectNumInfo) { (void)i_PselectNumInfo; dStage_SetErrorRoom(); OSReport("Room non pselect num data !!\n"); - JUT_ASSERT(2197, 0); + JUT_ASSERT(2197, FALSE); } virtual int getPselectNumInfo(void) const { OSReport("Room non pselect num data !!\n"); - JUT_ASSERT(2201, 0); + JUT_ASSERT(2201, FALSE); return NULL; } virtual void setEnvrNumInfo(int i_EnvrNumInfo) { (void)i_EnvrNumInfo; dStage_SetErrorRoom(); OSReport("Room non envr num data !!\n"); - JUT_ASSERT(2208, 0); + JUT_ASSERT(2208, FALSE); } virtual int getEnvrNumInfo(void) const { OSReport("Room non envr num data !!\n"); - JUT_ASSERT(2212, 0); + JUT_ASSERT(2212, FALSE); return NULL; } virtual void setVrboxNumInfo(int i_VrboxNumInfo) { mVrboxNumInfo = i_VrboxNumInfo; } @@ -842,11 +842,11 @@ public: (void)i_PlightNumInfo; dStage_SetErrorRoom(); OSReport("Room non plight num data !!\n"); - JUT_ASSERT(2223, 0); + JUT_ASSERT(2223, FALSE); } virtual int getPlightNumInfo(void) const { OSReport("Room non plight num data !!\n"); - JUT_ASSERT(2227, 0); + JUT_ASSERT(2227, FALSE); return NULL; } virtual void setLightVecInfo(stage_pure_lightvec_info_class* i_LightVecInfo) { mLightVecInfo = i_LightVecInfo; } @@ -857,11 +857,11 @@ public: (void)i_StagInfo; dStage_SetErrorRoom(); OSReport("Room non stag data !!\n"); - JUT_ASSERT(2256, 0); + JUT_ASSERT(2256, FALSE); } virtual stage_stag_info_class* getStagInfo(void) const { OSReport("Room non stag data !!\n"); - JUT_ASSERT(2260, 0); + JUT_ASSERT(2260, FALSE); return NULL; } virtual void setSclsInfo(stage_scls_info_dummy_class* i_SclsInfo) { mSclsInfo = i_SclsInfo; } @@ -870,22 +870,22 @@ public: (void)i_PntInfo; dStage_SetErrorRoom(); OSReport("Room non Pnt data !\n"); - JUT_ASSERT(2281, 0); + JUT_ASSERT(2281, FALSE); } virtual dStage_dPnt_c* getPntInf(void) const { OSReport("Room non Pnts data !\n"); - JUT_ASSERT(2285, 0); + JUT_ASSERT(2285, FALSE); return NULL; } virtual void setPathInfo(dStage_dPath_c* i_PathInfo) { (void)i_PathInfo; dStage_SetErrorRoom(); OSReport("Room non Path data !\n"); - JUT_ASSERT(2292, 0); + JUT_ASSERT(2292, FALSE); } virtual dStage_dPath_c* getPathInf(void) const { OSReport("Room non Path data !\n"); - JUT_ASSERT(2296, 0); + JUT_ASSERT(2296, FALSE); return NULL; } virtual void setPnt2Info(dStage_dPnt_c* i_Pnt2Info) { mPnt2Info = i_Pnt2Info; } @@ -907,44 +907,44 @@ public: virtual void setMemoryConfig(dStage_MemoryConfig_c* i_MemoryConfig) { (void)i_MemoryConfig; OSReport("Room non memory config data!\n"); - JUT_ASSERT(2414, 0); + JUT_ASSERT(2414, FALSE); } virtual dStage_MemoryConfig_c* getMemoryConfig(void) const { OSReport("Room non memory config data!\n"); - JUT_ASSERT(2423, 0); + JUT_ASSERT(2423, FALSE); return NULL; } virtual void setMemoryMap(dStage_MemoryMap_c* i_MemoryMap) { (void)i_MemoryMap; OSReport("Room non memory map data!\n"); - JUT_ASSERT(2433, 0); + JUT_ASSERT(2433, FALSE); } virtual dStage_MemoryMap_c* getMemoryMap(void) const { OSReport("Room non memory map data!\n"); - JUT_ASSERT(2442, 0); + JUT_ASSERT(2442, FALSE); return NULL; } virtual void setMulti(dStage_Multi_c* i_Multi) { (void)i_Multi; OSReport("Room non multi data!\n"); - JUT_ASSERT(2452, 0); + JUT_ASSERT(2452, FALSE); } virtual dStage_Multi_c* getMulti(void) const { OSReport("Room non multi data!\n"); - JUT_ASSERT(2457, 0); + JUT_ASSERT(2457, FALSE); return NULL; } virtual void setOldMulti(void) { OSReport("Room non old multi data!\n"); - JUT_ASSERT(2462, 0); + JUT_ASSERT(2462, FALSE); } virtual void resetOldMulti(void) { OSReport("Room non old multi data!\n"); - JUT_ASSERT(2467, 0); + JUT_ASSERT(2467, FALSE); } virtual dStage_Multi_c* getOldMulti(void) const { OSReport("Room non old multi data!\n"); - JUT_ASSERT(2472, 0); + JUT_ASSERT(2472, FALSE); return NULL; } virtual void setLbnk(dStage_Lbnk_c* i_Lbnk) { mLbnk = i_Lbnk; } @@ -954,11 +954,11 @@ public: virtual void setDMap(dStage_DMap_c* i_DMap) { (void)i_DMap; OS_REPORT("Room non DMap data\n"); - JUT_ASSERT(2508, 0); + JUT_ASSERT(2508, FALSE); } virtual dStage_DMap_c* getDMap(void) const { OS_REPORT("Room non DMap data\n"); - JUT_ASSERT(2513, 0); + JUT_ASSERT(2513, FALSE); return NULL; } virtual void setDrTg(stage_tgsc_class* i_DrTg) { mDrTg = i_DrTg; } @@ -968,18 +968,18 @@ public: virtual void setMapPath(void* i_MapPath) { (void)i_MapPath; OSReport("stage non 2d map path data !!\n"); - JUT_ASSERT(2557, 0); + JUT_ASSERT(2557, FALSE); } virtual void* getMapPath(void) { OSReport("stage non 2d map path data !!\n"); - JUT_ASSERT(2561, 0); + JUT_ASSERT(2561, FALSE); return NULL; } virtual void setElst(dStage_Elst_c* i_Elst) { (void)i_Elst; dStage_SetErrorRoom(); OSReport("Room non envLayserSet data\n"); - JUT_ASSERT(2572, 0); + JUT_ASSERT(2572, FALSE); } virtual dStage_Elst_c* getElst(void) { dStage_SetErrorRoom(); diff --git a/include/global.h b/include/global.h index f81e32af9a..c21c08164b 100644 --- a/include/global.h +++ b/include/global.h @@ -23,8 +23,8 @@ #define ALIGN_DECL(ALIGNMENT) __attribute__((aligned(ALIGNMENT))) -#define ARRAY_SIZE(o) (s32)(sizeof((o)) / sizeof(*(o))) -#define ARRAY_SIZEU(o) (sizeof((o)) / sizeof(*(o))) +#define ARRAY_SIZE(o) (s32)(sizeof(o) / sizeof(o[0])) +#define ARRAY_SIZEU(o) (sizeof(o) / sizeof(o[0])) // Align X to the previous N bytes (N must be power of two) #define ALIGN_PREV(X, N) ((X) & ~((N)-1)) @@ -37,10 +37,6 @@ #define TRUNC(n, a) (((u32)(n)) & ~((a)-1)) #define JUT_EXPECT(...) -#define FLAG_ON(V, F) (((V) & (F)) == 0) - -#define FLOAT_LABEL(x) (*(f32*)&x) -#define DOUBLE_LABEL(x) (*(f64*)&x) #define _SDA_BASE_(dummy) 0 #define _SDA2_BASE_(dummy) 0 @@ -76,9 +72,6 @@ void* __memcpy(void*, const void*, int); // hack to make strings with no references compile properly #define DEAD_STRING(s) OSReport(s) -#define UNK_BSS(name) \ - static u8 lit_##name[1 + 3 /* padding */]; - #define READU32_BE(ptr, offset) \ (((u32)ptr[offset] << 24) | ((u32)ptr[offset + 1] << 16) | ((u32)ptr[offset + 2] << 8) | (u32)ptr[offset + 3]); diff --git a/src/JSystem/JAudio2/JASBNKParser.cpp b/src/JSystem/JAudio2/JASBNKParser.cpp index 8c99ec1fd2..7e4102c5ec 100644 --- a/src/JSystem/JAudio2/JASBNKParser.cpp +++ b/src/JSystem/JAudio2/JASBNKParser.cpp @@ -186,7 +186,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h TInst* tinst = header->mOffsets.mInstOffset[i].ptr(header); if (tinst != NULL) { JASBasicInst* instp = new (heap, 0) JASBasicInst(); - JUT_ASSERT(368, instp != 0); + JUT_ASSERT(368, instp != NULL); instp->setVolume(tinst->mVolume); instp->setPitch(tinst->mPitch); @@ -199,7 +199,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h instp->setOsc(osc_idx, osc); } else { osc = new (heap, 0) JASOscillator::Data(); - JUT_ASSERT(386, osc != 0); + JUT_ASSERT(386, osc != NULL); osc->mTarget = tosc->mTarget; osc->_04 = tosc->field_0x4; @@ -208,7 +208,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h const JASOscillator::Point* endPtr = getOscTableEndPtr(points); int size = endPtr - points; JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size]; - JUT_ASSERT(396, table != 0); + JUT_ASSERT(396, table != NULL); JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point)); osc->mTable = table; } else { @@ -220,7 +220,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h const JASOscillator::Point* endPtr = getOscTableEndPtr(points); int size = endPtr - points; JASOscillator::Point* table = new (heap, 0) JASOscillator::Point[size]; - JUT_ASSERT(409, table != 0); + JUT_ASSERT(409, table != NULL); JASCalc::bcopy(points, table, size * sizeof(JASOscillator::Point)); osc->_0C = table; } else { @@ -255,7 +255,7 @@ JASBasicBank* JASBNKParser::Ver0::createBasicBank(void const* stream, JKRHeap* h TPerc* tperc = header->mOffsets.mPercOffset[i].ptr(header); if (tperc != NULL) { JASDrumSet* setp = new (heap, 0) JASDrumSet(); - JUT_ASSERT(509, setp != 0); + JUT_ASSERT(509, setp != NULL); setp->newPercArray(0x80, heap); for (int j = 0; j < 0x80; j++) { diff --git a/src/JSystem/JAudio2/JASBasicWaveBank.cpp b/src/JSystem/JAudio2/JASBasicWaveBank.cpp index 63c36f7aa6..749a5e4bd1 100644 --- a/src/JSystem/JAudio2/JASBasicWaveBank.cpp +++ b/src/JSystem/JAudio2/JASBasicWaveBank.cpp @@ -40,7 +40,7 @@ void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) { delete[] mWaveGroupArray; mGroupCount = param_0; mWaveGroupArray = new(param_1, 0) TWaveGroup[param_0]; - JUT_ASSERT(62, mWaveGroupArray != 0); + JUT_ASSERT(62, mWaveGroupArray != NULL); for (int i = 0; i < mGroupCount; i++) { mWaveGroupArray[i].mBank = this; } @@ -51,7 +51,7 @@ void JASBasicWaveBank::setGroupCount(u32 param_0, JKRHeap* param_1) { void JASBasicWaveBank::setWaveTableSize(u32 param_0, JKRHeap* param_1) { delete[] mWaveTable; mWaveTable = new(param_1, 0) TWaveHandle[param_0]; - JUT_ASSERT(92, mWaveTable != 0); + JUT_ASSERT(92, mWaveTable != NULL); mHandleCount = param_0; } @@ -129,7 +129,7 @@ void JASBasicWaveBank::TWaveGroup::setWaveCount(u32 param_0, JKRHeap* param_1) { delete[] mCtrlWaveArray; mWaveCount = param_0; mCtrlWaveArray = new(param_1, 0) TGroupWaveInfo[param_0]; - JUT_ASSERT(255, mCtrlWaveArray != 0); + JUT_ASSERT(255, mCtrlWaveArray != NULL); } /* 80298B04-80298B2C 293444 0028+00 1/0 0/0 0/0 .text diff --git a/src/JSystem/JAudio2/JASHeapCtrl.cpp b/src/JSystem/JAudio2/JASHeapCtrl.cpp index 7cb2131ef1..985336cf67 100644 --- a/src/JSystem/JAudio2/JASHeapCtrl.cpp +++ b/src/JSystem/JAudio2/JASHeapCtrl.cpp @@ -32,7 +32,7 @@ void JASHeap::initRootHeap(void* param_0, u32 param_1) { /* 8029021C-802903F4 28AB5C 01D8+00 0/0 2/2 0/0 .text alloc__7JASHeapFP7JASHeapUl */ bool JASHeap::alloc(JASHeap* mother, u32 param_1) { - JUT_ASSERT(120, mother != 0); + JUT_ASSERT(120, mother != NULL); JASMutexLock lock(&mMutex); if (isAllocated()) { #ifdef DEBUG @@ -147,8 +147,8 @@ bool JASHeap::free() { * insertChild__7JASHeapFP7JASHeapP7JASHeapPvUlb */ // NONMATCHING regalloc void JASHeap::insertChild(JASHeap* heap, JASHeap* next, void* param_2, u32 param_3, bool param_4) { - JUT_ASSERT(537, heap != 0); - JUT_ASSERT(538, next == 0 || &mTree == next->mTree.getParent()); + JUT_ASSERT(537, heap != NULL); + JUT_ASSERT(538, next == NULL || &mTree == next->mTree.getParent()); JASMutexLock lock(&mMutex); if (!param_4) { JSUTreeIterator it; diff --git a/src/JSystem/JAudio2/JAUSectionHeap.cpp b/src/JSystem/JAudio2/JAUSectionHeap.cpp index 1ce8d92dc3..3323a5839d 100644 --- a/src/JSystem/JAudio2/JAUSectionHeap.cpp +++ b/src/JSystem/JAudio2/JAUSectionHeap.cpp @@ -138,7 +138,7 @@ JAUSoundTable* JAUSection::newSoundTable(void const* bst, u32 param_1, bool para JUT_ASSERT(286, isBuilding()); JUT_ASSERT(287, bst); JUT_ASSERT(288, asSectionHeap() == this); - JUT_ASSERT(289, sectionHeap_->sectionHeapData_.soundTable == 0); + JUT_ASSERT(289, sectionHeap_->sectionHeapData_.soundTable == NULL); { TPushCurrentHeap push(getHeap_()); void const* bstDst = bst; @@ -161,7 +161,7 @@ JAUSoundNameTable* JAUSection::newSoundNameTable(void const* bstn, u32 param_1, JUT_ASSERT(316, isBuilding()); JUT_ASSERT(317, bstn); JUT_ASSERT(318, asSectionHeap() == this); - JUT_ASSERT(319, sectionHeap_->sectionHeapData_.soundNameTable == 0); + JUT_ASSERT(319, sectionHeap_->sectionHeapData_.soundNameTable == NULL); { TPushCurrentHeap push(getHeap_()); void const* bstnDst = bstn; @@ -183,7 +183,7 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param JUT_ASSERT(345, asSectionHeap() == this); JUT_ASSERT(346, isOpen()); JUT_ASSERT(347, isBuilding()); - JUT_ASSERT(348, sectionHeap_->sectionHeapData_.streamDataMgr_ == 0); + JUT_ASSERT(348, sectionHeap_->sectionHeapData_.streamDataMgr_ == NULL); { TPushCurrentHeap push(getHeap_()); JAIStreamDataMgr* r28 = NULL; @@ -207,7 +207,7 @@ JAIStreamDataMgr* JAUSection::newStreamFileTable(void const* param_0, bool param /* 802A5500-802A5598 29FE40 0098+00 0/0 1/1 0/0 .text newSeSeqCollection__10JAUSectionFPCvUl */ JAISeqDataMgr* JAUSection::newSeSeqCollection(void const* bsc, u32 param_1) { // JUT_ASSERT(398, asSectionHeap() == this); - JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == 0); + JUT_ASSERT(399, sectionHeap_->sectionHeapData_.seSeqDataMgr_ == NULL); if (param_1) { bsc = newCopy(bsc, param_1, 4); } @@ -340,7 +340,7 @@ JASBank* JAUSection::newBank(void const* param_0, u32 param_1) { JUT_ASSERT(647, isOpen()); JUT_ASSERT(648, isBuilding()); JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_1); - JUT_ASSERT(650, waveBank != 0); + JUT_ASSERT(650, waveBank != NULL); TPushCurrentHeap push(getHeap_()); u32 bank_no = JASBNKParser::getBankNumber(param_0); s32 r25 = getHeap_()->getFreeSize(); @@ -368,7 +368,7 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) { JUT_ASSERT(685, isOpen()); JUT_ASSERT(686, isBuilding()); JASWaveBank* waveBank = sectionHeap_->getWaveBankTable().getWaveBank(param_1); - JUT_ASSERT(688, waveBank != 0); + JUT_ASSERT(688, waveBank != NULL); TPushCurrentHeap push(getHeap_()); JASBank* voiceBank = new JASVoiceBank(); JASVoiceBank* voiceBank2 = (JASVoiceBank*)voiceBank; @@ -392,7 +392,7 @@ JASVoiceBank* JAUSection::newVoiceBank(u32 bank_no, u32 param_1) { bool JAUSection::beginNewBankTable(u32 param_0, u32 param_1) { JUT_ASSERT(714, isOpen()); JUT_ASSERT(715, isBuilding()); - JUT_ASSERT(716, buildingBankTable_ == 0); + JUT_ASSERT(716, buildingBankTable_ == NULL); JAUBankTableLink* bankTableLink = NULL; { TPushCurrentHeap push(getHeap_()); diff --git a/src/JSystem/JFramework/JFWSystem.cpp b/src/JSystem/JFramework/JFWSystem.cpp index 843f11449f..0216f06b92 100644 --- a/src/JSystem/JFramework/JFWSystem.cpp +++ b/src/JSystem/JFramework/JFWSystem.cpp @@ -66,7 +66,7 @@ u32 JFWSystem::CSetUpParam::exConsoleBufferSize = 0x24FC; /* 80271CD0-80271D18 26C610 0048+00 1/1 1/1 0/0 .text firstInit__9JFWSystemFv */ void JFWSystem::firstInit() { - JUT_ASSERT(80, rootHeap == 0); + JUT_ASSERT(80, rootHeap == NULL); OSInit(); DVDInit(); rootHeap = JKRExpHeap::createRoot(CSetUpParam::maxStdHeaps, false); diff --git a/src/JSystem/JHostIO/JORServer.cpp b/src/JSystem/JHostIO/JORServer.cpp index f453351894..495d6b976e 100644 --- a/src/JSystem/JHostIO/JORServer.cpp +++ b/src/JSystem/JHostIO/JORServer.cpp @@ -9,13 +9,13 @@ void JOREventCallbackListNode::JORAppend() { JORServer* pServer = JORServer::getInstance(); - JUT_ASSERT(51, pServer!=0); + JUT_ASSERT(51, pServer!=NULL); pServer->appendEventCallbackListNode(this); } void JOREventCallbackListNode::JORRemove() { JORServer* pServer = JORServer::getInstance(); - JUT_ASSERT(57, pServer!=0); + JUT_ASSERT(57, pServer!=NULL); pServer->removeEventCallbackListNode(this); } diff --git a/src/JSystem/JKernel/JKRAramArchive.cpp b/src/JSystem/JKernel/JKRAramArchive.cpp index 621af36a66..8874cd8c8f 100644 --- a/src/JSystem/JKernel/JKRAramArchive.cpp +++ b/src/JSystem/JKernel/JKRAramArchive.cpp @@ -286,7 +286,7 @@ u32 JKRAramArchive::fetchResource_subroutine(u32 entryNum, u32 length, JKRHeap* case COMPRESSION_NONE: { buffer = (u8*)(JKRAllocFromHeap(pHeap, alignedLen, 0x20)); - JUT_ASSERT(677, buffer != 0); + JUT_ASSERT(677, buffer != NULL); JKRAramToMainRam(entryNum, buffer, alignedLen, EXPAND_SWITCH_UNKNOWN0, alignedLen, NULL, -1, NULL); *out = buffer; return length; diff --git a/src/JSystem/JKernel/JKRArchivePub.cpp b/src/JSystem/JKernel/JKRArchivePub.cpp index be85ac87a1..a2899fd432 100644 --- a/src/JSystem/JKernel/JKRArchivePub.cpp +++ b/src/JSystem/JKernel/JKRArchivePub.cpp @@ -295,7 +295,7 @@ void JKRArchive::removeResourceAll() { /* 802D603C-802D609C 2D097C 0060+00 1/0 2/0 0/0 .text removeResource__10JKRArchiveFPv */ bool JKRArchive::removeResource(void* resource) { - JUT_ASSERT(678, resource != 0); + JUT_ASSERT(678, resource != NULL); SDIFileEntry* fileEntry = findPtrResource(resource); if (fileEntry == NULL) return false; @@ -307,7 +307,7 @@ bool JKRArchive::removeResource(void* resource) { /* 802D609C-802D60D8 2D09DC 003C+00 1/0 4/0 0/0 .text detachResource__10JKRArchiveFPv */ bool JKRArchive::detachResource(void* resource) { - JUT_ASSERT(707, resource != 0); + JUT_ASSERT(707, resource != NULL); SDIFileEntry* fileEntry = findPtrResource(resource); if (fileEntry == NULL) return false; @@ -318,7 +318,7 @@ bool JKRArchive::detachResource(void* resource) { /* 802D60D8-802D610C 2D0A18 0034+00 1/0 4/0 0/0 .text getResSize__10JKRArchiveCFPCv */ u32 JKRArchive::getResSize(const void* resource) const { - JUT_ASSERT(732, resource != 0); + JUT_ASSERT(732, resource != NULL); SDIFileEntry* fileEntry = findPtrResource(resource); if (fileEntry == NULL) return -1; diff --git a/src/JSystem/JKernel/JKRDvdArchive.cpp b/src/JSystem/JKernel/JKRDvdArchive.cpp index 1c5db77bd9..3443aff128 100644 --- a/src/JSystem/JKernel/JKRDvdArchive.cpp +++ b/src/JSystem/JKernel/JKRDvdArchive.cpp @@ -290,7 +290,7 @@ u32 JKRDvdArchive::fetchResource_subroutine(s32 entryNum, u32 offset, u32 size, switch (fileCompression) { case COMPRESSION_NONE: buffer = (u8*)JKRAllocFromHeap(heap, alignedSize, sizeof(SArcHeader)); - JUT_ASSERT(675, buffer != 0); + JUT_ASSERT(675, buffer != NULL); JKRDvdToMainRam(entryNum, buffer, EXPAND_SWITCH_UNKNOWN0, alignedSize, NULL, JKRDvdRipper::ALLOC_DIRECTION_FORWARD, offset, NULL, NULL); diff --git a/src/JSystem/JKernel/JKRHeap.cpp b/src/JSystem/JKernel/JKRHeap.cpp index 41e57454ee..e50388817a 100644 --- a/src/JSystem/JKernel/JKRHeap.cpp +++ b/src/JSystem/JKernel/JKRHeap.cpp @@ -492,7 +492,7 @@ void operator delete[](void* ptr) { /* 802CED84-802CED88 2C96C4 0004+00 1/0 1/0 0/0 .text * state_register__7JKRHeapCFPQ27JKRHeap6TStateUl */ void JKRHeap::state_register(JKRHeap::TState* p, u32 id) const { - JUT_ASSERT(1213, p != 0); + JUT_ASSERT(1213, p != NULL); JUT_ASSERT(1214, p->getHeap() == this); } diff --git a/src/JSystem/JKernel/JKRSolidHeap.cpp b/src/JSystem/JKernel/JKRSolidHeap.cpp index cd8c47cb12..07598d13fa 100644 --- a/src/JSystem/JKernel/JKRSolidHeap.cpp +++ b/src/JSystem/JKernel/JKRSolidHeap.cpp @@ -252,7 +252,7 @@ bool JKRSolidHeap::dump(void) { /* 802D11FC-802D1258 2CBB3C 005C+00 1/0 0/0 0/0 .text * state_register__12JKRSolidHeapCFPQ27JKRHeap6TStateUl */ void JKRSolidHeap::state_register(JKRHeap::TState* p, u32 id) const { - JUT_ASSERT(604, p != 0); + JUT_ASSERT(604, p != NULL); JUT_ASSERT(605, p->getHeap() == this); getState_(p); diff --git a/src/JSystem/JKernel/JKRThread.cpp b/src/JSystem/JKernel/JKRThread.cpp index da9e87182e..0050ba609a 100644 --- a/src/JSystem/JKernel/JKRThread.cpp +++ b/src/JSystem/JKernel/JKRThread.cpp @@ -141,7 +141,7 @@ JKRThreadSwitch::JKRThreadSwitch(JKRHeap* param_0) { /* 802D1A14-802D1A70 2CC354 005C+00 0/0 1/1 0/0 .text createManager__15JKRThreadSwitchFP7JKRHeap */ JKRThreadSwitch* JKRThreadSwitch::createManager(JKRHeap* heap) { - JUT_ASSERT(343, sManager == 0); + JUT_ASSERT(343, sManager == NULL); if (!heap) { heap = JKRGetCurrentHeap(); diff --git a/src/JSystem/JMessage/control.cpp b/src/JSystem/JMessage/control.cpp index 5df6892a9f..d549fb5de5 100644 --- a/src/JSystem/JMessage/control.cpp +++ b/src/JSystem/JMessage/control.cpp @@ -67,14 +67,14 @@ void JMessage::TControl::render() { /* 802A77E8-802A78F4 2A2128 010C+00 0/0 1/1 0/0 .text setMessageCode__Q28JMessage8TControlFUsUs */ int JMessage::TControl::setMessageCode(u16 u16GroupID, u16 u16Index) { TProcessor* pProcessor = getProcessor(); - JUT_ASSERT(120, pProcessor!=0); + JUT_ASSERT(120, pProcessor!=NULL); return setMessageCode_inReset_(pProcessor, u16GroupID, u16Index); } /* 802A78F4-802A7A20 2A2234 012C+00 0/0 6/6 0/0 .text setMessageID__Q28JMessage8TControlFUlUlPb */ int JMessage::TControl::setMessageID(u32 uMsgID, u32 param_1, bool* pbValid) { TProcessor* pProcessor = getProcessor(); - JUT_ASSERT(132, pProcessor!=0); + JUT_ASSERT(132, pProcessor!=NULL); u32 uCode = pProcessor->toMessageCode_messageID(uMsgID, param_1, pbValid); if (uCode == 0xFFFFFFFF) { @@ -96,7 +96,7 @@ bool JMessage::TControl::setMessageCode_inSequence_(JMessage::TProcessor const* uMessageID_ = u16Index; pResourceCache_ = pProcessor->getResourceCache(); - JUT_ASSERT(155, pResourceCache_!=0); + JUT_ASSERT(155, pResourceCache_!=NULL); pMessageText_begin_ = pResourceCache_->getMessageText_messageEntry(pEntry_); pMessageText_current_ = pMessageText_begin_; diff --git a/src/JSystem/JMessage/processor.cpp b/src/JSystem/JMessage/processor.cpp index dd0f2bde27..c6c9f3cbf6 100644 --- a/src/JSystem/JMessage/processor.cpp +++ b/src/JSystem/JMessage/processor.cpp @@ -101,9 +101,9 @@ void JMessage::TProcessor::on_select_begin(char const* (*pfn)(JMessage::TProcess oProcess_.rData.pOffset = pOffset; oProcess_.rData.uRest = uNumber; - JUT_ASSERT(205, pfn!=0); + JUT_ASSERT(205, pfn!=NULL); const char* psz = pfn(this); - JUT_ASSERT(207, psz!=0); + JUT_ASSERT(207, psz!=NULL); stack_pushCurrent_(psz); do_select_begin(uNumber); @@ -131,10 +131,10 @@ void JMessage::TProcessor::on_select_separate() { JUT_ASSERT(237, rData.uRest>0); const char* (*pfn)(TProcessor*) = rData.pfn; - JUT_ASSERT(240, pfn!=0); + JUT_ASSERT(240, pfn!=NULL); const char* psz = pfn(this); - JUT_ASSERT(242, psz!=0); + JUT_ASSERT(242, psz!=NULL); stack_pushCurrent_(psz); do_select_separate(); @@ -175,7 +175,7 @@ void JMessage::TProcessor::do_select_separate() {} void JMessage::TProcessor::on_tag_() { u32 uSize; char* psz = (char*)getCurrent(); - JUT_ASSERT(292, psz!=0); + JUT_ASSERT(292, psz!=NULL); JUT_ASSERT(293, psz[-1]==data::gcTagBegin); uSize = *(u8*)psz; @@ -254,7 +254,7 @@ void JMessage::TProcessor::do_tag_(u32 uTag, void const* pData, u32 uSize) { /* 802A81EC-802A828C 2A2B2C 00A0+00 2/2 0/0 0/0 .text * process_character___Q28JMessage10TProcessorFv */ bool JMessage::TProcessor::process_character_() { - JUT_ASSERT(397, pszCurrent_!=0); + JUT_ASSERT(397, pszCurrent_!=NULL); int iCharacter = on_parseCharacter(&pszCurrent_); switch (iCharacter) { @@ -311,8 +311,8 @@ bool JMessage::TProcessor::process_onCharacterEnd_select_(JMessage::TProcessor* const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor* pThis) { TProcess_::rdata& rData = pThis->oProcess_.rData; JUT_ASSERT(454, rData.pfn==&process_onSelect_limited_); - JUT_ASSERT(455, rData.pcBase!=0); - JUT_ASSERT(456, rData.pOffset!=0); + JUT_ASSERT(455, rData.pcBase!=NULL); + JUT_ASSERT(456, rData.pOffset!=NULL); JUT_ASSERT(457, rData.uRest>0); u16* puOffset = (u16*)rData.pOffset; @@ -327,8 +327,8 @@ const char* JMessage::TProcessor::process_onSelect_limited_(JMessage::TProcessor const char* JMessage::TProcessor::process_onSelect_(JMessage::TProcessor* pThis) { TProcess_::rdata& rData = pThis->oProcess_.rData; JUT_ASSERT(471, rData.pfn==&process_onSelect_); - JUT_ASSERT(472, rData.pcBase!=0); - JUT_ASSERT(473, rData.pOffset!=0); + JUT_ASSERT(472, rData.pcBase!=NULL); + JUT_ASSERT(473, rData.pOffset!=NULL); JUT_ASSERT(474, rData.uRest>0); u32* puOffset = (u32*)rData.pOffset; @@ -358,7 +358,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) { case STATUS_NORMAL: break; case STATUS_JUMP: { - JUT_ASSERT(549, pControl_!=0); + JUT_ASSERT(549, pControl_!=NULL); if (!on_jump_isReady()) { return pszCurrent_; @@ -368,7 +368,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) { TProcess_& process = oProcess2_; TSequenceProcessor::jumpPfn pfn = process.process.jump_process.jumpFn; - JUT_ASSERT(556, pfn!=0); + JUT_ASSERT(556, pfn!=NULL); const void* pEntry = pfn(this); if (pEntry != NULL) { @@ -377,7 +377,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) { break; } case STATUS_BRANCH: { - JUT_ASSERT(567, pControl_!=0); + JUT_ASSERT(567, pControl_!=NULL); u32 queryResult = on_branch_queryResult(); if (queryResult > 0x7FFFFFFF) { @@ -398,7 +398,7 @@ const char* JMessage::TSequenceProcessor::process(char const* pszText) { JGADGET_WARNMSG1(588, "unknown result : ", queryResult); } else { TSequenceProcessor::branchPfn pfn = process.process.branch_process.branchFn; - JUT_ASSERT(592, pfn!=0); + JUT_ASSERT(592, pfn!=NULL); const void* pEntry = pfn(this, queryResult); if (pEntry != NULL) { @@ -456,8 +456,8 @@ void JMessage::TSequenceProcessor::on_jump(void const* pEntry, char const* pszTe on_resetStatus_(pszText); JUT_ASSERT(658, eStatus_==STATUS_NORMAL); - JUT_ASSERT(659, pEntry!=0); - JUT_ASSERT(660, pszText!=0); + JUT_ASSERT(659, pEntry!=NULL); + JUT_ASSERT(660, pszText!=NULL); do_jump(pEntry, pszText); } @@ -495,8 +495,8 @@ void JMessage::TSequenceProcessor::on_branch(void const* pEntry, char const* psz on_resetStatus_(pszText); JUT_ASSERT(717, eStatus_==STATUS_NORMAL); - JUT_ASSERT(718, pEntry!=0); - JUT_ASSERT(719, pszText!=0); + JUT_ASSERT(718, pEntry!=NULL); + JUT_ASSERT(719, pszText!=NULL); do_branch(pEntry, pszText); } @@ -653,7 +653,7 @@ void* JMessage::TSequenceProcessor::process_setMessageCode_(JMessage::TSequenceP } TControl* pControl = pProcessor->getControl(); - JUT_ASSERT(911, pControl!=0); + JUT_ASSERT(911, pControl!=NULL); if (!pControl->setMessageCode_inSequence_(pProcessor, u16GroupID, u16Index)) { JGADGET_WARNMSG1(914, "message-code undefined : ", pControl->getMessageCode()); @@ -687,7 +687,7 @@ const void* JMessage::TSequenceProcessor::process_onBranch_limited_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) { const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process; - JUT_ASSERT(942, rData.pTarget!=0); + JUT_ASSERT(942, rData.pTarget!=NULL); JUT_ASSERT(943, uTargetIndex >::parse(rData.pTarget, uTargetIndex); @@ -700,7 +700,7 @@ const void* JMessage::TSequenceProcessor::process_onBranch_(JMessage::TSequenceProcessor const* pProcessor, u32 uTargetIndex) { const TProcess_::processData::branchData& rData = pProcessor->oProcess2_.process.branch_process; - JUT_ASSERT(957, rData.pTarget!=0); + JUT_ASSERT(957, rData.pTarget!=NULL); JUT_ASSERT(958, uTargetIndex >::parse(rData.pTarget, uTargetIndex); diff --git a/src/JSystem/JMessage/resource.cpp b/src/JSystem/JMessage/resource.cpp index 8f50f15c11..145a92fef1 100644 --- a/src/JSystem/JMessage/resource.cpp +++ b/src/JSystem/JMessage/resource.cpp @@ -66,7 +66,7 @@ u16 JMessage::TResource::toMessageIndex_messageID(u32 uMsgID, u32 upperHalf, boo int nMsgNumber = oParse_TBlock_messageID_.get_number(); const u32* pContent = oParse_TBlock_messageID_.getContent(); - JUT_ASSERT(131, pContent!=0); + JUT_ASSERT(131, pContent!=NULL); const u32* pFirst = pContent; const u32* pLast = pFirst + nMsgNumber; @@ -156,13 +156,13 @@ void JMessage::TResourceContainer::setEncoding(u8 e) { void JMessage::TResourceContainer::setEncoding_(u8 e) { encodingType_ = e; pfnParseCharacter_ = JGadget::toValueFromIndex(e, sapfnParseCharacter_, 5, NULL); - JUT_ASSERT(299, pfnParseCharacter_!=0); + JUT_ASSERT(299, pfnParseCharacter_!=NULL); } /* 802A9130-802A9158 2A3A70 0028+00 0/0 2/2 0/0 .text * __ct__Q28JMessage6TParseFPQ28JMessage18TResourceContainer */ JMessage::TParse::TParse(JMessage::TResourceContainer* pContainer) { - JUT_ASSERT(324, pContainer!=0); + JUT_ASSERT(324, pContainer!=NULL); pContainer_ = pContainer; pResource_ = NULL; } @@ -174,17 +174,17 @@ JMessage::TParse::~TParse() {} * parseHeader_next__Q28JMessage6TParseFPPCvPUlUl */ // NONMATCHING regalloc, missing clrlwi bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_out, u32 param_2) { - JUT_ASSERT(343, ppData_inout!=0); - JUT_ASSERT(344, puBlock_out!=0); + JUT_ASSERT(343, ppData_inout!=NULL); + JUT_ASSERT(344, puBlock_out!=NULL); const void* pData = *ppData_inout; - JUT_ASSERT(346, pData!=0); + JUT_ASSERT(346, pData!=NULL); data::TParse_THeader oHeader(pData); *ppData_inout = oHeader.getContent(); *puBlock_out = oHeader.get_blockNumber(); - JUT_ASSERT(350, pContainer_!=0); + JUT_ASSERT(350, pContainer_!=NULL); if (memcmp(oHeader.get_signature(), &data::ga4cSignature, sizeof(data::ga4cSignature)) != 0) { JGADGET_WARNMSG(355, "unknown signature"); @@ -230,11 +230,11 @@ bool JMessage::TParse::parseHeader_next(const void** ppData_inout, u32* puBlock_ /* 802A92F4-802A9490 2A3C34 019C+00 1/0 0/0 0/0 .text * parseBlock_next__Q28JMessage6TParseFPPCvPUlUl */ bool JMessage::TParse::parseBlock_next(const void** ppData_inout, u32* puData_out, u32 param_2) { - JUT_ASSERT(401, ppData_inout!=0); - JUT_ASSERT(402, puData_out!=0); + JUT_ASSERT(401, ppData_inout!=NULL); + JUT_ASSERT(402, puData_out!=NULL); const void* pData = *ppData_inout; - JUT_ASSERT(404, pData!=0); + JUT_ASSERT(404, pData!=NULL); data::TParse_TBlock oBlock(pData); diff --git a/src/JSystem/JParticle/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp index 80dcf104e5..adad4698e8 100644 --- a/src/JSystem/JParticle/JPAEmitterManager.cpp +++ b/src/JSystem/JParticle/JPAEmitterManager.cpp @@ -55,7 +55,7 @@ JPABaseEmitter* JPAEmitterManager::createSimpleEmitterID(JGeometry::TVec3 c JPAParticleCallBack* ptclCB) { JUT_ASSERT(88, group_id < gidMax); JUT_ASSERT(89, res_mgr_id < ridMax); - JUT_ASSERT(90, pResMgrAry[res_mgr_id] != 0); + JUT_ASSERT(90, pResMgrAry[res_mgr_id] != NULL); JPAResource* pRes = pResMgrAry[res_mgr_id]->getResource(resID); if (pRes == NULL) { @@ -160,7 +160,7 @@ void JPAEmitterManager::forceDeleteEmitter(JPABaseEmitter* emtr) { /* 8027E344-8027E354 278C84 0010+00 0/0 2/2 0/0 .text * entryResourceManager__17JPAEmitterManagerFP18JPAResourceManagerUc */ void JPAEmitterManager::entryResourceManager(JPAResourceManager* resMgr, u8 resMgrID) { - JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == 0, + JUT_ASSERT_MSG_F(325, resMgrID < ridMax && (pResMgrAry[resMgrID]) == NULL, "res_id %d res_id_max %d array[%d] = %x", resMgrID, ridMax, resMgrID, pResMgrAry[resMgrID]); pResMgrAry[resMgrID] = resMgr; diff --git a/src/JSystem/JStudio/JStudio/ctb.cpp b/src/JSystem/JStudio/JStudio/ctb.cpp index 92e03b337c..4ca8717e21 100644 --- a/src/JSystem/JStudio/JStudio/ctb.cpp +++ b/src/JSystem/JStudio/JStudio/ctb.cpp @@ -111,10 +111,10 @@ JStudio::ctb::TParse::~TParse() {} /* 802813DC-80281470 27BD1C 0094+00 1/0 0/0 0/0 .text * parseHeader_next__Q37JStudio3ctb6TParseFPPCvPUlUl */ bool JStudio::ctb::TParse::parseHeader_next(void const** ppData_inout, u32* puBlock_out, u32 param_3) { - JUT_ASSERT(221, ppData_inout!=0); - JUT_ASSERT(222, puBlock_out!=0); + JUT_ASSERT(221, ppData_inout!=NULL); + JUT_ASSERT(222, puBlock_out!=NULL); void const* pData = *ppData_inout; - JUT_ASSERT(224, pData!=0); + JUT_ASSERT(224, pData!=NULL); data::TParse_THeader aTStack_478(pData); *ppData_inout = aTStack_478.getContent(); *puBlock_out = aTStack_478.get_blockNumber(); @@ -134,15 +134,15 @@ bool JStudio::ctb::TParse::parseHeader_next(void const** ppData_inout, u32* puBl /* 80281470-80281554 27BDB0 00E4+00 1/0 0/0 0/0 .text * parseBlock_next__Q37JStudio3ctb6TParseFPPCvPUlUl */ bool JStudio::ctb::TParse::parseBlock_next(void const** ppData_inout, u32* puData_out, u32 param_3) { - JUT_ASSERT(260, ppData_inout!=0); - JUT_ASSERT(261, puData_out!=0); + JUT_ASSERT(260, ppData_inout!=NULL); + JUT_ASSERT(261, puData_out!=NULL); void const* pData = *ppData_inout; - JUT_ASSERT(263, pData!=0); + JUT_ASSERT(263, pData!=NULL); data::TParse_TBlock aTStack_260(pData); *ppData_inout = aTStack_260.getNext(); *puData_out = aTStack_260.get_size(); JStudio::ctb::TControl* pControl = getControl(); - JUT_ASSERT(269, pControl!=0); + JUT_ASSERT(269, pControl!=NULL); if ((param_3 & 0x10) != 0) { if (pControl->getObject(aTStack_260.get_ID(), aTStack_260.get_IDSize()) != NULL) { return true; diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp index 193d1304a6..f169e00469 100644 --- a/src/JSystem/JStudio/JStudio/functionvalue.cpp +++ b/src/JSystem/JStudio/JStudio/functionvalue.cpp @@ -301,7 +301,7 @@ f64 TFunctionValue_composite::composite_index(TVector_pointer c } TFunctionValue** local_148 = (TFunctionValue**)param_1.begin(); TFunctionValue* pFront = *local_148; - JUT_ASSERT(599, pFront!=0); + JUT_ASSERT(599, pFront!=NULL); f64 dVar4 = pFront->getValue(param_3); s32 index = floor(dVar4); u32 uVar2 = param_2.get_unsignedInteger(); @@ -397,7 +397,7 @@ f64 TFunctionValue_composite::composite_subtract(TVector_pointer aTStack_18(param_1); TFunctionValue* const* local_148 = *aTStack_18; TFunctionValue* pFront = *local_148; - JUT_ASSERT(688, pFront!=0); + JUT_ASSERT(688, pFront!=NULL); f64 dVar4 = pFront->getValue(param_3); while (aTStack_18) { TFunctionValue* const* ppiVar3 = *aTStack_18; @@ -436,7 +436,7 @@ f64 TFunctionValue_composite::composite_divide(TVector_pointer TContainerEnumerator_const_TVector aTStack_18(param_1); TFunctionValue* const* local_148 = *aTStack_18; TFunctionValue* pFront = *local_148; - JUT_ASSERT(724, pFront!=0); + JUT_ASSERT(724, pFront!=NULL); f64 dVar4 = pFront->getValue(param_3); while (aTStack_18) { TFunctionValue* const* ppiVar3 = *aTStack_18; @@ -624,7 +624,7 @@ f64 TFunctionValue_list::getValue(f64 param_1) { } local_178._8 = floor(local_178._0); local_178._10 = local_178._8; - JUT_ASSERT(1063, pfnUpdate_!=0); + JUT_ASSERT(1063, pfnUpdate_!=NULL); return pfnUpdate_(*this, local_178); } @@ -751,7 +751,7 @@ void TFunctionValue_list_parameter::prepare() { * getValue__Q27JStudio29TFunctionValue_list_parameterFd */ f64 TFunctionValue_list_parameter::getValue(f64 param_0) { param_0 = range_getParameter(param_0, data_getValue_front(), data_getValue_back()); - JUT_ASSERT(1395, pfData_!=0) + JUT_ASSERT(1395, pfData_!=NULL) dat3 = JGadget::findUpperBound_binary_current(dat1, dat2, dat3, param_0); if (dat3 == dat1) { @@ -764,7 +764,7 @@ f64 TFunctionValue_list_parameter::getValue(f64 param_0) { const f32* pf = dat3.get(); JUT_ASSERT(1411, (pfData_<=pf-suData_size)&&(pftransform_setOrigin_TxyzRy(local_468, 0.0f); @@ -161,9 +161,9 @@ bool JStudio::TParse::parseBlock_block(JStudio::stb::data::TParse_TBlock const& bool JStudio::TParse::parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock const& param_0, u32 param_1) { TControl* pControl = getControl(); - JUT_ASSERT(361, pControl!=0); + JUT_ASSERT(361, pControl!=NULL); const void* pContent = param_0.getContent(); - JUT_ASSERT(363, pContent!=0); + JUT_ASSERT(363, pContent!=NULL); u32 uVar4 = param_1 & 0xf; if ((param_1 & 0x10) != 0) { uVar4 |= 0x10; @@ -186,9 +186,9 @@ bool JStudio::TParse::parseBlock_block_fvb_(JStudio::stb::data::TParse_TBlock co bool JStudio::TParse::parseBlock_block_ctb_(JStudio::stb::data::TParse_TBlock const& param_0, u32 param_1) { TControl* pControl = getControl(); - JUT_ASSERT(386, pControl!=0); + JUT_ASSERT(386, pControl!=NULL); const void* pContent = param_0.getContent(); - JUT_ASSERT(388, pContent!=0); + JUT_ASSERT(388, pContent!=NULL); u32 uVar4 = param_1 & 0xf; if ((param_1 & 0x10) != 0) { uVar4 |= 0x10; diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/src/JSystem/JStudio/JStudio/jstudio-object.cpp index b8598677b7..67e5dcc5b4 100644 --- a/src/JSystem/JStudio/JStudio/jstudio-object.cpp +++ b/src/JSystem/JStudio/JStudio/jstudio-object.cpp @@ -97,7 +97,7 @@ JStudio::TVariableValue::TOutput::~TOutput() {} void JStudio::TVariableValue::update(f64 param_0, JStudio::TAdaptor* param_1) { if (field_0x8) { field_0x8(this, param_0); - JUT_ASSERT(200, pOutput_!=0); + JUT_ASSERT(200, pOutput_!=NULL); (*pOutput_)(mValue, param_1); } } @@ -175,7 +175,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue(JStudio::TControl* pControl, u3 JStudio::data::TEOperationData param_3, void const* param_4, u32 param_5) { setVarFunc func; - JUT_ASSERT(304, pControl!=0); + JUT_ASSERT(304, pControl!=NULL); switch (param_3) { case JStudio::data::UNK_0x1: func = &adaptor_setVariableValue_VOID_; @@ -207,7 +207,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue_n(JStudio::TControl* pControl, u32 const* param_2, u32 param_3, JStudio::data::TEOperationData param_4, void const* param_5, u32 param_6) { - JUT_ASSERT(343, pControl!=0); + JUT_ASSERT(343, pControl!=NULL); setVarFunc pcVar6; u32 iVar7; switch(param_4) { @@ -254,7 +254,7 @@ void JStudio::TAdaptor::adaptor_setVariableValue_immediate( /* 80286204-80286274 280B44 0070+00 0/0 4/4 0/0 .text * adaptor_setVariableValue_Vec__Q27JStudio8TAdaptorFPCUlRC3Vec */ void JStudio::TAdaptor::adaptor_setVariableValue_Vec(u32 const* puIndex, Vec const& param_2) { - JUT_ASSERT(400, puIndex!=0); + JUT_ASSERT(400, puIndex!=NULL); adaptor_referVariableValue(puIndex[0])->setValue_immediate(param_2.x); adaptor_referVariableValue(puIndex[1])->setValue_immediate(param_2.y); adaptor_referVariableValue(puIndex[2])->setValue_immediate(param_2.z); @@ -272,7 +272,7 @@ void JStudio::TAdaptor::adaptor_getVariableValue_Vec(Vec* param_1, u32 const* pa * adaptor_setVariableValue_GXColor__Q27JStudio8TAdaptorFPCUlRC8_GXColor */ void JStudio::TAdaptor::adaptor_setVariableValue_GXColor(u32 const* puIndex, GXColor const& param_2) { - JUT_ASSERT(431, puIndex!=0); + JUT_ASSERT(431, puIndex!=NULL); adaptor_referVariableValue(puIndex[0])->setValue_immediate(param_2.r); adaptor_referVariableValue(puIndex[1])->setValue_immediate(param_2.g); adaptor_referVariableValue(puIndex[2])->setValue_immediate(param_2.b); @@ -292,7 +292,7 @@ void JStudio::TAdaptor::adaptor_getVariableValue_GXColor(GXColor* param_1, /* 802864D8-8028656C 280E18 0094+00 1/1 0/0 0/0 .text * adaptor_updateVariableValue__Q27JStudio8TAdaptorFPQ27JStudio8TControlUl */ void JStudio::TAdaptor::adaptor_updateVariableValue(JStudio::TControl* pControl, u32 param_2) { - JUT_ASSERT(479, pControl!=0); + JUT_ASSERT(479, pControl!=NULL); f64 dVar3 = pControl->getSecondPerFrame(); JGadget::TEnumerator enumerator(pValue_, pValue_ + uvv_); while (enumerator) { @@ -1057,7 +1057,7 @@ void JStudio::TObject_message::do_paragraph(u32 param_1, void const* param_2, u3 default: return; } - JUT_ASSERT(1161, pmfn_!=0); + JUT_ASSERT(1161, pmfn_!=NULL); (((TAdaptor_message*)adaptor)->*pmfn_)(operation, param_2, param_3); } diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp index 1aa0a2fe16..99ee1ef081 100644 --- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp +++ b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp @@ -51,7 +51,7 @@ void TParse_TParagraph::getData(TData* pData) const { } void TParse_TParagraph_data::getData(TParse_TParagraph_data::TData* pData) const { - JUT_ASSERT(104, pData!=0); + JUT_ASSERT(104, pData!=NULL); pData->entrySize = 0; pData->entryCount = 0; pData->content = NULL; diff --git a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp index 4f96bf8778..753c73df07 100644 --- a/src/JSystem/JStudio/JStudio_JAudio2/control.cpp +++ b/src/JSystem/JStudio/JStudio_JAudio2/control.cpp @@ -16,7 +16,7 @@ JStudio_JAudio2::TCreateObject::~TCreateObject() {} */ bool JStudio_JAudio2::TCreateObject::create( JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) { - JUT_ASSERT(40, ppObject!=0); + JUT_ASSERT(40, ppObject!=NULL); CreateFunc func; switch (param_2.get_type()) { case 'JSND': diff --git a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp index 20e8f876c0..5a5e8d2d1d 100644 --- a/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp +++ b/src/JSystem/JStudio/JStudio_JAudio2/object-sound.cpp @@ -56,7 +56,7 @@ JStudio_JAudio2::TAdaptor_sound::TAdaptor_sound(JStudio_JAudio2::TCreateObject* field_0x13c = NULL; field_0x140 = 0xffffffff; field_0x144 = 0; - JUT_ASSERT(112, pCreateObject_!=0); + JUT_ASSERT(112, pCreateObject_!=NULL); } /* 8028D8F4-8028D9A4 288234 00B0+00 1/0 0/0 0/0 .text __dt__Q215JStudio_JAudio214TAdaptor_soundFv @@ -120,9 +120,9 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_end() { * adaptor_do_update__Q215JStudio_JAudio214TAdaptor_soundFUl */ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_update(u32 param_1) { const JStudio::TObject* pObject = adaptor_getObject(); - JUT_ASSERT(194, pObject!=0); + JUT_ASSERT(194, pObject!=NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(196, pControl!=0); + JUT_ASSERT(196, pControl!=NULL); JStudio::TControl::TTransform_position VStack_148; JStudio::TControl::TTransform_position VStack_154; JStudio::TControl::TTransform_position* pVVar2; @@ -165,7 +165,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_SOUND(JStudio::data::TEOperatio void const* pContent, u32 uSize) { switch(param_1) { case JStudio::data::UNK_0x19: - JUT_ASSERT(283, pContent!=0); + JUT_ASSERT(283, pContent!=NULL); JUT_ASSERT(284, uSize==4); field_0x124 = *(u32*)pContent; prepareSound_(); @@ -192,7 +192,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_BEGIN_FADE_IN( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { case JStudio::data::UNK_0x2: - JUT_ASSERT(323, pContent!=0); + JUT_ASSERT(323, pContent!=NULL); JUT_ASSERT(324, uSize==4); beginSound_fadeIn_(*(f32*)pContent); break; @@ -218,7 +218,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_END_FADE_OUT( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { case JStudio::data::UNK_0x2: - JUT_ASSERT(364, pContent!=0); + JUT_ASSERT(364, pContent!=NULL); JUT_ASSERT(365, uSize==4); endSound_fadeOut_(*(f32*)pContent); break; @@ -231,14 +231,14 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { case JStudio::data::UNK_0x18: - JUT_ASSERT(387, pContent!=0); + JUT_ASSERT(387, pContent!=NULL); JUT_ASSERT(388, uSize!=0); field_0x13c = NULL; JStage::TSystem* pJSGSystem = (JStage::TSystem*)pCreateObject_->get_pJSGSystem_(); - JUT_ASSERT(396, pJSGSystem != 0); + JUT_ASSERT(396, pJSGSystem != NULL); JStage::TObject* pJSGObject; if (!pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED)) { - JUT_ASSERT(405, pJSGObject != 0); + JUT_ASSERT(405, pJSGObject != NULL); field_0x13c = pJSGObject; } break; @@ -253,7 +253,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp switch (param_1) { case JStudio::data::UNK_0x18: if (field_0x13c != NULL) { - JUT_ASSERT(431, pContent!=0); + JUT_ASSERT(431, pContent!=NULL); JUT_ASSERT(432, uSize==0); field_0x140 = field_0x13c->JSGFindNodeID((char*)pContent); if (field_0x140 == -1) { @@ -263,7 +263,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_NODE(JStudio::data::TEOp break; case JStudio::data::UNK_0x19: JUT_ASSERT(447, uSize==4); - JUT_ASSERT(448, pContent!=0); + JUT_ASSERT(448, pContent!=NULL); field_0x140 = *(u32*)pContent; break; } @@ -276,7 +276,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_PARENT_ENABLE( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { JUT_ASSERT(468, uSize == 4); - JUT_ASSERT(469, pContent != 0); + JUT_ASSERT(469, pContent != NULL); field_0x144 = *(u32*)pContent ? 1 : 0; } } @@ -287,7 +287,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_REPEAT(JStudio::data::TEOperati const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { JUT_ASSERT(490, uSize == 4); - JUT_ASSERT(491, pContent != 0); + JUT_ASSERT(491, pContent != NULL); field_0x11e = *(u32*)pContent ? 1 : 0; } } @@ -299,7 +299,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOpe const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { JUT_ASSERT(512, uSize == 4); - JUT_ASSERT(513, pContent != 0); + JUT_ASSERT(513, pContent != NULL); field_0x11d = *(u32*)pContent ? 1 : 0; } } @@ -309,7 +309,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_CONTINUOUS(JStudio::data::TEOpe void JStudio_JAudio2::TAdaptor_sound::adaptor_do_LOCATED(JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { - JUT_ASSERT(534, pContent != 0); + JUT_ASSERT(534, pContent != NULL); JUT_ASSERT(535, uSize == 4); u32 val = *(u32*)pContent; field_0x12c = NULL; @@ -326,7 +326,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { JUT_ASSERT(512, uSize == 4); - JUT_ASSERT(513, pContent != 0); + JUT_ASSERT(513, pContent != NULL); field_0x11f = *(u32*)pContent ? 1 : 0; } } @@ -335,7 +335,7 @@ void JStudio_JAudio2::TAdaptor_sound::adaptor_do_ON_EXIT_NOT_END( * __cl__Q315JStudio_JAudio214TAdaptor_sound13TVVOSetValue_CFfPQ27JStudio8TAdaptor */ void JStudio_JAudio2::TAdaptor_sound::TVVOSetValue_::operator()(f32 param_1, JStudio::TAdaptor* param_2) const { - JUT_ASSERT(596, param_2 != 0); + JUT_ASSERT(596, param_2 != NULL); if (((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_) { JAISound* sound = ((JStudio_JAudio2::TAdaptor_sound*)param_2)->opJAISoundHandle_.sound_; field_0x08(sound, param_1); diff --git a/src/JSystem/JStudio/JStudio_JParticle/control.cpp b/src/JSystem/JStudio/JStudio_JParticle/control.cpp index fb1092f44f..0925aaa37e 100644 --- a/src/JSystem/JStudio/JStudio_JParticle/control.cpp +++ b/src/JSystem/JStudio/JStudio_JParticle/control.cpp @@ -18,7 +18,7 @@ JStudio_JParticle::TCreateObject::~TCreateObject() {} bool JStudio_JParticle::TCreateObject::create(JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& param_2) { - JUT_ASSERT(40, ppObject!=0); + JUT_ASSERT(40, ppObject!=NULL); CreateFunc func; switch (param_2.get_type()) { case 'JPTC': diff --git a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp index 46ceaf44d7..b5f2d9b895 100644 --- a/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp +++ b/src/JSystem/JStudio/JStudio_JParticle/object-particle.cpp @@ -27,7 +27,7 @@ JStudio_JParticle::TAdaptor_particle::TAdaptor_particle( field_0x1d0 = NULL; field_0x1d4 = -1; field_0x1d8 = 0; - JUT_ASSERT(90, pCreateObject_!=0); + JUT_ASSERT(90, pCreateObject_!=NULL); } /* 8028E760-8028E850 2890A0 00F0+00 1/0 0/0 0/0 .text @@ -80,12 +80,12 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_end() { * adaptor_do_update__Q217JStudio_JParticle17TAdaptor_particleFUl */ void JStudio_JParticle::TAdaptor_particle::adaptor_do_update(u32 param_1) { const JStudio::TObject* pObject = adaptor_getObject(); - JUT_ASSERT(179, pObject != 0); + JUT_ASSERT(179, pObject != NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(181, pControl != 0); + JUT_ASSERT(181, pControl != NULL); if (u32FadeTime_end != 0 && field_0x1c4 < u32FadeTime_end) { JUT_ASSERT(187, state_isFade_()); - JUT_ASSERT(188, pJPAEmitter_ != 0); + JUT_ASSERT(188, pJPAEmitter_ != NULL); field_0x1c4 += param_1; if (field_0x1c4 >= u32FadeTime_end) { switch (field_0x1b8) { @@ -116,7 +116,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARTICLE( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x19) { JUT_ASSERT(232, uSize==4); - JUT_ASSERT(233, pContent!=0); + JUT_ASSERT(233, pContent!=NULL); field_0x1bc = *(u32*)pContent; } } @@ -141,7 +141,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_BEGIN_FADE_IN( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { case JStudio::data::UNK_0x2: - JUT_ASSERT(272, pContent!=0); + JUT_ASSERT(272, pContent!=NULL); JUT_ASSERT(273, uSize==4); beginParticle_fadeIn_(*(f32*)pContent); break; @@ -165,7 +165,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_END_FADE_OUT( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { case JStudio::data::UNK_0x2: - JUT_ASSERT(336, pContent!=0); + JUT_ASSERT(336, pContent!=NULL); JUT_ASSERT(337, uSize==4); endParticle_fadeOut_(*(f32*)pContent); break; @@ -179,14 +179,14 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT( JStudio::data::TEOperationData param_1, const void* pContent, u32 uSize) { switch (param_1) { case JStudio::data::UNK_0x18: - JUT_ASSERT(313, pContent!=0); + JUT_ASSERT(313, pContent!=NULL); JUT_ASSERT(314, uSize==4); field_0x1d0 = NULL; const JStage::TSystem* pJSGSystem = pCreateObject_->get_pJSGSystem_(); - JUT_ASSERT(345, pJSGSystem!=0); + JUT_ASSERT(345, pJSGSystem!=NULL); JStage::TObject* pJSGObject; if (pJSGSystem->JSGFindObject(&pJSGObject, (const char*)pContent, JStage::OBJECT_UNDEFINED) == 0) { - JUT_ASSERT(354, pJSGObject!=0); + JUT_ASSERT(354, pJSGObject!=NULL); field_0x1d0 = pJSGObject; } break; @@ -201,7 +201,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE( switch (param_1) { case JStudio::data::UNK_0x18: if (field_0x1d0 != NULL) { - JUT_ASSERT(380, pContent!=0); + JUT_ASSERT(380, pContent!=NULL); JUT_ASSERT(381, uSize==4); field_0x1d4 = field_0x1d0->JSGFindNodeID((const char*)pContent); if (field_0x1d4 == -1) { @@ -211,7 +211,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_NODE( break; case JStudio::data::UNK_0x19: JUT_ASSERT(397, uSize==4); - JUT_ASSERT(396, pContent!=0); + JUT_ASSERT(396, pContent!=NULL); field_0x1d4 = *(u32*)pContent; break; } @@ -224,7 +224,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_ENABLE(JStudio::dat const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { JUT_ASSERT(417, uSize==4); - JUT_ASSERT(418, pContent!=0); + JUT_ASSERT(418, pContent!=NULL); field_0x1d8 = *(u32*)pContent ? 1 : 0; } } @@ -236,7 +236,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_PARENT_FUNCTION(JStudio::d const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { JUT_ASSERT(439, uSize==4); - JUT_ASSERT(439, pContent!=0); + JUT_ASSERT(439, pContent!=NULL); field_0x1cc = *(u32*)pContent; } } @@ -248,7 +248,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_REPEAT(JStudio::data::TEOp const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { JUT_ASSERT(460, uSize==4); - JUT_ASSERT(461, pContent!=0); + JUT_ASSERT(461, pContent!=NULL); field_0x1b5 = *(u32*)pContent ? 1 : 0; } } @@ -260,7 +260,7 @@ void JStudio_JParticle::TAdaptor_particle::adaptor_do_ON_EXIT_NOT_END(JStudio::d const void* pContent, u32 uSize) { if (param_1 == JStudio::data::UNK_0x2) { JUT_ASSERT(460, uSize==4); - JUT_ASSERT(461, pContent!=0); + JUT_ASSERT(461, pContent!=NULL); field_0x1b6 = *(u32*)pContent ? 1 : 0; } } @@ -279,9 +279,9 @@ JStudio_JParticle::TAdaptor_particle::TJPACallback_emitter_::execute(JPABaseEmit return; } const JStudio::TObject* pObject = pThis_->adaptor_getObject(); - JUT_ASSERT(534, pObject!=0); + JUT_ASSERT(534, pObject!=NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(536, pControl!=0); + JUT_ASSERT(536, pControl!=NULL); TJPAEmitter_stopDrawParticle_ aTStack_21c(pJPAEmitter); JStudio::TControl::TTransform_translation_rotation_scaling VStack_19c; JStudio::TControl::TTransform_translation_rotation_scaling aTStack_1c0; diff --git a/src/JSystem/JStudio/JStudio_JStage/control.cpp b/src/JSystem/JStudio/JStudio_JStage/control.cpp index 937b0bc937..acb33f66c6 100644 --- a/src/JSystem/JStudio/JStudio_JStage/control.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/control.cpp @@ -20,7 +20,7 @@ JStudio_JStage::TCreateObject::~TCreateObject() {} */ bool JStudio_JStage::TCreateObject::create( JStudio::TObject** ppObject, JStudio::stb::data::TParse_TBlock_object const& rParse) { - JUT_ASSERT(83, ppObject!=0); + JUT_ASSERT(83, ppObject!=NULL); *ppObject = NULL; ObjCreateFuncT pfnCreateObject; JStage::TEObject eObject; @@ -48,14 +48,14 @@ bool JStudio_JStage::TCreateObject::create( default: return NULL; } - JUT_ASSERT(99, pfnCreateObject!=0); + JUT_ASSERT(99, pfnCreateObject!=NULL); JUT_ASSERT(100, eObject!=JStage::OBJECT_UNDEFINED); - JUT_ASSERT(109, pJSGSystem_!=0); + JUT_ASSERT(109, pJSGSystem_!=NULL); JStage::TObject* pJSGObject; int pJVar2 = pJSGSystem_->JSGFindObject(&pJSGObject, (char const*)rParse.get_ID(), eObject); switch(pJVar2) { case 0: - JUT_ASSERT(115, pJSGObject!=0); + JUT_ASSERT(115, pJSGObject!=NULL); *ppObject = pfnCreateObject(rParse, pJSGObject, pJSGSystem_); return true; case 2: diff --git a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp index 3b635d054a..a8bcd1fed8 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-actor.cpp @@ -52,9 +52,9 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_begin() { #ifdef DEBUG { // This block is needed to match the stack in debug const JStudio::TObject* pObject = adaptor_getObject(); - JUT_ASSERT(72, pObject!=0); + JUT_ASSERT(72, pObject!=NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(74, pControl!=0); + JUT_ASSERT(74, pControl!=NULL); getJSG_SRT_(pControl); } #else @@ -85,9 +85,9 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_end() { * adaptor_do_update__Q214JStudio_JStage14TAdaptor_actorFUl */ void JStudio_JStage::TAdaptor_actor::adaptor_do_update(u32 param_1) { const JStudio::TObject* pObject = adaptor_getObject(); - JUT_ASSERT(104, pObject != 0); + JUT_ASSERT(104, pObject != NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(106, pControl != 0); + JUT_ASSERT(106, pControl != NULL); setJSG_SRT_(pControl); pJSGObject_->JSGUpdate(); } @@ -123,7 +123,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_ANIMATION_MODE(JStudio::data::TE switch (operation) { case JStudio::data::UNK_0x2: JUT_ASSERT(153, uSize==4); - JUT_ASSERT(154, pContent!=0); + JUT_ASSERT(154, pContent!=NULL); field_0x130 = *(u32*)pContent; break; } @@ -145,7 +145,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_TEXTURE_ANIMATION_MODE( switch (operation) { case JStudio::data::UNK_0x2: JUT_ASSERT(182, uSize==4); - JUT_ASSERT(183, pContent!=0); + JUT_ASSERT(183, pContent!=NULL); field_0x134 = *(u32*)pContent; break; } @@ -157,7 +157,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { case JStudio::data::UNK_0x18: - JUT_ASSERT(203, pContent!=0); + JUT_ASSERT(203, pContent!=NULL); JUT_ASSERT(204, uSize!=0); field_0x13c = adaptor_object_findJSGObject_((const char*)pContent); break; @@ -171,13 +171,13 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_NODE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { case JStudio::data::UNK_0x18: - JUT_ASSERT(226, pContent!=0); + JUT_ASSERT(226, pContent!=NULL); JUT_ASSERT(227, uSize!=0); field_0x140 = adaptor_object_findJSGObjectNode_(field_0x13c, (const char*)pContent); break; case JStudio::data::UNK_0x19: JUT_ASSERT(237, uSize==4); - JUT_ASSERT(238, pContent!=0); + JUT_ASSERT(238, pContent!=NULL); field_0x140 = *(u32*)pContent; break; } @@ -191,7 +191,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_ENABLE( switch (operation) { case JStudio::data::UNK_0x2: JUT_ASSERT(257, uSize==4); - JUT_ASSERT(258, pContent!=0); + JUT_ASSERT(258, pContent!=NULL); bool v0 = (*(u32*)pContent != 0); if (field_0x144 != v0) { field_0x144 = v0; @@ -221,7 +221,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_PARENT_FUNCTION( switch (operation) { case JStudio::data::UNK_0x2: JUT_ASSERT(303, uSize==4); - JUT_ASSERT(304, pContent!=0); + JUT_ASSERT(304, pContent!=NULL); field_0x138 = *(u32*)pContent; break; } @@ -233,7 +233,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { case JStudio::data::UNK_0x18: - JUT_ASSERT(324, pContent!=0); + JUT_ASSERT(324, pContent!=NULL); JUT_ASSERT(325, uSize!=0); field_0x148 = adaptor_object_findJSGObject_((const char*)pContent); break; @@ -247,13 +247,13 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_NODE( JStudio::data::TEOperationData operation, void const* pContent, u32 uSize) { switch (operation) { case JStudio::data::UNK_0x18: - JUT_ASSERT(347, pContent!=0); + JUT_ASSERT(347, pContent!=NULL); JUT_ASSERT(348, uSize!=0); field_0x14c = adaptor_object_findJSGObjectNode_(field_0x13c, (const char*)pContent); break; case JStudio::data::UNK_0x19: JUT_ASSERT(358, uSize==4); - JUT_ASSERT(359, pContent!=0); + JUT_ASSERT(359, pContent!=NULL); field_0x14c = *(u32*)pContent; break; } @@ -267,7 +267,7 @@ void JStudio_JStage::TAdaptor_actor::adaptor_do_RELATION_ENABLE( switch (operation) { case JStudio::data::UNK_0x2: JUT_ASSERT(378, uSize==4); - JUT_ASSERT(379, pContent!=0); + JUT_ASSERT(379, pContent!=NULL); pJSGObject_->JSGSetRelation(*(u32*)pContent, field_0x148, field_0x14c); break; } diff --git a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp index f06923e7b5..0ab70536d1 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-camera.cpp @@ -56,9 +56,9 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_begin() { adaptor_object_begin_(); JStage::TCamera* pCamera = get_pJSG_(); const JStudio::TObject* pObject = adaptor_getObject(); - JUT_ASSERT(70, pObject != 0); + JUT_ASSERT(70, pObject != NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(72, pControl != 0); + JUT_ASSERT(72, pControl != NULL); getJSG_position_(pControl); getJSG_targetPosition_(pControl); TVVOutput* pOutput = saoVVOutput_; @@ -78,9 +78,9 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_end() { * adaptor_do_update__Q214JStudio_JStage15TAdaptor_cameraFUl */ void JStudio_JStage::TAdaptor_camera::adaptor_do_update(u32 param_1) { const JStudio::TObject* pObject = adaptor_getObject(); - JUT_ASSERT(98, pObject != 0); + JUT_ASSERT(98, pObject != NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(100, pControl != 0); + JUT_ASSERT(100, pControl != NULL); setJSG_position_(pControl); setJSG_targetPosition_(pControl); pJSGObject_->JSGUpdate(); @@ -99,7 +99,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT(JStudio::data::TEOperati void const* pContent, u32 uSize) { switch(param_1) { case JStudio::data::UNK_0x18: - JUT_ASSERT(132, pContent!=0); + JUT_ASSERT(132, pContent!=NULL); JUT_ASSERT(133, uSize!=0); field_0x10c = adaptor_object_findJSGObject_((char*)pContent); break; @@ -113,13 +113,13 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_NODE(JStudio::data::TEOp void const* pContent, u32 uSize) { switch (param_1) { case JStudio::data::UNK_0x18: - JUT_ASSERT(155, pContent!=0); + JUT_ASSERT(155, pContent!=NULL); JUT_ASSERT(156, uSize!=0); field_0x110 = adaptor_object_findJSGObjectNode_(field_0x10c, (char*)pContent); break; case JStudio::data::UNK_0x19: JUT_ASSERT(166, uSize==4); - JUT_ASSERT(167, pContent!=0); + JUT_ASSERT(167, pContent!=NULL); field_0x110 = *(int*)pContent; break; } @@ -134,7 +134,7 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_ENABLE(JStudio::data::TEOpera switch (param_1) { case JStudio::data::UNK_0x2: JUT_ASSERT(185, uSize==4); - JUT_ASSERT(186, pContent!=0); + JUT_ASSERT(186, pContent!=NULL); field_0x114 = *(u32*)pContent ? 1 : 0; switch(field_0x108) { case 1: @@ -162,7 +162,7 @@ JStudio_JStage::TAdaptor_camera::adaptor_do_PARENT_FUNCTION(JStudio::data::TEOpe switch(param_1) { case JStudio::data::UNK_0x2: JUT_ASSERT(226, uSize==4); - JUT_ASSERT(227, pContent!=0); + JUT_ASSERT(227, pContent!=NULL); field_0x108 = *(int*)pContent; break; } @@ -175,7 +175,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch(param_1) { case JStudio::data::UNK_0x18: - JUT_ASSERT(247, pContent!=0); + JUT_ASSERT(247, pContent!=NULL); JUT_ASSERT(248, uSize!=0); field_0x118 = adaptor_object_findJSGObject_((char*)pContent); break; @@ -189,13 +189,13 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_NODE( JStudio::data::TEOperationData param_1, void const* pContent, u32 uSize) { switch (param_1) { case JStudio::data::UNK_0x18: - JUT_ASSERT(270, pContent!=0); + JUT_ASSERT(270, pContent!=NULL); JUT_ASSERT(271, uSize!=0); field_0x11c = adaptor_object_findJSGObjectNode_(field_0x118, (char*)pContent); break; case JStudio::data::UNK_0x19: JUT_ASSERT(282, uSize==4); - JUT_ASSERT(283, pContent!=0); + JUT_ASSERT(283, pContent!=NULL); field_0x11c = *(int*)pContent; break; } @@ -209,7 +209,7 @@ void JStudio_JStage::TAdaptor_camera::adaptor_do_TARGET_PARENT_ENABLE( switch(param_1) { case JStudio::data::UNK_0x2: JUT_ASSERT(301, uSize==4); - JUT_ASSERT(302, pContent!=0); + JUT_ASSERT(302, pContent!=NULL); field_0x120 = *(int*)pContent ? 1 : 0; break; } diff --git a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp index 2e3cb702a4..b36eb74718 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object-light.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object-light.cpp @@ -61,9 +61,9 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_begin() { adaptor_object_begin_(); JStage::TLight* pLightObj = get_pJSG_(); const JStudio::TObject* pObject = adaptor_getObject(); - JUT_ASSERT(60, pObject != 0); + JUT_ASSERT(60, pObject != NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(62, pControl != 0); + JUT_ASSERT(62, pControl != NULL); GXColor lightColor = pLightObj->JSGGetColor(); adaptor_setVariableValue_GXColor(sauVariableValue_4_COLOR_RGBA, lightColor); JStudio::TControl::TTransform_position_direction lightObjTransform; @@ -98,9 +98,9 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_end() { void JStudio_JStage::TAdaptor_light::adaptor_do_update(u32 param_1) { JStage::TLight* lightObj = get_pJSG_(); const JStudio::TObject* pObject = adaptor_getObject(); - JUT_ASSERT(118, pObject!=0); + JUT_ASSERT(118, pObject!=NULL); const JStudio::TControl* pControl = pObject->getControl(); - JUT_ASSERT(120, pControl!=0); + JUT_ASSERT(120, pControl!=NULL); GXColor lightColor; adaptor_getVariableValue_GXColor(&lightColor, sauVariableValue_4_COLOR_RGBA); lightObj->JSGSetColor(lightColor); @@ -145,7 +145,7 @@ void JStudio_JStage::TAdaptor_light::adaptor_do_FACULTY(JStudio::data::TEOperati switch (param_1) { case JStudio::data::UNK_0x2: JUT_ASSERT(198, uSize==4); - JUT_ASSERT(199, pContent!=0); + JUT_ASSERT(199, pContent!=NULL); JStage::TELight lightType; switch (*(u32*)pContent) { case 0x301: diff --git a/src/JSystem/JStudio/JStudio_JStage/object.cpp b/src/JSystem/JStudio/JStudio_JStage/object.cpp index 153fd826f6..2950bf0203 100644 --- a/src/JSystem/JStudio/JStudio_JStage/object.cpp +++ b/src/JSystem/JStudio/JStudio_JStage/object.cpp @@ -107,7 +107,7 @@ JStage::TObject* JStudio_JStage::TAdaptor_object_::adaptor_object_findJSGObject_(char const* param_1) { JStage::TObject* pJSGObject; if (pJSGSystem_->JSGFindObject(&pJSGObject, param_1, JStage::OBJECT_UNDEFINED) == 0) { - JUT_ASSERT(122, pJSGObject != 0); + JUT_ASSERT(122, pJSGObject != NULL); } else { return NULL; } @@ -133,7 +133,7 @@ JStudio_JStage::TAdaptor_object_::adaptor_object_ENABLE_(JStudio::data::TEOperat switch (param_1) { case JStudio::data::UNK_0x2: JUT_ASSERT(157, uSize==4); - JUT_ASSERT(158, pContent!=0); + JUT_ASSERT(158, pContent!=NULL); if (*(u32*)pContent != 0) { pJSGObject_->JSGFEnableFlag(2); } else { diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp index 8b8a8271d3..8c042fdf88 100644 --- a/src/JSystem/JUtility/JUTConsole.cpp +++ b/src/JSystem/JUtility/JUTConsole.cpp @@ -17,7 +17,7 @@ JUTConsoleManager* JUTConsoleManager::sManager; */ JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRHeap* pHeap) { JUTConsoleManager* pManager = JUTConsoleManager::getManager(); - JUT_ASSERT(33, pManager != 0); + JUT_ASSERT(33, pManager != NULL); u8* buffer = (u8*)JKRAllocFromHeap(pHeap, getObjectSizeFromBufferSize(param_0, maxLines), 0); @@ -32,7 +32,7 @@ JUTConsole* JUTConsole::create(unsigned int param_0, unsigned int maxLines, JKRH /* 802E73E4-802E746C 2E1D24 0088+00 0/0 1/1 0/0 .text create__10JUTConsoleFUiPvUl */ JUTConsole* JUTConsole::create(unsigned int param_0, void* buffer, u32 bufferSize) { JUTConsoleManager* pManager = JUTConsoleManager::getManager(); - JUT_ASSERT(59, pManager != 0); + JUT_ASSERT(59, pManager != NULL); JUT_ASSERT(62, ( (u32)buffer & 0x3 ) == 0); u32 maxLines = getLineFromObjectSize(bufferSize, param_0); @@ -262,7 +262,7 @@ void JUTConsole::print(char const* str) { /* 802E7F30-802E7F7C 2E2870 004C+00 1/1 1/1 0/0 .text JUTConsole_print_f_va_ */ extern "C" void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_list args) { - JUT_ASSERT(563, console!=0); + JUT_ASSERT(563, console!=NULL); char buf[1024]; vsnprintf(buf, sizeof(buf), fmt, args); @@ -361,7 +361,7 @@ JUTConsoleManager::JUTConsoleManager() { /* 802E81F4-802E8240 2E2B34 004C+00 0/0 1/1 0/0 .text createManager__17JUTConsoleManagerFP7JKRHeap */ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) { - JUT_ASSERT(0x39c, sManager == 0); + JUT_ASSERT(0x39c, sManager == NULL); if (pHeap == NULL) { pHeap = JKRGetCurrentHeap(); @@ -375,7 +375,7 @@ JUTConsoleManager* JUTConsoleManager::createManager(JKRHeap* pHeap) { /* 802E8240-802E82B0 2E2B80 0070+00 3/3 0/0 0/0 .text * appendConsole__17JUTConsoleManagerFP10JUTConsole */ void JUTConsoleManager::appendConsole(JUTConsole* console) { - JUT_ASSERT(961, sManager != 0 && console != 0); + JUT_ASSERT(961, sManager != NULL && console != NULL); JUT_ASSERT(964, soLink_.Find( console ) == soLink_.end()); soLink_.Push_back(console); @@ -388,7 +388,7 @@ void JUTConsoleManager::appendConsole(JUTConsole* console) { /* 802E82B0-802E8384 2E2BF0 00D4+00 2/2 0/0 0/0 .text * removeConsole__17JUTConsoleManagerFP10JUTConsole */ void JUTConsoleManager::removeConsole(JUTConsole* console) { - JUT_ASSERT(982, sManager != 0 && console != 0); + JUT_ASSERT(982, sManager != NULL && console != NULL); JUT_ASSERT(985, soLink_.Find( console ) != soLink_.end()); if (mActiveConsole == console) { diff --git a/src/JSystem/JUtility/JUTResFont.cpp b/src/JSystem/JUtility/JUTResFont.cpp index 9f6b471cf2..fef05c326d 100644 --- a/src/JSystem/JUtility/JUTResFont.cpp +++ b/src/JSystem/JUtility/JUTResFont.cpp @@ -12,8 +12,6 @@ #include "JSystem/JUtility/JUTConsole.h" #include "dolphin/gx.h" -#define suAboutEncoding_ 3 - /* 802DEF48-802DEF94 2D9888 004C+00 0/0 1/1 0/0 .text __ct__10JUTResFontFv */ JUTResFont::JUTResFont() { initialize_state(); diff --git a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h index 4b0c0b22f5..3c3b15ec08 100644 --- a/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h +++ b/src/PowerPC_EABI_Support/MSL/MSL_C/MSL_Common/Include/float.h @@ -12,9 +12,14 @@ #define FP_NAN FP_QNAN -#define fpclassify(x) ((sizeof(x) == sizeof(float)) ? __fpclassifyf(x) : __fpclassifyd(x)) +#define fpclassify(x) \ + ((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : \ + (sizeof(x) == sizeof(double)) ? __fpclassifyd((double)(x)) : \ + __fpclassifyl((long double)(x)) ) #define signbit(x) ((sizeof(x) == sizeof(float)) ? __signbitf(x) : __signbitd(x)) #define isfinite(x) ((fpclassify(x) > 2)) +#define isnan(x) (fpclassify(x) == FP_NAN) +#define isinf(x) (fpclassify(x) == FP_INFINITE) #define __signbitf(x) ((int)(__HI(x) & 0x80000000)) @@ -26,6 +31,10 @@ extern unsigned long __float_huge[]; extern unsigned long __float_max[]; extern unsigned long __float_epsilon[]; +#ifdef __cplusplus +extern "C" { +#endif + inline int __fpclassifyf(float __value) { unsigned long integer = *(unsigned long*)&__value; @@ -66,6 +75,13 @@ inline int __fpclassifyd(double __value) { return FP_NORMAL; } +// Stripped function. +int __fpclassifyl(long double __value); + +#ifdef __cplusplus +}; // extern "C" +#endif + #define FLT_MANT_DIG 24 #define FLT_DIG 6 #define FLT_MIN_EXP (-125) diff --git a/src/SSystem/SComponent/c_cc_d.cpp b/src/SSystem/SComponent/c_cc_d.cpp index 55ac56a417..2c9fd58562 100644 --- a/src/SSystem/SComponent/c_cc_d.cpp +++ b/src/SSystem/SComponent/c_cc_d.cpp @@ -6,7 +6,6 @@ #include "SSystem/SComponent/c_cc_d.h" #include "JSystem/JUtility/JUTAssert.h" -#define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !(((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : __fpclassifyd((double)(x)) ) == 1)); #define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f); /* 80430CB4-80430CC0 05D9D4 000C+00 1/1 2/2 0/0 .bss m_virtual_center__14cCcD_ShapeAttr @@ -224,9 +223,9 @@ void cCcD_Stts::PlusCcMove(f32 x, f32 y, f32 z) { m_cc_move.y += y; m_cc_move.z += z; - CHECK_FLOAT_CLASS(422, m_cc_move.x); - CHECK_FLOAT_CLASS(423, m_cc_move.y); - CHECK_FLOAT_CLASS(424, m_cc_move.z); + JUT_ASSERT(422, !isnan(m_cc_move.x)); + JUT_ASSERT(423, !isnan(m_cc_move.y)); + JUT_ASSERT(424, !isnan(m_cc_move.z)); CHECK_FLOAT_RANGE(426, m_cc_move.x); CHECK_FLOAT_RANGE(427, m_cc_move.y); diff --git a/src/SSystem/SComponent/c_cc_s.cpp b/src/SSystem/SComponent/c_cc_s.cpp index ead97f8b8f..8c6f4bffed 100644 --- a/src/SSystem/SComponent/c_cc_s.cpp +++ b/src/SSystem/SComponent/c_cc_s.cpp @@ -6,9 +6,7 @@ #include "SSystem/SComponent/c_cc_s.h" #include "JSystem/JUtility/JUTAssert.h" -#define CHECK_FLOAT_CLASS(line, x) \ - JUT_ASSERT(line, !(((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : \ - __fpclassifyd((double)(x))) == 1)); +#define CHECK_FLOAT_CLASS(line, x) JUT_ASSERT(line, !isnan(x)); #define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f); /* 80264A6C-80264A94 25F3AC 0028+00 0/0 1/1 0/0 .text __ct__4cCcSFv */ @@ -165,7 +163,7 @@ void cCcS::ChkAtTg() { continue; cCcD_ShapeAttr* pat_sa = (*pat_obj)->GetShapeAttr(); - JUT_ASSERT(0, pat_sa != 0); + JUT_ASSERT(0, pat_sa != NULL); for (cCcD_Obj** ptg_obj = mpObjTg; ptg_obj < objTgEnd; ++ptg_obj) { if (*ptg_obj == NULL || !(*ptg_obj)->ChkTgSet()) @@ -176,7 +174,7 @@ void cCcS::ChkAtTg() { continue; cCcD_ShapeAttr* ptg_sa = (*ptg_obj)->GetShapeAttr(); - JUT_ASSERT(0, ptg_sa != 0); + JUT_ASSERT(0, ptg_sa != NULL); static cXyz cross; bool didCross = pat_sa->CrossAtTg(*ptg_sa, &cross); @@ -225,7 +223,7 @@ void cCcS::ChkCo() { continue; cCcD_ShapeAttr* pco1_sa = (*pco1_obj)->GetShapeAttr(); - JUT_ASSERT(0, pco1_sa != 0); + JUT_ASSERT(0, pco1_sa != NULL); for (cCcD_Obj** pco2_obj = pco1_obj + 1; pco2_obj < objCoEnd; ++pco2_obj) { if (*pco2_obj == NULL || !(*pco2_obj)->ChkCoSet()) @@ -236,7 +234,7 @@ void cCcS::ChkCo() { continue; cCcD_ShapeAttr* pco2_sa = (*pco2_obj)->GetShapeAttr(); - JUT_ASSERT(0, pco2_sa != 0); + JUT_ASSERT(0, pco2_sa != NULL); f32 cross_len; if (pco1_sa->CrossCo(*pco2_sa, &cross_len)) { @@ -456,7 +454,7 @@ void cCcS::CalcArea() { for (cCcD_Obj** pset_obj = mpObj; pset_obj < mpObj + mObjCount; ++pset_obj) { if (*pset_obj != NULL) { cCcD_ShapeAttr* pset_sa = (*pset_obj)->GetShapeAttr(); - JUT_ASSERT(0, pset_sa != 0); + JUT_ASSERT(0, pset_sa != NULL); pset_sa->CalcAabBox(); aab.SetMinMax(pset_sa->GetWorkAab()); @@ -467,7 +465,7 @@ void cCcS::CalcArea() { for (cCcD_Obj** pset_obj = mpObj; pset_obj < mpObj + mObjCount; ++pset_obj) { if (*pset_obj != NULL) { const cCcD_ShapeAttr* pset_sa = (*pset_obj)->GetShapeAttr(); - JUT_ASSERT(0, pset_sa != 0); + JUT_ASSERT(0, pset_sa != NULL); cCcD_DivideInfo* divideInfo = &(*pset_obj)->GetDivideInfo(); mDivideArea.CalcDivideInfo(divideInfo, pset_sa->GetWorkAab(), diff --git a/src/SSystem/SComponent/c_m3d_g_aab.cpp b/src/SSystem/SComponent/c_m3d_g_aab.cpp index f3fb27c3b9..0fc5d0ed30 100644 --- a/src/SSystem/SComponent/c_m3d_g_aab.cpp +++ b/src/SSystem/SComponent/c_m3d_g_aab.cpp @@ -40,8 +40,8 @@ bool cM3dGAab::TopPlaneYUnder(f32 y) const { /* 8026ECF8-8026ED1C 0024+00 s=0 e=6 z=0 None .text ClearForMinMax__8cM3dGAabFv */ void cM3dGAab::ClearForMinMax() { - mMin.x = mMin.y = mMin.z = 1000000000.0f; - mMax.x = mMax.y = mMax.z = -1000000000.0f; + mMin.x = mMin.y = mMin.z = G_CM3D_F_INF; + mMax.x = mMax.y = mMax.z = -G_CM3D_F_INF; } /* 8026ED1C-8026ED60 0044+00 s=1 e=3 z=0 None .text SetMinMax__8cM3dGAabFRC4cXyz */ diff --git a/src/SSystem/SComponent/c_xyz.cpp b/src/SSystem/SComponent/c_xyz.cpp index 4ffddf1de7..7a64762416 100644 --- a/src/SSystem/SComponent/c_xyz.cpp +++ b/src/SSystem/SComponent/c_xyz.cpp @@ -96,7 +96,7 @@ cXyz cXyz::normZC() const { /* 80266EF4-80266F48 0054+00 s=0 e=13 z=17 None .text normalize__4cXyzFv */ cXyz cXyz::normalize() { - JUT_ASSERT(285, isNearZeroSquare() == 0); + JUT_ASSERT(285, isNearZeroSquare() == FALSE); PSVECNormalize(this, this); return *this; } diff --git a/src/Z2AudioLib/Z2SpeechMgr2.cpp b/src/Z2AudioLib/Z2SpeechMgr2.cpp index 9cc6913e75..a54db697bc 100644 --- a/src/Z2AudioLib/Z2SpeechMgr2.cpp +++ b/src/Z2AudioLib/Z2SpeechMgr2.cpp @@ -486,7 +486,7 @@ void Z2SpeechMgr2::setString(u16 const* s, s16 i_textNum, u8 i_speaker, u16 i_mo mText[i] = 0; } - JUT_ASSERT(383, s != 0); + JUT_ASSERT(383, s != NULL); if (i_textNum > 500) { mTextNum = 500; diff --git a/src/d/actor/d_a_L7demo_dr.cpp b/src/d/actor/d_a_L7demo_dr.cpp index 9b9bcdc8a3..f9df3dbaff 100644 --- a/src/d/actor/d_a_L7demo_dr.cpp +++ b/src/d/actor/d_a_L7demo_dr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_L7demo_dr.h" #include "d/actor/d_a_player.h" @@ -326,7 +326,7 @@ static int daDr_Delete(daDr_c* i_this) { /* 805AA084-805AA17C 000EC4 00F8+00 1/1 0/0 0/0 .text CreateHeap__6daDr_cFv */ int daDr_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49); - JUT_ASSERT(655, modelData != 0); + JUT_ASSERT(655, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x1E), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_L7low_dr.cpp b/src/d/actor/d_a_L7low_dr.cpp index 3ef1533015..ae2c7d9163 100644 --- a/src/d/actor/d_a_L7low_dr.cpp +++ b/src/d/actor/d_a_L7low_dr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_L7low_dr.h" #include "d/d_com_inf_game.h" @@ -136,7 +136,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { /* 805AAC5C-805AAD58 0006DC 00FC+00 1/1 0/0 0/0 .text CreateHeap__11daL7lowDr_cFv */ int daL7lowDr_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L7lowDr", 10); - JUT_ASSERT(244, modelData != 0); + JUT_ASSERT(244, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("L7lowDr", 4), 0, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_L7op_demo_dr.cpp b/src/d/actor/d_a_L7op_demo_dr.cpp index 2fcbbef1fc..5a5cae5069 100644 --- a/src/d/actor/d_a_L7op_demo_dr.cpp +++ b/src/d/actor/d_a_L7op_demo_dr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_L7op_demo_dr.h" #include "d/actor/d_a_player.h" @@ -775,7 +775,7 @@ static int daL7ODR_Delete(daL7ODR_c* i_this) { /* 805AD90C-805ADA0C 0028EC 0100+00 1/1 0/0 0/0 .text CreateHeap__9daL7ODR_cFv */ int daL7ODR_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_dr", 0x49); - JUT_ASSERT(1146, modelData != 0); + JUT_ASSERT(1146, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_dr", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); field_0x890 = 0x2F; if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_alink.cpp b/src/d/actor/d_a_alink.cpp index ec96db25a7..35fdf98563 100644 --- a/src/d/actor/d_a_alink.cpp +++ b/src/d/actor/d_a_alink.cpp @@ -3,7 +3,7 @@ * Player (Link) Actor */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_alink.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -3698,11 +3698,11 @@ void daAlink_c::footBgCheck() { mLinkGndChk.SetPos(&sp44); f32 temp_f1 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); - if (-1000000000.0f != temp_f1) { + if (-G_CM3D_F_INF != temp_f1) { dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp98); } - if (-1000000000.0f != temp_f1 && cBgW_CheckBGround(sp98.mNormal.y) && sp44.y - temp_f1 < l_autoUpHeight - l_autoDownHeight) { + if (-G_CM3D_F_INF != temp_f1 && cBgW_CheckBGround(sp98.mNormal.y) && sp44.y - temp_f1 < l_autoUpHeight - l_autoDownHeight) { *sp24 = temp_f1; var_r29->field_0x0 = 1; sp20[i] = getGroundAngle(&mLinkGndChk, shape_angle.y); @@ -3820,7 +3820,7 @@ void daAlink_c::handBgCheck() { mLinkGndChk.SetPos(&sp28); f32 temp_f1 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); - if (-1000000000.0f != temp_f1 && (sp28.y - temp_f1 < l_autoUpHeight - l_autoDownHeight)) { + if (-G_CM3D_F_INF != temp_f1 && (sp28.y - temp_f1 < l_autoUpHeight - l_autoDownHeight)) { *var_r25 = temp_f1; if (dComIfG_Bgsp().GetGroundCode(mLinkGndChk) != 8) { @@ -4362,7 +4362,7 @@ void daAlink_c::playerInit() { m_mSwordBrk->searchUpdateMaterialID(modelData2); modelData2->entryTevRegAnimator(m_mSwordBrk); - f32 tmp = -1000000000.0f; + f32 tmp = -G_CM3D_F_INF; mWaterY = tmp; field_0x33b8 = tmp; field_0x33bc = tmp; @@ -4737,7 +4737,7 @@ int daAlink_c::create() { mLinkAcch.CrrPos(dComIfG_Bgsp()); void* var_r24 = NULL; - if (mLinkAcch.GetGroundH() == -1000000000.0f || + if (mLinkAcch.GetGroundH() == -G_CM3D_F_INF || (startMode == 14 && !dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) || (startPoint == -4 && !(var_r24 = fopAcIt_Judge((fopAcIt_JudgeFunc)daAlink_searchPortal, ¤t.pos))) || @@ -4917,7 +4917,7 @@ void daAlink_c::setShapeAngleOnGround() { sp20.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk); bool var_r29; - if (-1000000000.0f != sp20.y) { + if (-G_CM3D_F_INF != sp20.y) { var_r29 = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp2C); } else { var_r29 = 0; @@ -4934,7 +4934,7 @@ void daAlink_c::setShapeAngleOnGround() { sp14.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk); bool var_r29_2; - if (-1000000000.0f != sp14.y) { + if (-G_CM3D_F_INF != sp14.y) { var_r29_2 = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &sp2C); } else { var_r29_2 = 0; @@ -6782,7 +6782,7 @@ int daAlink_c::setDoubleAnime(f32 i_blendRate, f32 i_anmSpeedA, f32 i_anmSpeedB, if (checkWolf()) { // "Player is Wolf, but setting Link animation\n" OSReport("狼なのにリンクアニメ設定\n"); - JUT_ASSERT(8591, 0); + JUT_ASSERT(8591, FALSE); } #endif @@ -8602,13 +8602,13 @@ void daAlink_c::setFrontWallType() { mLinkGndChk.SetPos(&chk_start_pos); f32 sp38 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); - if (-1000000000.0f != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) { + if (-G_CM3D_F_INF != sp38 && fabsf(sp1C - sp38) < l_autoUpHeight) { found_gnd_tri = dComIfG_Bgsp().GetTriPla(mLinkGndChk, &gndchk_tri); } if ((!checkModeFlg(0x40000) && sp38 < body_height) || !found_gnd_tri) { return; } - if (-1000000000.0f == sp38 || !cBgW_CheckBGround(gndchk_tri.mNormal.y)) { + if (-G_CM3D_F_INF == sp38 || !cBgW_CheckBGround(gndchk_tri.mNormal.y)) { return; } @@ -8687,7 +8687,7 @@ void daAlink_c::setWaterY() { } else { offNoResetFlg0(FLG0_UNK_80); field_0x2fbc = 16; - mWaterY = -1000000000.0f; + mWaterY = -G_CM3D_F_INF; } } @@ -8737,7 +8737,7 @@ void daAlink_c::setHangWaterY() { checkWaterInKandelaar(field_0x33b8); } } else { - field_0x33b8 = -1000000000.0f; + field_0x33b8 = -G_CM3D_F_INF; field_0x2fc5 = 0x10; field_0x2fc6 = 0; } @@ -13176,7 +13176,7 @@ void daAlink_c::autoGroundHit() { } BOOL var_r28; - if (-1000000000.0f != mLinkAcch.GetGroundH()) { + if (-G_CM3D_F_INF != mLinkAcch.GetGroundH()) { dComIfG_Bgsp().GetTriPla(mLinkAcch.m_gnd, &sp74); var_r28 = cBgW_CheckBGround(sp74.mNormal.y); } else { @@ -13384,7 +13384,7 @@ BOOL daAlink_c::checkRestartRoom() { return procCoLavaReturnInit(1); } else if ((checkModeFlg(0x40000) || (checkNoResetFlg0(FLG0_UNK_80) && mWaterY - current.pos.y > daAlinkHIO_swim_c0::m.mInitHeight)) && fopAcM_GetRoomNo(this) == 0 && checkStageName("F_SP114")) { return procCoSwimFreezeReturnInit(); - } else if (!checkCargoCarry() && (field_0x3174 == 4 || field_0x3174 == 10 || (-1000000000.0f == mLinkAcch.GetGroundH() && !checkModeFlg(0x40000)))) { + } else if (!checkCargoCarry() && (field_0x3174 == 4 || field_0x3174 == 10 || (-G_CM3D_F_INF == mLinkAcch.GetGroundH() && !checkModeFlg(0x40000)))) { BOOL temp_r28 = mWaterY > mLinkAcch.GetGroundH(); f32 var_f31; @@ -13452,7 +13452,7 @@ BOOL daAlink_c::checkRestartRoom() { return true; } - } else if ((mLinkAcch.ChkGroundHit() && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x80)) || (checkWaterPolygonUnder() && checkNoResetFlg0(FLG0_UNK_80) && (dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x80)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && (field_0x2fc6 & 0x80)) || (field_0x2fbc == 6 && checkNoResetFlg0(FLG0_UNK_80) && checkWaterPolygonUnder() && mWaterY > (daAlinkHIO_basic_c0::m.mLavaDeathDepth + mLinkAcch.GetGroundH())) || (field_0x2fc5 == 6 && -1000000000.0f != field_0x33b8 && field_0x33bc < field_0x33b8 && checkModeFlg(0x40) && field_0x33b8 > (field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))) { + } else if ((mLinkAcch.ChkGroundHit() && (dKy_pol_argument_get(&mLinkAcch.m_gnd) & 0x80)) || (checkWaterPolygonUnder() && checkNoResetFlg0(FLG0_UNK_80) && (dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x80)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -G_CM3D_F_INF != field_0x33b8 && (field_0x2fc6 & 0x80)) || (field_0x2fbc == 6 && checkNoResetFlg0(FLG0_UNK_80) && checkWaterPolygonUnder() && mWaterY > (daAlinkHIO_basic_c0::m.mLavaDeathDepth + mLinkAcch.GetGroundH())) || (field_0x2fc5 == 6 && -G_CM3D_F_INF != field_0x33b8 && field_0x33bc < field_0x33b8 && checkModeFlg(0x40) && field_0x33b8 > (field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))) { if (field_0x2fbc == 6 || (checkModeFlg(0x40) && field_0x2fc5 == 6)) { return procCoLavaReturnInit(0); } @@ -17227,7 +17227,7 @@ int daAlink_c::procCoMetamorphoseInit() { mLinkGndChk.SetPos(&pos); f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk); - if (gnd_cross != -1000000000.0f) { + if (gnd_cross != -G_CM3D_F_INF) { pos.y = gnd_cross; cXyz sp14 = current.pos; @@ -17624,7 +17624,7 @@ int daAlink_c::execute() { } } } else if (mProcID != PROC_HOOKSHOT_FLY && !checkModeFlg(MODE_VINE_CLIMB | MODE_UNK_800) && - mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -1000000000.0f && + mProcID != PROC_TOOL_DEMO && mLinkAcch.GetGroundH() != -G_CM3D_F_INF && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && dComIfG_Bgsp().ChkMoveBG(mLinkAcch.m_gnd)) { @@ -18013,7 +18013,7 @@ int daAlink_c::execute() { speed.y = 0.0f; if (field_0x3198 != 0) { - if (mLinkAcch.GetGroundH() != -1000000000.0f) { + if (mLinkAcch.GetGroundH() != -G_CM3D_F_INF) { current.pos.y = mLinkAcch.GetGroundH(); } } @@ -18037,7 +18037,7 @@ int daAlink_c::execute() { field_0x3178 = field_0x3174; - if (mLinkAcch.GetGroundH() != -1000000000.0f) { + if (mLinkAcch.GetGroundH() != -G_CM3D_F_INF) { setRoomInfo(); if (!checkModeFlg(MODE_PLAYER_FLY) && !checkMagneBootsOn() && mProcID != PROC_TOOL_DEMO && diff --git a/src/d/actor/d_a_alink_bottle.inc b/src/d/actor/d_a_alink_bottle.inc index 227794fee8..15095721a2 100644 --- a/src/d/actor/d_a_alink_bottle.inc +++ b/src/d/actor/d_a_alink_bottle.inc @@ -70,14 +70,14 @@ void daAlink_c::setBottleModel(u16 i_itemNo) { J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E8, 0xC00); mpHookTipModel = initModel(loadAramBmd(0x31D, 0x1400), 0); if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { - JUT_ASSERT(142, 0); + JUT_ASSERT(142, FALSE); } mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f); } else if (i_itemNo == fpcNm_ITEM_WORM) { J3DAnmTransform* bck = (J3DAnmTransform*)loadAram(0x1E9, 0xC00); mpHookTipModel = initModel(loadAramBmd(0x31E, 0x2400), 0); if (!mHookTipBck.init(bck, FALSE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { - JUT_ASSERT(151, 0); + JUT_ASSERT(151, FALSE); } mHookTipBck.entry(mpHookTipModel->getModelData(), 0.0f); } else if (i_itemNo == fpcNm_ITEM_BEE_CHILD) { diff --git a/src/d/actor/d_a_alink_damage.inc b/src/d/actor/d_a_alink_damage.inc index ebf9897742..3ea022aff2 100644 --- a/src/d/actor/d_a_alink_damage.inc +++ b/src/d/actor/d_a_alink_damage.inc @@ -308,7 +308,7 @@ int daAlink_c::checkPolyDamage() { } } - if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -1000000000.0f != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) { + if (!checkBoardRide() && ((checkWaterPolygonUnder() && dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_wtr) && ((dKy_pol_argument_get(&mLinkAcch.m_wtr) & 0x60) || field_0x2fbc == 6)) || (checkModeFlg(0x40) && field_0x33bc < field_0x33b8 && -G_CM3D_F_INF != field_0x33b8 && ((field_0x2fc6 & 0x60) || field_0x2fc5 == 6) && (field_0x2fc5 != 6 || !(field_0x33b8 > field_0x33d8 + daAlinkHIO_basic_c0::m.mLavaDeathDepth))))) { return 2; } diff --git a/src/d/actor/d_a_alink_demo.inc b/src/d/actor/d_a_alink_demo.inc index 77abd0c7cd..dda03af60d 100644 --- a/src/d/actor/d_a_alink_demo.inc +++ b/src/d/actor/d_a_alink_demo.inc @@ -1297,7 +1297,7 @@ BOOL daAlink_c::checkDeadAction(int param_0) { offCargoCarry(); int var_r29; - if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && -1000000000.0f != mLinkAcch.GetGroundH()) { + if (dComIfG_Bgsp().ChkPolySafe(mLinkAcch.m_gnd) && -G_CM3D_F_INF != mLinkAcch.GetGroundH()) { var_r29 = dComIfG_Bgsp().GetExitId(mLinkAcch.m_gnd); } else { var_r29 = 0x3F; @@ -1605,7 +1605,7 @@ int daAlink_c::procCoToolDemo() { } } } else if (sp1C == 1) { - JUT_ASSERT(2345, 0); + JUT_ASSERT(2345, FALSE); } else if (sp1C == 2) { if (sp18 == 1) { if (sp14 == 2) { @@ -2216,7 +2216,7 @@ int daAlink_c::procCoGetItem() { // "Get Item is not an item!!! %d\n" OSReport("ゲットするアイテムがアイテムじゃない！！！　%d\n", fopAcM_GetName(item_partner_p)); - JUT_ASSERT(3415, 0); + JUT_ASSERT(3415, FALSE); } #endif @@ -3733,7 +3733,7 @@ int daAlink_c::procNotUseItem() { // "Present Item is not this Item!!! %d\n" OSReport("差し出すアイテムがアイテムじゃない！！！　%d\n", fopAcM_GetName(item_partner_p)); - JUT_ASSERT(5506, 0); + JUT_ASSERT(5506, FALSE); } #endif if (item_partner_p != NULL) { diff --git a/src/d/actor/d_a_alink_hang.inc b/src/d/actor/d_a_alink_hang.inc index 747176ffcd..f0d8c605df 100644 --- a/src/d/actor/d_a_alink_hang.inc +++ b/src/d/actor/d_a_alink_hang.inc @@ -354,7 +354,7 @@ int daAlink_c::procHangFallStartInit(cM3dGPla* param_0) { f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk); sp58.y = cross; - if (sp58.y != -1000000000.0f) { + if (sp58.y != -G_CM3D_F_INF) { if (sp58.y < current.pos.y + l_autoDownHeight) { return 0; } @@ -1986,7 +1986,7 @@ int daAlink_c::checkClimbGround(cXyz* param_0, f32 param_1) { mLinkGndChk.SetPos(param_0); f32 cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk); - if (cross != -1000000000.0f && dBgS_CheckBGroundPoly(mLinkGndChk) && + if (cross != -G_CM3D_F_INF && dBgS_CheckBGroundPoly(mLinkGndChk) && cross >= param_1 - 50.0f) { param_0->y = cross; diff --git a/src/d/actor/d_a_alink_swindow.inc b/src/d/actor/d_a_alink_swindow.inc index 793eef49c5..741cf4b197 100644 --- a/src/d/actor/d_a_alink_swindow.inc +++ b/src/d/actor/d_a_alink_swindow.inc @@ -278,7 +278,7 @@ void daAlink_c::initStatusWindow() { J3DAnmTransform* bck = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(tmpBuffer, J3DLOADER_UNK_FLAG0); if (!m_sWindowBck->init(bck, 1, 2, 1.0f, 0, -1, false)) { - JUT_ASSERT(0x1B1, 0); + JUT_ASSERT(433, FALSE); } tmpBuffer = new (0x20) void*[0x100]; diff --git a/src/d/actor/d_a_alink_whistle.inc b/src/d/actor/d_a_alink_whistle.inc index c7351f1bda..111ae5b610 100644 --- a/src/d/actor/d_a_alink_whistle.inc +++ b/src/d/actor/d_a_alink_whistle.inc @@ -168,7 +168,7 @@ int daAlink_c::procGrassWhistleWaitInit(int param_0, int param_1, int param_2, s mLinkGndChk.SetPos(param_4); f32 gnd_cross = dComIfG_Bgsp().GroundCross(&mLinkGndChk); - if (gnd_cross != -1000000000.0f) { + if (gnd_cross != -G_CM3D_F_INF) { current.pos.set(param_4->x, gnd_cross, param_4->z); } diff --git a/src/d/actor/d_a_alink_wolf.inc b/src/d/actor/d_a_alink_wolf.inc index 3a97a00b2c..7def877925 100644 --- a/src/d/actor/d_a_alink_wolf.inc +++ b/src/d/actor/d_a_alink_wolf.inc @@ -1225,7 +1225,7 @@ int daAlink_c::setDoubleAnimeWolf(f32 param_0, f32 param_1, f32 param_2, if (!checkWolf()) { // "Is Adult Link but setting Wolf animation\n" OS_REPORT("リンクなのに狼アニメ設定\n"); - JUT_ASSERT(0x82B, 0); + JUT_ASSERT(2091, FALSE); } J3DAnmTransform* var_r25 = getNowAnmPackUnder(UNDER_0); @@ -1303,7 +1303,7 @@ int daAlink_c::setSingleAnimeWolf(daAlink_c::daAlink_WANM i_anmID, f32 i_speed, if (!checkWolf()) { // "Is Adult Link but setting Wolf animation\n" OS_REPORT("リンクなのに狼アニメ設定\n"); - JUT_ASSERT(0x82B, 0); + JUT_ASSERT(2091, FALSE); } J3DAnmTransform* var_r30 = getAnimeResource(&mUnderAnmHeap[0], m_wlAnmDataTable[i_anmID].field_0x0, 0x10800); @@ -2036,7 +2036,7 @@ void daAlink_c::wolfFootBgCheck() { temp_f31 = dComIfG_Bgsp().GroundCross(&mLinkGndChk); temp_f30 = var_r26->y - temp_f31; - if (-1000000000.0f != temp_f31 && temp_f30 < temp_f27 && temp_f30 > sp1C) { + if (-G_CM3D_F_INF != temp_f31 && temp_f30 < temp_f27 && temp_f30 > sp1C) { *sp20 = temp_f31; var_r28->field_0x0 = 1; sp48[i][j] = getGroundAngle(&mLinkGndChk, shape_angle.y); @@ -2144,11 +2144,11 @@ void daAlink_c::wolfFootBgCheck() { } int sp18; - if (-1000000000.0f != temp_f31) { + if (-G_CM3D_F_INF != temp_f31) { sp18 = dComIfG_Bgsp().GetPolyAtt0(mLinkGndChk); } - if (-1000000000.0f == temp_f31 || sp18 == 3 || sp18 == 0xD) { + if (-G_CM3D_F_INF == temp_f31 || sp18 == 3 || sp18 == 0xD) { sp90.y += mSinkShapeOffset; } @@ -2161,11 +2161,11 @@ void daAlink_c::wolfFootBgCheck() { sp84.y = current.pos.y; } - if (-1000000000.0f != temp_f31) { + if (-G_CM3D_F_INF != temp_f31) { sp18 = dComIfG_Bgsp().GetPolyAtt0(mLinkGndChk); } - if (-1000000000.0f == temp_f31 || sp18 == 3 || sp18 == 0xD) { + if (-G_CM3D_F_INF == temp_f31 || sp18 == 3 || sp18 == 0xD) { sp84.y += mSinkShapeOffset; } @@ -5695,7 +5695,7 @@ int daAlink_c::procWolfHangFallStartInit(cM3dGPla* param_0) { mLinkGndChk.SetPos(&gnd_chk_pos); gnd_chk_pos.y = dComIfG_Bgsp().GroundCross(&mLinkGndChk); - if (gnd_chk_pos.y != -1000000000.0f) { + if (gnd_chk_pos.y != -G_CM3D_F_INF) { if (gnd_chk_pos.y < current.pos.y + l_autoDownHeight) { return 0; } diff --git a/src/d/actor/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp index 84267f3f30..8eb0752269 100644 --- a/src/d/actor/d_a_alldie.cpp +++ b/src/d/actor/d_a_alldie.cpp @@ -3,7 +3,7 @@ * Activates a switch when all enemies are defeated */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_alldie.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_andsw.cpp b/src/d/actor/d_a_andsw.cpp index 62c14923e6..e0129a0f34 100644 --- a/src/d/actor/d_a_andsw.cpp +++ b/src/d/actor/d_a_andsw.cpp @@ -3,7 +3,7 @@ * AND - Switch */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_andsw.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp index 3fa3a770a3..94869a4113 100644 --- a/src/d/actor/d_a_andsw2.cpp +++ b/src/d/actor/d_a_andsw2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_andsw2.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp index 5aa361d3f8..990e3cfb5b 100644 --- a/src/d/actor/d_a_arrow.cpp +++ b/src/d/actor/d_a_arrow.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_arrow.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_b_bh.cpp b/src/d/actor/d_a_b_bh.cpp index 0544e839ea..94f4d80e47 100644 --- a/src/d/actor/d_a_b_bh.cpp +++ b/src/d/actor/d_a_b_bh.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_bh.h" #include "d/actor/d_a_b_bq.h" @@ -1462,7 +1462,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } void* modelData = dComIfG_getObjectRes("B_BH", BMDR_BH_KUKI); - JUT_ASSERT(2475, modelData != 0); + JUT_ASSERT(2475, modelData != NULL); for (int i = 0; i < 17; i++) { a_this->mpStemModels[i] = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); @@ -1474,7 +1474,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = dComIfG_getObjectRes("B_BH", BMDR_BH_LEAF); - JUT_ASSERT(2491, modelData != 0); + JUT_ASSERT(2491, modelData != NULL); for (int i = 0; i < 17; i++) { if ((i & 3) == 2) { diff --git a/src/d/actor/d_a_b_bq.cpp b/src/d/actor/d_a_b_bq.cpp index d926738b4b..bd76686dcb 100644 --- a/src/d/actor/d_a_b_bq.cpp +++ b/src/d/actor/d_a_b_bq.cpp @@ -3,7 +3,7 @@ * Boss Baba (Diababa) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_bq.h" #include "d/d_com_inf_game.h" @@ -2490,7 +2490,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_bq", BMDR_BQ_EYEBALL); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); a_this->mpEyeballModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpEyeballModel == NULL) { diff --git a/src/d/actor/d_a_b_dr.cpp b/src/d/actor/d_a_b_dr.cpp index d62c6dabad..b1407e4b8b 100644 --- a/src/d/actor/d_a_b_dr.cpp +++ b/src/d/actor/d_a_b_dr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_dr.h" #include "d/d_com_inf_game.h" @@ -1115,7 +1115,7 @@ bool daB_DR_c::flapMove(bool param_0) { } } - if (-1000000000.0f == mAcch.GetGroundH()) { + if (-G_CM3D_F_INF == mAcch.GetGroundH()) { target_y += home.pos.y; } else { target_y += mAcch.GetGroundH(); @@ -1195,7 +1195,7 @@ bool daB_DR_c::mPlayerHighCheck() { gndchk.SetPos(&chk_pos); field_0x734 = dComIfG_Bgsp().GroundCross(&gndchk); - if (-1000000000.0f == field_0x734 || field_0x734 < 0.0f) { + if (-G_CM3D_F_INF == field_0x734 || field_0x734 < 0.0f) { field_0x734 = home.pos.y; } @@ -1217,7 +1217,7 @@ bool daB_DR_c::mBgFallGroundCheck() { chkpos.y += 300.0f; gndchk.SetPos(&chkpos); chkpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (-1000000000.0f == chkpos.y) { + if (-G_CM3D_F_INF == chkpos.y) { chkpos.y = home.pos.y; } if (chkpos.y < home.pos.y) { @@ -2728,7 +2728,7 @@ void daB_DR_c::executeGliderAttack() { field_0x7dc = 1; } - if (-1000000000.0f != mAcch.GetGroundH()) { + if (-G_CM3D_F_INF != mAcch.GetGroundH()) { if (mAnm == ANM_DR_WIND_ATTACKB) { mCount[1]++; if (mCount[1] > WREG_S(9)) { @@ -2945,7 +2945,7 @@ void daB_DR_c::executePillarSearch() { cLib_addCalcAngleS2(¤t.angle.x, sp30.atan2sY_XZ(), 20, NREG_S(3) + 0x400); cLib_addCalcAngleS2(&shape_angle.x, current.angle.x, NREG_S(2) + 20, NREG_S(3) + 0x400); - if (mPlayerHighCheck() && -1000000000.0f != mAcch.GetGroundH()) { + if (mPlayerHighCheck() && -G_CM3D_F_INF != mAcch.GetGroundH()) { setActionMode(ACTION_BREATH_ATTACK, 0); } } @@ -3571,7 +3571,7 @@ void daB_DR_c::action() { if (abs(temp_r28) < 0x2000) { field_0x74e = temp_r28; } - if (mAnm == ANM_DR_WIND_ATTACKATOB || mAnm == ANM_DR_WIND_ATTACKB || -1000000000.0f != mAcch.GetGroundH() || mCount[3] == 0) { + if (mAnm == ANM_DR_WIND_ATTACKATOB || mAnm == ANM_DR_WIND_ATTACKB || -G_CM3D_F_INF != mAcch.GetGroundH() || mCount[3] == 0) { field_0x74e = 0; } } @@ -3632,7 +3632,7 @@ void daB_DR_c::mtx_set() { sp28.SetPos(&sp1C); f32 var_f31 = dComIfG_Bgsp().GroundCross(&sp28); - if (-1000000000.0f == var_f31 || var_f31 < 5250.0f + JREG_F(4)) { + if (-G_CM3D_F_INF == var_f31 || var_f31 < 5250.0f + JREG_F(4)) { var_f31 = 5250.0f + JREG_F(4); } field_0x7a8.y = var_f31; @@ -3648,7 +3648,7 @@ void daB_DR_c::mtx_set() { } } - if (mAnm == ANM_DR_WIND_ATTACKB && -1000000000.0f != mAcch.GetGroundH()) { + if (mAnm == ANM_DR_WIND_ATTACKB && -G_CM3D_F_INF != mAcch.GetGroundH()) { cXyz sp10 = current.pos - home.pos; if (sp10.abs() > 3000.0f || current.pos.y > 370.0f) { if (field_0x7d8 == 0) { @@ -3746,7 +3746,7 @@ void daB_DR_c::cc_set() { mSound2.startCreatureSoundLevel(Z2SE_EN_DR_WIND_ATTACK, 0, -1); } - if (mAnm == ANM_DR_WIND_ATTACKB && -1000000000.0f != mAcch.GetGroundH() && mCount[1] > WREG_S(9)) { + if (mAnm == ANM_DR_WIND_ATTACKB && -G_CM3D_F_INF != mAcch.GetGroundH() && mCount[1] > WREG_S(9)) { var_r27 = 1; } @@ -4055,7 +4055,7 @@ int daB_DR_c::CreateHeap() { if (arg0 == 0x14 || arg0 == 0x15) { static int mPartDt[] = {74, 74, 75, 76, 77, 78}; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", mPartDt[mPartNo]); - JUT_ASSERT(6312, modelData != 0); + JUT_ASSERT(6312, modelData != NULL); mpPartModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpPartModel == NULL) { @@ -4066,7 +4066,7 @@ int daB_DR_c::CreateHeap() { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49); - JUT_ASSERT(6324, modelData != 0); + JUT_ASSERT(6324, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_DR", 0x2F), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { @@ -4286,7 +4286,7 @@ int daB_DR_c::create() { setActionMode(ACTION_GLIDER_ATTACK, 0); mTargetHeight = 1500.0f + mAcch.GetGroundH(); - if (-1000000000.0f == mAcch.GetGroundH()) { + if (-G_CM3D_F_INF == mAcch.GetGroundH()) { mTargetHeight = 1500.0f + current.pos.y; } if (dComIfGs_isZoneSwitch(1, fopAcM_GetRoomNo(this))) { diff --git a/src/d/actor/d_a_b_dre.cpp b/src/d/actor/d_a_b_dre.cpp index ae7c89599e..df280a46eb 100644 --- a/src/d/actor/d_a_b_dre.cpp +++ b/src/d/actor/d_a_b_dre.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_dre.h" #include "SSystem/SComponent/c_math.h" @@ -18,7 +18,7 @@ int daB_DRE_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_DR", 0x49); - JUT_ASSERT(0xB4, modelData != 0); + JUT_ASSERT(0xB4, modelData != NULL); if (mAction == 0) { mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, diff --git a/src/d/actor/d_a_b_ds.cpp b/src/d/actor/d_a_b_ds.cpp index d02aa5861e..9808511d45 100644 --- a/src/d/actor/d_a_b_ds.cpp +++ b/src/d/actor/d_a_b_ds.cpp @@ -3,7 +3,7 @@ * Boss - Stallord */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_ds.h" #include "d/actor/d_a_player.h" @@ -441,7 +441,7 @@ void daB_DS_c::mSmokeSet() { } if (mAcch.ChkGroundHit()) { - if (field_0x84d == 0 && mAcch.GetGroundH() != -1000000000.0f) { + if (field_0x84d == 0 && mAcch.GetGroundH() != -G_CM3D_F_INF) { cXyz particle_scale(1.0f, 1.0f, 1.0f); cXyz particle_pos(current.pos); csXyz particle_angle(shape_angle); @@ -508,7 +508,7 @@ void daB_DS_c::handSPosSet(int i_hand) { gnd_chk.SetPos(&chk_pos); chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (chk_pos.y == -1000000000.0f) { + if (chk_pos.y == -G_CM3D_F_INF) { chk_pos.y = mFingerPos[i_hand].y; } particle_pos = chk_pos - mHandPos[i_hand]; @@ -525,7 +525,7 @@ void daB_DS_c::handSPosSet(int i_hand) { gnd_chk.SetPos(&particle_pos); particle_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (particle_pos.y == -1000000000.0f) { + if (particle_pos.y == -G_CM3D_F_INF) { particle_pos.y = mHandPos[i_hand].y; } chk_pos = particle_pos - mHandPos[i_hand]; @@ -600,7 +600,7 @@ void daB_DS_c::mZsMoveChk() { zs_pos.y += 2000.0f; gnd_chk.SetPos(&zs_pos); - if (zs_pos.y != -1000000000.0f) { + if (zs_pos.y != -G_CM3D_F_INF) { zs_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); } else { zs_pos.y = current.pos.y += 800.0f; @@ -665,7 +665,7 @@ void daB_DS_c::mZsMoveChk_Guard() { zs_pos.y += 2000.0f; gnd_chk.SetPos(&zs_pos); - if (zs_pos.y != -1000000000.0f) { + if (zs_pos.y != -G_CM3D_F_INF) { zs_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); } else { zs_pos.y = current.pos.y += 800.0f; @@ -1906,7 +1906,7 @@ void daB_DS_c::damageHitCamera() { offset.y = 300.0f; MtxPosition(&offset, &pos); pos.x += current.pos.x; - if (mAcch.GetGroundH() != -1000000000.0f) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF) { pos.y += mAcch.GetGroundH(); } pos.z += current.pos.z; @@ -1916,7 +1916,7 @@ void daB_DS_c::damageHitCamera() { offset.z = 700.0f; MtxPosition(&offset, &pos); pos.x += current.pos.x; - if (mAcch.GetGroundH() != -1000000000.0f) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF) { pos.y += mAcch.GetGroundH(); } pos.z += current.pos.z; @@ -2091,7 +2091,7 @@ void daB_DS_c::executeDamage() { sp1BC.z = 1000.0f; MtxPosition(&sp1BC, &sp1B0); sp1B0 += current.pos; - if (mAcch.GetGroundH() != -1000000000.0f) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF) { sp1B0.y = mAcch.GetGroundH(); } @@ -3329,7 +3329,7 @@ void daB_DS_c::executeBattle2Damage() { chk_pos.y += 300.0f; gnd_chk.SetPos(&chk_pos); chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (chk_pos.y == -1000000000.0f) { + if (chk_pos.y == -G_CM3D_F_INF) { chk_pos.y = current.pos.y - 200.0f; } @@ -5253,7 +5253,7 @@ int daB_DS_c::execute() { chk_pos.y += 3000.0f; gnd_chk.SetPos(&chk_pos); chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (chk_pos.y == -1000000000.0f) { + if (chk_pos.y == -G_CM3D_F_INF) { chk_pos.y = jnt_pos.y; } @@ -5276,7 +5276,7 @@ int daB_DS_c::execute() { chk_pos.y += 3000.0f; gnd_chk.SetPos(&chk_pos); chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (chk_pos.y == -1000000000.0f) { + if (chk_pos.y == -G_CM3D_F_INF) { chk_pos.y = jnt_pos.y; } @@ -5391,7 +5391,7 @@ int daB_DS_c::CreateHeap() { anm_res = ANM_HEAD_FWAIT; } - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", anm_res)), @@ -5409,7 +5409,7 @@ int daB_DS_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 74); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpSwordMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", 63)), 0, @@ -5431,7 +5431,7 @@ int daB_DS_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_DS", 75); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpZantMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, static_cast(dComIfG_getObjectRes("B_DS", 66)), 2, @@ -5441,7 +5441,7 @@ int daB_DS_c::CreateHeap() { } modelData = static_cast(dComIfG_getObjectRes("B_DS", 73)); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpOpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284); if (mpOpPatternModel == NULL) { @@ -5473,7 +5473,7 @@ int daB_DS_c::CreateHeap() { } modelData = static_cast(dComIfG_getObjectRes("B_DS", 72)); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpPatternModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284); if (mpPatternModel == NULL) { @@ -5624,7 +5624,7 @@ cPhs__Step daB_DS_c::create() { gnd_chk.SetPos(&chk_pos); chk_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (chk_pos.y != -1000000000.0f) { + if (chk_pos.y != -G_CM3D_F_INF) { current.pos.y = chk_pos.y; } } diff --git a/src/d/actor/d_a_b_gg.cpp b/src/d/actor/d_a_b_gg.cpp index 8f59ac0006..1619b1ac70 100644 --- a/src/d/actor/d_a_b_gg.cpp +++ b/src/d/actor/d_a_b_gg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_gg.h" #include "d/d_com_inf_game.h" @@ -154,7 +154,7 @@ daB_GG_HIO_c::daB_GG_HIO_c() { int daB_GG_c::CreateHeap() { J3DModelData* modelData; modelData = (J3DModelData*)dComIfG_getObjectRes("B_gg", 0x23); - JUT_ASSERT(207, modelData != 0); + JUT_ASSERT(207, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_gg", 0xE), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { @@ -4494,7 +4494,7 @@ int daB_GG_c::Create() { SetAnm(BCK_GG_WAIT, 2, 5.0f, 1.0f); fopAcM_OnStatus(this, 0x200000); - if (-1000000000.0f != mAcch.GetGroundH()) { + if (-G_CM3D_F_INF != mAcch.GetGroundH()) { current.pos.y = mAcch.GetGroundH(); field_0x648 = mAcch.GetGroundH(); } diff --git a/src/d/actor/d_a_b_gm.cpp b/src/d/actor/d_a_b_gm.cpp index 219ee66a3f..2d8e1a1bbf 100644 --- a/src/d/actor/d_a_b_gm.cpp +++ b/src/d/actor/d_a_b_gm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_gm.h" #include "d/actor/d_a_e_gm.h" @@ -2086,7 +2086,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { J3DModelData* modelData; for (int i = 0; i < 4; i++) { modelData = (J3DModelData*)dComIfG_getObjectRes("B_gm", 0x22); - JUT_ASSERT(0xCE9, modelData != 0); + JUT_ASSERT(0xCE9, modelData != NULL); a_this->mpSpotLightModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (a_this->mpSpotLightModel[i] == NULL) { return 0; diff --git a/src/d/actor/d_a_b_gnd.cpp b/src/d/actor/d_a_b_gnd.cpp index 1b9ef02b00..1ca037d818 100644 --- a/src/d/actor/d_a_b_gnd.cpp +++ b/src/d/actor/d_a_b_gnd.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_gnd.h" #include "d/d_com_inf_game.h" @@ -4088,7 +4088,7 @@ static int daB_GND_Execute(b_gnd_class* i_this) { sp6C->setBaseTRMtx(mDoMtx_stack_c::get()); u32 sp68; - if (i_this->mAcch.GetGroundH() != -1000000000.0f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { if (i_this->mAcch.ChkWaterHit() && i_this->mAcch.m_wtr.GetHeight() > a_this->current.pos.y) { sp68 = dKy_pol_sound_get(&i_this->mAcch.m_wtr); } else if (i_this->mAcch.ChkGroundHit()) { @@ -4692,7 +4692,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { J3DModelData* modelData; modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x62); - JUT_ASSERT(6612, modelData != 0); + JUT_ASSERT(6612, modelData != NULL); i_this->mpSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpSwordModel == NULL) { return 0; @@ -4702,7 +4702,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { i_this->mpSwordModel->setBaseTRMtx(mDoMtx_stack_c::get()); modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 0x61); - JUT_ASSERT(6626, modelData != 0); + JUT_ASSERT(6626, modelData != NULL); i_this->mpSheathModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpSheathModel == NULL) { return 0; @@ -4713,7 +4713,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { for (int i = 0; i < 2; i++) { modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", blur_model[i]); - JUT_ASSERT(6647, modelData != 0); + JUT_ASSERT(6647, modelData != NULL); i_this->mpSwordBlurModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpSwordBlurModel[i] == NULL) { return 0; @@ -4724,7 +4724,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_gnd", 99); - JUT_ASSERT(6670, modelData != 0); + JUT_ASSERT(6670, modelData != NULL); for (int i = 0; i < 36; i++) { i_this->mpMantShadowModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_b_go.cpp b/src/d/actor/d_a_b_go.cpp index 17ef5a3bd7..476a1ee112 100644 --- a/src/d/actor/d_a_b_go.cpp +++ b/src/d/actor/d_a_b_go.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_go.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_b_gos.cpp b/src/d/actor/d_a_b_gos.cpp index 107e543713..7c2e59f418 100644 --- a/src/d/actor/d_a_b_gos.cpp +++ b/src/d/actor/d_a_b_gos.cpp @@ -3,7 +3,7 @@ * Combined Goron Child */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_gos.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_b_mgn.cpp b/src/d/actor/d_a_b_mgn.cpp index 8eb57cf7e7..06db9677c9 100644 --- a/src/d/actor/d_a_b_mgn.cpp +++ b/src/d/actor/d_a_b_mgn.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_mgn.h" #include "d/actor/d_a_obj_bhashi.h" @@ -304,7 +304,7 @@ int daB_MGN_c::draw() { dBgS_GndChk gndchk; f32 gnd_height; - if (mAcch.GetGroundH() == -1000000000.0f) { + if (mAcch.GetGroundH() == -G_CM3D_F_INF) { cXyz spC(current.pos); gndchk.SetPos(&spC); gnd_height = dComIfG_Bgsp().GroundCross(&gndchk); @@ -406,7 +406,7 @@ void daB_MGN_c::setDashSmokeEffect() { gndchk.SetPos(&effpos); effpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (effpos.y != -1000000000.0f) { + if (effpos.y != -G_CM3D_F_INF) { fopAcM_effSmokeSet1(&field_0x25f8[var_r27], &field_0x2608[var_r27], &effpos, NULL, 3.0f, &tevStr, 1); } } @@ -448,7 +448,7 @@ void daB_MGN_c::setBackJumpEffect() { gndchk.SetPos(&effpos); effpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (effpos.y != -1000000000.0f) { + if (effpos.y != -G_CM3D_F_INF) { fopAcM_effSmokeSet1(&field_0x25f8[var_r27], &field_0x2608[var_r27], &effpos, NULL, 3.0f, &tevStr, 1); } } @@ -469,7 +469,7 @@ void daB_MGN_c::setSlideSmokeEffect() { gndchk.SetPos(&effpos); effpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (effpos.y != -1000000000.0f) { + if (effpos.y != -G_CM3D_F_INF) { fopAcM_effSmokeSet2(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 3.0f, &tevStr); } } @@ -496,7 +496,7 @@ void daB_MGN_c::setBodySlideEffect() { gndchk.SetPos(&effpos); effpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (effpos.y != -1000000000.0f) { + if (effpos.y != -G_CM3D_F_INF) { fopAcM_effSmokeSet2(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 10.0f, &tevStr); } } @@ -514,7 +514,7 @@ void daB_MGN_c::setOpeningEffect() { gndchk.SetPos(&effpos); effpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (effpos.y != -1000000000.0f) { + if (effpos.y != -G_CM3D_F_INF) { fopAcM_effSmokeSet1(&field_0x25f8[0], &field_0x2608[0], &effpos, NULL, 15.0f, &tevStr, 1); } @@ -524,7 +524,7 @@ void daB_MGN_c::setOpeningEffect() { gndchk.SetPos(&effpos); effpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (effpos.y != -1000000000.0f) { + if (effpos.y != -G_CM3D_F_INF) { fopAcM_effSmokeSet1(&field_0x25f8[1], &field_0x2608[1], &effpos, NULL, 15.0f, &tevStr, 1); } } @@ -546,7 +546,7 @@ void daB_MGN_c::setStepEffect() { effpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (effpos.y != -1000000000.0f) { + if (effpos.y != -G_CM3D_F_INF) { fopAcM_effSmokeSet1(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 3.0f, &tevStr, 1); } } @@ -573,7 +573,7 @@ void daB_MGN_c::setFallAttackEffect() { effpos.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (effpos.y != -1000000000.0f) { + if (effpos.y != -G_CM3D_F_INF) { fopAcM_effSmokeSet1(&field_0x25f8[i], &field_0x2608[i], &effpos, NULL, 10.0f, &tevStr, 1); } } @@ -3348,7 +3348,7 @@ static int daB_MGN_Delete(daB_MGN_c* i_this) { /* 8060EAE0-8060F068 0094A0 0588+00 1/1 0/0 0/0 .text CreateHeap__9daB_MGN_cFv */ int daB_MGN_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN); - JUT_ASSERT(4010, modelData != 0); + JUT_ASSERT(4010, modelData != NULL); mpMgnModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_mgn", BCK_MGN_WAIT), 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000284); @@ -3389,7 +3389,7 @@ int daB_MGN_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgn", BMDR_MGN_TAIEKI); - JUT_ASSERT(4068, modelData != 0); + JUT_ASSERT(4068, modelData != NULL); for (int i = 0; i < 20; i++) { mpMgnTaiekiModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -3399,7 +3399,7 @@ int daB_MGN_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_mgne", BMDR_EF_GDGATE); - JUT_ASSERT(4084, modelData != 0); + JUT_ASSERT(4084, modelData != NULL); for (int i = 0; i < 4; i++) { mpGdgateModelMorf[i] = new mDoExt_McaMorfSO(modelData, NULL, NULL, diff --git a/src/d/actor/d_a_b_ob.cpp b/src/d/actor/d_a_b_ob.cpp index 7756f08db7..02bd744023 100644 --- a/src/d/actor/d_a_b_ob.cpp +++ b/src/d/actor/d_a_b_ob.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_b_ob // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_ob.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -3491,7 +3491,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_oh", BMDR_EF_OISUI); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); a_this->mpSuiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (a_this->mpSuiModel == NULL) { diff --git a/src/d/actor/d_a_b_oh.cpp b/src/d/actor/d_a_b_oh.cpp index 39cf9c6784..2003e1325b 100644 --- a/src/d/actor/d_a_b_oh.cpp +++ b/src/d/actor/d_a_b_oh.cpp @@ -3,7 +3,7 @@ * Morpheel Tentacle */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_ob.h" #include "d/actor/d_a_b_oh.h" diff --git a/src/d/actor/d_a_b_oh2.cpp b/src/d/actor/d_a_b_oh2.cpp index 4651917694..32388a9d4b 100644 --- a/src/d/actor/d_a_b_oh2.cpp +++ b/src/d/actor/d_a_b_oh2.cpp @@ -3,7 +3,7 @@ * Morpheel Tentacle */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_oh2.h" #include "d/actor/d_a_b_ob.h" diff --git a/src/d/actor/d_a_b_tn.cpp b/src/d/actor/d_a_b_tn.cpp index 3d3fcedc85..69079d4591 100644 --- a/src/d/actor/d_a_b_tn.cpp +++ b/src/d/actor/d_a_b_tn.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_tn.h" #include diff --git a/src/d/actor/d_a_b_yo.cpp b/src/d/actor/d_a_b_yo.cpp index ad75d97acb..9ca23a0343 100644 --- a/src/d/actor/d_a_b_yo.cpp +++ b/src/d/actor/d_a_b_yo.cpp @@ -4,7 +4,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_yo.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_b_yo_ice.cpp b/src/d/actor/d_a_b_yo_ice.cpp index 0f0cf6a5a3..b02c9cd650 100644 --- a/src/d/actor/d_a_b_yo_ice.cpp +++ b/src/d/actor/d_a_b_yo_ice.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_yo_ice.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_b_zant.cpp b/src/d/actor/d_a_b_zant.cpp index 8f69e5e35f..66cb1cb6a0 100644 --- a/src/d/actor/d_a_b_zant.cpp +++ b/src/d/actor/d_a_b_zant.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_zant.h" #include "d/actor/d_a_b_zant_mobile.h" @@ -1240,7 +1240,7 @@ void daB_ZANT_c::executeWarp() { gndchk.SetPos(&mFlyWarpPos); f32 gnd_y = dComIfG_Bgsp().GroundCross(&gndchk); - if (gnd_y != -1000000000.0f) { + if (gnd_y != -G_CM3D_F_INF) { mFlyWarpPos.y = gnd_y; } @@ -1784,7 +1784,7 @@ void daB_ZANT_c::executeFly() { gndchk.SetPos(&sp9C); { f32 gnd_pos = dComIfG_Bgsp().GroundCross(&gndchk); - if (gnd_pos != -1000000000.0f && current.pos.y <= gnd_pos) { + if (gnd_pos != -G_CM3D_F_INF && current.pos.y <= gnd_pos) { if (dComIfG_Bgsp().GetPolyAtt0(gndchk) == 11) { speed.y = 50.0f; speedF = 15.0f; @@ -5483,7 +5483,7 @@ static int daB_ZANT_Delete(daB_ZANT_c* i_this) { /* 8064DC04-8064E128 00FBE4 0524+00 1/1 0/0 0/0 .text CreateHeap__10daB_ZANT_cFv */ int daB_ZANT_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", BCK_ZAN_FLOAT_WAIT), 2, 1.0f, 0, -1, &mSound, 0, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; @@ -5550,14 +5550,14 @@ int daB_ZANT_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_SWORD_L); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpSwordLModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpSwordLModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", BMDR_ZAN_SWORD_R); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpSwordRModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpSwordRModel == NULL) { return 0; diff --git a/src/d/actor/d_a_b_zant_magic.cpp b/src/d/actor/d_a_b_zant_magic.cpp index fb3f0317df..973f849c42 100644 --- a/src/d/actor/d_a_b_zant_magic.cpp +++ b/src/d/actor/d_a_b_zant_magic.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_zant_magic.h" #include "d/actor/d_a_b_zant.h" diff --git a/src/d/actor/d_a_b_zant_mobile.cpp b/src/d/actor/d_a_b_zant_mobile.cpp index 15cd54a71d..2572c6107d 100644 --- a/src/d/actor/d_a_b_zant_mobile.cpp +++ b/src/d/actor/d_a_b_zant_mobile.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_zant_mobile.h" #include "d/actor/d_a_b_zant.h" @@ -201,7 +201,7 @@ f32 daB_ZANTZ_c::getGroundPos() { gndchk.SetPos(&sp88); sp88.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (sp88.y == -1000000000.0f) { + if (sp88.y == -G_CM3D_F_INF) { break; } @@ -422,7 +422,7 @@ static int daB_ZANTZ_Delete(daB_ZANTZ_c* i_this) { /* 80651DC4-80651FD0 001724 020C+00 1/1 0/0 0/0 .text CreateHeap__11daB_ZANTZ_cFv */ int daB_ZANTZ_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BMDR_ZZ); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("B_zan", daB_ZANT_c::BCK_ZZ_OPEN), 0, 0.0f, 0, -1, &mSound, 0, 0x11000084); if (mpMorf == NULL) { diff --git a/src/d/actor/d_a_b_zant_sima.cpp b/src/d/actor/d_a_b_zant_sima.cpp index 3399bf8386..fa262270c0 100644 --- a/src/d/actor/d_a_b_zant_sima.cpp +++ b/src/d/actor/d_a_b_zant_sima.cpp @@ -3,7 +3,7 @@ * Boss Zant Lava Island */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_b_zant_sima.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_balloon_2D.cpp b/src/d/actor/d_a_balloon_2D.cpp index 44e5fae7b2..f56a512f45 100644 --- a/src/d/actor/d_a_balloon_2D.cpp +++ b/src/d/actor/d_a_balloon_2D.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_balloon_2D.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -163,7 +163,7 @@ int daBalloon2D_c::createHeap() { return 0; } dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName); - JUT_ASSERT(445, resInfo != 0); + JUT_ASSERT(445, resInfo != NULL); JKRArchive* arc = resInfo->getArchive(); mScreen->setPriority("zelda_balloon_game.blo", 0x20000, arc); dPaneClass_showNullPane(mScreen); @@ -243,7 +243,7 @@ int daBalloon2D_c::create() { if (!fopAcM_entrySolidHeap(this, daBalloon2D_createHeap, 0)) { return cPhs_ERROR_e; } - JUT_ASSERT(566, daBalloon2D_c::myclass == 0); + JUT_ASSERT(566, daBalloon2D_c::myclass == NULL); myclass = this; setHIO(true); } diff --git a/src/d/actor/d_a_bd.cpp b/src/d/actor/d_a_bd.cpp index 729bf18cfb..3ca4cf34c4 100644 --- a/src/d/actor/d_a_bd.cpp +++ b/src/d/actor/d_a_bd.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bd.h" #include "d/actor/d_a_cow.h" diff --git a/src/d/actor/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp index 0f1aeb3dbf..4fa9b88f38 100644 --- a/src/d/actor/d_a_bg.cpp +++ b/src/d/actor/d_a_bg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bg.h" #include "d/d_com_inf_game.h" @@ -515,7 +515,7 @@ int daBg_c::create() { JKRExpHeap* room_heap = dStage_roomControl_c::getMemoryBlock(roomNo); if (room_heap != NULL) { this->heap = JKRCreateSolidHeap(-1, room_heap, false); - JUT_ASSERT(471, heap != 0); + JUT_ASSERT(471, heap != NULL); JKRHeap* old = mDoExt_setCurrentHeap(this->heap); int rt = createHeap(); diff --git a/src/d/actor/d_a_bg_obj.cpp b/src/d/actor/d_a_bg_obj.cpp index 087543ceaa..4663e62f5a 100644 --- a/src/d/actor/d_a_bg_obj.cpp +++ b/src/d/actor/d_a_bg_obj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bg_obj.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -133,7 +133,7 @@ u8* daBgObj_c::spec_data_c::initFarInfoBlock(u8* i_dataPtr) { */ // NONMATCHING - close-ish bool daBgObj_c::spec_data_c::Set(void* i_ptr) { - JUT_ASSERT(496, i_ptr != 0); + JUT_ASSERT(496, i_ptr != NULL); u8* data = (u8*)i_ptr; @@ -406,8 +406,8 @@ void daBgObj_c::settingCullSizeBoxForCo(int param_0) { /* 80459F14-8045A0EC 000934 01D8+00 3/3 0/0 0/0 .text settingCullSizeBoxForCull__9daBgObj_cFi */ void daBgObj_c::settingCullSizeBoxForCull(int param_0) { - cXyz max(1000000000.0f, 1000000000.0f, 1000000000.0f); - cXyz min(-1000000000.0f, -1000000000.0f, -1000000000.0f); + cXyz max(G_CM3D_F_INF, G_CM3D_F_INF, G_CM3D_F_INF); + cXyz min(-G_CM3D_F_INF, -G_CM3D_F_INF, -G_CM3D_F_INF); for (int i = 0; i < 2; i++) { J3DModel* cur_model = field_0x5a8[param_0][i]; @@ -448,7 +448,7 @@ void daBgObj_c::settingCullSizeBoxForCull(int param_0) { } } - if (1000000000.0f != max.x) { + if (G_CM3D_F_INF != max.x) { fopAcM_setCullSizeBox(this, max.x, max.y, max.z, min.x, min.y, min.z); } else { fopAcM_setCullSizeBox(this, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); @@ -974,7 +974,7 @@ void daBgObj_c::setParticle() { switch (modelNumber) { case 1: bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); - JUT_ASSERT(1683, bmd != 0); + JUT_ASSERT(1683, bmd != NULL); scale.setall(KREG_F(29) + 0.9f); break; default: diff --git a/src/d/actor/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp index cdb7f5f538..cdd52be8b8 100644 --- a/src/d/actor/d_a_boomerang.cpp +++ b/src/d/actor/d_a_boomerang.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_boomerang.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -663,7 +663,7 @@ void daBoomerang_c::setRoomInfo() { mGroundY = dComIfG_Bgsp().GroundCross(&m_gndChk); int roomNo; - if (mGroundY != -1000000000.0f) { + if (mGroundY != -G_CM3D_F_INF) { roomNo = dComIfG_Bgsp().GetRoomId(m_gndChk); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(m_gndChk); } else { @@ -1295,7 +1295,7 @@ int daBoomerang_c::execute() { if (fopAcM_rc_c::roofCheck(&spC) && dComIfG_Bgsp().GetUnderwaterRoofCode(*fopAcM_rc_c::getRoofCheck()) == 0) { roof_y = fopAcM_rc_c::getRoofY(); } else { - roof_y = 1000000000.0f; + roof_y = G_CM3D_F_INF; } if (roof_y > fopAcM_wt_c::getWaterY() && current.pos.y < fopAcM_wt_c::getWaterY() - 50.0f) { @@ -1414,21 +1414,21 @@ int daBoomerang_c::createHeap() { m_sight.initialize(); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x1F); - JUT_ASSERT(2882, modelData != 0); + JUT_ASSERT(2882, modelData != NULL); mp_boomModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mp_boomModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x34); - JUT_ASSERT(2898, modelData != 0); + JUT_ASSERT(2898, modelData != NULL); mp_shippuModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284); if (mp_shippuModel == NULL) { return 0; } J3DAnmTransform* transAnm = (J3DAnmTransform*)dComIfG_getObjectRes(daAlink_c::getAlinkArcName(), 0x13); - JUT_ASSERT(2911, transAnm != 0); + JUT_ASSERT(2911, transAnm != NULL); if (m_shippuBck.init(transAnm, 0, 2, 1.0f, 0, -1, false) == 0) { return 0; } diff --git a/src/d/actor/d_a_bullet.cpp b/src/d/actor/d_a_bullet.cpp index 2b5906367b..72c42b7871 100644 --- a/src/d/actor/d_a_bullet.cpp +++ b/src/d/actor/d_a_bullet.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_bullet.h" #include "d/d_com_inf_game.h" @@ -58,7 +58,7 @@ int daBullet_c::create() { /* 80655E5C-80655EDC 0005FC 0080+00 1/1 0/0 0/0 .text CreateHeap__10daBullet_cFv */ BOOL daBullet_c::CreateHeap() { void* mdlData_p = dComIfG_getObjectRes(getResName(), getBmdName()); - JUT_ASSERT(273, 0 != mdlData_p); + JUT_ASSERT(273, NULL != mdlData_p); mpModel = mDoExt_J3DModel__create((J3DModelData*)mdlData_p, 0x80000, 0x11000084); return mpModel != NULL; } @@ -94,11 +94,11 @@ int daBullet_c::Execute() { mGndChk = mAcch.m_gnd; mGroundY = mAcch.GetGroundH(); } else { - mGroundY = -1000000000.0f; + mGroundY = -G_CM3D_F_INF; } int room_no; - if (mGroundY != -1000000000.0f) { + if (mGroundY != -G_CM3D_F_INF) { room_no = dComIfG_Bgsp().GetRoomId(mGndChk); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk); } else { diff --git a/src/d/actor/d_a_canoe.cpp b/src/d/actor/d_a_canoe.cpp index bc58cc2a9a..7a638c6166 100644 --- a/src/d/actor/d_a_canoe.cpp +++ b/src/d/actor/d_a_canoe.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_canoe.h" #include "d/d_com_inf_game.h" @@ -199,7 +199,7 @@ static int daCanoe_Delete(daCanoe_c* i_this) { /* 804DB008-804DB0B0 000BA8 00A8+00 1/1 0/0 0/0 .text setRoomInfo__9daCanoe_cFv */ void daCanoe_c::setRoomInfo() { int room_no; - if (mAcch[0].GetGroundH() != -1000000000.0f) { + if (mAcch[0].GetGroundH() != -G_CM3D_F_INF) { room_no = dComIfG_Bgsp().GetRoomId(mAcch[0].m_gnd); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch[0].m_gnd); } else { diff --git a/src/d/actor/d_a_coach_2D.cpp b/src/d/actor/d_a_coach_2D.cpp index f216a953f5..180ab9eb22 100644 --- a/src/d/actor/d_a_coach_2D.cpp +++ b/src/d/actor/d_a_coach_2D.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_coach_2D.h" #include "d/d_com_inf_game.h" @@ -118,7 +118,7 @@ int daCoach2D_c::createHeap() { } dRes_info_c* resInfo = dComIfG_getObjectResInfo(l_arcName); - JUT_ASSERT(285, resInfo != 0); + JUT_ASSERT(285, resInfo != NULL); JKRArchive* archive = resInfo->getArchive(); mpScrn->setPriority("zelda_game_image_fire_icon.blo", 0x20000, archive); diff --git a/src/d/actor/d_a_coach_fire.cpp b/src/d/actor/d_a_coach_fire.cpp index d708b2d150..04d46b6302 100644 --- a/src/d/actor/d_a_coach_fire.cpp +++ b/src/d/actor/d_a_coach_fire.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_coach_fire.h" diff --git a/src/d/actor/d_a_cow.cpp b/src/d/actor/d_a_cow.cpp index d2c057621e..e20afd6e4c 100644 --- a/src/d/actor/d_a_cow.cpp +++ b/src/d/actor/d_a_cow.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_cow.h" #include "SSystem/SComponent/c_lib.h" diff --git a/src/d/actor/d_a_crod.cpp b/src/d/actor/d_a_crod.cpp index 7ea5790863..c43ac55a71 100644 --- a/src/d/actor/d_a_crod.cpp +++ b/src/d/actor/d_a_crod.cpp @@ -3,7 +3,7 @@ * Dominion Rod Object */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_crod.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_cstaF.cpp b/src/d/actor/d_a_cstaF.cpp index 3e502bf32a..2b30c2e071 100644 --- a/src/d/actor/d_a_cstaF.cpp +++ b/src/d/actor/d_a_cstaF.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_cstaF.h" #include "d/actor/d_a_alink.h" @@ -230,7 +230,7 @@ static int daCstaF_Delete(daCstaF_c* a_this) { /* 804DE558-804DE5F0 000C78 0098+00 2/2 0/0 0/0 .text setRoomInfo__9daCstaF_cFv */ void daCstaF_c::setRoomInfo() { int room_no; - if (m_acch.GetGroundH() != -1000000000.0f) { + if (m_acch.GetGroundH() != -G_CM3D_F_INF) { room_no = dComIfG_Bgsp().GetRoomId(m_acch.m_gnd); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(m_acch.m_gnd); } else { @@ -308,7 +308,7 @@ void daCstaF_c::posMove() { m_cc_stts.ClrCcMove(); m_acch.CrrPos(dComIfG_Bgsp()); - if (pre_gnd_hit && !m_acch.ChkGroundHit() && -1000000000.0f != m_acch.GetGroundH()) { + if (pre_gnd_hit && !m_acch.ChkGroundHit() && -G_CM3D_F_INF != m_acch.GetGroundH()) { f32 ground_dist = m_acch.GetGroundH() - current.pos.y; cM3dGPla tri; dComIfG_Bgsp().GetTriPla(m_acch.m_gnd, &tri); @@ -498,7 +498,7 @@ int daCstaF_c::Execute(Mtx** param_0) { posMove(); int poly_sound; - if (m_acch.GetGroundH() != -1000000000.0f) { + if (m_acch.GetGroundH() != -G_CM3D_F_INF) { poly_sound = dKy_pol_sound_get(&m_acch.m_gnd); } else { poly_sound = 0; diff --git a/src/d/actor/d_a_cstatue.cpp b/src/d/actor/d_a_cstatue.cpp index 2f7ba21912..aedfedabde 100644 --- a/src/d/actor/d_a_cstatue.cpp +++ b/src/d/actor/d_a_cstatue.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_cstatue.h" #include @@ -433,7 +433,7 @@ static int daCstatue_Delete(void* actor) { /* 80664AA0-80664B38 0014E0 0098+00 2/2 0/0 0/0 .text setRoomInfo__11daCstatue_cFv */ void daCstatue_c::setRoomInfo() { int roomId; - if (mStatueAcch.GetGroundH() != -1000000000.0f) { + if (mStatueAcch.GetGroundH() != -G_CM3D_F_INF) { roomId = dComIfG_Bgsp().GetRoomId(mStatueAcch.m_gnd); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mStatueAcch.m_gnd); } else { @@ -475,7 +475,7 @@ void daCstatue_c::setMatrix() { void daCstatue_c::posMove() { if (checkStateFlg0(daCstatue_FLG0_8)) { mStatueAcch.CrrPos(dComIfG_Bgsp()); - if (mStatueAcch.GetGroundH() == -1000000000.0f) { + if (mStatueAcch.GetGroundH() == -G_CM3D_F_INF) { return; } if (dComIfG_Bgsp().ChkMoveBG_NoDABg(mStatueAcch.m_gnd)) { @@ -584,7 +584,7 @@ void daCstatue_c::posMove() { current.pos += *mStts.GetCCMoveP(); mStts.ClrCcMove(); mStatueAcch.CrrPos(dComIfG_Bgsp()); - if (groundHit && !mStatueAcch.ChkGroundHit() && mStatueAcch.GetGroundH() != -1000000000.0f) + if (groundHit && !mStatueAcch.ChkGroundHit() && mStatueAcch.GetGroundH() != -G_CM3D_F_INF) { f32 groundDistance = mStatueAcch.GetGroundH() - current.pos.y; cM3dGPla plane; @@ -1137,7 +1137,7 @@ int daCstatue_c::execute() { } } u32 morf = - mStatueAcch.GetGroundH() != -1000000000.0f ? dKy_pol_sound_get(&mStatueAcch.m_gnd) : 0; + mStatueAcch.GetGroundH() != -G_CM3D_F_INF ? dKy_pol_sound_get(&mStatueAcch.m_gnd) : 0; mpMorf->play(morf, mReverb); if (!bossType && mCurrentAnim == CStatueAnimIndex_2 && link->checkCopyRodSwingMode()) { if (mpMorf->getEndFrame() > link->getBaseAnimeFrame()) { diff --git a/src/d/actor/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp index 2b534861c4..405468f97a 100644 --- a/src/d/actor/d_a_demo00.cpp +++ b/src/d/actor/d_a_demo00.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_demo00.h" #include "JSystem/JKernel/JKRSolidHeap.h" @@ -110,7 +110,7 @@ void daDemo00_c::setBaseMtx() { field_0x568 = current.pos; if (mground2 != 0) { - if (sp38.y != -1000000000.0f) { + if (sp38.y != -G_CM3D_F_INF) { bVar1 = dComIfG_Bgsp().GetTriPla(mBgc->mGndChk, &plane); } @@ -229,7 +229,7 @@ int daDemo00_c::createHeap() { if (modelData == NULL) { OS_REPORT("\ngetDemoArcName=[%s]", dStage_roomControl_c::getDemoArcName()); OS_REPORT("\nmModel.mID.mShapeID=[%d]\n", mModel.mID.mShapeID); - JUT_ASSERT(441, modelData != 0); + JUT_ASSERT(441, modelData != NULL); } s32 uVar1 = 0x11000084; @@ -331,7 +331,7 @@ int daDemo00_c::createHeap() { } } else { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.mID.field_0x4); - JUT_ASSERT(580, anm != 0); + JUT_ASSERT(580, anm != NULL); if (field_0x6a5 != 0) { uVar1 |= 0x20000000; @@ -387,7 +387,7 @@ int daDemo00_c::createHeap() { if (mModel.mID.field_0x1c != -1) { mDeformData = (J3DDeformData*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.mID.field_0x1c); // Should be mModel.mDeformData - JUT_ASSERT(687, mDeformData != 0); + JUT_ASSERT(687, mDeformData != NULL); if (mModel.mID.field_0x20 != -1) { mpBlkAnm = new mDoExt_blkAnm(); @@ -559,7 +559,7 @@ int daDemo00_c::actPerformance(dDemo_actor_c* actor) { if (mModel.mID.field_0x20 != mModel.field_0x0.field_0x20) { // Should be mModel.mDeformData and mModel.mBlkAnm - JUT_ASSERT(1049, mDeformData != 0 && mpBlkAnm != 0); + JUT_ASSERT(1049, mDeformData != NULL && mpBlkAnm != NULL); J3DAnmCluster* anmCluster = (J3DAnmCluster*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), (u16)mModel.field_0x0.field_0x20); if (anmCluster == NULL) { diff --git a/src/d/actor/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp index a6278de7d0..94a9be0dbd 100644 --- a/src/d/actor/d_a_demo_item.cpp +++ b/src/d/actor/d_a_demo_item.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_demo_item.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp index 817da0f787..4317a2a74a 100644 --- a/src/d/actor/d_a_disappear.cpp +++ b/src/d/actor/d_a_disappear.cpp @@ -3,7 +3,7 @@ * Disappear death effect when an enemy is defeated */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_disappear.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_dmidna.cpp b/src/d/actor/d_a_dmidna.cpp index 2d5a525871..0ee3293fe4 100644 --- a/src/d/actor/d_a_dmidna.cpp +++ b/src/d/actor/d_a_dmidna.cpp @@ -3,7 +3,7 @@ * Dying Midna Actor */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_dmidna.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_do.cpp b/src/d/actor/d_a_do.cpp index f234eab5c2..a31049cd70 100644 --- a/src/d/actor/d_a_do.cpp +++ b/src/d/actor/d_a_do.cpp @@ -5,7 +5,7 @@ // Every function matches, but a Z2SoundObjSimple dtor is generated that should not exist -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "c/c_damagereaction.h" #include "d/actor/d_a_canoe.h" diff --git a/src/d/actor/d_a_door_boss.cpp b/src/d/actor/d_a_door_boss.cpp index 4a4af4ddeb..cb4623685d 100644 --- a/src/d/actor/d_a_door_boss.cpp +++ b/src/d/actor/d_a_door_boss.cpp @@ -3,7 +3,7 @@ * Boss Door */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_boss.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_door_bossL1.cpp b/src/d/actor/d_a_door_bossL1.cpp index cca82154a4..dd2026e856 100644 --- a/src/d/actor/d_a_door_bossL1.cpp +++ b/src/d/actor/d_a_door_bossL1.cpp @@ -2,7 +2,7 @@ // Translation Unit: Boss Door L1 // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_bossL1.h" #include "d/actor/d_a_obj_keyhole.h" @@ -182,7 +182,7 @@ const char* daBdoorL1_c::getDzb() { */ J3DModelData* daBdoorL1_c::getDoorModelData() { J3DModelData* door_model = static_cast(dComIfG_getObjectRes(getArcName(), getBmd())); - JUT_ASSERT(256, door_model != 0) + JUT_ASSERT(256, door_model != NULL) return door_model; } @@ -205,7 +205,7 @@ static u32 const l_heap_size[11] = { int daBdoorL1_c::CreateHeap() { int nowLevel = getNowLevel(); J3DModelData* modelData = getDoorModelData(); - JUT_ASSERT(313, modelData != 0); + JUT_ASSERT(313, modelData != NULL); u32 dlistFlag = 0x11000084; if (nowLevel == 8) { dlistFlag |= 0x200; @@ -225,14 +225,14 @@ int daBdoorL1_c::CreateHeap() { } if (nowLevel == 8) { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(getArcName(), "door_shutterBoss.btk"); - JUT_ASSERT(341, pbtk != 0); + JUT_ASSERT(341, pbtk != NULL); field_0x58c = new mDoExt_btkAnm(); if (field_0x58c == NULL || !field_0x58c->init(field_0x580->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) { return 0; } } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); - JUT_ASSERT(354, anm != 0); + JUT_ASSERT(354, anm != NULL); field_0x588 = new mDoExt_bckAnm(); if (field_0x588 == NULL || !field_0x588->init(anm, 1, 0, 1.0f, 0, -1,false)) { return 0; @@ -310,7 +310,7 @@ void daBdoorL1_c::calcMtx() { MTXCopy(mDoMtx_stack_c::get(), field_0x7ec); break; default: - JUT_ASSERT(442, 0); + JUT_ASSERT(442, FALSE); break; } } @@ -560,7 +560,7 @@ int daBdoorL1_c::openInit() { dComIfG_Bgsp().Release(field_0x590); } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); - JUT_ASSERT(811, anm != 0); + JUT_ASSERT(811, anm != NULL); int rt = field_0x588->init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(813, rt == 0); if (field_0x59b != 0) { @@ -665,7 +665,7 @@ int daBdoorL1_c::openEnd() { /* 804E3850-804E3A2C 001B30 01DC+00 1/1 0/0 0/0 .text closeInit__11daBdoorL1_cFv */ int daBdoorL1_c::closeInit() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm()); - JUT_ASSERT(1020, anm != 0); + JUT_ASSERT(1020, anm != NULL); int rt = field_0x588->init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(1022, rt == 0); switch(getNowLevel()) { diff --git a/src/d/actor/d_a_door_bossL5.cpp b/src/d/actor/d_a_door_bossL5.cpp index 0c1d164da0..3fc1f72cf6 100644 --- a/src/d/actor/d_a_door_bossL5.cpp +++ b/src/d/actor/d_a_door_bossL5.cpp @@ -2,7 +2,7 @@ // Boss Door Level 5 // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_bossL5.h" #include "d/actor/d_a_obj_keyhole.h" @@ -88,14 +88,14 @@ static char* action_table[14] = { /* 80670D10-80670EC0 000150 01B0+00 1/1 0/0 0/0 .text CreateHeap__11daBdoorL5_cFv */ int daBdoorL5_c::CreateHeap() { J3DModelData* modelData = getDoorModelData(); - JUT_ASSERT(313, modelData != 0); + JUT_ASSERT(313, modelData != NULL); field_0x580 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (field_0x580 == NULL) { return 0; } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); - JUT_ASSERT(354, anm != 0); + JUT_ASSERT(354, anm != NULL); field_0x584 = new mDoExt_bckAnm(); if (field_0x584 == NULL || !field_0x584->init(anm, 1, 0, 1.0f, 0, -1, false)) { return 0; @@ -265,7 +265,7 @@ void daBdoorL5_c::demoProc() { int daBdoorL5_c::openInit() { dComIfG_Bgsp().Release(field_0x588); J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); - JUT_ASSERT(454, anm != 0); + JUT_ASSERT(454, anm != NULL); int rt = field_0x584->init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(456, rt == 0); return 1; @@ -288,7 +288,7 @@ int daBdoorL5_c::openEnd() { /* 80671720-806717FC 000B60 00DC+00 1/1 0/0 0/0 .text closeInit__11daBdoorL5_cFv */ int daBdoorL5_c::closeInit() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm()); - JUT_ASSERT(511, anm != 0); + JUT_ASSERT(511, anm != NULL); int rt = field_0x584->init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(513, rt == 0); mDoAud_seStart(Z2SE_OBJ_LV3_SHTR_CL, ¤t.pos, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); diff --git a/src/d/actor/d_a_door_dbdoor00.cpp b/src/d/actor/d_a_door_dbdoor00.cpp index 221f86d1fc..91cf8c5e2b 100644 --- a/src/d/actor/d_a_door_dbdoor00.cpp +++ b/src/d/actor/d_a_door_dbdoor00.cpp @@ -2,7 +2,7 @@ // d_a_door_dbdoor00 // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_dbdoor00.h" #include "printf.h" diff --git a/src/d/actor/d_a_door_knob00.cpp b/src/d/actor/d_a_door_knob00.cpp index c41ce01028..543088dd32 100644 --- a/src/d/actor/d_a_door_knob00.cpp +++ b/src/d/actor/d_a_door_knob00.cpp @@ -2,7 +2,7 @@ // Door Knob // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_knob00.h" #include "f_op/f_op_actor_mng.h" @@ -84,7 +84,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { /* 8045E960-8045EBA0 000180 0240+00 1/1 0/0 0/0 .text CreateHeap__10daKnob20_cFv */ int daKnob20_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getAlwaysArcName(), getDummyBmd()); - JUT_ASSERT(201, modelData != 0); + JUT_ASSERT(201, modelData != NULL); mModel1 = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mModel1 == NULL) { return 0; @@ -95,14 +95,14 @@ int daKnob20_c::CreateHeap() { mModel1->setBaseTRMtx(mDoMtx_stack_c::get()); J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck"); - JUT_ASSERT(222, anm != 0); + JUT_ASSERT(222, anm != NULL); if (field_0x57c.init(anm, 1, 0, 1.0f, 0, -1, false) == 0) { return 0; } mJoint = modelData->getJointName()->getIndex("FDoor"); JUT_ASSERT(227, mJoint >= 0); modelData = getDoorModelData(); - JUT_ASSERT(235, modelData != 0); + JUT_ASSERT(235, modelData != NULL); mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mModel2 == 0) { return 0; @@ -115,7 +115,7 @@ int daKnob20_c::CreateHeap() { field_0x57c.entry(mModel1->getModelData()); mModel1->calc(); cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(getAlwaysArcName(), getDzb()); - JUT_ASSERT(261, bgd != 0); + JUT_ASSERT(261, bgd != NULL); if (field_0x5a0->Set(bgd, 1, (Mtx*)mModel1->getAnmMtx(mJoint)) == 1) { return 0; } else { @@ -503,7 +503,7 @@ static char* bck_table[4] = { int daKnob20_c::openInit(int param_1) { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), bck_table[param_1]); - JUT_ASSERT(937, anm != 0); + JUT_ASSERT(937, anm != NULL); field_0x57c.init(anm, 1, 0, 1.0f, 0, -1, true); onFlag(1); if (param_1 >= 2) { diff --git a/src/d/actor/d_a_door_mbossL1.cpp b/src/d/actor/d_a_door_mbossL1.cpp index 38f4eebc16..e421add66b 100644 --- a/src/d/actor/d_a_door_mbossL1.cpp +++ b/src/d/actor/d_a_door_mbossL1.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_mbossL1.h" #include "d/actor/d_a_obj_stopper.h" @@ -205,7 +205,7 @@ void dDoor_stop2_c::draw(fopAc_ac_c* param_1) { f32 dDoor_stop2_c::getHeight() { if (mModel != NULL) { J3DJoint* root_jnt = mModel->getModelData()->getJointNodePointer(0); - JUT_ASSERT(360, root_jnt != 0); + JUT_ASSERT(360, root_jnt != NULL); return root_jnt->getMax()->y; } return 300.0f; @@ -325,7 +325,7 @@ J3DModelData* daMBdoorL1_c::getDoorModelData() { int daMBdoorL1_c::CreateHeap() { int level = getNowLevel(this); J3DModelData* modelData = getDoorModelData(); - JUT_ASSERT(579, modelData != 0); + JUT_ASSERT(579, modelData != NULL); if (getDoorType() == DOOR_TYPE_2) { for (int i = 0; i < 2; i++) { mModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -334,7 +334,7 @@ int daMBdoorL1_c::CreateHeap() { } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes( getAlwaysArcName(), "FDoorA.bck"); - JUT_ASSERT(597, anm != 0); + JUT_ASSERT(597, anm != NULL); mBckAnms[i] = new mDoExt_bckAnm(); if (mBckAnms[i] == NULL || !mBckAnms[i]->init(anm, 1, 0, 1.0f, 0, -1, false)) { return 0; @@ -355,7 +355,7 @@ int daMBdoorL1_c::CreateHeap() { } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); - JUT_ASSERT(628, anm != 0); + JUT_ASSERT(628, anm != NULL); mBckAnms[0] = new mDoExt_bckAnm(); if (mBckAnms[0] == NULL || !mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, false)) { return 0; @@ -365,7 +365,7 @@ int daMBdoorL1_c::CreateHeap() { } if (level == 8) { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk()); - JUT_ASSERT(646, pbtk != 0); + JUT_ASSERT(646, pbtk != NULL); field_0x594 = new mDoExt_btkAnm(); if (field_0x594 == NULL || !field_0x594->init(mModels[0]->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) @@ -375,7 +375,7 @@ int daMBdoorL1_c::CreateHeap() { } if (checkMakeStop()) { J3DModelData* mdl = (J3DModelData*)dComIfG_getStageRes("door-stop.bmd"); - JUT_ASSERT(671, mdl != 0); + JUT_ASSERT(671, mdl != NULL); if (!mDoorStop.create(mdl)) { return 0; } @@ -955,7 +955,7 @@ int daMBdoorL1_c::openInit() { dComIfG_Bgsp().Release(field_0x598); } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getOpenAnm()); - JUT_ASSERT(1550, anm != 0); + JUT_ASSERT(1550, anm != NULL); int rt = mBckAnms[0]->init(anm, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, true); JUT_ASSERT(1552, rt == 0); int level = getNowLevel(this); @@ -1068,7 +1068,7 @@ int daMBdoorL1_c::closeInit() { smokeInit2(); } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAnmArcName(), getCloseAnm()); - JUT_ASSERT(1762, anm != 0); + JUT_ASSERT(1762, anm != NULL); int rt = mBckAnms[0]->init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(1764, rt != 0); return 1; @@ -1120,7 +1120,7 @@ int daMBdoorL1_c::openInitKnob(int param_1) { }; J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes( getAlwaysArcName(), bck_table[param_1]); - JUT_ASSERT(1847, anm != 0); + JUT_ASSERT(1847, anm != NULL); if ((field_0x5df == 0 && param_1 == 0) || (field_0x5df == 1 && param_1 == 2)) { field_0x590 = mBckAnms[0]; } else if ((field_0x5df == 1 && param_1 == 0) || (field_0x5df == 0 && param_1 == 2)) { @@ -1331,7 +1331,7 @@ void daMBdoorL1_c::setStart(f32 param_1, f32 param_2) { static f32 dummy(f32 param_0) { dBgS_ObjGndChk gnd_chk; - return param_0 + -1e9f + 50.0f; + return param_0 + -G_CM3D_F_INF + 50.0f; } /* 80676004-806760B4 003844 00B0+00 1/1 0/0 0/0 .text smokeInit2__12daMBdoorL1_cFv */ diff --git a/src/d/actor/d_a_door_push.cpp b/src/d/actor/d_a_door_push.cpp index 1b847782e2..053989c664 100644 --- a/src/d/actor/d_a_door_push.cpp +++ b/src/d/actor/d_a_door_push.cpp @@ -3,7 +3,7 @@ * Door - Push */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_push.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_door_shutter.cpp b/src/d/actor/d_a_door_shutter.cpp index a843a2330c..16b54cd45e 100644 --- a/src/d/actor/d_a_door_shutter.cpp +++ b/src/d/actor/d_a_door_shutter.cpp @@ -2,7 +2,7 @@ // Door Shutter // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_shutter.h" #include "d/actor/d_a_obj_Lv5Key.h" @@ -114,7 +114,7 @@ static int CheckCreateHeap(fopAc_ac_c* i_this) { int daDoor20_c::CreateHeap() { int kind = door_param2_c::getKind(this); J3DModelData* modelData = getModelData(); - JUT_ASSERT(355, modelData != 0); + JUT_ASSERT(355, modelData != NULL); int dListFlag = 0x11000084; if (kind == 2) { dListFlag |= 0x200; @@ -136,7 +136,7 @@ int daDoor20_c::CreateHeap() { return 0; } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck"); - JUT_ASSERT(394, anm != 0); + JUT_ASSERT(394, anm != NULL); if (!field_0x5a0.init(anm, 1, 0, 1.0f, 0, -1, false)) { return 0; } @@ -159,7 +159,7 @@ int daDoor20_c::CreateHeap() { break; case 2: J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes(getBtk()); - JUT_ASSERT(421, pbtk != 0); + JUT_ASSERT(421, pbtk != NULL); field_0x5c0 = new mDoExt_btkAnm(); if (field_0x5c0 == NULL || !field_0x5c0->init(mModel1->getModelData(), pbtk, 1, 0, 1.0f, 0, -1)) { return 0; @@ -170,7 +170,7 @@ int daDoor20_c::CreateHeap() { anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpF.bck"); break; } - JUT_ASSERT(375, anm != 0); + JUT_ASSERT(375, anm != NULL); if (field_0x584.init(anm, 1, 0, 1.0f, 0, -1, false) == 0) { return 0; } @@ -419,7 +419,7 @@ void daDoor20_c::openInit_0() { anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpD.bck"); } } - JUT_ASSERT(832, anm != 0); + JUT_ASSERT(832, anm != NULL); int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(835, rt == 0); daPy_py_c* player = daPy_getPlayerActorClass(); @@ -451,7 +451,7 @@ void daDoor20_c::openInit_1() { } else { anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpC.bck"); } - JUT_ASSERT(915, anm != 0); + JUT_ASSERT(915, anm != NULL); int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(918, rt == 0); u8 bVar5 = door_param2_c::getSwbit3(this); @@ -600,7 +600,7 @@ void daDoor20_c::closeInit_0() { } else { anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseD.bck"); } - JUT_ASSERT(1178, anm != 0); + JUT_ASSERT(1178, anm != NULL); int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(1181, rt == 0); cXyz acStack_40(home.pos.x, home.pos.y + 200.0f, home.pos.z); @@ -629,7 +629,7 @@ void daDoor20_c::closeInit_0() { void daDoor20_c::closeInit_1() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorCloseC.bck"); - JUT_ASSERT(1236, anm != 0); + JUT_ASSERT(1236, anm != NULL); int rt = field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true); JUT_ASSERT(1239, rt == 0); mDoAud_seStart(Z2SE_OBJ_WOOD_DOOR_ROLLCLOSE, ¤t.pos, 0, @@ -929,7 +929,7 @@ int daDoor20_c::demoProc() { case 13: J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes( getAlwaysArcName(), "FDoorB.bck"); - JUT_ASSERT(1796, anm != 0); + JUT_ASSERT(1796, anm != NULL); if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm, 1, 0, 1.0f, 0, -1, true)) { @@ -941,7 +941,7 @@ int daDoor20_c::demoProc() { case 12: anm = (J3DAnmTransform*)dComIfG_getObjectRes(getAlwaysArcName(), "FDoorA.bck"); - JUT_ASSERT(1809, anm != 0); + JUT_ASSERT(1809, anm != NULL); if (!field_0x584.init(anm, 1, 0, 1.0f, 0, -1, true) || !field_0x5a0.init(anm, 1, 0, 1.0f, 0, -1, true)) { @@ -2201,7 +2201,7 @@ int dDoor_stop_c::openProc(daDoor20_c* i_this) { /* 804664E8-80466538 005A28 0050+00 1/1 0/0 0/0 .text create__12dDoor_stop_cFP10daDoor20_c */ int dDoor_stop_c::create(daDoor20_c* i_this) { J3DModelData* stopModelData = i_this->getStopModelData(); - JUT_ASSERT(3923, stopModelData != 0); + JUT_ASSERT(3923, stopModelData != NULL); field_0x0 = mDoExt_J3DModel__create(stopModelData, 0x80000, 0x11000084); return field_0x0 != NULL ? 1 : 0; } diff --git a/src/d/actor/d_a_door_spiral.cpp b/src/d/actor/d_a_door_spiral.cpp index e6962461ea..83b8fe063c 100644 --- a/src/d/actor/d_a_door_spiral.cpp +++ b/src/d/actor/d_a_door_spiral.cpp @@ -2,7 +2,7 @@ // Door Spiral // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_door_spiral.h" #include "f_op/f_op_actor.h" diff --git a/src/d/actor/d_a_dshutter.cpp b/src/d/actor/d_a_dshutter.cpp index d1264cb908..a208ae2488 100644 --- a/src/d/actor/d_a_dshutter.cpp +++ b/src/d/actor/d_a_dshutter.cpp @@ -3,7 +3,7 @@ * Gates that shutter open / close */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_dshutter.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_e_ai.cpp b/src/d/actor/d_a_e_ai.cpp index a047d6ad78..99cc68db94 100644 --- a/src/d/actor/d_a_e_ai.cpp +++ b/src/d/actor/d_a_e_ai.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ai.h" @@ -885,7 +885,7 @@ static int daE_AI_Delete(e_ai_class* i_this) { /* 8067B6F0-8067B87C 002670 018C+00 1/1 0/0 0/0 .text CreateHeap__10e_ai_classFv */ int e_ai_class::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_AI", 0xD); - JUT_ASSERT(1703, modelData != 0); + 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); if (m_modelMorf == NULL || m_modelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_arrow.cpp b/src/d/actor/d_a_e_arrow.cpp index 7279059b7e..ae5bae42a9 100644 --- a/src/d/actor/d_a_e_arrow.cpp +++ b/src/d/actor/d_a_e_arrow.cpp @@ -3,7 +3,7 @@ * Enemy Arrow */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_arrow.h" #include "SSystem/SComponent/c_math.h" @@ -668,7 +668,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->mResName, res_id); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpModel == NULL) { diff --git a/src/d/actor/d_a_e_ba.cpp b/src/d/actor/d_a_e_ba.cpp index ed384af775..6157cf05c2 100644 --- a/src/d/actor/d_a_e_ba.cpp +++ b/src/d/actor/d_a_e_ba.cpp @@ -3,7 +3,7 @@ * Enemy - Keese */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ba.h" #include "JSystem/JKernel/JKRHeap.h" diff --git a/src/d/actor/d_a_e_bee.cpp b/src/d/actor/d_a_e_bee.cpp index 5befdd0145..8662d5f971 100644 --- a/src/d/actor/d_a_e_bee.cpp +++ b/src/d/actor/d_a_e_bee.cpp @@ -3,7 +3,7 @@ * Enemy - Bees */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_bee.h" #include "d/actor/d_a_e_nest.h" diff --git a/src/d/actor/d_a_e_bg.cpp b/src/d/actor/d_a_e_bg.cpp index ff3cebc7ce..f5e5dbb67d 100644 --- a/src/d/actor/d_a_e_bg.cpp +++ b/src/d/actor/d_a_e_bg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_bg.h" #include "SSystem/SComponent/c_math.h" @@ -340,7 +340,7 @@ void daE_BG_c::executeSwim() { { if (!fopAcM_otherBgCheck(this, daPy_getPlayerActorClass())) { if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { - if (field_0x684 != -1e+09f) { + if (field_0x684 != -G_CM3D_F_INF) { if (daPy_getPlayerActorClass()->current.pos.y < field_0x684 - 20.0f) { setActionMode(2, 0); return; @@ -365,7 +365,7 @@ void daE_BG_c::executeSwim() { switch (mMoveMode) { case 0: { field_0x660.y = home.pos.y + cM_rndFX(500.0f); - if (field_0x684 != -1e+09f && field_0x660.y > field_0x684 - 50.0f) { + if (field_0x684 != -G_CM3D_F_INF && field_0x660.y > field_0x684 - 50.0f) { field_0x660.y = field_0x684 - 50.0f; } @@ -409,7 +409,7 @@ void daE_BG_c::executeSwim() { cLib_addCalcAngleS(&field_0x6a0, 0xc00, 8, 0x400, 0x100); - if (speed.y > 0.0f && field_0x684 != -1e+09f && current.pos.y > field_0x684 - 50.0f) { + if (speed.y > 0.0f && field_0x684 != -G_CM3D_F_INF && current.pos.y > field_0x684 - 50.0f) { mMoveMode = 3; } @@ -463,7 +463,7 @@ void daE_BG_c::executeAttack() { if (mMoveMode <= 2) { if (daPy_getPlayerActorClass()->checkEquipHeavyBoots()) { - if (field_0x684 != -1e+09f && playerPos.y >= field_0x684 - 20.0f) { + if (field_0x684 != -G_CM3D_F_INF && playerPos.y >= field_0x684 - 20.0f) { setActionMode(1, 0); return; } @@ -966,7 +966,7 @@ void daE_BG_c::executeEat() { switch (this->mMoveMode) { case 0: field_0x660.y = rodPos.y + cM_rndFX(100.0f); - if (field_0x684 != -1e+09f && field_0x660.y > field_0x684 - 50.0f) { + if (field_0x684 != -G_CM3D_F_INF && field_0x660.y > field_0x684 - 50.0f) { field_0x660.y = field_0x684 - 50.0f; } @@ -1164,7 +1164,7 @@ void daE_BG_c::action() { fopAcM_posMoveF(this, mStts.GetCCMoveP()); - if (field_0x684 != -1e+09f && current.pos.y > field_0x684 - 50.0f) { + if (field_0x684 != -G_CM3D_F_INF && current.pos.y > field_0x684 - 50.0f) { current.pos.y = field_0x684 - 50.0f; if (speed.y > 0.0f) { speed.y = 0.0f; @@ -1323,7 +1323,7 @@ static int daE_BG_Delete(daE_BG_c* i_this) { /* 80689A0C-80689BD0 0042EC 01C4+00 1/1 0/0 0/0 .text CreateHeap__8daE_BG_cFv */ int daE_BG_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BG", 10); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_BG", 7), 0, 1.0f, 0, @@ -1426,7 +1426,7 @@ int daE_BG_c::create() { gndChkSpl.SetPos(&gndChkPos); field_0x684 = dComIfG_Bgsp().GroundCross(&gndChkSpl); - if (field_0x684 != -1e+09f && current.pos.y > field_0x684 - 50.0f) { + if (field_0x684 != -G_CM3D_F_INF && current.pos.y > field_0x684 - 50.0f) { current.pos.y = field_0x684 - 50.0f; } diff --git a/src/d/actor/d_a_e_bi.cpp b/src/d/actor/d_a_e_bi.cpp index 1cae415594..baa96bbad9 100644 --- a/src/d/actor/d_a_e_bi.cpp +++ b/src/d/actor/d_a_e_bi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_bi.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_e_bi_leaf.cpp b/src/d/actor/d_a_e_bi_leaf.cpp index 40a1234b69..bee19a57aa 100644 --- a/src/d/actor/d_a_e_bi_leaf.cpp +++ b/src/d/actor/d_a_e_bi_leaf.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_bi_leaf.h" #include "d/d_com_inf_game.h" @@ -88,7 +88,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (a_this->field_0x5b4 != 1) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_BI", 15); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpModel == NULL) { diff --git a/src/d/actor/d_a_e_bs.cpp b/src/d/actor/d_a_e_bs.cpp index 2d160fb936..c7cb7faa43 100644 --- a/src/d/actor/d_a_e_bs.cpp +++ b/src/d/actor/d_a_e_bs.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_bs.h" #include "f_op/f_op_actor_enemy.h" diff --git a/src/d/actor/d_a_e_bu.cpp b/src/d/actor/d_a_e_bu.cpp index 21874cdd16..423a8ad89c 100644 --- a/src/d/actor/d_a_e_bu.cpp +++ b/src/d/actor/d_a_e_bu.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_bu.h" #include "f_op/f_op_actor_enemy.h" @@ -549,7 +549,7 @@ static void e_bu_path_fly(e_bu_class* i_this) { int next_path_id = i_this->ppd->m_nextID; if (next_path_id != 0xFFFF) { i_this->ppd = dPath_GetRoomPath(next_path_id, fopAcM_GetRoomNo(actor)); - JUT_ASSERT(919, i_this->ppd != 0); + JUT_ASSERT(919, i_this->ppd != NULL); } } else if (i_this->now_path_pntNo < 0) { i_this->path_step = 1; diff --git a/src/d/actor/d_a_e_bug.cpp b/src/d/actor/d_a_e_bug.cpp index cf04735ee5..f102bd119d 100644 --- a/src/d/actor/d_a_e_bug.cpp +++ b/src/d/actor/d_a_e_bug.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_bug.h" #include "d/actor/d_a_player.h" @@ -814,10 +814,10 @@ static int useHeapInit(fopAc_ac_c* a_this) { e_bug_class* i_this = (e_bug_class*)a_this; J3DModelData* modelData = static_cast(dComIfG_getObjectRes("E_bug", BMDG_MU04)); - JUT_ASSERT(1322, modelData != 0); + JUT_ASSERT(1322, modelData != NULL); J3DModelData* modelData2 = static_cast(dComIfG_getObjectRes("E_bug", BMDG_MU05)); - JUT_ASSERT(1327, modelData2 != 0); + JUT_ASSERT(1327, modelData2 != NULL); for (int i = 0; i < i_this->bug_num; i++) { i_this->Bug_s[i].field_0x0 = mDoExt_J3DModel__create(modelData, 0x20000, 0x11000084); @@ -908,7 +908,7 @@ static cPhs__Step daE_Bug_Create(fopAc_ac_c* a_this) { static u32 const l_bmdidx[2] = {BMDG_MU04, BMDG_MU05}; for (u32 i = 0; i < 2; i++) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_bug", l_bmdidx[i]); - JUT_ASSERT(1476, modelData != 0); + JUT_ASSERT(1476, modelData != NULL); if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 0) == -1) { OS_REPORT("1Bh[43;30m虫の集団：シンプルモデル登録失敗しました。\n1Bh[m"); // 1Bh, group of insects: Simple model registration failed. diff --git a/src/d/actor/d_a_e_cr.cpp b/src/d/actor/d_a_e_cr.cpp index cdd2889021..72316d5d1f 100644 --- a/src/d/actor/d_a_e_cr.cpp +++ b/src/d/actor/d_a_e_cr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_cr.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_e_cr_egg.cpp b/src/d/actor/d_a_e_cr_egg.cpp index 6f808deaff..2ee85ca475 100644 --- a/src/d/actor/d_a_e_cr_egg.cpp +++ b/src/d/actor/d_a_e_cr_egg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_cr_egg.h" #include "d/d_cc_d.h" @@ -159,7 +159,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { e_cr_egg_class* a_this = (e_cr_egg_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_CR", 0xC); - JUT_ASSERT(374, modelData != 0); + JUT_ASSERT(374, modelData != NULL); a_this->model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->model == NULL) { diff --git a/src/d/actor/d_a_e_db.cpp b/src/d/actor/d_a_e_db.cpp index 67468086f8..411bfe7f46 100644 --- a/src/d/actor/d_a_e_db.cpp +++ b/src/d/actor/d_a_e_db.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_db.h" #include "d/actor/d_a_e_db_leaf.h" @@ -2080,7 +2080,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_db", 0x19); - JUT_ASSERT(3622, modelData != 0); + JUT_ASSERT(3622, modelData != NULL); for (int i = 1; i < 11; i++) { if (i & 1) { diff --git a/src/d/actor/d_a_e_db_leaf.cpp b/src/d/actor/d_a_e_db_leaf.cpp index 9c74c04038..9b8a78bceb 100644 --- a/src/d/actor/d_a_e_db_leaf.cpp +++ b/src/d/actor/d_a_e_db_leaf.cpp @@ -1,6 +1,6 @@ // Translation Unit: d_a_e_db_leaf -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_db_leaf.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_e_dd.cpp b/src/d/actor/d_a_e_dd.cpp index 0e76786943..6baaa5143a 100644 --- a/src/d/actor/d_a_e_dd.cpp +++ b/src/d/actor/d_a_e_dd.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_dd.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_e_df.cpp b/src/d/actor/d_a_e_df.cpp index eedf55efba..97308ec8ae 100644 --- a/src/d/actor/d_a_e_df.cpp +++ b/src/d/actor/d_a_e_df.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_df.h" #include "d/actor/d_a_obj_carry.h" @@ -39,7 +39,7 @@ daE_DF_HIO_c::daE_DF_HIO_c() { /* 806A7710-806A7808 000110 00F8+00 1/1 0/0 0/0 .text CreateHeap__8daE_DF_cFv */ int daE_DF_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_DF", 0xD); - JUT_ASSERT(161, modelData != 0); + JUT_ASSERT(161, modelData != NULL); mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_DF", 10), 2, 1.0f, 0, diff --git a/src/d/actor/d_a_e_dk.cpp b/src/d/actor/d_a_e_dk.cpp index 309c935a23..903fb6c8d1 100644 --- a/src/d/actor/d_a_e_dk.cpp +++ b/src/d/actor/d_a_e_dk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_dk.h" #include "d/actor/d_a_player.h" @@ -281,7 +281,7 @@ void daE_DK_c::checkWaterHeight() { gndChkPos.y += 1000.0f; gndChk.SetPos(&gndChkPos); field_0x6b8 = dComIfG_Bgsp().GroundCross(&gndChk); - if (field_0x6b8 != -1000000000.0f && current.pos.y + 350.0f > field_0x6b8) { + if (field_0x6b8 != -G_CM3D_F_INF && current.pos.y + 350.0f > field_0x6b8) { current.pos.y = field_0x6b8 - 350.0f; } } else { @@ -289,7 +289,7 @@ void daE_DK_c::checkWaterHeight() { gndChkPos.y += 1000.0f; gndChk.SetPos(&gndChkPos); field_0x6b8 = dComIfG_Bgsp().GroundCross(&gndChk); - if (field_0x6b8 != -1000000000.0f && field_0x670.y + 350.0f > field_0x6b8) { + if (field_0x6b8 != -G_CM3D_F_INF && field_0x670.y + 350.0f > field_0x6b8) { field_0x670.y = field_0x6b8 - 350.0f; } } diff --git a/src/d/actor/d_a_e_dn.cpp b/src/d/actor/d_a_e_dn.cpp index 6611af1ab0..c83ba45a5f 100644 --- a/src/d/actor/d_a_e_dn.cpp +++ b/src/d/actor/d_a_e_dn.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_dn.h" #include "d/d_cc_d.h" @@ -2812,14 +2812,14 @@ static void action(e_dn_class* i_this) { gnd_chk.SetPos(&sp264); sp264.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp264.y != -1000000000.0f) { + if (sp264.y != -G_CM3D_F_INF) { sp258.x = sp264.x; sp258.y = sp264.y + 100.0f; sp258.z = sp264.z + fVar1; gnd_chk.SetPos(&sp258); sp258.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp258.y != -1000000000.0f) { + if (sp258.y != -G_CM3D_F_INF) { sVar7 = -cM_atan2s(sp258.y - sp264.y, sp258.z - sp264.z); if (sVar7 > 0x3000 || sVar7 < -0x3000) { sVar7 = 0; @@ -2831,7 +2831,7 @@ static void action(e_dn_class* i_this) { sp258.z = sp264.z; gnd_chk.SetPos(&sp258); sp258.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp258.y != -1000000000.0f) { + if (sp258.y != -G_CM3D_F_INF) { sVar6 = cM_atan2s(sp258.y - sp264.y, sp258.x - sp264.x); if (sVar6 > 0x3000 || sVar6 < -0x3000) { sVar6 = 0; @@ -3302,14 +3302,14 @@ static int useHeapInit(fopAc_ac_c* a_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_dn", 39); - JUT_ASSERT(5420, modelData != 0); + JUT_ASSERT(5420, modelData != NULL); i_this->mpKnifeModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpKnifeModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes("E_dn", 41); - JUT_ASSERT(5432, modelData != 0); + JUT_ASSERT(5432, modelData != NULL); i_this->mpShieldModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpShieldModel == NULL) { return 0; @@ -3317,7 +3317,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { if (i_this->field_0x5b7 == 1) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_dn", 40); - JUT_ASSERT(5443, modelData != 0); + JUT_ASSERT(5443, modelData != NULL); i_this->mpSkullModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpSkullModel == NULL) { return 0; diff --git a/src/d/actor/d_a_e_dt.cpp b/src/d/actor/d_a_e_dt.cpp index 66ecabbc93..8f54497be7 100644 --- a/src/d/actor/d_a_e_dt.cpp +++ b/src/d/actor/d_a_e_dt.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_dt.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_e_fb.cpp b/src/d/actor/d_a_e_fb.cpp index 452a29cfc9..02a876c547 100644 --- a/src/d/actor/d_a_e_fb.cpp +++ b/src/d/actor/d_a_e_fb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_fb.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_e_fk.cpp b/src/d/actor/d_a_e_fk.cpp index 2ddd41b846..83c8dd6b21 100644 --- a/src/d/actor/d_a_e_fk.cpp +++ b/src/d/actor/d_a_e_fk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_fk.h" #include "d/d_s_play.h" @@ -38,7 +38,7 @@ daE_FK_HIO_c::daE_FK_HIO_c() { /* 806B93CC-806B9514 00012C 0148+00 1/1 0/0 0/0 .text CreateHeap__8daE_FK_cFv */ int daE_FK_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_fk", 15); - JUT_ASSERT(189, modelData != 0); + 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); 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 28a860e8f4..b98fcd5ae4 100644 --- a/src/d/actor/d_a_e_fm.cpp +++ b/src/d/actor/d_a_e_fm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_fm.h" #include "d/d_com_inf_game.h" @@ -3595,7 +3595,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = static_cast(dComIfG_getObjectRes("E_fm", BMDE_FM_CORE)); - JUT_ASSERT(7257, modelData != 0); + JUT_ASSERT(7257, modelData != NULL); a_this->mpCoreModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (a_this->mpCoreModel == NULL) { return 0; @@ -3659,10 +3659,10 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = static_cast(dComIfG_getObjectRes("E_fm", BMDR_KUSARI)); - JUT_ASSERT(7404, modelData != 0); + JUT_ASSERT(7404, modelData != NULL); J3DModelData* modelData2 = static_cast(dComIfG_getObjectRes("E_fm", BMDR_HANDLE)); - JUT_ASSERT(7408, modelData2 != 0); + JUT_ASSERT(7408, modelData2 != NULL); for (int i = 0; i < 4; i++) { for (int j = 0; j < 26; j++) { diff --git a/src/d/actor/d_a_e_fs.cpp b/src/d/actor/d_a_e_fs.cpp index b3f1b2bbd8..fd61653232 100644 --- a/src/d/actor/d_a_e_fs.cpp +++ b/src/d/actor/d_a_e_fs.cpp @@ -3,7 +3,7 @@ * Enemy - Puppet */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_fs.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_e_fz.cpp b/src/d/actor/d_a_e_fz.cpp index bd08802607..f5be87ec6a 100644 --- a/src/d/actor/d_a_e_fz.cpp +++ b/src/d/actor/d_a_e_fz.cpp @@ -3,7 +3,7 @@ * @brief Enemy - Mini Freezard */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_fz.h" #include "f_op/f_op_actor_enemy.h" @@ -377,7 +377,7 @@ bool daE_FZ_c::way_gake_check() { gnd_chk.SetPos(&field_0x6e8); field_0x6e8.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (field_0x6e8.y == -1e+09f) { + if (field_0x6e8.y == -G_CM3D_F_INF) { field_0x6e8.y = current.pos.y; return true; } else if (current.pos.y - field_0x6e8.y > 100.0f) { @@ -782,7 +782,7 @@ void daE_FZ_c::action() { gnd_chk.SetPos(&pos); pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (pos.y != -1e+09f) { + if (pos.y != -G_CM3D_F_INF) { field_0x710 = 0; if (current.pos.y - pos.y > 400.0f && field_0x713 == 0) { diff --git a/src/d/actor/d_a_e_ga.cpp b/src/d/actor/d_a_e_ga.cpp index 879a2658fc..7f6d17d02a 100644 --- a/src/d/actor/d_a_e_ga.cpp +++ b/src/d/actor/d_a_e_ga.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ga.h" #include "d/d_com_inf_game.h" @@ -185,7 +185,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { e_ga_class* a_this = (e_ga_class*)i_this; void* modelData = dComIfG_getObjectRes("E_Ga", 3); - JUT_ASSERT(450, modelData != 0); + JUT_ASSERT(450, modelData != NULL); for (int i = 0; i < a_this->ga_num; i++) { a_this->ga_s[i].model = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x20000, 0x11000084); @@ -255,7 +255,7 @@ static int daE_Ga_Create(fopAc_ac_c* i_this) { daE_Ga_Execute(a_this); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ga", 3); - JUT_ASSERT(536, modelData != 0); + JUT_ASSERT(536, modelData != NULL); if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(i_this), FALSE) == -1) { // "Moth: Simple Model addition failed.\n" diff --git a/src/d/actor/d_a_e_gb.cpp b/src/d/actor/d_a_e_gb.cpp index cce42938f7..781b0b5506 100644 --- a/src/d/actor/d_a_e_gb.cpp +++ b/src/d/actor/d_a_e_gb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_gb.h" #include "d/d_cc_d.h" @@ -1556,7 +1556,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { i_this->mBrkAnm->setPlaySpeed(0.0f); J3DModelData* modelData = static_cast(dComIfG_getObjectRes("E_gb", 32)); - JUT_ASSERT(3378, modelData != 0); + JUT_ASSERT(3378, modelData != NULL); for (int i = 0; i < 18; i++) { i_this->field_0x828[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -1569,7 +1569,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { if (strcmp(dComIfGp_getStartStageName(), "D_MN05") == 0) { modelData = static_cast(dComIfG_getObjectRes("E_gb", 30)); - JUT_ASSERT(3395, modelData != 0); + JUT_ASSERT(3395, modelData != NULL); i_this->field_0x66c = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->field_0x66c == NULL) { return 0; diff --git a/src/d/actor/d_a_e_ge.cpp b/src/d/actor/d_a_e_ge.cpp index a6de69660e..ce63b178f3 100644 --- a/src/d/actor/d_a_e_ge.cpp +++ b/src/d/actor/d_a_e_ge.cpp @@ -3,7 +3,7 @@ * Enemy - Guay */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ge.h" #include "d/d_cc_d.h" @@ -1007,7 +1007,7 @@ COMPILER_STRIP_GATE(0x806CD104, &lit_5842); /* 806CD108-806CD10C 000108 0004+00 0/1 0/0 0/0 .rodata @5843 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_5843 = -1000000000.0f; +SECTION_RODATA static f32 const lit_5843 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x806CD108, &lit_5843); #pragma pop diff --git a/src/d/actor/d_a_e_gi.cpp b/src/d/actor/d_a_e_gi.cpp index 034dcf2f2f..5094e8297c 100644 --- a/src/d/actor/d_a_e_gi.cpp +++ b/src/d/actor/d_a_e_gi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_gi.h" #include "d/d_com_inf_game.h" @@ -342,7 +342,7 @@ void daE_GI_c::setDragSwordEffect() { gndchk.SetPos(&pos); f32 ground_height = dComIfG_Bgsp().GroundCross(&gndchk); - if (-1000000000.0f != ground_height) { + if (-G_CM3D_F_INF != ground_height) { pos.y = ground_height; } @@ -1025,7 +1025,7 @@ static int daE_GI_Delete(daE_GI_c* a_this) { /* 806D00E8-806D025C 002D48 0174+00 1/1 0/0 0/0 .text CreateHeap__8daE_GI_cFv */ int daE_GI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x13); - JUT_ASSERT(1621, modelData != 0); + 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); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { @@ -1042,7 +1042,7 @@ int daE_GI_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("E_GI", 0x14); - JUT_ASSERT(1652, modelData != 0); + JUT_ASSERT(1652, modelData != NULL); mpSwordModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpSwordModel == NULL) { return 0; diff --git a/src/d/actor/d_a_e_gm.cpp b/src/d/actor/d_a_e_gm.cpp index ee48307888..7c98ce671d 100644 --- a/src/d/actor/d_a_e_gm.cpp +++ b/src/d/actor/d_a_e_gm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_gm.h" #include "f_op/f_op_actor_enemy.h" @@ -1713,7 +1713,7 @@ int daE_GM_c::CreateHeap() { if (mType == TYPE_GOMA) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_mg", BMDV_MD); - JUT_ASSERT(2683, modelData != 0); + JUT_ASSERT(2683, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_mg", 9), 0, 1.0f, 0, -1, &mSound, 0, 0x11000084); @@ -1721,7 +1721,7 @@ int daE_GM_c::CreateHeap() { if (mType != TYPE_NORMAL) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_gm", BMDE_GOMA_EGG); - JUT_ASSERT(2701, modelData != 0); + JUT_ASSERT(2701, modelData != NULL); mpEggModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpEggModel == NULL) { @@ -1731,7 +1731,7 @@ int daE_GM_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes("E_gm", BMDV_GB); - JUT_ASSERT(2714, modelData != 0); + JUT_ASSERT(2714, modelData != NULL); mpModelMorf = 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 5458b97e5a..64c9c80e65 100644 --- a/src/d/actor/d_a_e_gob.cpp +++ b/src/d/actor/d_a_e_gob.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_gob.h" #include "d/d_com_inf_game.h" @@ -1584,14 +1584,14 @@ static void action(e_gob_class* i_this) { sp7C.SetPos(&sp4C); sp4C.y = dComIfG_Bgsp().GroundCross(&sp7C); - if (-1000000000.0f != sp4C.y) { + if (-G_CM3D_F_INF != sp4C.y) { sp58.x = sp4C.x; sp58.y = 50.0f + sp4C.y; sp58.z = sp4C.z + temp_f28; sp7C.SetPos(&sp58); sp58.y = dComIfG_Bgsp().GroundCross(&sp7C); - if (-1000000000.0f != sp58.y) { + if (-G_CM3D_F_INF != sp58.y) { f32 var_f30 = sp58.y - sp4C.y; f32 var_f24 = sp58.z - sp4C.z; sp1A = -cM_atan2s(var_f30, var_f24); @@ -1606,7 +1606,7 @@ static void action(e_gob_class* i_this) { sp7C.SetPos(&sp58); sp58.y = dComIfG_Bgsp().GroundCross(&sp7C); - if (-1000000000.0f != sp58.y) { + if (-G_CM3D_F_INF != sp58.y) { f32 var_f30 = sp58.y - sp4C.y; f32 var_f25 = sp58.x - sp4C.x; sp18 = (s16)cM_atan2s(var_f30, var_f25); @@ -2288,7 +2288,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } void* modelData = dComIfG_getObjectRes("E_gob", BMDR_MG_MET); - JUT_ASSERT(3631, modelData != 0); + JUT_ASSERT(3631, modelData != NULL); a_this->mpArmorModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); if (a_this->mpArmorModel == NULL) { return 0; diff --git a/src/d/actor/d_a_e_gs.cpp b/src/d/actor/d_a_e_gs.cpp index 773d57f5d8..e6878a35e8 100644 --- a/src/d/actor/d_a_e_gs.cpp +++ b/src/d/actor/d_a_e_gs.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_gs.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_hb.cpp b/src/d/actor/d_a_e_hb.cpp index c05fddf2dd..99e27d1c17 100644 --- a/src/d/actor/d_a_e_hb.cpp +++ b/src/d/actor/d_a_e_hb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_hb.h" #include "d/actor/d_a_e_hb_leaf.h" @@ -1384,7 +1384,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_hb", 0x19); - JUT_ASSERT(3031, modelData != 0); + JUT_ASSERT(3031, modelData != NULL); for (int i = 1; i < 11; i++) { if (i & 1) { diff --git a/src/d/actor/d_a_e_hb_leaf.cpp b/src/d/actor/d_a_e_hb_leaf.cpp index 39a3721b55..35ffe0e7af 100644 --- a/src/d/actor/d_a_e_hb_leaf.cpp +++ b/src/d/actor/d_a_e_hb_leaf.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_hb_leaf.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_hm.cpp b/src/d/actor/d_a_e_hm.cpp index 84898dc2c3..4812afbc2d 100644 --- a/src/d/actor/d_a_e_hm.cpp +++ b/src/d/actor/d_a_e_hm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_hm.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_e_hp.cpp b/src/d/actor/d_a_e_hp.cpp index e63916738f..11897fa65c 100644 --- a/src/d/actor/d_a_e_hp.cpp +++ b/src/d/actor/d_a_e_hp.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_hp.h" #include "d/actor/d_a_alink.h" @@ -830,7 +830,7 @@ void daE_HP_c::action() { } daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); - if (mObjAcch.GetGroundH() != -1000000000.0f) { + if (mObjAcch.GetGroundH() != -G_CM3D_F_INF) { if (arg0 != 2 || mAction == 5 || mAction == 6) { gravity = -3.0f; if ((mAction == 5 && field_0x780 == 9 || mAction == 6) && mObjAcch.ChkGroundHit()) { @@ -885,7 +885,7 @@ void daE_HP_c::action() { field_0x768 = field_0x7a4 + (20.0f + NREG_F(4)) * cM_ssin((f32)field_0x7a8 * (1000.0f + NREG_F(3))); - if (mObjAcch.GetGroundH() != -1000000000.0f) { + if (mObjAcch.GetGroundH() != -G_CM3D_F_INF) { field_0x72c.y = mObjAcch.GetGroundH(); } @@ -1153,7 +1153,7 @@ static int daE_HP_Delete(daE_HP_c* i_this) { /* 806E9240-806E94FC 003540 02BC+00 1/1 0/0 0/0 .text CreateHeap__8daE_HP_cFv */ int daE_HP_c::CreateHeap() { J3DModelData* modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 19); - JUT_ASSERT(0x764, modeldata != 0) + JUT_ASSERT(0x764, modeldata != NULL); mpMorfSO = new mDoExt_McaMorfSO(modeldata, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HP", 13), 2, 1.0f, 0, -1, &mSound1, 0x80000, 0x11000084); @@ -1175,7 +1175,7 @@ int daE_HP_c::CreateHeap() { } modeldata = (J3DModelData*)dComIfG_getObjectRes("E_HP", 20); - JUT_ASSERT(0x78b, modeldata != 0); + JUT_ASSERT(0x78b, modeldata != NULL); mpModel = mDoExt_J3DModel__create(modeldata, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_e_hz.cpp b/src/d/actor/d_a_e_hz.cpp index 550eeb5e33..f0020b9d91 100644 --- a/src/d/actor/d_a_e_hz.cpp +++ b/src/d/actor/d_a_e_hz.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_e_hz.h" @@ -324,7 +324,7 @@ void daE_HZ_c::checkFall() { gnd_chk.SetPos(&modified_pos); f32 ground_cross = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (speed.y < 0.0f && ground_cross != -1000000000.0f) { + if (speed.y < 0.0f && ground_cross != -G_CM3D_F_INF) { s32 gnd_chk_ground_code = dComIfG_Bgsp().GetGroundCode(gnd_chk); if ((gnd_chk_ground_code == 4 || gnd_chk_ground_code == 10 || gnd_chk_ground_code == 5) && ground_cross + 500.0f > current.pos.y) @@ -346,7 +346,7 @@ void daE_HZ_c::setCloseSmokeEffect() { modified_pos.y += 100.0f; gnd_chk.SetPos(&modified_pos); - if (dComIfG_Bgsp().GroundCross(&gnd_chk) != -1000000000.0f) { + if (dComIfG_Bgsp().GroundCross(&gnd_chk) != -G_CM3D_F_INF) { dComIfGp_particle_setPolyColor(dPa_RM(ID_ZM_S_HAZIKIPLATESMOKE00), gnd_chk, &mSmokeEffectPosition, &tevStr, &shape_angle, NULL, 0, NULL, -1, NULL); } @@ -1905,7 +1905,7 @@ int daE_HZ_c::JointCallBack(J3DJoint* i_joint, int param_1) { /* 806EF8CC-806EFB34 0053AC 0268+00 1/1 0/0 0/0 .text CreateHeap__8daE_HZ_cFv */ int daE_HZ_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_HZ", 0x16); - JUT_ASSERT(2479, modelData != 0); + JUT_ASSERT(2479, modelData != NULL); mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_HZ", 0x10), 0, 1.0f, @@ -1921,7 +1921,7 @@ int daE_HZ_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes(mpName, 3); } - JUT_ASSERT(2505, modelData != 0); + JUT_ASSERT(2505, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -1942,7 +1942,7 @@ int daE_HZ_c::CreateHeap() { mpBgW->SetCrrFunc(dBgS_MoveBGProc_Typical); modelData = (J3DModelData*)dComIfG_getObjectRes("E_HZ", 0x17); - JUT_ASSERT(2532, modelData != 0); + JUT_ASSERT(2532, modelData != NULL); mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel2 == NULL) { @@ -1973,7 +1973,7 @@ void daE_HZ_c::setInitPos() { gnd_chk.SetPos(&modified_home_pos); f32 ground_cross = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (ground_cross != -1000000000.0f) { + if (ground_cross != -G_CM3D_F_INF) { home.pos.y = ground_cross; old.pos.y = ground_cross; current.pos.y = ground_cross; diff --git a/src/d/actor/d_a_e_hzelda.cpp b/src/d/actor/d_a_e_hzelda.cpp index b6250d4c70..d88081638f 100644 --- a/src/d/actor/d_a_e_hzelda.cpp +++ b/src/d/actor/d_a_e_hzelda.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_hzelda.h" #include "d/actor/d_a_player.h" @@ -1352,14 +1352,14 @@ static int useHeapInit(fopAc_ac_c* i_this) { } J3DModelData* modelData = static_cast(dComIfG_getObjectRes("Hzelda", 0x1C)); - JUT_ASSERT(2129, modelData != 0); + JUT_ASSERT(2129, modelData != NULL); a_this->mpSwordModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpSwordModel == NULL) { return 0; } modelData = static_cast(dComIfG_getObjectRes("Hzelda", 0x1A)); - JUT_ASSERT(2149, modelData != 0); + JUT_ASSERT(2149, modelData != NULL); a_this->mpTriangleAtModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (a_this->mpTriangleAtModel == NULL) { return 0; diff --git a/src/d/actor/d_a_e_is.cpp b/src/d/actor/d_a_e_is.cpp index 1760e7d503..6bb8672050 100644 --- a/src/d/actor/d_a_e_is.cpp +++ b/src/d/actor/d_a_e_is.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_is.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_kg.cpp b/src/d/actor/d_a_e_kg.cpp index 8a79e13120..5520ea1a18 100644 --- a/src/d/actor/d_a_e_kg.cpp +++ b/src/d/actor/d_a_e_kg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_kg.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_e_kk.cpp b/src/d/actor/d_a_e_kk.cpp index fa1fda29e3..18d12d4fce 100644 --- a/src/d/actor/d_a_e_kk.cpp +++ b/src/d/actor/d_a_e_kk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_kk.h" #include "d/actor/d_a_player.h" @@ -404,7 +404,7 @@ bool daE_KK_c::way_gake_check() { gndChk.SetPos(&field_0x6d4[i]); field_0x6d4[i].y = dComIfG_Bgsp().GroundCross(&gndChk); - if (field_0x6d4[i].y == -1000000000.0f) { + if (field_0x6d4[i].y == -G_CM3D_F_INF) { field_0x6d4[i].y = current.pos.y; return true; } @@ -1166,7 +1166,7 @@ void daE_KK_c::action() { position.y += 300.0f; gndChk.SetPos(&position); position.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (position.y == -1000000000.0f) { + if (position.y == -G_CM3D_F_INF) { mTimer = 100; setActionMode(10, 2); } else { @@ -1362,7 +1362,7 @@ static int daE_KK_Delete(daE_KK_c* i_this) { int daE_KK_c::CreateHeap() { if (field_0x679 != 1) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x22); - JUT_ASSERT(2212, modelData != 0); + JUT_ASSERT(2212, modelData != NULL); mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_KK", 0x19), 0, @@ -1380,7 +1380,7 @@ int daE_KK_c::CreateHeap() { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_KK", 0x23); - JUT_ASSERT(2247, modelData != 0); + JUT_ASSERT(2247, modelData != NULL); mpWeaponMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_KK", 0x1D), 0, diff --git a/src/d/actor/d_a_e_kr.cpp b/src/d/actor/d_a_e_kr.cpp index 7ce0bd5372..662199050b 100644 --- a/src/d/actor/d_a_e_kr.cpp +++ b/src/d/actor/d_a_e_kr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_kr.h" #include "d/actor/d_a_horse.h" @@ -1881,13 +1881,13 @@ static void ground_angle_set(e_kr_class* i_this) { unkXyz3.y += 100.0f; gndChk.SetPos(&unkXyz3); unkXyz3.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (unkXyz3.y != -1e+09f) { + if (unkXyz3.y != -G_CM3D_F_INF) { unkVec1.x = unkXyz3.x; unkVec1.y = unkXyz3.y + 100.0f; unkVec1.z = unkXyz3.z + unkFloat1; gndChk.SetPos(&unkVec1); unkVec1.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (unkVec1.y != -1e+09f) { + if (unkVec1.y != -G_CM3D_F_INF) { diffY = unkVec1.y - unkXyz3.y; diffZ = unkVec1.z - unkXyz3.z; unkShort2 = -cM_atan2s(diffY, diffZ); @@ -1901,7 +1901,7 @@ static void ground_angle_set(e_kr_class* i_this) { unkVec1.z = unkXyz3.z; gndChk.SetPos(&unkVec1); unkVec1.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (unkVec1.y != -1e+09f) { + if (unkVec1.y != -G_CM3D_F_INF) { diffY = unkVec1.y - unkXyz3.y; diffZ = unkVec1.x - unkXyz3.x; unkShort1 = (s16)cM_atan2s(diffY, diffZ); diff --git a/src/d/actor/d_a_e_mb.cpp b/src/d/actor/d_a_e_mb.cpp index 07e3351555..a833f432b4 100644 --- a/src/d/actor/d_a_e_mb.cpp +++ b/src/d/actor/d_a_e_mb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_mb.h" #include "d/actor/d_a_b_bq.h" diff --git a/src/d/actor/d_a_e_md.cpp b/src/d/actor/d_a_e_md.cpp index b351886c4b..f262de4310 100644 --- a/src/d/actor/d_a_e_md.cpp +++ b/src/d/actor/d_a_e_md.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_md.h" #include "d/d_com_inf_game.h" @@ -66,7 +66,7 @@ int daE_MD_c::CreateHeap() { modelData = dComIfG_getObjectRes("E_MD", 9); } - JUT_ASSERT(180, modelData != 0); + JUT_ASSERT(180, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO((J3DModelData*)modelData, NULL, NULL, NULL, 2, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_mf.cpp b/src/d/actor/d_a_e_mf.cpp index 05fe2eb811..cb8f610ce0 100644 --- a/src/d/actor/d_a_e_mf.cpp +++ b/src/d/actor/d_a_e_mf.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_mf.h" #include "d/d_cc_d.h" @@ -2692,14 +2692,14 @@ static void action(e_mf_class* i_this) { gnd_chk.SetPos(&sp264); sp264.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp264.y != -1000000000.0f) { + if (sp264.y != -G_CM3D_F_INF) { sp258.x = sp264.x; sp258.y = sp264.y + 100.0f; sp258.z = sp264.z + fVar1; gnd_chk.SetPos(&sp258); sp258.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp258.y != -1000000000.0f) { + if (sp258.y != -G_CM3D_F_INF) { sVar7 = -cM_atan2s(sp258.y - sp264.y, sp258.z - sp264.z); if (sVar7 > 0x3000 || sVar7 < -0x3000) { sVar7 = 0; @@ -2711,7 +2711,7 @@ static void action(e_mf_class* i_this) { sp258.z = sp264.z; gnd_chk.SetPos(&sp258); sp258.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp258.y != -1000000000.0f) { + if (sp258.y != -G_CM3D_F_INF) { sVar6 = cM_atan2s(sp258.y - sp264.y, sp258.x - sp264.x); if (sVar6 > 0x3000 || sVar6 < -0x3000) { sVar6 = 0; @@ -3173,14 +3173,14 @@ static int useHeapInit(fopAc_ac_c* a_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_mf", 39); - JUT_ASSERT(5274, modelData != 0); + JUT_ASSERT(5274, modelData != NULL); i_this->mpAxeModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpAxeModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes("E_mf", 40); - JUT_ASSERT(5286, modelData != 0); + JUT_ASSERT(5286, modelData != NULL); i_this->mpShieldModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpShieldModel == NULL) { return 0; diff --git a/src/d/actor/d_a_e_mk.cpp b/src/d/actor/d_a_e_mk.cpp index 2090fba076..c20c6ae392 100644 --- a/src/d/actor/d_a_e_mk.cpp +++ b/src/d/actor/d_a_e_mk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_mk.h" #include "d/d_cc_d.h" @@ -2773,7 +2773,7 @@ static int useHeapInit(fopAc_ac_c* actor) { } J3DModelData* i_modelData = (J3DModelData*)dComIfG_getObjectRes("E_mk", 46); - JUT_ASSERT(4743, i_modelData != 0); + JUT_ASSERT(4743, i_modelData != NULL); i_this->mpBoomerangModel = mDoExt_J3DModel__create(i_modelData, 0x80000, 0x11000084); if (i_this->mpBoomerangModel == NULL) { return 0; diff --git a/src/d/actor/d_a_e_mk_bo.cpp b/src/d/actor/d_a_e_mk_bo.cpp index 909583c2f9..e74617d70c 100644 --- a/src/d/actor/d_a_e_mk_bo.cpp +++ b/src/d/actor/d_a_e_mk_bo.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_mk_bo.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_e_mm.cpp b/src/d/actor/d_a_e_mm.cpp index 8073b360aa..92bf65baa9 100644 --- a/src/d/actor/d_a_e_mm.cpp +++ b/src/d/actor/d_a_e_mm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_mm.h" #include "d/d_cc_d.h" @@ -478,7 +478,7 @@ COMPILER_STRIP_GATE(0x80722CA8, &lit_4141); /* 80722CAC-80722CB0 000070 0004+00 0/1 0/0 0/0 .rodata @4142 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4142 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4142 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80722CAC, &lit_4142); #pragma pop diff --git a/src/d/actor/d_a_e_mm_mt.cpp b/src/d/actor/d_a_e_mm_mt.cpp index 19f887e18a..69e82d703a 100644 --- a/src/d/actor/d_a_e_mm_mt.cpp +++ b/src/d/actor/d_a_e_mm_mt.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_mm_mt.h" #include "d/d_cc_d.h" @@ -287,7 +287,7 @@ COMPILER_STRIP_GATE(0x807258C0, &lit_4091); /* 807258C4-807258C8 00006C 0004+00 0/1 0/0 0/0 .rodata @4092 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4092 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4092 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x807258C4, &lit_4092); #pragma pop diff --git a/src/d/actor/d_a_e_ms.cpp b/src/d/actor/d_a_e_ms.cpp index 0445d8a5ce..ac6f942456 100644 --- a/src/d/actor/d_a_e_ms.cpp +++ b/src/d/actor/d_a_e_ms.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ms.h" #include "Z2AudioLib/Z2Instances.h" diff --git a/src/d/actor/d_a_e_nest.cpp b/src/d/actor/d_a_e_nest.cpp index 27c6b85fea..6c2bb01c87 100644 --- a/src/d/actor/d_a_e_nest.cpp +++ b/src/d/actor/d_a_e_nest.cpp @@ -3,7 +3,7 @@ * Enemy - Beehive */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_nest.h" #include "d/actor/d_a_npc_tk.h" diff --git a/src/d/actor/d_a_e_nz.cpp b/src/d/actor/d_a_e_nz.cpp index 32a69d41bc..f0505c12c2 100644 --- a/src/d/actor/d_a_e_nz.cpp +++ b/src/d/actor/d_a_e_nz.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_nz.h" #include "c/c_damagereaction.h" diff --git a/src/d/actor/d_a_e_oc.cpp b/src/d/actor/d_a_e_oc.cpp index 9b51906755..30a1d0d531 100644 --- a/src/d/actor/d_a_e_oc.cpp +++ b/src/d/actor/d_a_e_oc.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_oc.h" #include "d/d_camera.h" @@ -449,7 +449,7 @@ int daE_OC_c::checkBeforeFloorBg(f32 arg) { cLib_offsetPos(&my_vec_0, ¤t.pos, shape_angle.y, &my_vec_1); gnd_chk_spl.SetPos(&my_vec_0); f32 val_0 = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); - if (val_0 != -1e+09f) { + if (val_0 != -G_CM3D_F_INF) { gnd_chk.SetPos(&my_vec_0); if (val_0 >= dComIfG_Bgsp().GroundCross(&gnd_chk)) return 1; @@ -499,7 +499,7 @@ void daE_OC_c::setGroundAngle() { my_vec_0.z = my_vec_2.z + 80.0f; gnd_chk.SetPos(&my_vec_0); my_vec_0.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (my_vec_0.y != -1e+09f && (f32)fabs(my_vec_0.y - my_vec_2.y) < 50.0f) { + if (my_vec_0.y != -G_CM3D_F_INF && (f32)fabs(my_vec_0.y - my_vec_2.y) < 50.0f) { my_vec_3 = my_vec_0 - my_vec_2; field_0x688.x = -cM_atan2s(my_vec_3.y, my_vec_3.z); } @@ -508,7 +508,7 @@ void daE_OC_c::setGroundAngle() { my_vec_1.z = my_vec_2.z; gnd_chk.SetPos(&my_vec_1); my_vec_1.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (my_vec_1.y != -1e+09f && (f32)fabs(my_vec_1.y - my_vec_2.y) < 50.0f) { + if (my_vec_1.y != -G_CM3D_F_INF && (f32)fabs(my_vec_1.y - my_vec_2.y) < 50.0f) { my_vec_3 = my_vec_1 - my_vec_2; field_0x688.z = cM_atan2s(my_vec_3.y, my_vec_3.x); } @@ -1227,10 +1227,10 @@ void daE_OC_c::setWeaponGroundAngle() { my_vec_1.y += 100.0f; gnd_chk.SetPos(&my_vec_0); my_vec_0.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (my_vec_0.y != -1e+09f) { + if (my_vec_0.y != -G_CM3D_F_INF) { gnd_chk.SetPos(&my_vec_1); my_vec_1.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (my_vec_1.y != -1e+09f) { + if (my_vec_1.y != -G_CM3D_F_INF) { f32 my_float = my_vec_0.absXZ(my_vec_1); my_val = (s16) -cM_atan2s(my_vec_1.y - my_vec_0.y, my_float); if (my_val < -0x2000) { @@ -2009,7 +2009,7 @@ void daE_OC_c::checkFall() { } if (mActionMode != 0xD && mActionMode != 0xE && mActionMode != 10 && mActionMode != 0xB && mActionMode != 0xC && speed.y < 0.0f) { - if (groundY == -1000000000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 + if (groundY == -G_CM3D_F_INF || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { if (field_0x69c > current.pos.y) { @@ -2251,7 +2251,7 @@ bool daE_OC_c::checkWaterSurface() { gnd_chk_spl.SetPos((Vec*)&my_vec_0); mWaterLvl = dComIfG_Bgsp().GroundCross(&gnd_chk_spl); if (mAcch.ChkGroundHit()) { - mWaterLvl = -1e9f; + mWaterLvl = -G_CM3D_F_INF; } if (mWaterLvl > (current.pos.y - 140.0f)) { return 1; diff --git a/src/d/actor/d_a_e_oct_bg.cpp b/src/d/actor/d_a_e_oct_bg.cpp index a0a38fa7af..49bf54634d 100644 --- a/src/d/actor/d_a_e_oct_bg.cpp +++ b/src/d/actor/d_a_e_oct_bg.cpp @@ -2,7 +2,7 @@ // d_a_e_oct_bg // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "dolphin/types.h" @@ -808,7 +808,7 @@ int daE_OctBg_c::JointCallBack(J3DJoint* param_0, int param_1) { /* 8073921C-807393DC 0030FC 01C0+00 1/1 0/0 0/0 .text CreateHeap__11daE_OctBg_cFv */ int daE_OctBg_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_bg", 10); - JUT_ASSERT(1341, modelData != 0); + JUT_ASSERT(1341, modelData != NULL); field_0x5b4 = new mDoExt_McaMorfSO( modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_bg", 7), 0, 1.0f, 0, -1, &field_0x5bc, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_ot.cpp b/src/d/actor/d_a_e_ot.cpp index f6fb73aebe..5df9ad2008 100644 --- a/src/d/actor/d_a_e_ot.cpp +++ b/src/d/actor/d_a_e_ot.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ot.h" #include "Z2AudioLib/Z2Instances.h" diff --git a/src/d/actor/d_a_e_ph.cpp b/src/d/actor/d_a_e_ph.cpp index 29b1854f42..6795d0cfa5 100644 --- a/src/d/actor/d_a_e_ph.cpp +++ b/src/d/actor/d_a_e_ph.cpp @@ -3,7 +3,7 @@ * Peahat Enemy */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ph.h" #include "SSystem/SComponent/c_math.h" @@ -167,7 +167,7 @@ void daE_PH_c::setCcSph() { int daE_PH_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PH", PH_BMD); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_PH", ANM_WAIT), @@ -206,7 +206,7 @@ void daE_PH_c::SetAnm(int i_anmID, int i_attr, f32 i_morf, f32 i_speed) { /* 8073DBD4-8073DDF8 000874 0224+00 1/1 0/0 0/0 .text SearchNearP__8daE_PH_cFv */ void daE_PH_c::SearchNearP() { - f32 nearest_dist = 1000000000.0f; + f32 nearest_dist = G_CM3D_F_INF; for (int i = 0; i < mpPath->m_num; i++) { f32 pnt_dist = current.pos.absXZ(dPath_GetPnt(mpPath, i)->m_position); @@ -317,7 +317,7 @@ void daE_PH_c::GoTarget() { cLib_chaseAngleS(&field_0x612, field_0x610 * mAnmSpeed, 0x10); mpMorf->setPlaySpeed(mAnmSpeed); - if (mAcch.GetGroundH() != -1000000000.0f && current.pos.y < mAcch.GetGroundH() + 100.0f) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF && current.pos.y < mAcch.GetGroundH() + 100.0f) { current.pos.y = mAcch.GetGroundH() + 100.0f; } } @@ -512,7 +512,7 @@ void daE_PH_c::S_SetPlaySpeed() { void daE_PH_c::S_GoTarget() { cXyz unused(mCurrentPntPos.x, mCurrentPntPos.y, mCurrentPntPos.z); - if (mAcch.GetGroundH() != -1000000000.0f && current.pos.y < mAcch.GetGroundH() + 100.0f) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF && current.pos.y < mAcch.GetGroundH() + 100.0f) { current.pos.y = mAcch.GetGroundH() + 100.0f; } diff --git a/src/d/actor/d_a_e_pm.cpp b/src/d/actor/d_a_e_pm.cpp index c97c161adb..d4783fedad 100644 --- a/src/d/actor/d_a_e_pm.cpp +++ b/src/d/actor/d_a_e_pm.cpp @@ -3,7 +3,7 @@ * Enemy - Skull Kid */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_pm.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_e_po.cpp b/src/d/actor/d_a_e_po.cpp index 3919daec07..afe1621ec1 100644 --- a/src/d/actor/d_a_e_po.cpp +++ b/src/d/actor/d_a_e_po.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_po.h" #include "d/actor/d_a_obj_poFire.h" @@ -1012,7 +1012,7 @@ static void e_po_dead(e_po_class* i_this) { i_this->field_0x74A[0] = 20; break; } else { - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_this->field_0x788.y = i_this->mAcch.GetGroundH(); } } @@ -1051,7 +1051,7 @@ static void e_po_dead(e_po_class* i_this) { PSMTXCopy(model->getAnmMtx(0x15), *calc_mtx); local_100.set(50.0f, 0.0f, 0.0f); MtxPosition(&local_100, &i_this->field_0x788); - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_this->field_0x788.y = i_this->mAcch.GetGroundH(); } } @@ -1064,7 +1064,7 @@ static void e_po_dead(e_po_class* i_this) { i_this->field_0x74A[2] = 50; Z2GetAudioMgr()->seStart(Z2SE_OBJ_FIRE_EMERGE, &i_this->field_0x788, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0); - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_this->field_0x7C4 = ((70.0f + i_this->mAcch.GetGroundH()) - i_this->field_0x788.y) / 60.0f; Z2GetAudioMgr()->seStartLevel(Z2SE_OBJ_FIRE_FLY, &a_this->current.pos, 0, 0, @@ -1100,7 +1100,7 @@ static void e_po_dead(e_po_class* i_this) { } } bool var_r0 = FALSE; - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { if ((70.0f + i_this->mAcch.GetGroundH()) <= i_this->field_0x788.y) { var_r0 = TRUE; } @@ -1282,7 +1282,7 @@ static void e_po_dead(e_po_class* i_this) { i_this->field_0x838.set(cStack_10c); camera_player->mCamera.Set(i_this->field_0x844, i_this->field_0x838); } - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { cLib_addCalc2(&a_this->current.pos.y, i_this->mAcch.GetGroundH(), 0.05f, 15.0f); } return; @@ -1305,7 +1305,7 @@ static f32 e_rollingMove(e_po_class* i_this, s16 param_1, f32 param_2, f32 param local_38.set(player_p->current.pos); cLib_addCalc2(&i_this->field_0x820.x, local_38.x, 0.7f, param_3); cLib_addCalc2(&i_this->field_0x820.z, local_38.z, 0.7f, param_3); - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_this->field_0x820.y = i_this->mAcch.GetGroundH(); } cStack_44 += i_this->field_0x820; @@ -1365,7 +1365,7 @@ static void e_po_limbering(e_po_class* i_this) { a_this->current.angle.y = fopAcM_searchPlayerAngleY(a_this); a_this->shape_angle.y = a_this->current.angle.y + 0x8000; i_this->field_0x820 = player_p->current.pos; - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_this->field_0x820.y = i_this->mAcch.GetGroundH(); } a_this->attention_info.distances[fopAc_attn_BATTLE_e] = 25; @@ -1423,7 +1423,7 @@ static void e_po_limbering(e_po_class* i_this) { case 1: i_this->field_0x820.set(player_p->current.pos); - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_this->field_0x820.y = i_this->mAcch.GetGroundH(); } local_48 = a_this->current.pos - i_this->field_0x82C; @@ -1578,7 +1578,7 @@ static void e_po_roll_move(e_po_class* i_this) { } i_this->field_0x7E0 = i_this->field_0x7E2; i_this->field_0x820.set(player_p->current.pos); - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_this->field_0x820.y = i_this->mAcch.GetGroundH(); } i_this->mSph2.OffCoSetBit(); @@ -1642,7 +1642,7 @@ static void e_po_roll_move(e_po_class* i_this) { i_this->field_0x804 = 600.0f + ZREG_F(8); } i_this->field_0x820.set(player_p->current.pos); - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_this->field_0x820.y = i_this->mAcch.GetGroundH(); } cLib_addCalc2(&i_this->field_0x7D4, 100.0f, 0.5f, 10.0f); @@ -3116,7 +3116,7 @@ static int daE_PO_Create(fopAc_ac_c* i_act_this) { i_this->mActionID = ACT_DEAD; i_this->mType = 9; fopAcM_SetMtx(i_act_this, i_this->mpMorf3->getModel()->getBaseTRMtx()); - if (i_this->mAcch.GetGroundH() != -1e9f) { + if (i_this->mAcch.GetGroundH() != -G_CM3D_F_INF) { i_act_this->current.pos.y = i_this->mAcch.GetGroundH(); } i_this->mpMorf3->setStartFrame(95.0f); diff --git a/src/d/actor/d_a_e_pz.cpp b/src/d/actor/d_a_e_pz.cpp index 011a8e46dc..60e05c4327 100644 --- a/src/d/actor/d_a_e_pz.cpp +++ b/src/d/actor/d_a_e_pz.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_pz.h" #include "d/d_com_inf_game.h" @@ -2429,7 +2429,7 @@ static int daE_PZ_Delete(daE_PZ_c* i_this) { int daE_PZ_c::CreateHeap() { if (arg0 >= 20 && arg0 <= 23) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PZ", 0x18); - JUT_ASSERT(3876, modelData != 0); + JUT_ASSERT(3876, modelData != NULL); mpPortalModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mpPortalModel == NULL) { return 0; @@ -2457,7 +2457,7 @@ int daE_PZ_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("E_PZ", 0x19); - JUT_ASSERT(3920, modelData != 0); + 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); if (mpBallModelMorf == NULL) { return 0; @@ -2478,7 +2478,7 @@ int daE_PZ_c::CreateHeap() { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_PZ", 0x1C); - JUT_ASSERT(3959, modelData != 0); + 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); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { return 0; diff --git a/src/d/actor/d_a_e_rb.cpp b/src/d/actor/d_a_e_rb.cpp index eba7871a0e..7d9e534de7 100644 --- a/src/d/actor/d_a_e_rb.cpp +++ b/src/d/actor/d_a_e_rb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_rb.h" #include "d/d_com_inf_game.h" @@ -615,7 +615,7 @@ static void e_rb_base_1(e_rb_class* i_this) { sp108.SetPos(&sp68); f32 ground_y = dComIfG_Bgsp().GroundCross(&sp108); - if (-1000000000.0f != ground_y) { + if (-G_CM3D_F_INF != ground_y) { child[i]->enemy.current.pos = child[i]->enemy.old.pos = child[i]->field_0xa10; child[i]->enemy.old.pos.y = ground_y; child[i]->enemy.current.pos.y = ground_y; diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index 85a234ea4c..cf02587932 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_rd.h" #include "d/d_cc_d.h" @@ -5443,14 +5443,14 @@ static void action(e_rd_class* i_this) { gnd_chk.SetPos(&sp28c); sp28c.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp28c.y != -1000000000.0f) { + if (sp28c.y != -G_CM3D_F_INF) { sp280.x = sp28c.x; sp280.y = sp28c.y + 100.0f; sp280.z = sp28c.z + fVar2; gnd_chk.SetPos(&sp280); sp280.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp280.y != -1000000000.0f) { + if (sp280.y != -G_CM3D_F_INF) { sVar5 = -cM_atan2s(sp280.y - sp28c.y, sp280.z - sp28c.z); if (sVar5 > 0x3000 || sVar5 < -0x3000) { sVar5 = 0; @@ -5463,7 +5463,7 @@ static void action(e_rd_class* i_this) { gnd_chk.SetPos(&sp280); sp280.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (sp280.y != -1000000000.0f) { + if (sp280.y != -G_CM3D_F_INF) { sVar4 = cM_atan2s(sp280.y - sp28c.y, sp280.x - sp28c.x); if (sVar4 > 0x3000 || sVar4 < -0x3000) { sVar4 = 0; @@ -6368,7 +6368,7 @@ static int daE_RD_Execute(e_rd_class* i_this) { i_this->field_0x1294 = 0; - if (i_this->mObjAcch.GetGroundH() != -1000000000.0f && i_this->mObjAcch.ChkWaterHit() && i_this->mObjAcch.m_wtr.GetHeight() > a_this->current.pos.y) { + if (i_this->mObjAcch.GetGroundH() != -G_CM3D_F_INF && i_this->mObjAcch.ChkWaterHit() && i_this->mObjAcch.m_wtr.GetHeight() > a_this->current.pos.y) { i_this->field_0x1294 = 1; } } @@ -7061,7 +7061,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { if (i_this->mBossMode == 3) { if (i < 2) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_rdb", ikki2_boss_part_bmd[i]); - JUT_ASSERT(10672, modelData != 0); + JUT_ASSERT(10672, modelData != NULL); i_this->mpBossArmorParts[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpBossArmorParts[i] == NULL) { return 0; @@ -7071,7 +7071,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } } else if (i_this->mBossMode == 1 || i == 13) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_rdb", boss_part_bmd[i]); - JUT_ASSERT(10687, modelData != 0); + JUT_ASSERT(10687, modelData != NULL); i_this->mpBossArmorParts[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpBossArmorParts[i] == NULL) { return 0; @@ -7104,7 +7104,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_CLUB); } - JUT_ASSERT(10762, modelData != 0); + JUT_ASSERT(10762, modelData != NULL); i_this->field_0x694 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->field_0x694 == NULL) { @@ -7136,7 +7136,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_ARROW); } - JUT_ASSERT(10810, modelData != 0); + JUT_ASSERT(10810, modelData != NULL); i_this->field_0x694 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->field_0x694 == NULL) { @@ -7147,7 +7147,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, BMDR_RD_EYE); - JUT_ASSERT(10823, modelData != 0); + JUT_ASSERT(10823, modelData != NULL); for (u16 i = 0; i < 2; i++) { i_this->mpEyeModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_e_rdb.cpp b/src/d/actor/d_a_e_rdb.cpp index 4ef85389ae..ae996c8587 100644 --- a/src/d/actor/d_a_e_rdb.cpp +++ b/src/d/actor/d_a_e_rdb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_rdb.h" #include "Z2AudioLib/Z2Instances.h" @@ -1800,7 +1800,7 @@ static int useHeapInit(fopAc_ac_c* actor) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_rdb", e_rdb_class::BMDR_RB_ONO); - JUT_ASSERT(2827, modelData != 0); + JUT_ASSERT(2827, modelData != NULL); i_this->mpAxeModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpAxeModel != NULL) { return 1; diff --git a/src/d/actor/d_a_e_rdy.cpp b/src/d/actor/d_a_e_rdy.cpp index 0c5b96dd88..4c9fc92300 100644 --- a/src/d/actor/d_a_e_rdy.cpp +++ b/src/d/actor/d_a_e_rdy.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_rdy.h" #include "Z2AudioLib/Z2Instances.h" diff --git a/src/d/actor/d_a_e_s1.cpp b/src/d/actor/d_a_e_s1.cpp index 85419742f5..51da7d2599 100644 --- a/src/d/actor/d_a_e_s1.cpp +++ b/src/d/actor/d_a_e_s1.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_s1.h" #include "SSystem/SComponent/c_math.h" @@ -1898,14 +1898,14 @@ static int daE_S1_Execute(e_s1_class* i_this) { gndchk.SetPos(&spBC); spBC.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (-1000000000.0f != spBC.y) { + if (-G_CM3D_F_INF != spBC.y) { spC8.x = spBC.x; spC8.y = spBC.y + 100.0f; spC8.z = spBC.z + temp_f30; gndchk.SetPos(&spC8); spC8.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (-1000000000.0f != spC8.y) { + if (-G_CM3D_F_INF != spC8.y) { spA = -cM_atan2s(spC8.y - spBC.y, spC8.z - spBC.z); if (spA > 0x3000 || spA < -0x3000) { spA = 0; @@ -1918,7 +1918,7 @@ static int daE_S1_Execute(e_s1_class* i_this) { gndchk.SetPos(&spC8); spC8.y = dComIfG_Bgsp().GroundCross(&gndchk); - if (-1000000000.0f != spC8.y) { + if (-G_CM3D_F_INF != spC8.y) { spC = (s16)cM_atan2s(spC8.y - spBC.y, spC8.x - spBC.x); if (spC > 0x3000 || spC < -0x3000) { spC = 0; diff --git a/src/d/actor/d_a_e_sb.cpp b/src/d/actor/d_a_e_sb.cpp index a8e4103d4e..7ec5e01484 100644 --- a/src/d/actor/d_a_e_sb.cpp +++ b/src/d/actor/d_a_e_sb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_sb.h" #include "d/actor/d_a_e_bg.h" @@ -69,7 +69,7 @@ void daE_SB_HIO_c::genMessage(JORMContext* ctext) { /* 807816D8-807817D0 000178 00F8+00 1/1 0/0 0/0 .text CreateHeap__8daE_SB_cFv */ int daE_SB_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("E_SB", 0xF); - JUT_ASSERT(271, modelData != 0); + JUT_ASSERT(271, modelData != NULL); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_SB", 0xC), 2, 1.0f, 0, -1, @@ -1028,7 +1028,7 @@ void daE_SB_c::setGroundAngle() { vec_0x44.z = 80.0f + vec_0x2c.z; gnd_chk.SetPos(&vec_0x44); vec_0x44.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1000000000.0f != vec_0x44.y && fabsf(vec_0x44.y - vec_0x2c.y) < 50.0f) { + if (-G_CM3D_F_INF != vec_0x44.y && fabsf(vec_0x44.y - vec_0x2c.y) < 50.0f) { vec_0x20 = vec_0x44 - vec_0x2c; cLib_chaseAngleS(&field_0x614.x, (s16) -cM_atan2s(vec_0x20.y, vec_0x20.z), 0x100); } @@ -1038,7 +1038,7 @@ void daE_SB_c::setGroundAngle() { vec_0x38.z = vec_0x2c.z; gnd_chk.SetPos(&vec_0x38); vec_0x38.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1000000000.0f != vec_0x38.y && fabsf(vec_0x38.y - vec_0x2c.y) < 50.0f) { + if (-G_CM3D_F_INF != vec_0x38.y && fabsf(vec_0x38.y - vec_0x2c.y) < 50.0f) { vec_0x20 = vec_0x38 - vec_0x2c; cLib_chaseAngleS(&field_0x614.z, (s16) cM_atan2s(vec_0x20.y, vec_0x20.x), 0x100); } diff --git a/src/d/actor/d_a_e_sf.cpp b/src/d/actor/d_a_e_sf.cpp index cda8c66a1d..92133a71d4 100644 --- a/src/d/actor/d_a_e_sf.cpp +++ b/src/d/actor/d_a_e_sf.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_sf.h" #include "d/d_cc_d.h" @@ -853,7 +853,7 @@ COMPILER_STRIP_GATE(0x80789CFC, &lit_5203); #pragma push #pragma force_active on SECTION_RODATA static f32 const lit_5204[1 + 1 /* padding */] = { - -1000000000.0f, + -G_CM3D_F_INF, /* padding */ 0.0f, }; diff --git a/src/d/actor/d_a_e_sg.cpp b/src/d/actor/d_a_e_sg.cpp index fdbdb28aa0..ba33acf40c 100644 --- a/src/d/actor/d_a_e_sg.cpp +++ b/src/d/actor/d_a_e_sg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_sg.h" #include "Z2AudioLib/Z2Instances.h" @@ -1024,7 +1024,7 @@ static int daE_SG_Execute(e_sg_class* i_this) { gnd_chk.SetPos(&local_138); f32 fVar71 = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (fVar71 != -1000000000.0f && i_this->mGroundY != fVar71) { + if (fVar71 != -G_CM3D_F_INF && i_this->mGroundY != fVar71) { i_this->mGroundY = fVar71; i_this->home.pos.y = i_this->mGroundY - 250.0f + cM_rndFX(50.0f); } diff --git a/src/d/actor/d_a_e_sh.cpp b/src/d/actor/d_a_e_sh.cpp index 8cbddfbc46..8e59d88e46 100644 --- a/src/d/actor/d_a_e_sh.cpp +++ b/src/d/actor/d_a_e_sh.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_sh.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_e_sm.cpp b/src/d/actor/d_a_e_sm.cpp index c05d196e67..3f12f8e8bc 100644 --- a/src/d/actor/d_a_e_sm.cpp +++ b/src/d/actor/d_a_e_sm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_sm.h" #include "d/d_cc_d.h" @@ -1893,7 +1893,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { int daE_SM_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_SM", BMDE_SM); - JUT_ASSERT(3246, modelData != 0); + JUT_ASSERT(3246, modelData != NULL); mpBubbleModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mpBubbleModel == NULL) { diff --git a/src/d/actor/d_a_e_sm2.cpp b/src/d/actor/d_a_e_sm2.cpp index d1d7fd07f2..5e026f38ed 100644 --- a/src/d/actor/d_a_e_sm2.cpp +++ b/src/d/actor/d_a_e_sm2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_sm2.h" #include "d/d_item.h" diff --git a/src/d/actor/d_a_e_st.cpp b/src/d/actor/d_a_e_st.cpp index 0a64d03902..e93598691e 100644 --- a/src/d/actor/d_a_e_st.cpp +++ b/src/d/actor/d_a_e_st.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_st.h" #include "d/d_cc_d.h" @@ -1253,7 +1253,7 @@ COMPILER_STRIP_GATE(0x807A6968, &lit_6283); /* 807A696C-807A6970 000148 0004+00 0/1 0/0 0/0 .rodata @6284 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_6284 = -1000000000.0f; +SECTION_RODATA static f32 const lit_6284 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x807A696C, &lit_6284); #pragma pop diff --git a/src/d/actor/d_a_e_st_line.cpp b/src/d/actor/d_a_e_st_line.cpp index 44ca08a6bb..03ee8e4b16 100644 --- a/src/d/actor/d_a_e_st_line.cpp +++ b/src/d/actor/d_a_e_st_line.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_st_line.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_e_sw.cpp b/src/d/actor/d_a_e_sw.cpp index 73370c6b91..9028a4f371 100644 --- a/src/d/actor/d_a_e_sw.cpp +++ b/src/d/actor/d_a_e_sw.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_sw.h" #include "f_op/f_op_actor_enemy.h" @@ -298,7 +298,7 @@ void daE_SW_c::checkFall() { f32 fVar1 = dComIfG_Bgsp().GroundCross(&gnd_chk); if (speed.y < 0.0f) { - if (fVar1 == -1000000000.0f || std::abs(fVar1 - current.pos.y) > 1000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || + if (fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { setActionMode(13, 0); } @@ -1702,7 +1702,7 @@ cPhs__Step daE_SW_c::create() { u32 uVar1 = (fopAcM_GetParam(this) >> 4) & 0xFF; if (uVar1 == 0xFF) { - field_0x690 = 1000000000.0f; + field_0x690 = G_CM3D_F_INF; } else { field_0x690 = uVar1 * 100.0f; } @@ -1894,7 +1894,7 @@ void daE_SW_c::d_checkFall() { f32 fVar1 = dComIfG_Bgsp().GroundCross(&gnd_chk); if (speed.y < 0.0f) { - if ((fVar1 == -1000000000.0f || std::abs(fVar1 - current.pos.y) > 1000.0f) || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || + if ((fVar1 == -G_CM3D_F_INF || std::abs(fVar1 - current.pos.y) > 1000.0f) || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { d_setAction(daE_SW_c::d_fall); } diff --git a/src/d/actor/d_a_e_th.cpp b/src/d/actor/d_a_e_th.cpp index 24044c94e9..a0b579e36c 100644 --- a/src/d/actor/d_a_e_th.cpp +++ b/src/d/actor/d_a_e_th.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_th.h" #include "d/actor/d_a_e_th_ball.h" diff --git a/src/d/actor/d_a_e_th_ball.cpp b/src/d/actor/d_a_e_th_ball.cpp index 131af368b1..6ced02308c 100644 --- a/src/d/actor/d_a_e_th_ball.cpp +++ b/src/d/actor/d_a_e_th_ball.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_th_ball.h" #include "d/actor/d_a_e_th.h" @@ -1051,14 +1051,14 @@ static int useHeapInit(fopAc_ac_c* a_this) { e_th_ball_class* i_this = (e_th_ball_class*)a_this; void* modelData = dComIfG_getObjectRes("E_th_ball", 4); - JUT_ASSERT(1839, modelData != 0); + JUT_ASSERT(1839, modelData != NULL); i_this->mpBallModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0, 0x11000084); if (i_this->mpBallModel == NULL) { return 0; } modelData = dComIfG_getObjectRes("E_th_ball", 7); - JUT_ASSERT(1851, modelData != 0); + JUT_ASSERT(1851, modelData != NULL); for (int i = 0; i < 50; i++) { i_this->field_0x65c.mp_model[i] = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); if (i_this->field_0x65c.mp_model[i] == NULL) { diff --git a/src/d/actor/d_a_e_tk.cpp b/src/d/actor/d_a_e_tk.cpp index 85f0025af1..3206023da2 100644 --- a/src/d/actor/d_a_e_tk.cpp +++ b/src/d/actor/d_a_e_tk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_tk.h" #include "d/actor/d_a_e_tk_ball.h" diff --git a/src/d/actor/d_a_e_tk2.cpp b/src/d/actor/d_a_e_tk2.cpp index d0266de628..a091086f2e 100644 --- a/src/d/actor/d_a_e_tk2.cpp +++ b/src/d/actor/d_a_e_tk2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_tk2.h" #include "d/actor/d_a_e_tk_ball.h" diff --git a/src/d/actor/d_a_e_tk_ball.cpp b/src/d/actor/d_a_e_tk_ball.cpp index babe9f9277..97cff666a7 100644 --- a/src/d/actor/d_a_e_tk_ball.cpp +++ b/src/d/actor/d_a_e_tk_ball.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_tk_ball.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_e_tt.cpp b/src/d/actor/d_a_e_tt.cpp index 3c07e45d7e..9caa2f5631 100644 --- a/src/d/actor/d_a_e_tt.cpp +++ b/src/d/actor/d_a_e_tt.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_tt.h" #include "dol2asm.h" @@ -555,7 +555,7 @@ COMPILER_STRIP_GATE(0x807C2004, &lit_4145); /* 807C2008-807C200C 000050 0004+00 0/1 0/0 0/0 .rodata @4146 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4146 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4146 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x807C2008, &lit_4146); #pragma pop diff --git a/src/d/actor/d_a_e_vt.cpp b/src/d/actor/d_a_e_vt.cpp index c1f87974cc..440a285b24 100644 --- a/src/d/actor/d_a_e_vt.cpp +++ b/src/d/actor/d_a_e_vt.cpp @@ -3,7 +3,7 @@ * Variant Enemy (Death Sword) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_vt.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -3733,7 +3733,7 @@ static int daE_VA_Delete(daE_VA_c* i_this) { /* 807CD048-807CD600 00AB48 05B8+00 1/1 0/0 0/0 .text CreateHeap__8daE_VA_cFv */ int daE_VA_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x33); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 15), 0, 1.0f, 0, @@ -3756,7 +3756,7 @@ int daE_VA_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x30); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpWeaponModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpWeaponModel == NULL) { @@ -3776,7 +3776,7 @@ int daE_VA_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("E_VA", 0x37); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpEndEfMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_VA", 7), 0, 1.0f, @@ -3843,7 +3843,7 @@ int daE_VA_c::CreateHeap() { break; } - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpCardModels[i] = mDoExt_J3DModel__create(modelData, 0, 0x11000084); } diff --git a/src/d/actor/d_a_e_warpappear.cpp b/src/d/actor/d_a_e_warpappear.cpp index c4193994e8..416a065471 100644 --- a/src/d/actor/d_a_e_warpappear.cpp +++ b/src/d/actor/d_a_e_warpappear.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_warpappear.h" #include "d/actor/d_a_e_s1.h" @@ -836,7 +836,7 @@ static int useHeapInit(fopAc_ac_c* actor) { e_warpappear_class* i_this = (e_warpappear_class*)actor; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag04", 5); - JUT_ASSERT(1535, modelData != 0); + JUT_ASSERT(1535, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (i_this->mpModel == NULL) { diff --git a/src/d/actor/d_a_e_wb.cpp b/src/d/actor/d_a_e_wb.cpp index e17bcc5786..a587121f7b 100644 --- a/src/d/actor/d_a_e_wb.cpp +++ b/src/d/actor/d_a_e_wb.cpp @@ -3,7 +3,7 @@ * */ - #include "d/dolzel_rel.h" + #include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_rdb.h" #include "d/actor/d_a_obj_crvgate.h" #include "d/actor/d_a_obj_crvsteel.h" @@ -5375,7 +5375,7 @@ static int daE_WB_Execute(e_wb_class* i_this) { int soundParam; - if (-1000000000.0f != i_this->mAcch.GetGroundH()) { + if (-G_CM3D_F_INF != i_this->mAcch.GetGroundH()) { if (i_this->mAcch.ChkWaterHit() && i_this->mAcch.m_wtr.GetHeight() > a_this->current.pos.y) { soundParam = dKy_pol_sound_get(&i_this->mAcch.m_wtr); diff --git a/src/d/actor/d_a_e_ws.cpp b/src/d/actor/d_a_e_ws.cpp index 6f7b0f20f9..ded83ae93e 100644 --- a/src/d/actor/d_a_e_ws.cpp +++ b/src/d/actor/d_a_e_ws.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ws.h" #include "d/actor/d_a_obj_carry.h" @@ -882,7 +882,7 @@ static int daE_WS_Delete(daE_WS_c* a_this) { /* 807E6748-807E6840 002E28 00F8+00 1/1 0/0 0/0 .text CreateHeap__8daE_WS_cFv */ int daE_WS_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_WS", 0xD); - JUT_ASSERT(1401, modelData != 0); + 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); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_ww.cpp b/src/d/actor/d_a_e_ww.cpp index e9e4ec976f..7a053eeaea 100644 --- a/src/d/actor/d_a_e_ww.cpp +++ b/src/d/actor/d_a_e_ww.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ww.h" #include "f_op/f_op_camera_mng.h" @@ -433,7 +433,7 @@ void daE_WW_c::setGroundAngle() { gnd_pos.z = sp14.z + 100.0f * cM_scos(shape_angle.y); gnd_chk.SetPos(&gnd_pos); gnd_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1e9f == gnd_pos.y) { + if (-G_CM3D_F_INF == gnd_pos.y) { gnd_pos.y = (f32) sp14.y; } @@ -454,7 +454,7 @@ void daE_WW_c::setGroundAngle() { gnd_pos.z = 100.0f + sp14.z; gnd_chk.SetPos(&gnd_pos); gnd_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1e9f != gnd_pos.y) { + if (-G_CM3D_F_INF != gnd_pos.y) { field_0x674.x = -cM_atan2s(gnd_pos.y - sp14.y, gnd_pos.z - sp14.z); } @@ -463,7 +463,7 @@ void daE_WW_c::setGroundAngle() { gnd_pos.z = sp14.z; gnd_chk.SetPos(&gnd_pos); gnd_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1e9f != gnd_pos.y) { + if (-G_CM3D_F_INF != gnd_pos.y) { field_0x674.z = (s16)cM_atan2s(gnd_pos.y - sp14.y, gnd_pos.x - sp14.x); } @@ -478,9 +478,9 @@ f32 daE_WW_c::checkCreateBg(cXyz i_vector) { dBgS_GndChk gnd_chk; gnd_chk.SetPos(&sp14); f32 temp_f1 = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (temp_f1 != -1e9f) { + if (temp_f1 != -G_CM3D_F_INF) { if (std::abs(temp_f1 - current.pos.y) > field_0x6ac) { - return -1e9f; + return -G_CM3D_F_INF; } if (dComIfG_Bgsp().GetSpecialCode(gnd_chk) == 5 || dComIfG_Bgsp().GetPolyAtt0(gnd_chk) == 0xD) { @@ -493,14 +493,14 @@ f32 daE_WW_c::checkCreateBg(cXyz i_vector) { if (dComIfG_Bgsp().LineCross(&lin_chk) != 0) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(lin_chk, &plane); - return -1e9f; + return -G_CM3D_F_INF; } return temp_f1; } } - return -1e9f; + return -G_CM3D_F_INF; } /* 807E8560-807E8624 000F60 00C4+00 3/3 0/0 0/0 .text checkAttackWall__8daE_WW_cFv */ @@ -534,7 +534,7 @@ void daE_WW_c::setAppearEffect() { gnd_pos += current.pos; gnd_chk.SetPos(&gnd_pos); gnd_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (gnd_pos.y != -1e9f) { + if (gnd_pos.y != -G_CM3D_F_INF) { csXyz sp10(0, 0, 0); cM3dGPla plane; dComIfG_Bgsp().GetTriPla(gnd_chk, &plane); @@ -696,7 +696,7 @@ void daE_WW_c::executeMaster() { cLib_offsetPos(&sp3C, &sp48, fopCamM_GetAngleY(camera), &sp30); if (current.pos.abs(sp3C) < field_0x6a8) { f32 temp_f31 = checkCreateBg(sp3C); - if (-1e9f != temp_f31) { + if (-G_CM3D_F_INF != temp_f31) { sp3C.y = temp_f31; int var_r30 = 0; lbl_237_bss_30 = 0; @@ -738,7 +738,7 @@ void daE_WW_c::executeMaster() { sp30.x += cM_rndFX(200.0f); cLib_offsetPos(&sp3C, &field_0x65c, (s16)fopCamM_GetAngleY(camera), &sp30); f32 temp_f31_2 = checkCreateBg(sp3C); - if (-1e9f != temp_f31_2) { + if (-G_CM3D_F_INF != temp_f31_2) { sp3C.y = temp_f31_2; } else { sp3C = field_0x65c; @@ -1057,7 +1057,7 @@ void daE_WW_c::executeAttack() { dBgS_GndChk gnd_chk; gnd_chk.SetPos(&sp20); sp20.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1e9f != sp20.y) { + if (-G_CM3D_F_INF != sp20.y) { if (mActionMode == ACTION_MODE_25 && current.pos.y < sp20.y) { setAppearEffect(); mSound.startCreatureSound(Z2SE_EN_WW_HIDE, 0, -1); @@ -1106,7 +1106,7 @@ bool daE_WW_c::checkAttackStart() { } if (abs(temp_r28) < nREG_S(9) + 0x1555 && field_0x668.absXZ(sp14) < 800.0f + field_0x6a8) { - if (checkCreateBg(current.pos) != -1e9f && checkAttackWall() != 0) { + if (checkCreateBg(current.pos) != -G_CM3D_F_INF && checkAttackWall() != 0) { setActionMode(ACTION_ATTACK, ACTION_MODE_0); field_0x756 = 1; return 1; @@ -1694,7 +1694,7 @@ bool daE_WW_c::checkWalkStart() { cLib_offsetPos(&spd0, &spe8, (s16)(angleY + 0x1400 + cM_rndFX(1024.0f)), &spdc); f32 fVar1 = checkCreateBg(spd0); - if (fVar1 != -1e9f) { + if (fVar1 != -G_CM3D_F_INF) { uVar1 = 1; spd0.y = fVar1; } @@ -1703,7 +1703,7 @@ bool daE_WW_c::checkWalkStart() { cLib_offsetPos(&sp100, &spe8, (s16)(angleY - 0x1400 + cM_rndFX(1024.0f)), &spdc); fVar1 = checkCreateBg(sp100); - if (fVar1 != -1e9f) { + if (fVar1 != -G_CM3D_F_INF) { uVar1 |= 2; sp100.y = fVar1; } @@ -2198,7 +2198,7 @@ static int daE_WW_Delete(daE_WW_c* i_this) { int daE_WW_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_WW", BMDR_WW); - JUT_ASSERT(2823, modelData != 0); + 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); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_yc.cpp b/src/d/actor/d_a_e_yc.cpp index 99171e14fa..ea9fef674d 100644 --- a/src/d/actor/d_a_e_yc.cpp +++ b/src/d/actor/d_a_e_yc.cpp @@ -3,7 +3,7 @@ * Twilit Carrier Kargarok */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_yc.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_e_yd.cpp b/src/d/actor/d_a_e_yd.cpp index 6872f26a0a..bd0b47a63d 100644 --- a/src/d/actor/d_a_e_yd.cpp +++ b/src/d/actor/d_a_e_yd.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_yd.h" #include "d/actor/d_a_e_yd_leaf.h" diff --git a/src/d/actor/d_a_e_yd_leaf.cpp b/src/d/actor/d_a_e_yd_leaf.cpp index 504a95d748..6d58e45c88 100644 --- a/src/d/actor/d_a_e_yd_leaf.cpp +++ b/src/d/actor/d_a_e_yd_leaf.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_yd_leaf.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_e_yg.cpp b/src/d/actor/d_a_e_yg.cpp index 492725037b..41e59e6e6e 100644 --- a/src/d/actor/d_a_e_yg.cpp +++ b/src/d/actor/d_a_e_yg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_yg.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_e_yh.cpp b/src/d/actor/d_a_e_yh.cpp index 06f75a70ec..937a365f13 100644 --- a/src/d/actor/d_a_e_yh.cpp +++ b/src/d/actor/d_a_e_yh.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_yh.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_e_yk.cpp b/src/d/actor/d_a_e_yk.cpp index 7ab4d0aaa9..ce0d42ded7 100644 --- a/src/d/actor/d_a_e_yk.cpp +++ b/src/d/actor/d_a_e_yk.cpp @@ -5,7 +5,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_yk.h" #include "c/c_damagereaction.h" diff --git a/src/d/actor/d_a_e_ym.cpp b/src/d/actor/d_a_e_ym.cpp index d30a2311e3..93edc7b188 100644 --- a/src/d/actor/d_a_e_ym.cpp +++ b/src/d/actor/d_a_e_ym.cpp @@ -3,7 +3,7 @@ * Enemy - Shadow Insect / 闇虫 (Yami Mushi) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ym.h" #include "c/c_damagereaction.h" @@ -1054,7 +1054,7 @@ void daE_YM_c::executeDown() { dBgS_GndChk gnd_chk; gnd_chk.SetPos(¤t.pos); gnd_cross = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (gnd_cross == -1000000000.0f || fabsf(gnd_cross - current.pos.y) > 1000.0f + if (gnd_cross == -G_CM3D_F_INF || fabsf(gnd_cross - current.pos.y) > 1000.0f || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 4 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 10 || dComIfG_Bgsp().GetGroundCode(gnd_chk) == 5) { bckSet(6, 0, 0.0f, 1.0f); diff --git a/src/d/actor/d_a_e_ym_tag.cpp b/src/d/actor/d_a_e_ym_tag.cpp index 132a1846b2..6bfd9a471c 100644 --- a/src/d/actor/d_a_e_ym_tag.cpp +++ b/src/d/actor/d_a_e_ym_tag.cpp @@ -3,7 +3,7 @@ * Enemy - Shadow Insect / 闇虫 (Yami Mushi) - Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ym_tag.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_e_ymb.cpp b/src/d/actor/d_a_e_ymb.cpp index 8b3e7dbdda..4d7faa4bc6 100644 --- a/src/d/actor/d_a_e_ymb.cpp +++ b/src/d/actor/d_a_e_ymb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_ymb.h" #include "d/actor/d_a_midna.h" @@ -533,7 +533,7 @@ void daE_YMB_c::checkWaterPos() { dBgS_ObjGndChk_Spl wtr_chk; wtr_chk.SetPos(&pos); f32 wtr_pos = dComIfG_Bgsp().GroundCross(&wtr_chk); - if (wtr_pos != -1000000000.0f) { + if (wtr_pos != -G_CM3D_F_INF) { field_0x6cc = wtr_pos; field_0x69c.y = wtr_pos + 1000.0f + l_HIO.fly_height_adjust; @@ -558,7 +558,7 @@ void daE_YMB_c::checkGroundPos() { mGndChk.SetPos(&pos); f32 fVar1 = dComIfG_Bgsp().GroundCross(&mGndChk); field_0x6d4 = fVar1; - if (fVar1 != -1000000000.0f && field_0x6d0 < fVar1) { + if (fVar1 != -G_CM3D_F_INF && field_0x6d0 < fVar1) { field_0x6d0 = fVar1; } } @@ -3189,7 +3189,7 @@ static int daE_YMB_Delete(daE_YMB_c* i_this) { /* 80820AF0-80820D68 00AAD0 0278+00 1/1 0/0 0/0 .text CreateHeap__9daE_YMB_cFv */ int daE_YMB_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_YB", BMDR_YB_TW); - JUT_ASSERT(4196, modelData != 0); + JUT_ASSERT(4196, modelData != NULL); mpModelMorf = 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) { diff --git a/src/d/actor/d_a_e_yr.cpp b/src/d/actor/d_a_e_yr.cpp index 486ad7c9c8..4a6061c5aa 100644 --- a/src/d/actor/d_a_e_yr.cpp +++ b/src/d/actor/d_a_e_yr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_yr.h" #include "d/actor/d_a_horse.h" @@ -585,7 +585,7 @@ static void e_yr_path_move(e_yr_class* i_this) { s32 nextId = i_this->field_0x6ec->m_nextID; if (nextId != 0xffff) { i_this->field_0x6ec = dPath_GetRoomPath(nextId, fopAcM_GetRoomNo(actor)); - JUT_ASSERT(0x451, i_this->field_0x6ec != 0); + JUT_ASSERT(0x451, i_this->field_0x6ec != NULL); } } else { if (i_this->field_0x6ea < 0) { @@ -1985,14 +1985,14 @@ static void ground_angle_set(e_yr_class* i_this) { gndChk.SetPos(&unkXyz3); unkXyz3.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (unkXyz3.y != -1e+09f) { + if (unkXyz3.y != -G_CM3D_F_INF) { unkVec1.x = unkXyz3.x; unkVec1.y = unkXyz3.y + 100.0f; unkVec1.z = unkXyz3.z + unkFloat1; gndChk.SetPos(&unkVec1); unkVec1.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (unkVec1.y != -1e+09f) { + if (unkVec1.y != -G_CM3D_F_INF) { yDiff = unkVec1.y - unkXyz3.y; zDiff = unkVec1.z - unkXyz3.z; unkShort2 = -cM_atan2s(yDiff, zDiff); @@ -2005,7 +2005,7 @@ static void ground_angle_set(e_yr_class* i_this) { unkVec1.z = unkXyz3.z; gndChk.SetPos(&unkVec1); unkVec1.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (unkVec1.y != -1e+09f) { + if (unkVec1.y != -G_CM3D_F_INF) { yDiff = unkVec1.y - unkXyz3.y; xDiff = unkVec1.x - unkXyz3.x; unkShort1 = (s16)cM_atan2s(yDiff, xDiff); diff --git a/src/d/actor/d_a_e_zh.cpp b/src/d/actor/d_a_e_zh.cpp index 1b09d1a1b5..ed2a4b2d46 100644 --- a/src/d/actor/d_a_e_zh.cpp +++ b/src/d/actor/d_a_e_zh.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_zh.h" #include "d/actor/d_a_obj_carry.h" @@ -574,7 +574,7 @@ bool daE_ZH_c::mSearchMove(u8 param_1) { if (param_1 == 0) { sp5c += mS_Ball->current.pos; - if (mBgc.GetGroundH() != -1000000000.0f && mBgc.GetGroundH() > mS_Ball->current.pos.y) { + if (mBgc.GetGroundH() != -G_CM3D_F_INF && mBgc.GetGroundH() > mS_Ball->current.pos.y) { sp5c.y = mBgc.GetGroundH(); } } else { @@ -1113,7 +1113,7 @@ void daE_ZH_c::executeOpenStart() { // fallthrough case 15: sp34.y = mS_Ball->current.pos.y + 600.0f; - if (mBgc.GetGroundH() != -1000000000.0f) { + if (mBgc.GetGroundH() != -G_CM3D_F_INF) { sp34.y = mBgc.GetGroundH() + 600.0f; } @@ -1146,11 +1146,11 @@ void daE_ZH_c::executeSearchMove() { ato.y = mS_Ball->current.pos.y + 600.0f; - if (mBgc.GetGroundH() != -1000000000.0f && mBgc.GetGroundH() + 500.0f > ato.y) { + if (mBgc.GetGroundH() != -G_CM3D_F_INF && mBgc.GetGroundH() + 500.0f > ato.y) { ato.y = mBgc.GetGroundH() + 500.0f; } - if (mBgc.GetRoofHeight() != 1000000000.0f && ato.y > mBgc.GetRoofHeight()) { + if (mBgc.GetRoofHeight() != G_CM3D_F_INF && ato.y > mBgc.GetRoofHeight()) { ato.y = mBgc.GetRoofHeight() - 150.0f; } @@ -1425,14 +1425,14 @@ void daE_ZH_c::executeCatchFlyMove() { pmRoofPos = home.pos.y; if (arg0 == 0) { - if (mBgc.GetGroundH() != -1000000000.0f) { + if (mBgc.GetGroundH() != -G_CM3D_F_INF) { pmRoofPos = mBgc.GetGroundH() + 600.0f; } else { pmRoofPos = home.pos.y + 600.0f; } } - if (mBgc.GetRoofHeight() != 1000000000.0f && pmRoofPos > mBgc.GetRoofHeight()) { + if (mBgc.GetRoofHeight() != G_CM3D_F_INF && pmRoofPos > mBgc.GetRoofHeight()) { pmRoofPos = mBgc.GetRoofHeight() - 150.0f; } @@ -2169,7 +2169,7 @@ static int daE_ZH_Delete(daE_ZH_c* i_this) { /* 8082E4E4-8082E6C8 0055A4 01E4+00 1/1 0/0 0/0 .text CreateHeap__8daE_ZH_cFv */ int daE_ZH_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ZH", BMDV_ZH); - JUT_ASSERT(3305, modelData != 0); + JUT_ASSERT(3305, modelData != NULL); mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("E_ZH", BCK_ZH_WAIT01), 2, 1.0f, 0, -1, &mSound, 0, 0x31000284); @@ -2190,7 +2190,7 @@ int daE_ZH_c::CreateHeap() { if (arg0 == 1) { modelData = (J3DModelData*)dComIfG_getObjectRes("E_ZH", BMDV_ZH_ENTRANCE); - JUT_ASSERT(3342, modelData != 0); + JUT_ASSERT(3342, modelData != NULL); mEntranceModel = mDoExt_J3DModel__create(modelData, 0, 0x11020203); if (mEntranceModel == NULL) { diff --git a/src/d/actor/d_a_e_zm.cpp b/src/d/actor/d_a_e_zm.cpp index 980dc90816..8c40294380 100644 --- a/src/d/actor/d_a_e_zm.cpp +++ b/src/d/actor/d_a_e_zm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_zm.h" #include "f_op/f_op_actor_enemy.h" @@ -916,7 +916,7 @@ static int daE_ZM_Delete(daE_ZM_c* i_this) { int daE_ZM_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("E_ZM", BMDR_ZM); - JUT_ASSERT(1558, modelData != 0); + 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); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { diff --git a/src/d/actor/d_a_e_zs.cpp b/src/d/actor/d_a_e_zs.cpp index 8831aaff60..40c2b4e335 100644 --- a/src/d/actor/d_a_e_zs.cpp +++ b/src/d/actor/d_a_e_zs.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_zs.h" #include "f_op/f_op_actor_enemy.h" diff --git a/src/d/actor/d_a_econt.cpp b/src/d/actor/d_a_econt.cpp index 903528aae7..bc65ee4554 100644 --- a/src/d/actor/d_a_econt.cpp +++ b/src/d/actor/d_a_econt.cpp @@ -3,7 +3,7 @@ * Encounter */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_econt.h" #include "d/d_timer.h" diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp index 7cfc73cfda..9748a60b6e 100644 --- a/src/d/actor/d_a_ep.cpp +++ b/src/d/actor/d_a_ep.cpp @@ -2,7 +2,7 @@ // Translation Unit: d_a_ep // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ep.h" #include "d/actor/d_a_player.h" @@ -820,7 +820,7 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) { ep_class* i_this = (ep_class*)a_this; void* modelData = dComIfG_getObjectRes("Ep", model_d[i_this->field_0xa5a]); - JUT_ASSERT(0x855, modelData != 0); + JUT_ASSERT(0x855, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); if (i_this->mpModel == NULL) { @@ -831,7 +831,7 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) { i_this->mpModel->setBaseTRMtx(*calc_mtx); modelData = dComIfG_getObjectRes("Ep", 7); - JUT_ASSERT(0x884, modelData != 0); + JUT_ASSERT(0x884, modelData != NULL); for (int i = 0; i < 6; i++) { i_this->mHahen[i].mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_formation_mng.cpp b/src/d/actor/d_a_formation_mng.cpp index 4b57145679..d8472dd1ad 100644 --- a/src/d/actor/d_a_formation_mng.cpp +++ b/src/d/actor/d_a_formation_mng.cpp @@ -2,7 +2,7 @@ // Formation Manager // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_formation_mng.h" #include "d/actor/d_a_npc_fguard.h" @@ -379,10 +379,10 @@ void daFmtMng_c::create_init() { mFormationRow = getFormationRow(); mPos = NULL; mPos = new FmtPos_c[mFormationRow]; - JUT_ASSERT(357, mPos != 0); + JUT_ASSERT(357, mPos != NULL); mMember = NULL; mMember = new FmtMember_c[mFormationLine * mFormationRow]; - JUT_ASSERT(361, mMember != 0); + JUT_ASSERT(361, mMember != NULL); FmtMember_c* member = mMember; for (int i = 0; i < mFormationLine * mFormationRow; i++, member++) { diff --git a/src/d/actor/d_a_fr.cpp b/src/d/actor/d_a_fr.cpp index 5f44fc6fca..278c9f29b8 100644 --- a/src/d/actor/d_a_fr.cpp +++ b/src/d/actor/d_a_fr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_fr.h" #include "SSystem/SComponent/c_lib.h" diff --git a/src/d/actor/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp index 3207cb9655..0102c19c1f 100644 --- a/src/d/actor/d_a_grass.cpp +++ b/src/d/actor/d_a_grass.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_grass.h" #include "SSystem/SComponent/c_counter.h" diff --git a/src/d/actor/d_a_guard_mng.cpp b/src/d/actor/d_a_guard_mng.cpp index 09bd7dae63..3c7a4ff5b3 100644 --- a/src/d/actor/d_a_guard_mng.cpp +++ b/src/d/actor/d_a_guard_mng.cpp @@ -3,7 +3,7 @@ * Guard */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_guard_mng.h" #include "f_pc/f_pc_executor.h" @@ -26,7 +26,7 @@ static void* s_sub(void* i_actorP, void* i_this) { /* 80837B9C-80837BEC 0000FC 0050+00 1/1 0/0 0/0 .text checkMerchantNum__12daGuardMng_cFv */ u8 daGuardMng_c::checkMerchantNum() { - field_0x56c = 1000000000.0f; + field_0x56c = G_CM3D_F_INF; mMerchantNum = 0; fpcM_Search(s_sub,this); return mMerchantNum; diff --git a/src/d/actor/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp index 26bb2e8321..cdddac5c79 100644 --- a/src/d/actor/d_a_hitobj.cpp +++ b/src/d/actor/d_a_hitobj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_hitobj.h" #include "f_op/f_op_kankyo_mng.h" diff --git a/src/d/actor/d_a_horse.cpp b/src/d/actor/d_a_horse.cpp index 40d6b89849..b90e9ff455 100644 --- a/src/d/actor/d_a_horse.cpp +++ b/src/d/actor/d_a_horse.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_horse.h" #include "d/actor/d_a_alink.h" @@ -507,7 +507,7 @@ static void* daHorse_searchSingleBoar(fopAc_ac_c* i_actor, void* i_data) { /* 80838F98-808392D8 001158 0340+00 1/1 0/0 0/0 .text createHeap__9daHorse_cFv */ int daHorse_c::createHeap() { m_modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0x26); - JUT_ASSERT(0x487, m_modelData != 0); + JUT_ASSERT(0x487, m_modelData != NULL); m_model = mDoExt_J3DModel__create(m_modelData, 0x80000, 0x11020084); if (m_model == NULL) { @@ -544,7 +544,7 @@ int daHorse_c::createHeap() { } ResTIMG* texImg = (ResTIMG*)dComIfG_getObjectRes(l_arcName, 0x2C); - JUT_ASSERT(0x4B6, texImg != 0); + JUT_ASSERT(0x4B6, texImg != NULL); if (!m_reinLine.init(1, 75, texImg, 0)) { return 0; @@ -909,7 +909,7 @@ int daHorse_c::setSingleAnime(u16 i_anmIdx, f32 i_speed, f32 i_startF, s16 i_end J3DAnmTransform* bck; if (i_isDemoAnm) { if (i_anmIdx & 0x8000) { - JUT_ASSERT(0x6D4, 0); + JUT_ASSERT(1748, FALSE); } bck = (J3DAnmTransform*)dComIfG_getObjectIDRes(dStage_roomControl_c::getDemoArcName(), i_anmIdx); @@ -2109,7 +2109,7 @@ BOOL daHorse_c::checkWaitTurn() const { /* 8083D774-8083D918 005934 01A4+00 2/2 0/0 0/0 .text setRoomInfo__9daHorse_cFi */ void daHorse_c::setRoomInfo(int param_0) { int room_no; - if (-1000000000.0f != m_acch.GetGroundH() && (checkStateFlg0(FLG0_UNK_1) || m_procID == PROC_LARGE_DAMAGE_e || m_procID == PROC_JUMP_e || current.pos.y - m_acch.GetGroundH() < 500.0f)) { + if (-G_CM3D_F_INF != m_acch.GetGroundH() && (checkStateFlg0(FLG0_UNK_1) || m_procID == PROC_LARGE_DAMAGE_e || m_procID == PROC_JUMP_e || current.pos.y - m_acch.GetGroundH() < 500.0f)) { room_no = dComIfG_Bgsp().GetRoomId(m_acch.m_gnd); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(m_acch.m_gnd); @@ -4376,7 +4376,7 @@ int daHorse_c::execute() { sp54.z = sp70.mTranslate.z; mDoMtx_stack_c::multVec(&sp54, ¤t.pos); - if (field_0x1730 != 0 && -1000000000.0f != m_acch.GetGroundH()) { + if (field_0x1730 != 0 && -G_CM3D_F_INF != m_acch.GetGroundH()) { current.pos.y = m_acch.GetGroundH(); } } else if (m_procID == PROC_JUMP_e) { diff --git a/src/d/actor/d_a_hozelda.cpp b/src/d/actor/d_a_hozelda.cpp index 0cadf7f7a2..8b71b28fc8 100644 --- a/src/d/actor/d_a_hozelda.cpp +++ b/src/d/actor/d_a_hozelda.cpp @@ -2,7 +2,7 @@ // Translation Unit: d_a_hozelda // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_hozelda.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp index 4261148d24..ff89baad25 100644 --- a/src/d/actor/d_a_itembase.cpp +++ b/src/d/actor/d_a_itembase.cpp @@ -3,7 +3,7 @@ * Item Actor base */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_itembase.h" #include "d/d_com_inf_game.h" @@ -32,7 +32,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk JUT_ASSERT(0, 0 <= m_itemNo && m_itemNo <= 255); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_arcName, i_bmdName); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); u32 flags = 0x11000084; u32 modelflags = 0x80000; @@ -62,7 +62,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk if (i_btkName > 0) { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(i_arcName, i_btkName); - JUT_ASSERT(0, pbtk != 0); + JUT_ASSERT(0, pbtk != NULL); mpBtkAnm = new mDoExt_btkAnm(); if (mpBtkAnm == NULL || !mpBtkAnm->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { @@ -73,7 +73,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk mpBpkAnm = NULL; if (i_bpkName > 0) { J3DAnmColor* pbpk = (J3DAnmColor*)dComIfG_getObjectRes(i_arcName, i_bpkName); - JUT_ASSERT(0, pbpk != 0); + JUT_ASSERT(0, pbpk != NULL); mpBpkAnm = new mDoExt_bpkAnm(); if (mpBpkAnm == NULL || !mpBpkAnm->init(modelData, pbpk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { @@ -84,7 +84,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk mpBckAnm = NULL; if (i_bckName > 0) { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(i_arcName, i_bckName); - JUT_ASSERT(0, pbck != 0); + JUT_ASSERT(0, pbck != NULL); mpBckAnm = new mDoExt_bckAnm(); if (mpBckAnm == NULL || !mpBckAnm->init(pbck, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1, false)) { @@ -95,7 +95,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk mpBrkAnm = NULL; if (i_brkName > 0) { J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(i_arcName, i_brkName); - JUT_ASSERT(0, pbrk != 0); + JUT_ASSERT(0, pbrk != NULL); s8 tevFrm = getTevFrm(); int anmPlay = TRUE; @@ -112,7 +112,7 @@ int daItemBase_c::CreateItemHeap(char const* i_arcName, s16 i_bmdName, s16 i_btk mpBtpAnm = NULL; if (i_btpName > 0) { J3DAnmTexPattern* pbtp = (J3DAnmTexPattern*)dComIfG_getObjectRes(i_arcName, i_btpName); - JUT_ASSERT(0, pbtp != 0); + JUT_ASSERT(0, pbtp != NULL); mpBtpAnm = new mDoExt_btpAnm(); if (mpBtpAnm == NULL || !mpBtpAnm->init(modelData, pbtp, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { diff --git a/src/d/actor/d_a_izumi_gate.cpp b/src/d/actor/d_a_izumi_gate.cpp index 9f18568657..8108785160 100644 --- a/src/d/actor/d_a_izumi_gate.cpp +++ b/src/d/actor/d_a_izumi_gate.cpp @@ -3,7 +3,7 @@ * Spring - Gate */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_izumi_gate.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_kago.cpp b/src/d/actor/d_a_kago.cpp index f76f1d3c3d..1dae0174ac 100644 --- a/src/d/actor/d_a_kago.cpp +++ b/src/d/actor/d_a_kago.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kago.h" #include "d/d_camera.h" @@ -307,7 +307,7 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { field_0x738 = 0; - if (field_0x700 != -1e+09f) { + if (field_0x700 != -G_CM3D_F_INF) { field_0x738 = dComIfG_Bgsp().GetSpecialCode(gndChk); field_0x700 += l_HIO.mFlightGroundAltitude; if (retVal < field_0x700) { @@ -329,7 +329,7 @@ f32 daKago_c::checkGroundHeight(cXyz i_pos, f32* o_step) { dBgS_ObjGndChk_Spl gndChkSpl; gndChkSpl.SetPos(&gndChkPos); f32 gndCrossMag = dComIfG_Bgsp().GroundCross(&gndChkSpl); - if (gndCrossMag != -1e+09f) { + if (gndCrossMag != -G_CM3D_F_INF) { field_0x70c = gndCrossMag; gndCrossMag += l_HIO.mFlightGroundAltitude; if (current.pos.y < gndCrossMag + 50.0f) { @@ -378,7 +378,7 @@ f32 daKago_c::checkRoofHeight(cXyz param_0) { roofChk.SetPos(unkXyz1); roofChkYVal = dComIfG_Bgsp().RoofChk(&roofChk); - if (roofChkYVal != 1e9f) { + if (roofChkYVal != G_CM3D_F_INF) { roofChkYVal -= l_HIO.mFlightCeilingAltitude; if (current.pos.y > roofChkYVal) { mRoofHeight = current.pos.y; @@ -400,7 +400,7 @@ f32 daKago_c::checkRoofHeight(cXyz param_0) { } } } else { - mRoofHeight = 1e9f; + mRoofHeight = G_CM3D_F_INF; } if (!unkFlag1 && current.pos.y >= mRoofHeight - 100.0f) { @@ -3793,7 +3793,7 @@ int daKago_c::CreateHeap() { } else { modelData = (J3DModelData*)dComIfG_getObjectRes(field_0x75c, 0x10); } - JUT_ASSERT(0x139f, modelData != 0); + JUT_ASSERT(0x139f, modelData != NULL); mpMorf = new mDoExt_McaMorfSO( modelData, NULL, NULL, diff --git a/src/d/actor/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp index 463947665f..c6c31ed912 100644 --- a/src/d/actor/d_a_kytag00.cpp +++ b/src/d/actor/d_a_kytag00.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag00.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp index 412c4cad82..e084ba97db 100644 --- a/src/d/actor/d_a_kytag01.cpp +++ b/src/d/actor/d_a_kytag01.cpp @@ -3,7 +3,7 @@ * Sacred Grove Mist Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag01.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp index 3fc455ca61..96cb3db3a5 100644 --- a/src/d/actor/d_a_kytag02.cpp +++ b/src/d/actor/d_a_kytag02.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag02.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp index 3fcc607349..ef13866247 100644 --- a/src/d/actor/d_a_kytag03.cpp +++ b/src/d/actor/d_a_kytag03.cpp @@ -3,7 +3,7 @@ * Odor generation tag / rail */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag03.h" #include "SSystem/SComponent/c_counter.h" diff --git a/src/d/actor/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp index 77e4250b8e..05268485e4 100644 --- a/src/d/actor/d_a_kytag04.cpp +++ b/src/d/actor/d_a_kytag04.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag04.h" #include "d/actor/d_a_npc.h" @@ -237,7 +237,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { kytag04_class* a_this = (kytag04_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag04", 5); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202); if (a_this->mpModel != NULL) { diff --git a/src/d/actor/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp index 7f1cab1d4a..c9e7ee8813 100644 --- a/src/d/actor/d_a_kytag05.cpp +++ b/src/d/actor/d_a_kytag05.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag05.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp index 1bb0da9701..13f84df99f 100644 --- a/src/d/actor/d_a_kytag06.cpp +++ b/src/d/actor/d_a_kytag06.cpp @@ -3,7 +3,7 @@ * Weather System Manager */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag06.h" #include "SSystem/SComponent/c_counter.h" diff --git a/src/d/actor/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp index 7ccf8a91e4..a0cfebe86e 100644 --- a/src/d/actor/d_a_kytag07.cpp +++ b/src/d/actor/d_a_kytag07.cpp @@ -3,7 +3,7 @@ * Environment Tag 7 */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag07.h" #include "d/d_stage.h" diff --git a/src/d/actor/d_a_kytag08.cpp b/src/d/actor/d_a_kytag08.cpp index 70eb701500..d99e2f7ff0 100644 --- a/src/d/actor/d_a_kytag08.cpp +++ b/src/d/actor/d_a_kytag08.cpp @@ -3,7 +3,7 @@ * Fog Avoidance Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag08.h" #include "d/actor/d_a_player.h" @@ -225,7 +225,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { kytag08_class* a_this = (kytag08_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kytag08", 3); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202); diff --git a/src/d/actor/d_a_kytag09.cpp b/src/d/actor/d_a_kytag09.cpp index b0e4718c5c..32c3df7f94 100644 --- a/src/d/actor/d_a_kytag09.cpp +++ b/src/d/actor/d_a_kytag09.cpp @@ -3,7 +3,7 @@ * Twilight Film Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag09.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag10.cpp b/src/d/actor/d_a_kytag10.cpp index 4a4ef30772..23ab34dc63 100644 --- a/src/d/actor/d_a_kytag10.cpp +++ b/src/d/actor/d_a_kytag10.cpp @@ -3,7 +3,7 @@ * Sparks Particle Emitter on a Path */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag10.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_kytag11.cpp b/src/d/actor/d_a_kytag11.cpp index 39250fd943..eac590d8bd 100644 --- a/src/d/actor/d_a_kytag11.cpp +++ b/src/d/actor/d_a_kytag11.cpp @@ -3,7 +3,7 @@ * Time Control Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag11.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_kytag12.cpp b/src/d/actor/d_a_kytag12.cpp index 99f2909457..628cfc4574 100644 --- a/src/d/actor/d_a_kytag12.cpp +++ b/src/d/actor/d_a_kytag12.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag12.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_kytag13.cpp b/src/d/actor/d_a_kytag13.cpp index 08e648eecc..ecbdbecfcc 100644 --- a/src/d/actor/d_a_kytag13.cpp +++ b/src/d/actor/d_a_kytag13.cpp @@ -3,7 +3,7 @@ * Blowing Snow Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag13.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_kytag14.cpp b/src/d/actor/d_a_kytag14.cpp index a76fb3df60..b19f218af5 100644 --- a/src/d/actor/d_a_kytag14.cpp +++ b/src/d/actor/d_a_kytag14.cpp @@ -4,7 +4,7 @@ * Sets savefile spawn location */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag14.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_kytag15.cpp b/src/d/actor/d_a_kytag15.cpp index 7c2c4fd8b7..ea79054742 100644 --- a/src/d/actor/d_a_kytag15.cpp +++ b/src/d/actor/d_a_kytag15.cpp @@ -3,7 +3,7 @@ * Z Shake Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag15.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_kytag16.cpp b/src/d/actor/d_a_kytag16.cpp index fd9f762328..f33afcf954 100644 --- a/src/d/actor/d_a_kytag16.cpp +++ b/src/d/actor/d_a_kytag16.cpp @@ -3,7 +3,7 @@ * Pikari Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag16.h" #include "SSystem/SComponent/c_counter.h" diff --git a/src/d/actor/d_a_kytag17.cpp b/src/d/actor/d_a_kytag17.cpp index f5fdee396a..95f28f2f92 100644 --- a/src/d/actor/d_a_kytag17.cpp +++ b/src/d/actor/d_a_kytag17.cpp @@ -3,7 +3,7 @@ * Light Mask Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_kytag17.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp index 62353dc9f4..2974ed0055 100644 --- a/src/d/actor/d_a_mant.cpp +++ b/src/d/actor/d_a_mant.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mant.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" diff --git a/src/d/actor/d_a_mg_fish.cpp b/src/d/actor/d_a_mg_fish.cpp index 310e7f9b9d..fb8889b872 100644 --- a/src/d/actor/d_a_mg_fish.cpp +++ b/src/d/actor/d_a_mg_fish.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mg_fish.h" diff --git a/src/d/actor/d_a_mg_fshop.cpp b/src/d/actor/d_a_mg_fshop.cpp index 2f5d7ed517..26396d5292 100644 --- a/src/d/actor/d_a_mg_fshop.cpp +++ b/src/d/actor/d_a_mg_fshop.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mg_fshop.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_mg_rod.cpp b/src/d/actor/d_a_mg_rod.cpp index 7f082cb121..7345bbc229 100644 --- a/src/d/actor/d_a_mg_rod.cpp +++ b/src/d/actor/d_a_mg_rod.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mg_rod.h" #include "d/d_com_inf_game.h" @@ -6071,7 +6071,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { for (int i = 0; i < 5; i++) { static int lure_bmd[] = {6, 7, 8, 10, 13}; modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->arcname, lure_bmd[i]); - JUT_ASSERT(11397, modelData != 0); + JUT_ASSERT(11397, modelData != NULL); u32 mdlflg; if (i == 4) { @@ -6106,7 +6106,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->arcname, 5); - JUT_ASSERT(11440, modelData != 0); + JUT_ASSERT(11440, modelData != NULL); for (int j = 0; j < 2; j++) { a_this->hook_model[j] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -6116,7 +6116,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->arcname, 9); - JUT_ASSERT(11453, modelData != 0); + JUT_ASSERT(11453, modelData != NULL); a_this->ring_model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->ring_model == NULL) { @@ -6139,7 +6139,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->arcname, 9); - JUT_ASSERT(11499, modelData != 0); + JUT_ASSERT(11499, modelData != NULL); for (int i = 0; i < 6; i++) { a_this->unk_ring_model[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -6157,7 +6157,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", bmd_idx); - JUT_ASSERT(11523, modelData != 0); + JUT_ASSERT(11523, modelData != NULL); a_this->rod_uki_model[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->rod_uki_model[i] == NULL) { @@ -6175,7 +6175,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->arcname, 0x2D); - JUT_ASSERT(11547, modelData != 0); + JUT_ASSERT(11547, modelData != NULL); a_this->uki_model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->uki_model == NULL) { @@ -6183,14 +6183,14 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->arcname, 0x2E); - JUT_ASSERT(11556, modelData != 0); + JUT_ASSERT(11556, modelData != NULL); a_this->uki_saki_model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->uki_saki_model == NULL) { return 0; } - JUT_ASSERT(11564, modelData != 0); + JUT_ASSERT(11564, modelData != NULL); for (int i = 0; i < 2; i++) { static int hook_bmd[] = {44, 43,}; @@ -6219,7 +6219,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes(a_this->arcname, bmd_idx); - JUT_ASSERT(11624, modelData != 0); + JUT_ASSERT(11624, modelData != NULL); a_this->rod_uki_model[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->rod_uki_model[i] == NULL) { diff --git a/src/d/actor/d_a_midna.cpp b/src/d/actor/d_a_midna.cpp index 974d0742e8..b7fc6497c6 100644 --- a/src/d/actor/d_a_midna.cpp +++ b/src/d/actor/d_a_midna.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_midna.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" diff --git a/src/d/actor/d_a_mirror.cpp b/src/d/actor/d_a_mirror.cpp index 5303bb9a3f..489bd337b1 100644 --- a/src/d/actor/d_a_mirror.cpp +++ b/src/d/actor/d_a_mirror.cpp @@ -3,7 +3,7 @@ * Mirror of Twilight */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_mirror.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" @@ -206,7 +206,7 @@ void dMirror_packet_c::modelDraw(J3DModel* i_model, Mtx param_1) { } dScnKy_env_light_c* kankyo = dKy_getEnvlight(); - JUT_ASSERT(0, kankyo != 0); + JUT_ASSERT(0, kankyo != NULL); GXColor color = {0}; color.r = kankyo->bg_amb_col[0].r; @@ -597,7 +597,7 @@ int daMirror_c::execute() { } daPy_py_c* player = daPy_getLinkPlayerActorClass(); - JUT_ASSERT(0, player != 0); + JUT_ASSERT(0, player != NULL); if (mPacket.getViewScale().y > 0.0f && player->getKandelaarFlamePos() && fopAcM_searchActorDistance2(this, player) < 40000.0f) diff --git a/src/d/actor/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp index 4740bbccde..5710a61ccd 100644 --- a/src/d/actor/d_a_movie_player.cpp +++ b/src/d/actor/d_a_movie_player.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep // This TU seems to disable inlining entirely, as there are several weak functions that get inlined // in other TUs, but not here. @@ -3545,7 +3545,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) { if (!daMP_THPPlayerOpen(moviePath, 0)) { OSReport("Fail to open the thp file\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); return 0; } @@ -3564,7 +3564,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) { daMP_buffer = mDoExt_getArchiveHeap()->alloc(daMP_THPPlayerCalcNeedMemory(), 0x20); if (daMP_buffer == NULL) { OSReport("Can't allocate the memory"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); return 0; } @@ -3572,7 +3572,7 @@ static BOOL daMP_ActivePlayer_Init(char const* moviePath) { if (!daMP_THPPlayerPrepare(0, 0, daMP_audioInfo.field_0xc != 1 ? OSGetTick() % daMP_audioInfo.field_0xc : 0)) { OSReport("Fail to prepare\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); return 0; } @@ -3653,7 +3653,7 @@ int daMP_c::daMP_c_Get_arg_movieNo() { /* 80878C28-80878D10 006548 00E8+00 1/1 0/0 0/0 .text daMP_c_Init__6daMP_cFv */ int daMP_c::daMP_c_Init() { - JUT_ASSERT(9469, m_myObj == 0); + JUT_ASSERT(9469, m_myObj == NULL); mDoGph_gInf_c::setFrameRate(1); daMP_Fail_alloc = FALSE; diff --git a/src/d/actor/d_a_myna.cpp b/src/d/actor/d_a_myna.cpp index 23d981692c..8337a617ba 100644 --- a/src/d/actor/d_a_myna.cpp +++ b/src/d/actor/d_a_myna.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_myna.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_nbomb.cpp b/src/d/actor/d_a_nbomb.cpp index 5e67c44fa1..720d550d5c 100644 --- a/src/d/actor/d_a_nbomb.cpp +++ b/src/d/actor/d_a_nbomb.cpp @@ -3,7 +3,7 @@ * Bomb Actor */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_nbomb.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -141,7 +141,7 @@ int daNbomb_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(m_arcNameList[mType], bmdIdx[mType]); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; @@ -479,7 +479,7 @@ BOOL daNbomb_c::checkExplode() { /* 804C8430-804C84D8 001750 00A8+00 5/5 0/0 0/0 .text setRoomInfo__9daNbomb_cFv */ void daNbomb_c::setRoomInfo() { int room_no; - if (mAcch.GetGroundH() != -1000000000.0f) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF) { room_no = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); mPolySound = dKy_pol_sound_get(&mAcch.m_gnd); @@ -1701,7 +1701,7 @@ int daNbomb_c::draw() { mat->setTevColor(1, &bomb_color); } - if (mAcch.GetGroundH() != -1000000000.0f && !fopAcM_checkCarryNow(this)) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF && !fopAcM_checkCarryNow(this)) { cM3dGPla ground_poly; if (dComIfG_Bgsp().GetTriPla(mAcch.m_gnd, &ground_poly)) { dComIfGd_setSimpleShadow(¤t.pos, mAcch.GetGroundH(), scale.x * 25.0f, diff --git a/src/d/actor/d_a_ni.cpp b/src/d/actor/d_a_ni.cpp index 5f4dac869f..9dc7e377d0 100644 --- a/src/d/actor/d_a_ni.cpp +++ b/src/d/actor/d_a_ni.cpp @@ -4,7 +4,7 @@ // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/d_msg_flow.h" #include "d/d_s_play.h" @@ -2020,7 +2020,7 @@ static int daNi_Create(fopAc_ac_c* i_this) { a_this->mTimers[0] = 10; } - a_this->mSplGroundH = -1000000000.0f; + a_this->mSplGroundH = -G_CM3D_F_INF; daNi_Execute(a_this); } diff --git a/src/d/actor/d_a_no_chg_room.cpp b/src/d/actor/d_a_no_chg_room.cpp index 09fe2a7705..7f4dd9e909 100644 --- a/src/d/actor/d_a_no_chg_room.cpp +++ b/src/d/actor/d_a_no_chg_room.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_no_chg_room.h" #include "d/d_s_room.h" @@ -33,7 +33,7 @@ static bool isLoadRoom(int i_roomNo) { if (dComIfGp_roomControl_checkStatusFlag(load_room_index, 9) == (u32)TRUE) { room_of_scene_class* roomScene = (room_of_scene_class*)fopScnM_SearchByID( dStage_roomControl_c::getStatusProcID(load_room_index)); - JUT_ASSERT(0, roomScene != 0); + JUT_ASSERT(0, roomScene != NULL); if (roomScene->field_0x1d4 >= 0 || !fpcNd_IsDeleteTiming(&roomScene->base)) { // "Room <%d> objects loading!\n" diff --git a/src/d/actor/d_a_npc.cpp b/src/d/actor/d_a_npc.cpp index 37c295be3c..dfc8b8d875 100644 --- a/src/d/actor/d_a_npc.cpp +++ b/src/d/actor/d_a_npc.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc.h" #include "d/actor/d_a_npc_tk.h" @@ -220,8 +220,8 @@ void daNpcT_MotionSeqMngr_c::initialize() { /* 801458C0-80145A24 140200 0164+00 2/2 0/0 2/2 .text play__22daNpcT_MotionSeqMngr_cFUsPiPf */ int daNpcT_MotionSeqMngr_c::play(u16 i_loopNo, int* o_motionNo_p, f32* o_morfFrm_p) { int ret = 0; - JUT_ASSERT(471, 0 != o_motionNo_p); - JUT_ASSERT(472, 0 != o_morfFrm_p); + JUT_ASSERT(471, NULL != o_motionNo_p); + JUT_ASSERT(472, NULL != o_morfFrm_p); if (mPrevStepNo == mStepNo && mStepNo < mStepNum) { if ((&mpSeqData[mNo * mStepNum])[mStepNo].mAnmIdx != -1) { @@ -481,17 +481,17 @@ int daNpcT_Path_c::chkPassed1(cXyz i_pnt, int i_num) { if (!chkClose()) { if (chkReverse()) { if (cur_idx < next_idx || prev_idx < cur_idx) { - JUT_ASSERT(964, 0); + JUT_ASSERT(964, FALSE); } } else { if (cur_idx < prev_idx || next_idx < cur_idx) { - JUT_ASSERT(971, 0); + JUT_ASSERT(971, FALSE); } } } if (prev_idx == cur_idx && cur_idx == next_idx) { - JUT_ASSERT(978, 0); + JUT_ASSERT(978, FALSE); } prev_pos = getPntPos(prev_idx); @@ -568,17 +568,17 @@ int daNpcT_Path_c::chkPassed2(cXyz i_pnt, cXyz* param_2, int i_num, int param_4) if (!chkClose()) { if (chkReverse()) { if (cur_idx < next_idx || prev_idx < cur_idx || sp10 < prev_idx) { - JUT_ASSERT(1082, 0); + JUT_ASSERT(1082, FALSE); } } else { if (prev_idx < sp10 || cur_idx < prev_idx || next_idx < cur_idx) { - JUT_ASSERT(1090, 0); + JUT_ASSERT(1090, FALSE); } } } if (sp10 == prev_idx && prev_idx == cur_idx && cur_idx == next_idx) { - JUT_ASSERT(1098, 0); + JUT_ASSERT(1098, FALSE); } cStack_80 = getPntPos(sp10); @@ -658,7 +658,7 @@ static BOOL daNpcT_chkPassed(cXyz i_pos, dPnt* i_points, u16 i_idx, u16 i_num, B } else if (i_idx < next_idx) { angle = cM_atan2s(next_pnt.x - cur_pnt.x, next_pnt.z - cur_pnt.z); } else { - JUT_ASSERT(1470, 0); + JUT_ASSERT(1470, FALSE); } mDoMtx_stack_c::transS(next_pnt); @@ -736,7 +736,7 @@ void daNpcT_JntAnm_c::setParam(fopAc_ac_c* i_actor, J3DModel* i_model, cXyz* i_e mHeadPos.setall(0.0f); mDoMtx_stack_c::multVec(&mHeadPos, &mHeadPos); - JUT_ASSERT(1620, 0 != i_eyeOffset_p); + JUT_ASSERT(1620, NULL != i_eyeOffset_p); mEyePos.set(i_eyeOffset_p->x, i_eyeOffset_p->y, i_eyeOffset_p->z); mDoMtx_stack_c::multVec(&mEyePos, &mEyePos); @@ -1277,7 +1277,7 @@ int daNpcT_c::execute() { mGndChk = mAcch.m_gnd; mGroundAngle = fopAcM_getPolygonAngle(mGndChk, current.angle.y); mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { mPolSound = dKy_pol_sound_get(&mAcch.m_gnd); mReverb = dComIfGp_getReverb(mCcStts.GetRoomId()); @@ -1288,7 +1288,7 @@ int daNpcT_c::execute() { afterMoved(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -1687,7 +1687,7 @@ int daNpcT_c::ctrlMsgAnm(int* o_faceAnmAttr_p, int* o_anmAttr_p, fopAc_ac_c* i_t if (param_3 != 0 || eventInfo.checkCommandTalk() || mStaffId != -1) { if (dComIfGp_event_getTalkPartner() == i_talkPartner_p) { msg_class* msg_p = dMsgObject_c::getActor(); - JUT_ASSERT(3147, 0 != msg_p); + JUT_ASSERT(3147, NULL != msg_p); if (msg_p->mode == 2 || msg_p->mode == 3) { mMsgId = fpcM_ERROR_PROCESS_ID_e; @@ -2117,7 +2117,7 @@ void daNpcT_c::setPos(cXyz i_pos) { mGndChk.SetPos(&i_pos); i_pos.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(3922, -(1000000000.0f) != i_pos.y) + JUT_ASSERT(3922, -G_CM3D_F_INF != i_pos.y) current.pos = i_pos; old.pos = current.pos; @@ -2525,7 +2525,7 @@ BOOL daNpcT_c::talkProc(int* param_0, BOOL param_1, fopAc_ac_c** i_partnerList_p /* 8014BE2C-8014BEE4 14676C 00B8+00 0/0 0/0 25/25 .text getNearestActorP__8daNpcT_cFs */ fopAc_ac_c* daNpcT_c::getNearestActorP(s16 i_srchActorName) { fopAc_ac_c* actor = NULL; - f32 minDistance = 1000000000.0f; + f32 minDistance = G_CM3D_F_INF; mFindCount = 0; mSrchName = i_srchActorName; @@ -2545,7 +2545,7 @@ fopAc_ac_c* daNpcT_c::getNearestActorP(s16 i_srchActorName) { /* 8014BEE4-8014BFB0 146824 00CC+00 0/0 0/0 12/12 .text getEvtAreaTagP__8daNpcT_cFii */ fopAc_ac_c* daNpcT_c::getEvtAreaTagP(int i_type, int i_no) { int var_r29 = 0; - f32 var_f31 = 1000000000.0f; + f32 var_f31 = G_CM3D_F_INF; mFindCount = 0; mSrchName = PROC_TAG_EVTAREA; @@ -2699,7 +2699,7 @@ BOOL daNpcT_chkDoBtnIsSpeak(fopAc_ac_c* i_actor_p) { if (dComIfGp_getDoStatus() == 28) { if (daPy_getPlayerActorClass()->checkPriActorOwn(i_actor_p)) { - JUT_ASSERT(4965, 0 != dComIfGp_getAttention()); + JUT_ASSERT(4965, NULL != dComIfGp_getAttention()); for (int i = 0; i < dComIfGp_getAttention()->GetActionCount(); i++) { if (dComIfGp_getAttention()->ActionTarget(i) == i_actor_p && diff --git a/src/d/actor/d_a_npc2.cpp b/src/d/actor/d_a_npc2.cpp index 7bc30dea35..ab7f5e60be 100644 --- a/src/d/actor/d_a_npc2.cpp +++ b/src/d/actor/d_a_npc2.cpp @@ -395,7 +395,7 @@ int daBaseNpc_c::execute() { field_0x9d4 = mAcch.m_gnd; mGroundY = mAcch.GetGroundH(); - if (mGroundY != -1000000000.0f) { + if (mGroundY != -G_CM3D_F_INF) { field_0x918 = daBaseNpc_getGroundAngle(&field_0x9d4, field_0x91a.y); setEnvTevColor(); setRoomNo(); diff --git a/src/d/actor/d_a_npc3.cpp b/src/d/actor/d_a_npc3.cpp index 00ec3e979a..212114bf24 100644 --- a/src/d/actor/d_a_npc3.cpp +++ b/src/d/actor/d_a_npc3.cpp @@ -230,7 +230,7 @@ static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_ f32 sp24; if (sp12 == param_2 && param_2 == sp10) { - JUT_ASSERT(2288, 0); + JUT_ASSERT(2288, FALSE); } else if (sp12 < param_2 && param_2 < sp10) { sp24 = (sp4C - sp64).absXZ(); s16 temp_r31 = cM_atan2s(sp4C.x - sp64.x, sp4C.z - sp64.z); @@ -259,7 +259,7 @@ static s32 daBaseNpc_chkPnt(cXyz param_0, dPnt* param_1, u16 param_2, u16 param_ sp4C.x = sp70.x + (2.0f * sp24 * cM_ssin(temp_r31_3)); sp4C.z = sp70.z + (2.0f * sp24 * cM_scos(temp_r31_3)); } else { - JUT_ASSERT(2322, 0); + JUT_ASSERT(2322, FALSE); } f32 sp20; diff --git a/src/d/actor/d_a_npc4.cpp b/src/d/actor/d_a_npc4.cpp index d8e408ca22..bea6c9a810 100644 --- a/src/d/actor/d_a_npc4.cpp +++ b/src/d/actor/d_a_npc4.cpp @@ -431,7 +431,7 @@ void daNpcF_Lookat_c::initCalc(fopAc_ac_c* i_actor, Mtx i_baseTransformMtx, cXyz mDoMtx_stack_c::multVec(&local_90, ¶m_2[i]); } - JUT_ASSERT(1244, 0 != mAttnPos_p); + JUT_ASSERT(1244, NULL != mAttnPos_p); local_90 = *mAttnPos_p - i_actor->current.pos; mDoMtx_stack_c::multVec(&local_90, ¶m_5); @@ -553,7 +553,7 @@ BOOL daNpcF_c::execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { field_0x998 = daNpcF_getGroundAngle(&mGndChk, mCurAngle.y); setEnvTevColor(); setRoomNo(); @@ -1235,7 +1235,7 @@ int daNpcF_c::ctrlMsgAnm(int& o_expression, int& o_motion, fopAc_ac_c* param_2, fopAc_ac_c* talkPartner = dComIfGp_event_getTalkPartner(); if (talkPartner == param_2) { msg_class* msg_p = dMsgObject_c::getActor(); - JUT_ASSERT(2780, 0 != msg_p); + JUT_ASSERT(2780, NULL != msg_p); if (msg_p->mode == 2 || msg_p->mode == 3) { field_0x9a4 = -1; @@ -1298,7 +1298,7 @@ void daNpcF_c::changeEvent(char* i_arcName, char* i_evtName, u16 param_2, u16 pa dComIfGp_getEventManager().setObjectArchive(eventInfo.getArchiveName()); } - JUT_ASSERT(2887, 0 != i_evtName); + JUT_ASSERT(2887, NULL != i_evtName); mEventIdx = dComIfGp_getEventManager().getEventIdx(this, i_evtName, 0xFF); dComIfGp_getEvent().reset(this); @@ -1536,7 +1536,7 @@ fopAc_ac_c* daNpcF_c::getAttnActorP(BOOL i_playerAttn, fpcLyIt_JudgeFunc i_searc int sp38 = 0; int sp34; - f32 minDistance = 1000000000.0f; + f32 minDistance = G_CM3D_F_INF; f32 var_f30 = i_radius; if (mAttnChangeTimer != 0) { diff --git a/src/d/actor/d_a_npc_aru.cpp b/src/d/actor/d_a_npc_aru.cpp index bf392c0c5b..bb64567772 100644 --- a/src/d/actor/d_a_npc_aru.cpp +++ b/src/d/actor/d_a_npc_aru.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_aru.h" #include "d/actor/d_a_cow.h" @@ -374,7 +374,7 @@ cPhs__Step daNpc_Aru_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -560,7 +560,7 @@ fopAc_ac_c* daNpc_Aru_c::getCowP(int param_1) { /* 8095253C-8095260C 000E9C 00D0+00 1/1 0/0 0/0 .text getUDoor_l_P__11daNpc_Aru_cFv */ fopAc_ac_c* daNpc_Aru_c::getUDoor_l_P() { fopAc_ac_c* rv = NULL; - f32 fVar1 = 1e9f; + f32 fVar1 = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchUDoor, this); @@ -578,7 +578,7 @@ fopAc_ac_c* daNpc_Aru_c::getUDoor_l_P() { /* 8095260C-809526DC 000F6C 00D0+00 1/1 0/0 0/0 .text getUDoor_r_P__11daNpc_Aru_cFv */ fopAc_ac_c* daNpc_Aru_c::getUDoor_r_P() { fopAc_ac_c* rv = NULL; - f32 fVar1 = 1e9f; + f32 fVar1 = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchUDoor, this); @@ -1714,7 +1714,7 @@ int daNpc_Aru_c::cutNoEntrance(int i_staffID) { case 0: { fopAc_ac_c* actor_p = mActorMngrs[3].getActorP(); - JUT_ASSERT(3279, 0 != actor_p); + JUT_ASSERT(3279, NULL != actor_p); work.set(0.0f, 500.0f, actor_p->scale.z + 100.0f); angle.y = fopAcM_searchPlayerAngleY(actor_p) - actor_p->current.angle.y; @@ -1732,7 +1732,7 @@ int daNpc_Aru_c::cutNoEntrance(int i_staffID) { mGndChk.SetPos(&work); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(3298, -(1000000000.0f) != work.y); + JUT_ASSERT(3298, -G_CM3D_F_INF != work.y); angle.y = fopAcM_searchActorAngleY(daPy_getPlayerActorClass(), this); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, angle.y, 0); diff --git a/src/d/actor/d_a_npc_ash.cpp b/src/d/actor/d_a_npc_ash.cpp index 490df50634..fbb698b3ef 100644 --- a/src/d/actor/d_a_npc_ash.cpp +++ b/src/d/actor/d_a_npc_ash.cpp @@ -3,7 +3,7 @@ * NPC - Ashei */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ash.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_npc_ashB.cpp b/src/d/actor/d_a_npc_ashB.cpp index e2d3362add..5496eee21a 100644 --- a/src/d/actor/d_a_npc_ashB.cpp +++ b/src/d/actor/d_a_npc_ashB.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ashB.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -895,7 +895,7 @@ bool daNpcAshB_c::wait(void* param_0) { case 3: break; default: - JUT_ASSERT(0x579, 0); + JUT_ASSERT(1401, FALSE); } return true; diff --git a/src/d/actor/d_a_npc_bans.cpp b/src/d/actor/d_a_npc_bans.cpp index 47ad0c730f..96a9b1421b 100644 --- a/src/d/actor/d_a_npc_bans.cpp +++ b/src/d/actor/d_a_npc_bans.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bans.h" #include "dol2asm.h" @@ -869,7 +869,7 @@ COMPILER_STRIP_GATE(0x80967ED4, &lit_3994); /* 80967ED8-80967EDC 0000B8 0004+00 0/1 0/0 0/0 .rodata @3995 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_3995 = -1000000000.0f; +SECTION_RODATA static f32 const lit_3995 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80967ED8, &lit_3995); #pragma pop diff --git a/src/d/actor/d_a_npc_besu.cpp b/src/d/actor/d_a_npc_besu.cpp index f9ad9f8e66..2ffc5941ee 100644 --- a/src/d/actor/d_a_npc_besu.cpp +++ b/src/d/actor/d_a_npc_besu.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_besu.h" #include "d/actor/d_a_npc_len.h" @@ -669,7 +669,7 @@ int daNpc_Besu_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -1885,13 +1885,13 @@ int daNpc_Besu_c::cutConversationAboutPachinko(int arg0) { } case 3: { - JUT_ASSERT(0xD84, 0 != speakers[0]); + JUT_ASSERT(0xD84, NULL != speakers[0]); mJntAnm.lookActor(speakers[0], -40.0f, 0U); break; } case 4: { - JUT_ASSERT(0xD89, 0 != speakers[0]); + JUT_ASSERT(0xD89, NULL != speakers[0]); mJntAnm.lookActor(speakers[0], -40.0f, 0U); if (home.angle.y != mCurAngle.y) { if (chkBesu3()) { @@ -1906,13 +1906,13 @@ int daNpc_Besu_c::cutConversationAboutPachinko(int arg0) { case 10: case 11: { - JUT_ASSERT(0xD9F, 0 != speakers[0]); + JUT_ASSERT(0xD9F, NULL != speakers[0]); mJntAnm.lookActor(speakers[0], -40.0f, 0U); break; } case 12: { - JUT_ASSERT(0xDA4, 0 != speakers[1]); + JUT_ASSERT(0xDA4, NULL != speakers[1]); mJntAnm.lookActor(speakers[1], -40.0f, 0U); break; } @@ -2077,7 +2077,7 @@ int daNpc_Besu_c::cutSwdTutorial(int arg0) { mDamageTimer = 1; action(); actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xE7E, 0 != actor_p); + JUT_ASSERT(0xE7E, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); retval = 1; break; @@ -2154,7 +2154,7 @@ int daNpc_Besu_c::cutFindMonkey(int arg0) { case 1: { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xED5, 0 != actor_p); + JUT_ASSERT(0xED5, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0U); retval = 1; break; @@ -2168,7 +2168,7 @@ int daNpc_Besu_c::cutFindMonkey(int arg0) { mJntAnm.lookNone(0U); if (mEventTimer == 0) { actor_p = (fopAc_ac_c*) dComIfGp_getHorseActor(); - JUT_ASSERT(0xEE4, 0 != actor_p); + JUT_ASSERT(0xEE4, NULL != actor_p); my_vec_0 = actor_p->current.pos; if (50.0f < current.pos.absXZ(my_vec_0)) { cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &my_vec_0), 4, 0x800); diff --git a/src/d/actor/d_a_npc_blue_ns.cpp b/src/d/actor/d_a_npc_blue_ns.cpp index be751db95e..a4b2b9c8d9 100644 --- a/src/d/actor/d_a_npc_blue_ns.cpp +++ b/src/d/actor/d_a_npc_blue_ns.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_blue_ns.h" #include "d/d_cc_d.h" @@ -674,7 +674,7 @@ void daNpcBlueNS_c::Execute() { /* 8096C9F0-8096C9F4 0000D0 0004+00 0/1 0/0 0/0 .rodata @4392 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4392 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4392 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x8096C9F0, &lit_4392); #pragma pop diff --git a/src/d/actor/d_a_npc_bou.cpp b/src/d/actor/d_a_npc_bou.cpp index a08fbcdf41..a9825373f3 100644 --- a/src/d/actor/d_a_npc_bou.cpp +++ b/src/d/actor/d_a_npc_bou.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bou.h" #include "d/actor/d_a_cow.h" @@ -215,7 +215,7 @@ int daNpc_Bou_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -325,7 +325,7 @@ void* daNpc_Bou_c::srchCow(void* arg0, void* arg1) { /* 8096D9B4-8096DA78 000B14 00C4+00 1/1 0/0 0/0 .text getCowP__11daNpc_Bou_cFv */ fopAc_ac_c* daNpc_Bou_c::getCowP() { fopAc_ac_c* pActor = NULL; - f32 minDist = 1e9f; + f32 minDist = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchCow, this); for (int i = 0; i < mFindCount; i++) { @@ -832,7 +832,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) { switch (prm_val) { case 0: { actor_p = mActorMngr[0].getActorP(); - JUT_ASSERT(0x803, 0 != actor_p); + JUT_ASSERT(0x803, NULL != actor_p); ((daCow_c *)actor_p)->setCrazyReady(); daNpcT_offTmpBit(0x1C); initTalk(mFlowNodeNo, NULL); @@ -841,7 +841,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) { case 2: { actor_p = mActorMngr[0].getActorP(); - JUT_ASSERT(0x811, 0 != actor_p); + JUT_ASSERT(0x811, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); Z2GetAudioMgr()->subBgmStart(0x1000011); break; @@ -849,7 +849,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) { case 5: { actor_p = mActorMngr[0].getActorP(); - JUT_ASSERT(0x820, 0 != actor_p); + JUT_ASSERT(0x820, NULL != actor_p); ((daCow_c *)actor_p)->setCrazyGo(); break; } @@ -898,7 +898,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) { if (prm_val == 2 || prm_val == 3) { if (prm_val == 3) { actor_p = mActorMngr[0].getActorP(); - JUT_ASSERT(0x853, 0 != actor_p); + JUT_ASSERT(0x853, NULL != actor_p); mJntAnm.lookActor(actor_p, 0.0f, 0); } @@ -919,7 +919,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) { if (prm_val == 3 && ret_val != 0) { actor_p = mActorMngr[0].getActorP(); - JUT_ASSERT(0x86A, 0 != actor_p); + JUT_ASSERT(0x86A, NULL != actor_p); ((daCow_c *)actor_p)->setCrazyReadyDrawOn(); } @@ -932,7 +932,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) { case 7: case 8: { actor_p = mActorMngr[0].getActorP(); - JUT_ASSERT(0x875, 0 != actor_p); + JUT_ASSERT(0x875, NULL != actor_p); mJntAnm.lookActor(actor_p, 0.0f, 0); ret_val = 1; } @@ -1351,7 +1351,7 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) { work += current.pos; mGndChk.SetPos(&work); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(0xab4, -(1000000000.0f) != work.y); + JUT_ASSERT(0xab4, -G_CM3D_F_INF != work.y); dComIfGp_evmng_setGoal(&work); my_svec.y = mCurAngle.y + 0x5800; @@ -1361,7 +1361,7 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) { temp += work; mGndChk.SetPos(&temp); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(0xabf, -(1000000000.0f) != work.y); + JUT_ASSERT(0xabf, -G_CM3D_F_INF != work.y); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&temp, my_svec.y, 0); } else { my_svec.y = mPlayerAngle - home.angle.y; @@ -1381,7 +1381,7 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) { work += current.pos; mGndChk.SetPos(&work); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(0xad8, -(1000000000.0f) != work.y); + JUT_ASSERT(0xad8, -G_CM3D_F_INF != work.y); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, mCurAngle.y + 0x8000, 0); work.set(0.0f, 300.0f, 150.0f); @@ -1390,7 +1390,7 @@ int daNpc_Bou_c::cutMeetingAgain(int arg) { work += current.pos; mGndChk.SetPos(&work); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(0xae2, -(1000000000.0f) != work.y); + JUT_ASSERT(0xae2, -G_CM3D_F_INF != work.y); dComIfGp_evmng_setGoal(&work); } diff --git a/src/d/actor/d_a_npc_bouS.cpp b/src/d/actor/d_a_npc_bouS.cpp index f5c9c52ad0..e291721d9c 100644 --- a/src/d/actor/d_a_npc_bouS.cpp +++ b/src/d/actor/d_a_npc_bouS.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_bouS.h" #include "dol2asm.h" @@ -1796,7 +1796,7 @@ extern "C" void func_80977AC4(void* _this, s16 param_0) /* const */ { /* ############################################################################################## */ /* 80978754-80978758 000344 0004+00 1/1 0/0 0/0 .rodata @5753 */ -SECTION_RODATA static f32 const lit_5753 = 1000000000.0f; +SECTION_RODATA static f32 const lit_5753 = G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80978754, &lit_5753); /* 80978B64-80978B70 0003C0 000C+00 2/2 0/0 0/0 .data __vt__17daNpcBouS_Param_c */ diff --git a/src/d/actor/d_a_npc_cd.cpp b/src/d/actor/d_a_npc_cd.cpp index 76972da115..a1f852c08c 100644 --- a/src/d/actor/d_a_npc_cd.cpp +++ b/src/d/actor/d_a_npc_cd.cpp @@ -3,7 +3,7 @@ // Translation Unit: a/npc/d_a_npc_cd // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_cd.h" #include "d/actor/d_a_player.h" @@ -218,7 +218,7 @@ dCcD_SrcCyl const daNpcCd_c::m_cylDat = { int daNpcCd_c::NpcCreate(int param_1) { J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1); - JUT_ASSERT(470, 0 != a_mdlData_p); + JUT_ASSERT(470, NULL != a_mdlData_p); mpMorf = new mDoExt_McaMorfSO(a_mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_npc_cd2.cpp b/src/d/actor/d_a_npc_cd2.cpp index 848c2d60cd..8a4d6944f3 100644 --- a/src/d/actor/d_a_npc_cd2.cpp +++ b/src/d/actor/d_a_npc_cd2.cpp @@ -3,7 +3,7 @@ // Translation Unit: a/npc/d_a_npc_cd2 // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_cd2.h" #include "d/actor/d_a_player.h" @@ -259,7 +259,7 @@ static Vec const a_transScaleTbl[30] = { /* 80157D00-80157F28 152640 0228+00 0/0 0/0 4/4 .text NpcCreate__10daNpcCd2_cFi */ int daNpcCd2_c::NpcCreate(int param_1) { J3DModelData* a_mdlData_p = getNpcMdlDataP(param_1); - JUT_ASSERT(590, 0 != a_mdlData_p); + JUT_ASSERT(590, NULL != a_mdlData_p); J3DAnmTexPattern* anmTex = getTexAnmP(param_1); int uVar5; if (anmTex != NULL) { @@ -280,7 +280,7 @@ int daNpcCd2_c::NpcCreate(int param_1) { mCitizen.setMdlType(param_1, false, mIsDarkWorld != 0 ? 1 : 0); if (anmTex != NULL) { mpBtpAnm = new mDoExt_btpAnm(); - JUT_ASSERT(622, 0 != mpBtpAnm); + JUT_ASSERT(622, NULL != mpBtpAnm); if (mpBtpAnm == NULL || !mpBtpAnm->init(a_mdlData_p, anmTex, 1, 2, 1.0f, 0, -1)) { return 0; } @@ -1952,7 +1952,7 @@ bool PathTrace_c::setPath(int param_1, int param_2, int param_3, cXyz* param_4, field_0x20 = 0; if (param_5) { - f32 minDist = 1000000000.0f; + f32 minDist = G_CM3D_F_INF; field_0x20 = 0; for (int i = 0; i < mPath->m_num; i++) { dPnt* pnt = dPath_GetPnt(mPath, i); @@ -2006,9 +2006,9 @@ void PathTrace_c::getTargetPoint(Vec* targetPoint) { /* 80159ECC-80159F98 15480C 00CC+00 1/1 0/0 0/0 .text setAvoidPoint__11PathTrace_cFv */ void PathTrace_c::setAvoidPoint() { - JUT_ASSERT(1602, mPath != 0); - JUT_ASSERT(1603, mMyself != 0); - JUT_ASSERT(1604, mObstacle != 0); + JUT_ASSERT(1602, mPath != NULL); + JUT_ASSERT(1603, mMyself != NULL); + JUT_ASSERT(1604, mObstacle != NULL); cXyz& selfPos = fopAcM_GetPosition(mMyself); s16 obstacleAngle = cLib_targetAngleY(&selfPos, &fopAcM_GetPosition(mObstacle)); s16 diff = (s16)obstacleAngle - cLib_targetAngleY(&selfPos, &dPath_GetPnt(mPath, field_0x20)->m_position); @@ -2044,7 +2044,7 @@ void PathTrace_c::setNextPoint() { dPnt* pnt2 = dPath_GetPnt(mPath, field_0x20); cXyz acStack_28(pnt1->m_position); field_0x18 = acStack_28.abs(pnt2->m_position); - mNextPoint = 1000000000.0f; + mNextPoint = G_CM3D_F_INF; } /* 8015A264-8015A294 154BA4 0030+00 1/1 0/0 0/0 .text incIndex__11PathTrace_cFi */ @@ -2105,14 +2105,14 @@ fopAc_ac_c* PathTrace_c::checkObstacle(fopAc_ac_c* param_0) { * checkObstacleSub__11PathTrace_cFP10fopAc_ac_c */ void PathTrace_c::checkObstacleSub(fopAc_ac_c* pObstacle) { if (mMyself != pObstacle) { - JUT_ASSERT(1816, mPath != 0); + JUT_ASSERT(1816, mPath != NULL); cXyz& newObstaclePos = fopAcM_GetPosition(pObstacle); dPnt* pnt = dPath_GetPnt(mPath, field_0x20); f32 local_38; f32 local_3c; f32 local_40; - local_38 = 1000000000.0f; - JUT_ASSERT(1822, mMyself != 0); + local_38 = G_CM3D_F_INF; + JUT_ASSERT(1822, mMyself != NULL); cXyz& selfPos = fopAcM_GetPosition(mMyself); if (mObstacle != NULL) { f32 distCurObstacle = selfPos.abs2(fopAcM_GetPosition(mObstacle)); diff --git a/src/d/actor/d_a_npc_cdn3.cpp b/src/d/actor/d_a_npc_cdn3.cpp index 2bb29594ce..969bc768ad 100644 --- a/src/d/actor/d_a_npc_cdn3.cpp +++ b/src/d/actor/d_a_npc_cdn3.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_cdn3.h" #include "d/d_msg_object.h" @@ -76,13 +76,13 @@ void daNpcCdn3_c::setAction(daNpcCdn3_c::Mode_e i_action) { /* 80978E18-80978E40 0001B8 0028+00 1/1 0/0 0/0 .text callInit__11daNpcCdn3_cFv */ void daNpcCdn3_c::callInit() { - JUT_ASSERT(408, mAction != 0); + JUT_ASSERT(408, mAction != NULL); (this->*(mAction[0]))(); } /* 80978E40-80978E6C 0001E0 002C+00 1/1 0/0 0/0 .text callExecute__11daNpcCdn3_cFv */ void daNpcCdn3_c::callExecute() { - JUT_ASSERT(421, mAction != 0); + JUT_ASSERT(421, mAction != NULL); (this->*(mAction[1]))(); } @@ -556,7 +556,7 @@ void daNpcCdn3_c::initTalk() { field_0xb92 = shape_angle.y; field_0xb80 = mpMorf->getAnm(); field_0xb7c = mSeqNum; - JUT_ASSERT(658, 0 != m_targetAct.getActorP()); + JUT_ASSERT(658, NULL != m_targetAct.getActorP()); if (!isInShop() && !isNoTurnTalk()) { int uVar2; if (isChairStyle()) { @@ -635,7 +635,7 @@ void daNpcCdn3_c::executeTalk() { field_0xb97 = 0; field_0xb94 = 1; } - JUT_ASSERT(726, m_funcTbl[mSeqNum][field_0xb97] != 0); + JUT_ASSERT(726, m_funcTbl[mSeqNum][field_0xb97] != NULL); if ((this->*(m_funcTbl[mSeqNum][field_0xb97]))(NULL) != 0) { field_0xb97 = (m_funcTbl[mSeqNum][field_0xb97 + 1] == NULL) ? 0 : field_0xb97 + 1; field_0xb94 = 1; @@ -657,7 +657,7 @@ void daNpcCdn3_c::executeTalk() { /* 80979F08-8097A028 0012A8 0120+00 1/0 0/0 0/0 .text initEscape__11daNpcCdn3_cFv */ void daNpcCdn3_c::initEscape() { mEscapeTag = getEscapeTag(); - JUT_ASSERT(816, mEscapeTag != 0); + JUT_ASSERT(816, mEscapeTag != NULL); JUT_ASSERT(817, mEscapeTag->getPathID() != 0xff); m_path.setPath(mEscapeTag->getPathID(), fopAcM_GetRoomNo(this), 1, ¤t.pos, true); JUT_ASSERT(819, m_path.isPath()); @@ -906,7 +906,7 @@ int daNpcCdn3_c::ctrlMsgAnm() { } if (dComIfGp_event_getTalkPartner() == this) { msg_class* msg_p = dMsgObject_c::getActor(); - JUT_ASSERT(1524, 0 != msg_p); + JUT_ASSERT(1524, NULL != msg_p); if (msg_p->mode == 2 || msg_p->mode == 3) { mMsgIndex = -1; } else if (msg_p->mode == 6) { diff --git a/src/d/actor/d_a_npc_chat.cpp b/src/d/actor/d_a_npc_chat.cpp index e8ad672738..961035d098 100644 --- a/src/d/actor/d_a_npc_chat.cpp +++ b/src/d/actor/d_a_npc_chat.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_chat.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_chin.cpp b/src/d/actor/d_a_npc_chin.cpp index 5028306753..d5e109ef32 100644 --- a/src/d/actor/d_a_npc_chin.cpp +++ b/src/d/actor/d_a_npc_chin.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_chin.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_clerka.cpp b/src/d/actor/d_a_npc_clerka.cpp index c09bb1f851..d8216aac00 100644 --- a/src/d/actor/d_a_npc_clerka.cpp +++ b/src/d/actor/d_a_npc_clerka.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_clerka.h" #include "dol2asm.h" @@ -654,7 +654,7 @@ COMPILER_STRIP_GATE(0x8099590C, &lit_4030); /* 80995910-80995914 0000A0 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4031 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4031 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80995910, &lit_4031); #pragma pop diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp index 89a5c1f3c5..07fc92119e 100644 --- a/src/d/actor/d_a_npc_clerkb.cpp +++ b/src/d/actor/d_a_npc_clerkb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_clerkb.h" #include "dol2asm.h" @@ -679,7 +679,7 @@ COMPILER_STRIP_GATE(0x80999A18, &lit_4038); /* 80999A1C-80999A20 0000A4 0004+00 0/1 0/0 0/0 .rodata @4039 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4039 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4039 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80999A1C, &lit_4039); #pragma pop diff --git a/src/d/actor/d_a_npc_clerkt.cpp b/src/d/actor/d_a_npc_clerkt.cpp index 0f94b79ccd..254304d3fc 100644 --- a/src/d/actor/d_a_npc_clerkt.cpp +++ b/src/d/actor/d_a_npc_clerkt.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_clerkt.h" #include "dol2asm.h" @@ -620,7 +620,7 @@ COMPILER_STRIP_GATE(0x8099D2DC, &lit_4030); /* 8099D2E0-8099D2E4 00009C 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4031 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4031 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x8099D2E0, &lit_4031); #pragma pop diff --git a/src/d/actor/d_a_npc_coach.cpp b/src/d/actor/d_a_npc_coach.cpp index d763848e88..822c265cf5 100644 --- a/src/d/actor/d_a_npc_coach.cpp +++ b/src/d/actor/d_a_npc_coach.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_coach.h" #include "d/actor/d_a_coach_2D.h" @@ -530,7 +530,7 @@ BOOL daNpcChPath_c::setPath(int path_index, int room_no, cXyz& i_vec, bool param // Is this really what the Nintendo devs wrote?? The debug ROM suggests as such. if (param_4 && &i_vec) { - f32 fVar1 = 1000000000.0f; + f32 fVar1 = G_CM3D_F_INF; for (int pnt_index = 0; pnt_index < mpPath->m_num; pnt_index++) { dPnt* pnt = dPath_GetPnt(mpPath, pnt_index); f32 fVar2 = i_vec.abs2(pnt->m_position); @@ -543,7 +543,7 @@ BOOL daNpcChPath_c::setPath(int path_index, int room_no, cXyz& i_vec, bool param setNextPoint(); } - field_0x8 = 1000000000.0f; + field_0x8 = G_CM3D_F_INF; // ditto. if (&i_vec) { @@ -655,7 +655,7 @@ void daNpcCoach_c::setCoachBlazing(u8 damage) { break; default: - JUT_ASSERT(2552, 0); + JUT_ASSERT(2552, FALSE); break; } @@ -721,7 +721,7 @@ void daNpcCoach_c::setCoachBlazing(u8 damage) { int daNpcCoach_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_HORSE); - JUT_ASSERT(2702, modelData != 0); + JUT_ASSERT(2702, modelData != NULL); mChHorse.mpModelMorf = new mDoExt_McaMorf2(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_HU_WAIT_01), NULL, @@ -767,7 +767,7 @@ int daNpcCoach_c::createHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_HARNESS); - JUT_ASSERT(2762, modelData != 0); + JUT_ASSERT(2762, modelData != NULL); mChHarness.mHarnessModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mChHarness.mHarnessModel == NULL) { @@ -790,12 +790,12 @@ int daNpcCoach_c::createHeap() { if (mChHarness.field_0x6a0->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, DZB_HARNESS), 1, &mChHarness.mMtx)) { mChHarness.field_0x6a0 = NULL; - JUT_ASSERT(2782, 0); + JUT_ASSERT(2782, FALSE); } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_COACH); - JUT_ASSERT(2787, modelData != 0); + JUT_ASSERT(2787, modelData != NULL); mChCoach.mCoachModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mChCoach.mCoachModel == NULL) { @@ -820,12 +820,12 @@ int daNpcCoach_c::createHeap() { if (mChCoach.field_0x564->Set((cBgD_t*)dComIfG_getObjectRes(l_arcName, DZB_COACH), 1, &mChCoach.field_0x568) != 0) { mChCoach.field_0x564 = NULL; - JUT_ASSERT(2811, 0); + JUT_ASSERT(2811, FALSE); } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_YELIA); - JUT_ASSERT(2816, modelData != 0); + JUT_ASSERT(2816, modelData != NULL); mChYelia.mpModelMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_YELIA_WAIT), -1, 1.0f, 0, -1, &mChYelia.mSound, 0x80000, 0x11000084); @@ -1730,7 +1730,7 @@ void daNpcCoach_c::calcHorseAnm() { break; default: - JUT_ASSERT(1521, 0); + JUT_ASSERT(1521, FALSE); break; } @@ -1814,7 +1814,7 @@ BOOL daNpcCoach_c::setExpressionAnm(int param_1, bool param_2) { int bckIdx, i_attr; if ((param_1 == 2 || param_1 > 1) || param_1 < 1) { - JUT_ASSERT(2635, 0); + JUT_ASSERT(2635, FALSE); } else { bckIdx = BCK_HU_LASH; i_attr = J3DFrameCtrl::EMode_NONE; diff --git a/src/d/actor/d_a_npc_df.cpp b/src/d/actor/d_a_npc_df.cpp index 724079106c..65dbace4bb 100644 --- a/src/d/actor/d_a_npc_df.cpp +++ b/src/d/actor/d_a_npc_df.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_df.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_doc.cpp b/src/d/actor/d_a_npc_doc.cpp index 965fc4ca57..aae7c85d32 100644 --- a/src/d/actor/d_a_npc_doc.cpp +++ b/src/d/actor/d_a_npc_doc.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_doc.h" #include "dol2asm.h" @@ -690,7 +690,7 @@ COMPILER_STRIP_GATE(0x809AA3C4, &lit_4037); /* 809AA3C8-809AA3CC 0000AC 0004+00 0/1 0/0 0/0 .rodata @4038 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4038 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4038 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x809AA3C8, &lit_4038); #pragma pop diff --git a/src/d/actor/d_a_npc_doorboy.cpp b/src/d/actor/d_a_npc_doorboy.cpp index c1316fa139..49cb091d14 100644 --- a/src/d/actor/d_a_npc_doorboy.cpp +++ b/src/d/actor/d_a_npc_doorboy.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_doorboy.h" @@ -231,7 +231,7 @@ cPhs__Step daNpcDoorBoy_c::Create() { int daNpcDoorBoy_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], BMDR_DOORBOY); - JUT_ASSERT(292, 0 != mdlData_p); + JUT_ASSERT(292, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -622,7 +622,7 @@ bool daNpcDoorBoy_c::wait(void* param_1) { break; default: - JUT_ASSERT(1064, 0); + JUT_ASSERT(1064, FALSE); break; } @@ -648,7 +648,7 @@ bool daNpcDoorBoy_c::fear(void* param_1) { break; default: - JUT_ASSERT(1094, 0); + JUT_ASSERT(1094, FALSE); break; } @@ -708,7 +708,7 @@ bool daNpcDoorBoy_c::talk(void* param_1) { break; default: - JUT_ASSERT(1167, 0); + JUT_ASSERT(1167, FALSE); break; } @@ -730,7 +730,7 @@ bool daNpcDoorBoy_c::demo(void* param_1) { if (staffId != -1) { mStaffID = staffId; - JUT_ASSERT(1201, 0 != mEvtSeqList[mOrderEvtNo]); + JUT_ASSERT(1201, NULL != mEvtSeqList[mOrderEvtNo]); if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) { eventManager.cutEnd(staffId); @@ -750,7 +750,7 @@ bool daNpcDoorBoy_c::demo(void* param_1) { break; default: - JUT_ASSERT(1229, 0); + JUT_ASSERT(1229, FALSE); break; } @@ -780,7 +780,7 @@ bool daNpcDoorBoy_c::dummyTalk(void* param_1) { break; default: - JUT_ASSERT(1263, 0); + JUT_ASSERT(1263, FALSE); break; } diff --git a/src/d/actor/d_a_npc_drainSol.cpp b/src/d/actor/d_a_npc_drainSol.cpp index f62ec85017..57df5b536c 100644 --- a/src/d/actor/d_a_npc_drainSol.cpp +++ b/src/d/actor/d_a_npc_drainSol.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_drainSol.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_du.cpp b/src/d/actor/d_a_npc_du.cpp index dc24f063e1..008d8fd233 100644 --- a/src/d/actor/d_a_npc_du.cpp +++ b/src/d/actor/d_a_npc_du.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_du.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_npc_fairy.cpp b/src/d/actor/d_a_npc_fairy.cpp index a4beb40164..6ef35a190f 100644 --- a/src/d/actor/d_a_npc_fairy.cpp +++ b/src/d/actor/d_a_npc_fairy.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_fairy.h" #include "dol2asm.h" @@ -1541,7 +1541,7 @@ COMPILER_STRIP_GATE(0x809B93F8, &lit_4315); /* 809B93FC-809B9400 000118 0004+00 0/1 0/0 0/0 .rodata @4316 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4316 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4316 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x809B93FC, &lit_4316); #pragma pop diff --git a/src/d/actor/d_a_npc_fairy_seirei.cpp b/src/d/actor/d_a_npc_fairy_seirei.cpp index 3532685dc7..1d79452f1e 100644 --- a/src/d/actor/d_a_npc_fairy_seirei.cpp +++ b/src/d/actor/d_a_npc_fairy_seirei.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_fairy_seirei.h" @@ -105,7 +105,7 @@ int daNpc_FairySeirei_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_fguard.cpp b/src/d/actor/d_a_npc_fguard.cpp index 1cb7ae735d..b46bb221ca 100644 --- a/src/d/actor/d_a_npc_fguard.cpp +++ b/src/d/actor/d_a_npc_fguard.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_npc_fguard // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_fguard.h" diff --git a/src/d/actor/d_a_npc_fish.cpp b/src/d/actor/d_a_npc_fish.cpp index 0c7228a573..fd6da57caa 100644 --- a/src/d/actor/d_a_npc_fish.cpp +++ b/src/d/actor/d_a_npc_fish.cpp @@ -1,6 +1,6 @@ // Translation Unit: d_a_npc_fish -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_fish.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_npc_gnd.cpp b/src/d/actor/d_a_npc_gnd.cpp index e5d3a794c3..eefbc8a53a 100644 --- a/src/d/actor/d_a_npc_gnd.cpp +++ b/src/d/actor/d_a_npc_gnd.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gnd.h" #include "dol2asm.h" @@ -563,7 +563,7 @@ COMPILER_STRIP_GATE(0x809BE538, &lit_4023); /* 809BE53C-809BE540 00009C 0004+00 0/1 0/0 0/0 .rodata @4024 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4024 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4024 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x809BE53C, &lit_4024); #pragma pop diff --git a/src/d/actor/d_a_npc_gra.cpp b/src/d/actor/d_a_npc_gra.cpp index 5aa9a8367d..676cc8cf25 100644 --- a/src/d/actor/d_a_npc_gra.cpp +++ b/src/d/actor/d_a_npc_gra.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gra.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_grc.cpp b/src/d/actor/d_a_npc_grc.cpp index 333ad893c2..82f8dad3ed 100644 --- a/src/d/actor/d_a_npc_grc.cpp +++ b/src/d/actor/d_a_npc_grc.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grc.h" #include "Z2AudioLib/Z2Instances.h" @@ -375,7 +375,7 @@ int daNpc_grC_c::CreateHeap() { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[0].arcIdx], l_bmdGetParamList[0].fileIdx); } - JUT_ASSERT(452, 0 != mdlData_p); + JUT_ASSERT(452, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -1141,7 +1141,7 @@ BOOL daNpc_grC_c::doEvent() { int evtCutNo = eventManager.getMyActIdx(staffId, &mEvtCutNameList, 1, 0, 0); JUT_ASSERT(1774, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e)); - JUT_ASSERT(1775, 0 != mEvtCutList[evtCutNo]); + JUT_ASSERT(1775, NULL != mEvtCutList[evtCutNo]); if ((this->*mEvtCutList[evtCutNo])(staffId)) { eventManager.cutEnd(staffId); diff --git a/src/d/actor/d_a_npc_grd.cpp b/src/d/actor/d_a_npc_grd.cpp index 7a11ff4265..c8b36a411a 100644 --- a/src/d/actor/d_a_npc_grd.cpp +++ b/src/d/actor/d_a_npc_grd.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grd.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_grm.cpp b/src/d/actor/d_a_npc_grm.cpp index b00c409509..021531e9b2 100644 --- a/src/d/actor/d_a_npc_grm.cpp +++ b/src/d/actor/d_a_npc_grm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grm.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_grmc.cpp b/src/d/actor/d_a_npc_grmc.cpp index 8ba453628c..ca3b1d7d09 100644 --- a/src/d/actor/d_a_npc_grmc.cpp +++ b/src/d/actor/d_a_npc_grmc.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grmc.h" @@ -278,7 +278,7 @@ int daNpc_grMC_c::CreateHeap() { J3DModelData* mdlData_p = static_cast(dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdIdx][1]], l_bmdData[bmdIdx][0])); - JUT_ASSERT(701, 0 != mdlData_p); + JUT_ASSERT(701, NULL != mdlData_p); mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_gro.cpp b/src/d/actor/d_a_npc_gro.cpp index 656aec2dbe..e1023d9fdf 100644 --- a/src/d/actor/d_a_npc_gro.cpp +++ b/src/d/actor/d_a_npc_gro.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gro.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_grr.cpp b/src/d/actor/d_a_npc_grr.cpp index 54bddfacdb..e19cc4bed1 100644 --- a/src/d/actor/d_a_npc_grr.cpp +++ b/src/d/actor/d_a_npc_grr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grr.h" #include "Z2AudioLib/Z2Instances.h" @@ -349,7 +349,7 @@ int daNpc_grR_c::CreateHeap() { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[0][1]], l_bmdGetParamList[0][0]); } - JUT_ASSERT(458, 0 != mdlData_p); + JUT_ASSERT(458, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -1122,7 +1122,7 @@ BOOL daNpc_grR_c::doEvent() { int evtCutNo = eventManager.getMyActIdx(staffId, &mEvtCutNameList, 1, 0, 0); JUT_ASSERT(1771, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e)); - JUT_ASSERT(1772, 0 != mEvtCutList[evtCutNo]); + JUT_ASSERT(1772, NULL != mEvtCutList[evtCutNo]); if ((this->*mEvtCutList[evtCutNo])(staffId)) { eventManager.cutEnd(staffId); diff --git a/src/d/actor/d_a_npc_grs.cpp b/src/d/actor/d_a_npc_grs.cpp index 35bdfe5383..e26f52af08 100644 --- a/src/d/actor/d_a_npc_grs.cpp +++ b/src/d/actor/d_a_npc_grs.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grs.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_grz.cpp b/src/d/actor/d_a_npc_grz.cpp index dd43918e3e..f292504e35 100644 --- a/src/d/actor/d_a_npc_grz.cpp +++ b/src/d/actor/d_a_npc_grz.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_grz.h" #include "d/actor/d_a_obj_grz_rock.h" @@ -519,7 +519,7 @@ int daNpc_Grz_c::CreateHeap() { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[0][1]], l_bmdGetParamList[0][0]); } - JUT_ASSERT(556, 0 != mdlData_p); + JUT_ASSERT(556, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -1576,7 +1576,7 @@ BOOL daNpc_Grz_c::doEvent() { int evtCutNo = eventManager.getMyActIdx(staffId, mEvtCutNameList, 7, 0, 0); JUT_ASSERT(2262, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e)); - JUT_ASSERT(2263, 0 != mEvtCutList[evtCutNo]); + JUT_ASSERT(2263, NULL != mEvtCutList[evtCutNo]); if ((this->*mEvtCutList[evtCutNo])(staffId)) { eventManager.cutEnd(staffId); @@ -2180,7 +2180,7 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) { case 0: actor = (fopAc_ac_c*)fpcM_Search(s_sub2, this); - JUT_ASSERT(3349, 0 != actor); + JUT_ASSERT(3349, NULL != actor); mActorMngrs[2].entry(actor); setLookMode(LOOK_ATTN); @@ -2189,7 +2189,7 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) { case 1: actor = (fopAc_ac_c*)fpcM_Search(s_sub3, this); - JUT_ASSERT(3359, 0 != actor); + JUT_ASSERT(3359, NULL != actor); mActorMngrs[2].entry(actor); setLookMode(LOOK_ATTN); @@ -2226,7 +2226,7 @@ int daNpc_Grz_c::doGoOutCut(int i_staffId) { case 0: { fopAc_ac_c* actor_p = mActorMngrs[2].getActorP(); - JUT_ASSERT(3415, 0 != actor_p); + JUT_ASSERT(3415, NULL != actor_p); s16 angleY = fopAcM_searchActorAngleY(this, actor_p); if (angleY == mCurAngle.y) { diff --git a/src/d/actor/d_a_npc_guard.cpp b/src/d/actor/d_a_npc_guard.cpp index 13dfd2b6a5..6dc592a7d5 100644 --- a/src/d/actor/d_a_npc_guard.cpp +++ b/src/d/actor/d_a_npc_guard.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_guard.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_gwolf.cpp b/src/d/actor/d_a_npc_gwolf.cpp index c92427a76c..5b9ffe4722 100644 --- a/src/d/actor/d_a_npc_gwolf.cpp +++ b/src/d/actor/d_a_npc_gwolf.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_gwolf.h" #include "Z2AudioLib/Z2Instances.h" @@ -358,7 +358,7 @@ int daNpc_GWolf_c::CreateHeap() { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[0].arcIdx], l_bmdGetParamList[0].fileIdx); } - JUT_ASSERT(538, 0 != mdlData_p); + JUT_ASSERT(538, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -1129,7 +1129,7 @@ BOOL daNpc_GWolf_c::doEvent() { int evtCutNo = eventManager.getMyActIdx(staffId, mEvtCutNameList, 5, FALSE, FALSE); JUT_ASSERT(2087, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e)); - JUT_ASSERT(2088, 0 != mEvtCutList[evtCutNo]); + JUT_ASSERT(2088, NULL != mEvtCutList[evtCutNo]); if ((this->*mEvtCutList[evtCutNo])(staffId)) { eventManager.cutEnd(staffId); diff --git a/src/d/actor/d_a_npc_hanjo.cpp b/src/d/actor/d_a_npc_hanjo.cpp index 1a4ad8eb29..695394a9c3 100644 --- a/src/d/actor/d_a_npc_hanjo.cpp +++ b/src/d/actor/d_a_npc_hanjo.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_hanjo.h" #include "d/actor/d_a_npc_tk.h" @@ -231,7 +231,7 @@ int daNpc_Hanjo_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -1170,7 +1170,7 @@ int daNpc_Hanjo_c::cutConversation(int param_1) { } if (iVar6 == 1) { fopAc_ac_c* actor_p =field_0x10c8[0].getActorP(); - JUT_ASSERT(2650, 0 != actor_p); + JUT_ASSERT(2650, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); } break; @@ -1232,7 +1232,7 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) { case 0: setAngle(home.angle.y); actor_p = field_0x10c8[0].getActorP(); - JUT_ASSERT(2748, 0 != actor_p); + JUT_ASSERT(2748, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); for (int i = 0; i < 4; i++) { if (mStones[i].chkActive()) { @@ -1406,7 +1406,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { case 6: { mEventTimer = iVar7; fopAc_ac_c* actor_p = field_0x10c8[2].getActorP(); - JUT_ASSERT(3005, 0 != actor_p); + JUT_ASSERT(3005, NULL != actor_p); ((daNPC_TK_c*)actor_p)->setAttackLink(); field_0x1722 = 1; break; @@ -1416,7 +1416,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { 0); dComIfGs_onSaveSwitch(0x2b); actor_p = field_0x10c8[2].getActorP(); - JUT_ASSERT(3014, 0 != actor_p); + JUT_ASSERT(3014, NULL != actor_p); ((daNPC_TK_c*)actor_p)->setQuickHanjoHand(); field_0x1722 = 1; daNpcT_onTmpBit(0x27); @@ -1448,7 +1448,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { if (cLib_calcTimer(&mEventTimer) == 0) { mMotionSeqMngr.setNo(12, 8.0f, 0, 0); actor_p = field_0x10c8[2].getActorP(); - JUT_ASSERT(3068, 0 != actor_p); + JUT_ASSERT(3068, NULL != actor_p); ((daNPC_TK_c*)actor_p)->setHanjoHand(); } } else if (mMotionSeqMngr.checkEndSequence()) { @@ -1461,7 +1461,7 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) { case 4: mJntAnm.lookNone(0); actor_p = field_0x10c8[2].getActorP(); - JUT_ASSERT(3090, 0 != actor_p); + JUT_ASSERT(3090, NULL != actor_p); if (((daNPC_TK_c*)actor_p)->isHanjoHand()) { rv = 1; } diff --git a/src/d/actor/d_a_npc_henna.cpp b/src/d/actor/d_a_npc_henna.cpp index 525a8f004d..b6659c52ee 100644 --- a/src/d/actor/d_a_npc_henna.cpp +++ b/src/d/actor/d_a_npc_henna.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_henna.h" @@ -2698,7 +2698,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Henna", 0x24); - JUT_ASSERT(6547, modelData != 0); + JUT_ASSERT(6547, modelData != NULL); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpModel == 0) { return 0; diff --git a/src/d/actor/d_a_npc_henna0.cpp b/src/d/actor/d_a_npc_henna0.cpp index 37741ebe33..bbb0fdc69d 100644 --- a/src/d/actor/d_a_npc_henna0.cpp +++ b/src/d/actor/d_a_npc_henna0.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_henna0.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_hoz.cpp b/src/d/actor/d_a_npc_hoz.cpp index 815013b303..505966e0f9 100644 --- a/src/d/actor/d_a_npc_hoz.cpp +++ b/src/d/actor/d_a_npc_hoz.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_hoz.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_impal.cpp b/src/d/actor/d_a_npc_impal.cpp index 46a70f301e..ee8f2a8794 100644 --- a/src/d/actor/d_a_npc_impal.cpp +++ b/src/d/actor/d_a_npc_impal.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_impal.h" diff --git a/src/d/actor/d_a_npc_inko.cpp b/src/d/actor/d_a_npc_inko.cpp index 6661c9600d..b9079b61df 100644 --- a/src/d/actor/d_a_npc_inko.cpp +++ b/src/d/actor/d_a_npc_inko.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_inko.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_ins.cpp b/src/d/actor/d_a_npc_ins.cpp index 32792bce4d..338760f7fd 100644 --- a/src/d/actor/d_a_npc_ins.cpp +++ b/src/d/actor/d_a_npc_ins.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ins.h" #include "d/d_meter2_info.h" @@ -461,7 +461,7 @@ cPhs__Step daNpcIns_c::Create() { int daNpcIns_c::CreateHeap() { J3DModelData* mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], BMDR_INS)); - JUT_ASSERT(424, 0 != mdlData_p); + JUT_ASSERT(424, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -484,14 +484,14 @@ int daNpcIns_c::CreateHeap() { if (mType == TYPE_1 || mType == TYPE_2) { mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[2], BMDR_INS_UMBRELLA); - JUT_ASSERT(456, mdlData_p != 0); + JUT_ASSERT(456, mdlData_p != NULL); mpUmbrellaModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mpUmbrellaModel == NULL) { return 0; } mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[2], BMDE_INS_KAGO); - JUT_ASSERT(463, mdlData_p != 0); + JUT_ASSERT(463, mdlData_p != NULL); mpKagoModel = mDoExt_J3DModel__create(mdlData_p, 0, 0x11000084); if (mpKagoModel == NULL) { return 0; @@ -1203,7 +1203,7 @@ int daNpcIns_c::waitShop(void* param_1) { break; default: - JUT_ASSERT(1530, 0); + JUT_ASSERT(1530, FALSE); break; } @@ -1296,7 +1296,7 @@ int daNpcIns_c::waitPresent(void* param_1) { break; default: - JUT_ASSERT(1585, 0); + JUT_ASSERT(1585, FALSE); break; } @@ -1346,7 +1346,7 @@ int daNpcIns_c::waitOutSide1(void* param_1) { break; default: - JUT_ASSERT(1642, 0); + JUT_ASSERT(1642, FALSE); break; } @@ -1378,7 +1378,7 @@ int daNpcIns_c::waitOutSide2(void* param_1) { break; default: - JUT_ASSERT(1679, 0); + JUT_ASSERT(1679, FALSE); break; } @@ -1391,7 +1391,7 @@ int daNpcIns_c::goHome(void* param_1) { case 0: { cXyz targetPoint; - JUT_ASSERT(1702, mPath != 0); + JUT_ASSERT(1702, mPath != NULL); getTargetPoint(mPntIndex, &targetPoint); @@ -1444,7 +1444,7 @@ int daNpcIns_c::goHome(void* param_1) { break; default: - JUT_ASSERT(1750, 0); + JUT_ASSERT(1750, FALSE); break; } @@ -1558,7 +1558,7 @@ int daNpcIns_c::talk(void* param_1) { break; default: - JUT_ASSERT(1848, 0); + JUT_ASSERT(1848, FALSE); break; } @@ -1583,7 +1583,7 @@ int daNpcIns_c::demo(void* param_1) { if (staffId != -1) { mStaffID = staffId; - JUT_ASSERT(1882, 0 != mEvtSeqList[mOrderEvtNo]); + JUT_ASSERT(1882, NULL != mEvtSeqList[mOrderEvtNo]); if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) { eventManager->cutEnd(staffId); @@ -1605,7 +1605,7 @@ int daNpcIns_c::demo(void* param_1) { break; default: - JUT_ASSERT(1910, 0); + JUT_ASSERT(1910, FALSE); break; } @@ -1725,7 +1725,7 @@ const insect_param_data& daNpcIns_c::getInsectParamData(int i_index) { break; default: - JUT_ASSERT(1965, 0); + JUT_ASSERT(1965, FALSE); break; } diff --git a/src/d/actor/d_a_npc_jagar.cpp b/src/d/actor/d_a_npc_jagar.cpp index 857d329b0d..fe67068394 100644 --- a/src/d/actor/d_a_npc_jagar.cpp +++ b/src/d/actor/d_a_npc_jagar.cpp @@ -3,7 +3,7 @@ * NPC - Jaggle */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_jagar.h" #include "Z2AudioLib/Z2Instances.h" @@ -366,7 +366,7 @@ int daNpc_Jagar_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_kakashi.cpp b/src/d/actor/d_a_npc_kakashi.cpp index 067d6e1829..d86eacdf2c 100644 --- a/src/d/actor/d_a_npc_kakashi.cpp +++ b/src/d/actor/d_a_npc_kakashi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kakashi.h" #include "d/d_com_static.h" @@ -210,7 +210,7 @@ int daNpc_Kakashi_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_kasi_hana.cpp b/src/d/actor/d_a_npc_kasi_hana.cpp index 8e5856fada..4c910331b5 100644 --- a/src/d/actor/d_a_npc_kasi_hana.cpp +++ b/src/d/actor/d_a_npc_kasi_hana.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kasi_hana.h" #include "d/actor/d_a_npc_chin.h" @@ -704,7 +704,7 @@ cPhs__Step daNpcKasiHana_c::Create() { int daNpcKasiHana_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 5); - JUT_ASSERT(950, 0 != mdlData_p); + JUT_ASSERT(950, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -1432,7 +1432,7 @@ int daNpcKasiHana_c::turn(int param_1) { break; default: - JUT_ASSERT(2155, 0); + JUT_ASSERT(2155, FALSE); } return 1; @@ -1633,7 +1633,7 @@ int daNpcKasiHana_c::demo(int param_1) { if (staffId != -1) { mStaffID = staffId; - JUT_ASSERT(2459, 0 != mEvtSeqList[mOrderEvtNo]); + JUT_ASSERT(2459, NULL != mEvtSeqList[mOrderEvtNo]); if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) { dComIfGp_getEventManager().cutEnd(staffId); diff --git a/src/d/actor/d_a_npc_kasi_kyu.cpp b/src/d/actor/d_a_npc_kasi_kyu.cpp index a69616a889..18c942d261 100644 --- a/src/d/actor/d_a_npc_kasi_kyu.cpp +++ b/src/d/actor/d_a_npc_kasi_kyu.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kasi_kyu.h" #include "Z2AudioLib/Z2Instances.h" @@ -256,7 +256,7 @@ cPhs__Step daNpcKasiKyu_c::Create() { int daNpcKasiKyu_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], BMDR_KYU); - JUT_ASSERT(322, 0 != mdlData_p); + JUT_ASSERT(322, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -837,7 +837,7 @@ int daNpcKasiKyu_c::wait(int param_1) { break; default: - JUT_ASSERT(1296, 0); + JUT_ASSERT(1296, FALSE); break; } diff --git a/src/d/actor/d_a_npc_kasi_mich.cpp b/src/d/actor/d_a_npc_kasi_mich.cpp index 7e57f0671f..25d31658b4 100644 --- a/src/d/actor/d_a_npc_kasi_mich.cpp +++ b/src/d/actor/d_a_npc_kasi_mich.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kasi_mich.h" #include "Z2AudioLib/Z2Instances.h" @@ -256,7 +256,7 @@ cPhs__Step daNpcKasiMich_c::Create() { int daNpcKasiMich_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], BMDR_MICH); - JUT_ASSERT(314, 0 != mdlData_p); + JUT_ASSERT(314, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020084); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -837,7 +837,7 @@ int daNpcKasiMich_c::wait(int param_1) { break; default: - JUT_ASSERT(1301, 0); + JUT_ASSERT(1301, FALSE); break; } diff --git a/src/d/actor/d_a_npc_kdk.cpp b/src/d/actor/d_a_npc_kdk.cpp index 2d9704164c..fb6e696df1 100644 --- a/src/d/actor/d_a_npc_kdk.cpp +++ b/src/d/actor/d_a_npc_kdk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kdk.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_kkri.cpp b/src/d/actor/d_a_npc_kkri.cpp index f53a80c962..57ca42ad75 100644 --- a/src/d/actor/d_a_npc_kkri.cpp +++ b/src/d/actor/d_a_npc_kkri.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kkri.h" #include "d/actor/d_a_e_ym.h" @@ -358,7 +358,7 @@ int daNpc_Kkri_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -1109,7 +1109,7 @@ int daNpc_Kkri_c::sitWait1(void*) { /* 80551A4C-80551DA4 00278C 0358+00 1/0 0/0 0/0 .text fearWait__12daNpc_Kkri_cFPv */ int daNpc_Kkri_c::fearWait(void*) { fopAc_ac_c* nearest_actor = NULL; - f32 nearest_dist = 1000000000.0f; + f32 nearest_dist = G_CM3D_F_INF; switch (mMode) { case 0: diff --git a/src/d/actor/d_a_npc_kn.cpp b/src/d/actor/d_a_npc_kn.cpp index fbbc18c54e..2e404a05c7 100644 --- a/src/d/actor/d_a_npc_kn.cpp +++ b/src/d/actor/d_a_npc_kn.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "Z2AudioLib/Z2Instances.h" #include "d/actor/d_a_npc.h" @@ -506,7 +506,7 @@ int daNpc_Kn_c::CreateHeap() { int res_idx = l_bmdData[bmd_offset][0]; mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[arc_idx], res_idx); - JUT_ASSERT(1259, 0 != mdlData_p); + 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); @@ -535,7 +535,7 @@ int daNpc_Kn_c::CreateHeap() { arc_idx = l_bmdData[bmd_offset][1]; res_idx = l_bmdData[bmd_offset][0]; mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[arc_idx], res_idx); - JUT_ASSERT(1310, 0 != mdlData_p); + 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); @@ -1039,7 +1039,7 @@ void daNpc_Kn_c::beforeMove() { /* 80A2C4FC-80A2C56C 001BDC 0070+00 1/1 0/0 0/0 .text afterMoved__10daNpc_Kn_cFv */ void daNpc_Kn_c::afterMoved() { - if (mGroundHeight != -1000000000.0f) { + if (mGroundHeight != -G_CM3D_F_INF) { mTevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk); mTevStr.room_no = dComIfG_Bgsp().GetRoomId(mGndChk); } @@ -2018,7 +2018,7 @@ int daNpc_Kn_c::teach04_attackWait(void* param_0) { u8 cut_type = daPy_getPlayerActorClass()->getCutType(); if (cut_type == daPy_py_c::CUT_TYPE_GUARD_ATTACK) { fopAc_ac_c* aTgHitActor_p = mCylCc.GetTgHitAc(); - JUT_ASSERT(3715, 0 != aTgHitActor_p); + JUT_ASSERT(3715, NULL != aTgHitActor_p); s16 angle = cLib_targetAngleY(&aTgHitActor_p->current.pos, ¤t.pos); cXyz offset(0.0f, 0.0f, daNpc_Kn_Param_c::m.small_slide_distance); @@ -2401,7 +2401,7 @@ int daNpc_Kn_c::teach06_superJumpWait(void* param_0) { mSound.startCollisionSE(Z2SE_HIT_SWORD, 0x1f); } else if (cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP_INIT) { fopAc_ac_c* aTgHitActor_p = mCylCc.GetTgHitAc(); - JUT_ASSERT(4286, 0 != aTgHitActor_p); + JUT_ASSERT(4286, NULL != aTgHitActor_p); s16 angle = cLib_targetAngleY(&aTgHitActor_p->current.pos, ¤t.pos); cXyz offset(0.0f, 0.0f, daNpc_Kn_Param_c::m.small_slide_distance); @@ -2617,7 +2617,7 @@ int daNpc_Kn_c::teach06_superJumpWaitDivide(void* param_0) { mSound.startCollisionSE(Z2SE_HIT_SWORD, 0x1F); } else if (cut_type == daPy_py_c::CUT_TYPE_LARGE_JUMP_INIT) { fopAc_ac_c* aTgHitActor_p = mCylCc.GetTgHitAc(); - JUT_ASSERT(4619, 0 != aTgHitActor_p); + JUT_ASSERT(4619, NULL != aTgHitActor_p); s16 angle = cLib_targetAngleY(&aTgHitActor_p->current.pos, ¤t.pos); cXyz offset(0.0f, 0.0f, daNpc_Kn_Param_c::m.small_slide_distance); diff --git a/src/d/actor/d_a_npc_kn_base.inc b/src/d/actor/d_a_npc_kn_base.inc index d059ab65e5..0ffbb3aeee 100644 --- a/src/d/actor/d_a_npc_kn_base.inc +++ b/src/d/actor/d_a_npc_kn_base.inc @@ -134,7 +134,7 @@ int daNpc_Kn_c::execute() { mGroundHeight = mAcch.GetGroundH(); afterMoved(); - if (mGroundHeight != -1000000000.0f) { + if (mGroundHeight != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -521,7 +521,7 @@ int daNpc_Kn_c::ctrlMsgAnm(int* o_faceAnmAttr_p, int* o_anmAttr_p, fopAc_ac_c* i if (param_3 || eventInfo.checkCommandTalk() || mStaffId != -1) { if (dComIfGp_event_getTalkPartner() == i_talkPartner_p) { msg_class* msg_p = dMsgObject_c::getActor(); - JUT_ASSERT(1088, 0 != msg_p); + JUT_ASSERT(1088, NULL != msg_p); if (msg_p->mode == 2 || msg_p->mode == 3) { mMsgId = fpcM_ERROR_PROCESS_ID_e; @@ -1200,7 +1200,7 @@ static f32 dummy_lits_01(int sel) { case 1: return 6.0f; default: - return 1e9f; + return G_CM3D_F_INF; } } diff --git a/src/d/actor/d_a_npc_kn_teach02.inc b/src/d/actor/d_a_npc_kn_teach02.inc index b0fe5ce470..d80641d59c 100644 --- a/src/d/actor/d_a_npc_kn_teach02.inc +++ b/src/d/actor/d_a_npc_kn_teach02.inc @@ -281,7 +281,7 @@ int daNpc_Kn_c::teach02_shieldReflectWait(void* param_0) { if (mCylCc.ChkTgHit()) { fopAc_ac_c* aTgHitActor_p = mCylCc.GetTgHitAc(); - JUT_ASSERT(437, 0 != aTgHitActor_p); + JUT_ASSERT(437, NULL != aTgHitActor_p); if (fopAcM_GetName(aTgHitActor_p) == PROC_KN_BULLET) { mEvtNo = 0xB; diff --git a/src/d/actor/d_a_npc_knj.cpp b/src/d/actor/d_a_npc_knj.cpp index 7827ef03bd..faccf26b27 100644 --- a/src/d/actor/d_a_npc_knj.cpp +++ b/src/d/actor/d_a_npc_knj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_knj.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_kolin.cpp b/src/d/actor/d_a_npc_kolin.cpp index 3d7b2dcc2c..0c5ad0c3de 100644 --- a/src/d/actor/d_a_npc_kolin.cpp +++ b/src/d/actor/d_a_npc_kolin.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kolin.h" #include "Z2AudioLib/Z2Instances.h" @@ -463,7 +463,7 @@ cPhs__Step daNpc_Kolin_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -1383,7 +1383,7 @@ int daNpc_Kolin_c::cutHail(int i_cutIndex) { mGndChk.SetPos(&work); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(2646, -(1000000000.0f) != work.y); + JUT_ASSERT(2646, -G_CM3D_F_INF != work.y); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, angle, 0); break; @@ -2057,7 +2057,7 @@ int daNpc_Kolin_c::timidWalk(void* param_1) { } // fallthrough case 2:; - JUT_ASSERT(4359, 0 != mPath.getPathInfo()); + JUT_ASSERT(4359, NULL != mPath.getPathInfo()); /* dSv_event_flag_c::F_0010 - Ordon Village - First convo with Colin blocking path (forced) */ if (!daNpcT_chkEvtBit(14)) { diff --git a/src/d/actor/d_a_npc_kolinb.cpp b/src/d/actor/d_a_npc_kolinb.cpp index b125ac8b9b..1e059c765c 100644 --- a/src/d/actor/d_a_npc_kolinb.cpp +++ b/src/d/actor/d_a_npc_kolinb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kolinb.h" @@ -317,7 +317,7 @@ cPhs__Step daNpc_Kolinb_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_ks.cpp b/src/d/actor/d_a_npc_ks.cpp index 3d94b89a51..938fc6dc40 100644 --- a/src/d/actor/d_a_npc_ks.cpp +++ b/src/d/actor/d_a_npc_ks.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ks.h" #include "d/actor/d_a_obj_kago.h" @@ -6891,7 +6891,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, npc_ks_class::BMDR_SARU_STICK); - JUT_ASSERT(10232, modelData != 0); + JUT_ASSERT(10232, modelData != NULL); i_this->mpStickModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpStickModel == NULL) { return 0; @@ -6899,7 +6899,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { if (i_this->mRoomMonkeyID == 0 || i_this->mRoomMonkeyID == 10 || i_this->mRoomMonkeyID == 20 || i_this->mRoomMonkeyID == 21 || i_this->mRoomMonkeyID == 22) { modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mResName, npc_ks_class::BMDR_SARU_BARA); - JUT_ASSERT(10249, modelData != 0); + JUT_ASSERT(10249, modelData != NULL); i_this->mpRoseModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpRoseModel == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_kyury.cpp b/src/d/actor/d_a_npc_kyury.cpp index 55f8448730..79c8d50dc2 100644 --- a/src/d/actor/d_a_npc_kyury.cpp +++ b/src/d/actor/d_a_npc_kyury.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_kyury.h" #include "dol2asm.h" @@ -704,7 +704,7 @@ COMPILER_STRIP_GATE(0x80A63944, &lit_4042); /* 80A63948-80A6394C 00009C 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4043 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4043 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80A63948, &lit_4043); #pragma pop diff --git a/src/d/actor/d_a_npc_len.cpp b/src/d/actor/d_a_npc_len.cpp index c3d18e1c5d..eddc602dcc 100644 --- a/src/d/actor/d_a_npc_len.cpp +++ b/src/d/actor/d_a_npc_len.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_len.h" #include "dol2asm.h" @@ -842,7 +842,7 @@ COMPILER_STRIP_GATE(0x80A68F70, &lit_4072); /* 80A68F74-80A68F78 0000D0 0004+00 0/1 0/0 0/0 .rodata @4073 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4073 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4073 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80A68F74, &lit_4073); #pragma pop diff --git a/src/d/actor/d_a_npc_lf.cpp b/src/d/actor/d_a_npc_lf.cpp index ea21e60441..d1c07729bd 100644 --- a/src/d/actor/d_a_npc_lf.cpp +++ b/src/d/actor/d_a_npc_lf.cpp @@ -6,7 +6,7 @@ * @details Group of several small fish spawned in a group. Used in Fishing Pond. */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_lf.h" #include "f_op/f_op_camera_mng.h" diff --git a/src/d/actor/d_a_npc_lud.cpp b/src/d/actor/d_a_npc_lud.cpp index efa0fc1ef6..00b8ce3593 100644 --- a/src/d/actor/d_a_npc_lud.cpp +++ b/src/d/actor/d_a_npc_lud.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_len.h" #include "d/actor/d_a_npc_lud.h" @@ -246,7 +246,7 @@ int daNpc_Lud_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_maro.cpp b/src/d/actor/d_a_npc_maro.cpp index 081f016e45..ac1f6698dd 100644 --- a/src/d/actor/d_a_npc_maro.cpp +++ b/src/d/actor/d_a_npc_maro.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_maro.h" @@ -279,7 +279,7 @@ int daNpc_Maro_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -401,7 +401,7 @@ void* daNpc_Maro_c::srchArrow(void* param_1, void* param_2) { /* 8055C0B4-8055C1AC 000C14 00F8+00 1/1 0/0 0/0 .text getArrowP__12daNpc_Maro_cFv */ fopAc_ac_c* daNpc_Maro_c::getArrowP() { fopAc_ac_c* pActor = NULL; - f32 minDist = 1e9f; + f32 minDist = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchArrow, this); for (int i = 0; i < mFindCount; i++) { @@ -430,7 +430,7 @@ void* daNpc_Maro_c::srchItaMato(void* arg0, void* arg1) { /* 8055C248-8055C330 000DA8 00E8+00 1/1 0/0 0/0 .text getItaMatoP__12daNpc_Maro_cFi */ fopAc_ac_c* daNpc_Maro_c::getItaMatoP(int param_0) { fopAc_ac_c* pActor = NULL; - f32 minDist = 1e9f; + f32 minDist = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchItaMato, this); for (int i = 0; i < mFindCount; i++) { @@ -1423,7 +1423,7 @@ int daNpc_Maro_c::cutFindMonkey(int arg0) { mJntAnm.lookNone(0); if (mEventTimer == 0) { actor_p = dComIfGp_getHorseActor(); - JUT_ASSERT(0xA99, 0 != actor_p); + JUT_ASSERT(0xA99, NULL != actor_p); my_vec_0 = actor_p->current.pos; if (50.0f < current.pos.absXZ(my_vec_0)) { cLib_addCalcAngleS2(¤t.angle.y, cLib_targetAngleY(¤t.pos, &my_vec_0), 4, 0x800); @@ -1505,7 +1505,7 @@ int daNpc_Maro_c::cutGiveMeWoodSwd(int arg0) { case 1: { actor_p = mActorMngr[3].getActorP(); - JUT_ASSERT(0xB00, 0 != actor_p); + JUT_ASSERT(0xB00, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); retval = 1; break; @@ -1610,7 +1610,7 @@ int daNpc_Maro_c::cutGetWoodSwd(int arg0) { case 1: { actor_p = mActorMngr[3].getActorP(); - JUT_ASSERT(0xB79, 0 != actor_p); + JUT_ASSERT(0xB79, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); retval = 1; break; @@ -1619,7 +1619,7 @@ int daNpc_Maro_c::cutGetWoodSwd(int arg0) { case 2: case 3: { actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xB81, 0 != actor_p); + JUT_ASSERT(0xB81, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); retval = 1; break; @@ -1627,7 +1627,7 @@ int daNpc_Maro_c::cutGetWoodSwd(int arg0) { case 4: { actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xB81, 0 != actor_p); + JUT_ASSERT(0xB81, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); if (mEventTimer == 0) { my_vec_0.set(0.0f, 0.0f, 1600.0f); @@ -1684,7 +1684,7 @@ int daNpc_Maro_c::cutConversationWithMaro(int arg0) { switch (prm_val) { case 0: { actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xB81, 0 != actor_p); + JUT_ASSERT(0xB81, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); retval = 1; break; @@ -1844,7 +1844,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 0: { mActorMngr[4].entry(getItaMatoP(1)); actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xCC3, 0 != actor_p); + JUT_ASSERT(0xCC3, NULL != actor_p); dComIfGp_getEvent().setPtI(actor_p); break; } @@ -1857,7 +1857,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 2: case 4: { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xCCE, 0 != actor_p); + JUT_ASSERT(0xCCE, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); break; } @@ -1913,7 +1913,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { dComIfGp_getEvent().setPtT(this); mActorMngr[4].entry(getItaMatoP(1)); actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xD0B, 0 != actor_p); + JUT_ASSERT(0xD0B, NULL != actor_p); dComIfGp_getEvent().setPtI(actor_p); break; } @@ -1932,7 +1932,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 32: { mActorMngr[4].entry(getItaMatoP(2)); actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xD1E, 0 != actor_p); + JUT_ASSERT(0xD1E, NULL != actor_p); dComIfGp_getEvent().setPtI(actor_p); dComIfGp_getEvent().setPt2(actor_p); } @@ -1948,7 +1948,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { mEventTimer = timer_val; mActorMngr[4].entry(getItaMatoP(2)); actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xD2E, 0 != actor_p); + JUT_ASSERT(0xD2E, NULL != actor_p); dComIfGp_getEvent().setPtI(actor_p); dComIfGp_getEvent().setPt2(actor_p); break; @@ -1984,7 +1984,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 65: { actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xD2E, 0 != actor_p); + JUT_ASSERT(0xD2E, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); break; } @@ -2054,7 +2054,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { mDoMtx_stack_c::multVec(&my_vec_0, &temp); mGndChk.SetPos(&temp); temp.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(0xDA9, -(1000000000.0f) != temp.y); + JUT_ASSERT(0xDA9, -G_CM3D_F_INF != temp.y); dComIfGp_evmng_setGoal(&temp); } @@ -2064,7 +2064,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 34: { mActorMngr[4].entry(getItaMatoP(2)); actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xDB3, 0 != actor_p); + JUT_ASSERT(0xDB3, NULL != actor_p); dComIfGp_getEvent().setPtI(actor_p); dComIfGp_getEvent().setPt2(actor_p); } @@ -2076,7 +2076,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 44: { actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xDBD, 0 != actor_p); + JUT_ASSERT(0xDBD, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); break; } @@ -2119,7 +2119,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { if (prm_val == 1 && retval != 0) { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xDF0, 0 != actor_p); + JUT_ASSERT(0xDF0, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); } @@ -2131,7 +2131,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 5: { if (prm_val != 5) { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xDFA, 0 != actor_p); + JUT_ASSERT(0xDFA, NULL != actor_p); mJntAnm.lookActor(actor_p, 0.0f, 0); } @@ -2213,7 +2213,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 30: { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xE48, 0 != actor_p); + JUT_ASSERT(0xE48, NULL != actor_p); mJntAnm.lookActor(actor_p, 0.0f, 0); if (cLib_calcTimer(&mEventTimer) == 0) { retval = 1; @@ -2225,7 +2225,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 32: case 91: { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xE48, 0 != actor_p); + JUT_ASSERT(0xE48, NULL != actor_p); mJntAnm.lookActor(actor_p, 0.0f, 0); my_vals[0] = msgNo_val; if (talkProc(my_vals, send_val, local_4c, false)) { @@ -2256,7 +2256,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 40: { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xE48, 0 != actor_p); + JUT_ASSERT(0xE48, NULL != actor_p); mJntAnm.lookActor(actor_p, 0.0f, 0); if (cLib_calcTimer(&mEventTimer) == 0) { retval = 1; @@ -2267,7 +2267,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 41: { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xE48, 0 != actor_p); + JUT_ASSERT(0xE48, NULL != actor_p); mJntAnm.lookActor(actor_p, 0.0f, 0); my_vals[0] = msgNo_val; if (talkProc(my_vals, 0, local_4c, false)) { @@ -2282,7 +2282,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { if (retval != 0) { actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xE48, 0 != actor_p); + JUT_ASSERT(0xE48, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); } @@ -2293,7 +2293,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 43: case 92: { actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xE48, 0 != actor_p); + JUT_ASSERT(0xE48, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); my_vals[0] = msgNo_val; if (talkProc(my_vals, send_val, local_4c, false)) { @@ -2484,7 +2484,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 34: { actor_p = mActorMngr[4].getActorP(); - JUT_ASSERT(0xE48, 0 != actor_p); + JUT_ASSERT(0xE48, NULL != actor_p); mJntAnm.lookActor(actor_p, 0.0f, 0); my_vals[0] = msgNo_val; if (talkProc(my_vals, send_val, local_4c, 0)) { @@ -2515,7 +2515,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) { case 44: { actor_p = mActorMngr[1].getActorP(); - JUT_ASSERT(0xE48, 0 != actor_p); + JUT_ASSERT(0xE48, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); my_vals[0] = msgNo_val; if (talkProc(my_vals, send_val, local_4c, 0)) { @@ -2610,7 +2610,7 @@ int daNpc_Maro_c::cutMarosWhisper(int arg0) { case 0: { endChoccai(); actor_p = mActorMngr[0].getActorP(); - JUT_ASSERT(0xFF8, 0 != actor_p); + JUT_ASSERT(0xFF8, NULL != actor_p); angle_y = fopAcM_searchActorAngleY(daPy_getPlayerActorClass(), actor_p); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos, angle_y, 0); @@ -2734,7 +2734,7 @@ int daNpc_Maro_c::cutNotGonnaLet(int arg0) { mFaceMotionSeqMngr.setNo(9, 0.0f, 0, 0); mMotionSeqMngr.setNo(4, 0.0f, 0, 0); actor_p = mActorMngr[3].getActorP(); - JUT_ASSERT(0x108E, 0 != actor_p); + JUT_ASSERT(0x108E, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); my_vec_0.set(-718.0f, 1331.0f, -2139.0f); setPos(my_vec_0); @@ -2763,7 +2763,7 @@ int daNpc_Maro_c::cutNotGonnaLet(int arg0) { mFaceMotionSeqMngr.setNo(9, 0.0f, 0, 0); mMotionSeqMngr.setNo(0, 0.0f, 0, 0); actor_p = mActorMngr[3].getActorP(); - JUT_ASSERT(0x10B0, 0 != actor_p); + JUT_ASSERT(0x10B0, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); my_vec_0.set(-718.0f, 1331.0f, -2139.0f); setPos(my_vec_0); @@ -2873,7 +2873,7 @@ int daNpc_Maro_c::cutTalkToKakashi(int arg0) { mDoMtx_stack_c::multVec(&my_vec_0, &temp); mGndChk.SetPos(&temp); temp.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(0xDA9, -(1000000000.0f) != temp.y); + JUT_ASSERT(0xDA9, -G_CM3D_F_INF != temp.y); angle_y = cLib_targetAngleY(&temp, ¤t.pos); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&temp, angle_y, 0); break; @@ -2883,7 +2883,7 @@ int daNpc_Maro_c::cutTalkToKakashi(int arg0) { mFaceMotionSeqMngr.setNo(9, 0.0f, 0, 0); mMotionSeqMngr.setNo(0, 0.0f, 0, 0); actor_p = mActorMngr[0].getActorP(); - JUT_ASSERT(0x1133, 0 != actor_p); + JUT_ASSERT(0x1133, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 1); initTalk(mFlowNodeNo, NULL); break; diff --git a/src/d/actor/d_a_npc_midp.cpp b/src/d/actor/d_a_npc_midp.cpp index 3de07c0564..592047e415 100644 --- a/src/d/actor/d_a_npc_midp.cpp +++ b/src/d/actor/d_a_npc_midp.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_midp.h" @@ -171,7 +171,7 @@ int daNpc_midP_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp index 252b23dc55..2aa588f10a 100644 --- a/src/d/actor/d_a_npc_mk.cpp +++ b/src/d/actor/d_a_npc_mk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_mk.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_moi.cpp b/src/d/actor/d_a_npc_moi.cpp index 1b610345d7..27605f53fb 100644 --- a/src/d/actor/d_a_npc_moi.cpp +++ b/src/d/actor/d_a_npc_moi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "SSystem/SComponent/c_counter.h" #include "Z2AudioLib/Z2Instances.h" @@ -249,7 +249,7 @@ int daNpc_Moi_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_moir.cpp b/src/d/actor/d_a_npc_moir.cpp index ffe6be5f77..406a3a488d 100644 --- a/src/d/actor/d_a_npc_moir.cpp +++ b/src/d/actor/d_a_npc_moir.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_moir.h" #include "d/actor/d_a_ni.h" @@ -337,7 +337,7 @@ cPhs__Step daNpcMoiR_c::Create() { break; default: - JUT_ASSERT(343, 0); + JUT_ASSERT(343, FALSE); break; } @@ -379,7 +379,7 @@ cPhs__Step daNpcMoiR_c::Create() { int daNpcMoiR_c::CreateHeap() { J3DModelData* mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], BMDR_MOIR)); - JUT_ASSERT(403, 0 != mdlData_p); + JUT_ASSERT(403, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -404,7 +404,7 @@ int daNpcMoiR_c::CreateHeap() { mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], BMDR_HEADGEAR)); - JUT_ASSERT(436, mdlData_p != 0); + JUT_ASSERT(436, mdlData_p != NULL); mpHeadgearModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); @@ -426,7 +426,7 @@ int daNpcMoiR_c::CreateHeap() { break; default: - JUT_ASSERT(448, 0); + JUT_ASSERT(448, FALSE); break; } @@ -705,7 +705,7 @@ void daNpcMoiR_c::setWaitAction() { break; default: - JUT_ASSERT(1315, 0); + JUT_ASSERT(1315, FALSE); break; } } @@ -1083,7 +1083,7 @@ bool daNpcMoiR_c::wait_type0(void* param_1) { break; default: - JUT_ASSERT(1652, 0); + JUT_ASSERT(1652, FALSE); break; } @@ -1205,7 +1205,7 @@ bool daNpcMoiR_c::wait_type1(void* param_1) { break; default: - JUT_ASSERT(1756, 0); + JUT_ASSERT(1756, FALSE); break; } @@ -1252,7 +1252,7 @@ bool daNpcMoiR_c::wait_type2(void* param_1) { break; default: - JUT_ASSERT(1805, 0); + JUT_ASSERT(1805, FALSE); break; } break; @@ -1261,7 +1261,7 @@ bool daNpcMoiR_c::wait_type2(void* param_1) { break; default: - JUT_ASSERT(1810, 0); + JUT_ASSERT(1810, FALSE); break; } @@ -1352,7 +1352,7 @@ bool daNpcMoiR_c::talk(void* param_1) { break; default: - JUT_ASSERT(1893, 0); + JUT_ASSERT(1893, FALSE); break; } @@ -1478,7 +1478,7 @@ bool daNpcMoiR_c::fight(void* param_1) { break; default: - JUT_ASSERT(2030, 0); + JUT_ASSERT(2030, FALSE); break; } @@ -1505,7 +1505,7 @@ bool daNpcMoiR_c::demo(void* param_1) { mOrderEvtNo = actIdx; } - JUT_ASSERT(2069, mEvtSeqList[mOrderEvtNo] != 0); + JUT_ASSERT(2069, mEvtSeqList[mOrderEvtNo] != NULL); if ((this->*mEvtSeqList[mOrderEvtNo])(staffIdx)) { dComIfGp_getEventManager().cutEnd(staffIdx); @@ -1531,7 +1531,7 @@ bool daNpcMoiR_c::demo(void* param_1) { break; default: - JUT_ASSERT(2101, 0); + JUT_ASSERT(2101, FALSE); break; } @@ -1571,7 +1571,7 @@ bool daNpcMoiR_c::leave(void* param_1) { break; default: - JUT_ASSERT(2143, 0); + JUT_ASSERT(2143, FALSE); break; } @@ -1598,7 +1598,7 @@ BOOL daNpcMoiR_c::EvCut_Introduction(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(2178, 0); + JUT_ASSERT(2178, FALSE); break; } } @@ -1625,7 +1625,7 @@ BOOL daNpcMoiR_c::EvCut_Appear(int i_cutIndex) { break; default: - JUT_ASSERT(2211, 0); + JUT_ASSERT(2211, FALSE); break; } } @@ -1671,7 +1671,7 @@ BOOL daNpcMoiR_c::EvCut_Appear(int i_cutIndex) { break; default: - JUT_ASSERT(2259, 0); + JUT_ASSERT(2259, FALSE); break; } @@ -1716,7 +1716,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) { break; default: - JUT_ASSERT(2305, 0); + JUT_ASSERT(2305, FALSE); break; } } @@ -1787,7 +1787,7 @@ BOOL daNpcMoiR_c::EvCut_Appear2(int i_cutIndex) { break; default: - JUT_ASSERT(2363, 0); + JUT_ASSERT(2363, FALSE); break; } diff --git a/src/d/actor/d_a_npc_myna2.cpp b/src/d/actor/d_a_npc_myna2.cpp index 6cf08a8154..dcc82866f0 100644 --- a/src/d/actor/d_a_npc_myna2.cpp +++ b/src/d/actor/d_a_npc_myna2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_myna2.h" #include "dol2asm.h" @@ -793,7 +793,7 @@ COMPILER_STRIP_GATE(0x80A884D4, &lit_4577); /* 80A884D8-80A884DC 0000A4 0004+00 0/1 0/0 0/0 .rodata @4578 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4578 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4578 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80A884D8, &lit_4578); #pragma pop diff --git a/src/d/actor/d_a_npc_ne.cpp b/src/d/actor/d_a_npc_ne.cpp index 8808598db3..48f019a087 100644 --- a/src/d/actor/d_a_npc_ne.cpp +++ b/src/d/actor/d_a_npc_ne.cpp @@ -3,7 +3,7 @@ * NPC - Cat */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ne.h" #include "SSystem/SComponent/c_counter.h" diff --git a/src/d/actor/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp index cee11241b7..13d441122d 100644 --- a/src/d/actor/d_a_npc_p2.cpp +++ b/src/d/actor/d_a_npc_p2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_p2.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_pachi_besu.cpp b/src/d/actor/d_a_npc_pachi_besu.cpp index 9330e972c2..f669047283 100644 --- a/src/d/actor/d_a_npc_pachi_besu.cpp +++ b/src/d/actor/d_a_npc_pachi_besu.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pachi_besu.h" #include "d/actor/d_a_npc_pachi_taro.h" @@ -576,7 +576,7 @@ cPhs__Step daNpc_Pachi_Besu_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_pachi_maro.cpp b/src/d/actor/d_a_npc_pachi_maro.cpp index 478e558715..9a08c224e9 100644 --- a/src/d/actor/d_a_npc_pachi_maro.cpp +++ b/src/d/actor/d_a_npc_pachi_maro.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pachi_maro.h" #include "dol2asm.h" @@ -844,7 +844,7 @@ COMPILER_STRIP_GATE(0x80A9B928, &lit_4188); /* 80A9B92C-80A9B930 0000A0 0004+00 0/1 0/0 0/0 .rodata @4189 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4189 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4189 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80A9B92C, &lit_4189); #pragma pop diff --git a/src/d/actor/d_a_npc_pachi_taro.cpp b/src/d/actor/d_a_npc_pachi_taro.cpp index c0f41cc0ae..1ecbbb2f53 100644 --- a/src/d/actor/d_a_npc_pachi_taro.cpp +++ b/src/d/actor/d_a_npc_pachi_taro.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pachi_taro.h" #include "dol2asm.h" @@ -1170,7 +1170,7 @@ COMPILER_STRIP_GATE(0x80AA169C, &lit_4215); /* 80AA16A0-80AA16A4 00009C 0004+00 0/1 0/0 0/0 .rodata @4216 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4216 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4216 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80AA16A0, &lit_4216); #pragma pop diff --git a/src/d/actor/d_a_npc_passer.cpp b/src/d/actor/d_a_npc_passer.cpp index 16b8b8ca1e..b49c46c4c9 100644 --- a/src/d/actor/d_a_npc_passer.cpp +++ b/src/d/actor/d_a_npc_passer.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_passer.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_passer2.cpp b/src/d/actor/d_a_npc_passer2.cpp index 50564d1fd4..f15d3a044f 100644 --- a/src/d/actor/d_a_npc_passer2.cpp +++ b/src/d/actor/d_a_npc_passer2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_passer2.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_post.cpp b/src/d/actor/d_a_npc_post.cpp index 09ca145abd..99760334ae 100644 --- a/src/d/actor/d_a_npc_post.cpp +++ b/src/d/actor/d_a_npc_post.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_post.h" #include "dol2asm.h" @@ -797,7 +797,7 @@ COMPILER_STRIP_GATE(0x80AAD2A0, &lit_4070); /* 80AAD2A4-80AAD2A8 0000B8 0004+00 0/3 0/0 0/0 .rodata @4071 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4071 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4071 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80AAD2A4, &lit_4071); #pragma pop diff --git a/src/d/actor/d_a_npc_pouya.cpp b/src/d/actor/d_a_npc_pouya.cpp index 1697451091..7c7a105611 100644 --- a/src/d/actor/d_a_npc_pouya.cpp +++ b/src/d/actor/d_a_npc_pouya.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_pouya.h" #include "dol2asm.h" @@ -899,7 +899,7 @@ COMPILER_STRIP_GATE(0x80AB20B0, &lit_4042); /* 80AB20B4-80AB20B8 0000B4 0004+00 0/1 0/0 0/0 .rodata @4043 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4043 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4043 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80AB20B4, &lit_4043); #pragma pop diff --git a/src/d/actor/d_a_npc_prayer.cpp b/src/d/actor/d_a_npc_prayer.cpp index a4ea0e21d3..53fa1076d8 100644 --- a/src/d/actor/d_a_npc_prayer.cpp +++ b/src/d/actor/d_a_npc_prayer.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_prayer.h" #include "d/d_com_inf_game.h" @@ -163,7 +163,7 @@ int daNpcPray_c::Create() { /* 80AB348C-80AB3610 00078C 0184+00 1/1 0/0 0/0 .text CreateHeap__11daNpcPray_cFv */ int daNpcPray_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcNames[0], 9); - JUT_ASSERT(313, 0 != mdlData_p); + JUT_ASSERT(313, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11000084); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -582,7 +582,7 @@ bool daNpcPray_c::wait(void*) { break; case 1: case 3: - JUT_ASSERT(1076, 0); + JUT_ASSERT(1076, FALSE); break; } @@ -608,7 +608,7 @@ bool daNpcPray_c::fear(void*) { break; case 1: case 3: - JUT_ASSERT(1076, 0); + JUT_ASSERT(1076, FALSE); break; } @@ -672,7 +672,7 @@ bool daNpcPray_c::talk(void*) { } break; default: - JUT_ASSERT(1209, 0); + JUT_ASSERT(1209, FALSE); } return var_r28; @@ -695,7 +695,7 @@ bool daNpcPray_c::demo(void*) { if (staffID != -1) { mStaffID = staffID; - JUT_ASSERT(1243, 0 != mEvtSeqList[mOrderEvtNo]); + JUT_ASSERT(1243, NULL != mEvtSeqList[mOrderEvtNo]); if ((this->*mEvtSeqList[mOrderEvtNo])(staffID)) { evtmgr.cutEnd(staffID); var_r25 = 1; @@ -721,7 +721,7 @@ bool daNpcPray_c::demo(void*) { } break; case 3: - JUT_ASSERT(1280, 0); + JUT_ASSERT(1280, FALSE); break; } @@ -777,7 +777,7 @@ BOOL daNpcPray_c::_Evt_GetHeart_CutInit(const int& i_cutId) { break; } default: - JUT_ASSERT(1396, 0); + JUT_ASSERT(1396, FALSE); break; } @@ -830,7 +830,7 @@ BOOL daNpcPray_c::_Evt_GetHeart_CutMain(int const& i_cutId) { break; } default: - JUT_ASSERT(1474, 0); + JUT_ASSERT(1474, FALSE); var_r28 = 1; break; } diff --git a/src/d/actor/d_a_npc_raca.cpp b/src/d/actor/d_a_npc_raca.cpp index 228cda03f4..a01f69dc51 100644 --- a/src/d/actor/d_a_npc_raca.cpp +++ b/src/d/actor/d_a_npc_raca.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_raca.h" #include "d/actor/d_a_tag_evtarea.h" @@ -260,7 +260,7 @@ cPhs__Step daNpc_Raca_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -752,7 +752,7 @@ int daNpc_Raca_c::walk(void* param_1) { if (!mStagger.checkStagger()) { cXyz sp20; - JUT_ASSERT(1553, 0 != mPath.getPathInfo()); + JUT_ASSERT(1553, NULL != mPath.getPathInfo()); BOOL bVar1 = mPath.getDstPosH(current.pos, &sp20, mPath.getNumPnts(), 2); calcSpeedAndAngle(sp20, bVar1, MREG_S(0) + 4, MREG_S(1) + 0x800); diff --git a/src/d/actor/d_a_npc_rafrel.cpp b/src/d/actor/d_a_npc_rafrel.cpp index dc38d58845..e91cd5f5ed 100644 --- a/src/d/actor/d_a_npc_rafrel.cpp +++ b/src/d/actor/d_a_npc_rafrel.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_rafrel.h" @@ -226,7 +226,7 @@ int daNpcRafrel_c::Create() { heapsize = 0x6490; break; default: - JUT_ASSERT(343, 0); + JUT_ASSERT(343, FALSE); break; } @@ -272,7 +272,7 @@ int daNpcRafrel_c::CreateHeap() { J3DModel* mdl_p = NULL; mdlData_p = dComIfG_getObjectRes(l_arcNames[0], 0x11); - JUT_ASSERT(403, 0 != mdlData_p); + JUT_ASSERT(403, NULL != mdlData_p); u32 mdl_diff_flags = 0x11020284; mpMorf = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, J3DMdlFlag_DifferedDLBuffer, mdl_diff_flags); @@ -302,7 +302,7 @@ int daNpcRafrel_c::CreateHeap() { if (mType == 1) { mdlData_p = dComIfG_getObjectRes(l_arcNames[1], 0x15); - JUT_ASSERT(438, mdlData_p != 0); + JUT_ASSERT(438, mdlData_p != NULL); mpItemModel = mDoExt_J3DModel__create((J3DModelData*)mdlData_p, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpItemModel == NULL) { @@ -310,7 +310,7 @@ int daNpcRafrel_c::CreateHeap() { } } else if (mType == 2) { mdlData_p = dComIfG_getObjectRes(l_arcNames[3], 9); - JUT_ASSERT(445, mdlData_p != 0); + JUT_ASSERT(445, mdlData_p != NULL); mpItemModel = mDoExt_J3DModel__create((J3DModelData*)mdlData_p, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpItemModel == NULL) { @@ -333,7 +333,7 @@ int daNpcRafrel_c::CreateHeap() { setMotionAnm(0x1A, 0.0f); break; default: - JUT_ASSERT(460, 0); + JUT_ASSERT(460, FALSE); break; } @@ -888,7 +888,7 @@ void daNpcRafrel_c::setWaitAction() { setAction(&daNpcRafrel_c::wait_type2); return; default: - JUT_ASSERT(1274, 0); + JUT_ASSERT(1274, FALSE); return; } } @@ -1107,7 +1107,7 @@ bool daNpcRafrel_c::wait_type01(void* param_0) { break; case 3: default: - JUT_ASSERT(1634, 0); + JUT_ASSERT(1634, FALSE); break; } @@ -1189,13 +1189,13 @@ bool daNpcRafrel_c::wait_type2(void* param_0) { } break; default: - JUT_ASSERT(1683, 0); + JUT_ASSERT(1683, FALSE); break; } break; case 3: default: - JUT_ASSERT(1688, 0); + JUT_ASSERT(1688, FALSE); break; } @@ -1280,7 +1280,7 @@ bool daNpcRafrel_c::talk(void* param_0) { } break; default: - JUT_ASSERT(1770, 0); + JUT_ASSERT(1770, FALSE); break; } @@ -1310,7 +1310,7 @@ bool daNpcRafrel_c::demo(void* param_0) { mOrderEvtNo = actIdx; } - JUT_ASSERT(1820, 0 != mEvtSeqList[mOrderEvtNo]); + JUT_ASSERT(1820, NULL != mEvtSeqList[mOrderEvtNo]); if ((this->*mEvtSeqList[mOrderEvtNo])(staffId)) { evtmgr->cutEnd(staffId); } @@ -1330,7 +1330,7 @@ bool daNpcRafrel_c::demo(void* param_0) { break; case 3: default: - JUT_ASSERT(1842, 0); + JUT_ASSERT(1842, FALSE); break; } @@ -1361,7 +1361,7 @@ bool daNpcRafrel_c::leave(void* param_0) { break; case 3: default: - JUT_ASSERT(1881, 0); + JUT_ASSERT(1881, FALSE); break; } @@ -1388,7 +1388,7 @@ int daNpcRafrel_c::EvCut_Introduction(int i_staffId) { setLookMode(LOOK_PLAYER, NULL); return 1; default: - JUT_ASSERT(1916, 0); + JUT_ASSERT(1916, FALSE); break; } } @@ -1416,7 +1416,7 @@ int daNpcRafrel_c::EvCut_Meeting(int i_staffId) { setLookMode(LOOK_PLAYER, NULL); break; default: - JUT_ASSERT(1953, 0); + JUT_ASSERT(1953, FALSE); break; } } @@ -1442,7 +1442,7 @@ int daNpcRafrel_c::EvCut_Meeting(int i_staffId) { case 1: return 1; default: - JUT_ASSERT(1978, 0); + JUT_ASSERT(1978, FALSE); return 0; } @@ -1495,7 +1495,7 @@ int daNpcRafrel_c::EvCut_Appear(int i_staffId) { break; } default: - JUT_ASSERT(2040, 0); + JUT_ASSERT(2040, FALSE); } } @@ -1541,7 +1541,7 @@ int daNpcRafrel_c::EvCut_Appear(int i_staffId) { field_0x9eb = 1; return 1; default: - JUT_ASSERT(2087, 0); + JUT_ASSERT(2087, FALSE); } int sp10 = mMsgTimer; @@ -1577,7 +1577,7 @@ int daNpcRafrel_c::EvCut_WiretapSponsor(int i_staffId) { initTalk(field_0xe0c, sp18); break; default: - JUT_ASSERT(2138, 0); + JUT_ASSERT(2138, FALSE); } } @@ -1605,7 +1605,7 @@ int daNpcRafrel_c::EvCut_WiretapSponsor(int i_staffId) { break; } default: - JUT_ASSERT(2138, 0); + JUT_ASSERT(2138, FALSE); } return 0; @@ -1628,7 +1628,7 @@ int daNpcRafrel_c::EvCut_WiretapEntrant(int i_staffId) { setMotion(1, -1.0f, 0); break; default: - JUT_ASSERT(2201, 0); + JUT_ASSERT(2201, FALSE); } } @@ -1652,7 +1652,7 @@ int daNpcRafrel_c::EvCut_WiretapEntrant(int i_staffId) { return 1; } default: - JUT_ASSERT(2138, 0); + JUT_ASSERT(2138, FALSE); } return 0; diff --git a/src/d/actor/d_a_npc_saru.cpp b/src/d/actor/d_a_npc_saru.cpp index d9029ca400..42502745cb 100644 --- a/src/d/actor/d_a_npc_saru.cpp +++ b/src/d/actor/d_a_npc_saru.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_saru.h" #include "d/actor/d_a_npc_ks.h" @@ -340,7 +340,7 @@ int daNpc_Saru_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -892,7 +892,7 @@ int daNpc_Saru_c::cutFindMonkey(int param_1) { break; case 1: - JUT_ASSERT(1859, 0 != mPath.getPathInfo()); + JUT_ASSERT(1859, NULL != mPath.getPathInfo()); if (cLib_calcTimer(&mEventTimer) == 0) { rv = 1; } diff --git a/src/d/actor/d_a_npc_seib.cpp b/src/d/actor/d_a_npc_seib.cpp index 50dec3a4cf..8127f519e5 100644 --- a/src/d/actor/d_a_npc_seib.cpp +++ b/src/d/actor/d_a_npc_seib.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seib.h" @@ -160,7 +160,7 @@ int daNpc_seiB_c::create() { int daNpc_seiB_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]); - JUT_ASSERT(466, 0 != mdlData_p); + JUT_ASSERT(466, NULL != mdlData_p); mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); @@ -499,7 +499,7 @@ void daNpc_seiB_c::ctrlWaitAnm() { return; } - JUT_ASSERT(1068, 0); + JUT_ASSERT(1068, FALSE); } /* 80AC6140-80AC616C 001140 002C+00 1/0 0/0 0/0 .text wait__12daNpc_seiB_cFPv */ diff --git a/src/d/actor/d_a_npc_seic.cpp b/src/d/actor/d_a_npc_seic.cpp index 6b06d21517..63fc2b86c2 100644 --- a/src/d/actor/d_a_npc_seic.cpp +++ b/src/d/actor/d_a_npc_seic.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seic.h" #include "SSystem/SComponent/c_counter.h" @@ -179,7 +179,7 @@ int daNpc_seiC_c::create() { /* 80AC7828-80AC7980 0003C8 0158+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_seiC_cFv */ int daNpc_seiC_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]); - JUT_ASSERT(424, 0 != mdlData_p); + JUT_ASSERT(424, NULL != mdlData_p); mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_seid.cpp b/src/d/actor/d_a_npc_seid.cpp index 2911b3dfb5..0dc362cc5d 100644 --- a/src/d/actor/d_a_npc_seid.cpp +++ b/src/d/actor/d_a_npc_seid.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seid.h" #include "SSystem/SComponent/c_counter.h" @@ -180,7 +180,7 @@ int daNpc_seiD_c::create() { /* 80AC9968-80AC9AC0 0003C8 0158+00 1/1 0/0 0/0 .text CreateHeap__12daNpc_seiD_cFv */ int daNpc_seiD_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[0][1]], l_bmdData[0][0]); - JUT_ASSERT(424, 0 != mdlData_p); + JUT_ASSERT(424, NULL != mdlData_p); mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_seira.cpp b/src/d/actor/d_a_npc_seira.cpp index 34218cd8ea..143ba667a2 100644 --- a/src/d/actor/d_a_npc_seira.cpp +++ b/src/d/actor/d_a_npc_seira.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seira.h" #include "d/d_meter_HIO.h" diff --git a/src/d/actor/d_a_npc_seira2.cpp b/src/d/actor/d_a_npc_seira2.cpp index 29824c0eac..6b1c533839 100644 --- a/src/d/actor/d_a_npc_seira2.cpp +++ b/src/d/actor/d_a_npc_seira2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seira2.h" diff --git a/src/d/actor/d_a_npc_seirei.cpp b/src/d/actor/d_a_npc_seirei.cpp index 8880b66ee6..f178b45b42 100644 --- a/src/d/actor/d_a_npc_seirei.cpp +++ b/src/d/actor/d_a_npc_seirei.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_seirei.h" #include "d/d_meter2_info.h" @@ -257,7 +257,7 @@ cPhs__Step daNpc_Seirei_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_shad.cpp b/src/d/actor/d_a_npc_shad.cpp index bdae693e3e..b66fed1a54 100644 --- a/src/d/actor/d_a_npc_shad.cpp +++ b/src/d/actor/d_a_npc_shad.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_shad.h" #include "d/actor/d_a_cstaF.h" @@ -436,7 +436,7 @@ cPhs__Step daNpcShad_c::Create() { break; default: - JUT_ASSERT(423, 0); + JUT_ASSERT(423, FALSE); break; } @@ -475,7 +475,7 @@ cPhs__Step daNpcShad_c::Create() { /* 80AD8B60-80AD8F24 000A40 03C4+00 1/1 0/0 0/0 .text CreateHeap__11daNpcShad_cFv */ int daNpcShad_c::CreateHeap() { J3DModelData* mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], BMDR_SHAD)); - JUT_ASSERT(483, 0 != mdlData_p); + JUT_ASSERT(483, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -501,7 +501,7 @@ int daNpcShad_c::CreateHeap() { mBookKnifeModel = NULL; if (mMode == 1 || mMode == 2) { mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], BMDR_SHAD_BOOK_KNIFE)); - JUT_ASSERT(518, mdlData_p != 0); + JUT_ASSERT(518, mdlData_p != NULL); mBookKnifeModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mBookKnifeModel == NULL) { return 0; @@ -516,7 +516,7 @@ int daNpcShad_c::CreateHeap() { mKomonshoModel = NULL; if (mMode == 1) { mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[1], BMDR_SHAD_KOMONSHO)); - JUT_ASSERT(530, mdlData_p != 0); + JUT_ASSERT(530, mdlData_p != NULL); mKomonshoModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mKomonshoModel == NULL) { return 0; @@ -541,7 +541,7 @@ int daNpcShad_c::CreateHeap() { break; default: - JUT_ASSERT(545, 0); + JUT_ASSERT(545, FALSE); break; } @@ -867,7 +867,7 @@ inline void daNpcShad_c::setWaitAction() { break; default: - JUT_ASSERT(1379, 0); + JUT_ASSERT(1379, FALSE); } } @@ -1236,7 +1236,7 @@ bool daNpcShad_c::wait_type0(void* param_1) { break; default: - JUT_ASSERT(1747, 0); + JUT_ASSERT(1747, FALSE); } return true; @@ -1411,7 +1411,7 @@ bool daNpcShad_c::wait_type1(void* param_1) { break; default: - JUT_ASSERT(1915, 0); + JUT_ASSERT(1915, FALSE); } return true; @@ -1448,7 +1448,7 @@ bool daNpcShad_c::wait_type2(void* param_1) { break; default: - JUT_ASSERT(1957, 0); + JUT_ASSERT(1957, FALSE); break; } break; @@ -1457,7 +1457,7 @@ bool daNpcShad_c::wait_type2(void* param_1) { break; default: - JUT_ASSERT(1962, 0); + JUT_ASSERT(1962, FALSE); break; } @@ -1553,7 +1553,7 @@ bool daNpcShad_c::talk(void* param_1) { break; default: - JUT_ASSERT(2042, 0); + JUT_ASSERT(2042, FALSE); break; } @@ -1582,7 +1582,7 @@ bool daNpcShad_c::demo(void* param_1) { mOrderEvtNo = iVar2; } - JUT_ASSERT(2082, 0 != mEvtSeqList[mOrderEvtNo]); + JUT_ASSERT(2082, NULL != mEvtSeqList[mOrderEvtNo]); if ((this->*mEvtSeqList[mOrderEvtNo])(iVar1)) { eventManager.cutEnd(iVar1); @@ -1606,7 +1606,7 @@ bool daNpcShad_c::demo(void* param_1) { break; default: - JUT_ASSERT(2114, 0); + JUT_ASSERT(2114, FALSE); break; } @@ -1638,7 +1638,7 @@ bool daNpcShad_c::leave(void* param_1) { break; default: - JUT_ASSERT(2149, 0); + JUT_ASSERT(2149, FALSE); break; } @@ -1665,7 +1665,7 @@ BOOL daNpcShad_c::EvCut_Introduction(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(2184, 0); + JUT_ASSERT(2184, FALSE); break; } } @@ -1693,7 +1693,7 @@ BOOL daNpcShad_c::EvCut_Meeting(int i_cutIndex) { break; default: - JUT_ASSERT(2221, 0); + JUT_ASSERT(2221, FALSE); break; } } @@ -1722,7 +1722,7 @@ BOOL daNpcShad_c::EvCut_Meeting(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(2245, 0); + JUT_ASSERT(2245, FALSE); break; } @@ -1774,7 +1774,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell1(int i_cutIndex) { break; default: - JUT_ASSERT(2298, 0); + JUT_ASSERT(2298, FALSE); break; } @@ -1863,7 +1863,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell1(int i_cutIndex) { break; default: - JUT_ASSERT(2382, 0); + JUT_ASSERT(2382, FALSE); break; } @@ -1938,7 +1938,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { break; default: - JUT_ASSERT(2451, 0); + JUT_ASSERT(2451, FALSE); break; } } @@ -2024,7 +2024,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(2540, 0); + JUT_ASSERT(2540, FALSE); break; } @@ -2052,7 +2052,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2Skip(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(2574, 0); + JUT_ASSERT(2574, FALSE); break; } } @@ -2124,7 +2124,7 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannon(int i_cutIndex) { break; default: - JUT_ASSERT(2636, 0); + JUT_ASSERT(2636, FALSE); break; } } @@ -2179,7 +2179,7 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannon(int i_cutIndex) { break; default: - JUT_ASSERT(2693, 0); + JUT_ASSERT(2693, FALSE); break; } @@ -2217,7 +2217,7 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannonSkip(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(2729, 0); + JUT_ASSERT(2729, FALSE); break; } } @@ -2276,7 +2276,7 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) { break; default: - JUT_ASSERT(2786, 0); + JUT_ASSERT(2786, FALSE); } } @@ -2349,7 +2349,7 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(2873, 0); + JUT_ASSERT(2873, FALSE); break; } @@ -2376,7 +2376,7 @@ BOOL daNpcShad_c::EvCut_DisappearSkip(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(2905, 0); + JUT_ASSERT(2905, FALSE); break; } } @@ -2403,7 +2403,7 @@ BOOL daNpcShad_c::EvCut_CallBack(int i_cutIndex) { break; default: - JUT_ASSERT(2939, 0); + JUT_ASSERT(2939, FALSE); break; } } @@ -2428,7 +2428,7 @@ BOOL daNpcShad_c::EvCut_CallBack(int i_cutIndex) { break; default: - JUT_ASSERT(2965, 0); + JUT_ASSERT(2965, FALSE); break; } @@ -2449,7 +2449,7 @@ BOOL daNpcShad_c::EvCut_WiretapSponsor(int i_cutIndex) { break; default: - JUT_ASSERT(3002, 0); + JUT_ASSERT(3002, FALSE); break; } } @@ -2478,7 +2478,7 @@ BOOL daNpcShad_c::EvCut_WiretapSponsor(int i_cutIndex) { break; default: - JUT_ASSERT(3032, 0); + JUT_ASSERT(3032, FALSE); break; } return FALSE; @@ -2501,7 +2501,7 @@ BOOL daNpcShad_c::EvCut_WiretapEntrant(int i_cutIndex) { break; default: - JUT_ASSERT(3065, 0); + JUT_ASSERT(3065, FALSE); break; } } @@ -2526,7 +2526,7 @@ BOOL daNpcShad_c::EvCut_WiretapEntrant(int i_cutIndex) { return TRUE; default: - JUT_ASSERT(3088, 0); + JUT_ASSERT(3088, FALSE); break; } diff --git a/src/d/actor/d_a_npc_shaman.cpp b/src/d/actor/d_a_npc_shaman.cpp index 6675f83907..a6a58a7e81 100644 --- a/src/d/actor/d_a_npc_shaman.cpp +++ b/src/d/actor/d_a_npc_shaman.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_shaman.h" #include "dol2asm.h" @@ -1247,7 +1247,7 @@ COMPILER_STRIP_GATE(0x80AE6C6C, &lit_4030); /* 80AE6C70-80AE6C74 0000A8 0004+00 0/1 0/0 0/0 .rodata @4031 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4031 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4031 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80AE6C70, &lit_4031); #pragma pop diff --git a/src/d/actor/d_a_npc_shoe.cpp b/src/d/actor/d_a_npc_shoe.cpp index 064c0c6250..2661acfeca 100644 --- a/src/d/actor/d_a_npc_shoe.cpp +++ b/src/d/actor/d_a_npc_shoe.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_shoe.h" #include "dol2asm.h" @@ -184,7 +184,7 @@ cPhs__Step daNpcShoe_c::Create() { BOOL daNpcShoe_c::CreateHeap() { J3DModelData* mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], 8)); - JUT_ASSERT(292, 0 != mdlData_p) + JUT_ASSERT(292, NULL != mdlData_p) mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mCreature, 0x80000, 0x11020084); @@ -210,7 +210,7 @@ BOOL daNpcShoe_c::CreateHeap() { mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[0], 9)); - JUT_ASSERT(331, 0 != mdlData_p) + JUT_ASSERT(331, NULL != mdlData_p) mpModel1 = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mpModel1 == NULL) { @@ -219,7 +219,7 @@ BOOL daNpcShoe_c::CreateHeap() { mdlData_p = static_cast(dComIfG_getObjectRes(l_arcNames[2], 4)); - JUT_ASSERT(338, 0 != mdlData_p) + JUT_ASSERT(338, NULL != mdlData_p) mpModel2 = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mpModel2 == NULL) { @@ -506,7 +506,7 @@ bool daNpcShoe_c::wait(void* param_0) { case 3: break; default: - JUT_ASSERT(1063, 0) + JUT_ASSERT(1063, FALSE); break; } @@ -532,7 +532,7 @@ bool daNpcShoe_c::fear(void* param_0) { case 3: break; default: - JUT_ASSERT(1100, 0) + JUT_ASSERT(1100, FALSE); break; } return 1; @@ -571,7 +571,7 @@ bool daNpcShoe_c::talk(void* param_0) { dComIfGp_event_reset(); break; default: - JUT_ASSERT(1169, 0) + JUT_ASSERT(1169, FALSE); break; } return ret; @@ -593,7 +593,7 @@ bool daNpcShoe_c::demo(void* param_0) { if (staff_id != -1) { mStaffID = staff_id; - JUT_ASSERT(1203, 0 != mEvtSeqList[mOrderEvtNo]) + JUT_ASSERT(1203, NULL != mEvtSeqList[mOrderEvtNo]) if ((this->*(mEvtSeqList[mOrderEvtNo]))(staff_id)) { eventManager.cutEnd(staff_id); @@ -611,7 +611,7 @@ bool daNpcShoe_c::demo(void* param_0) { case 3: break; default: - JUT_ASSERT(1169, 0) + JUT_ASSERT(1169, FALSE); break; } return 1; diff --git a/src/d/actor/d_a_npc_shop0.cpp b/src/d/actor/d_a_npc_shop0.cpp index 9f4a4ef3ef..d344922e5b 100644 --- a/src/d/actor/d_a_npc_shop0.cpp +++ b/src/d/actor/d_a_npc_shop0.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_shop0.h" @@ -126,7 +126,7 @@ int daNpc_Shop0_c::draw() { mBckAnm.entry(mpModel->getModelData()); mDoExt_modelUpdateDL(mpModel); - if (mGroundCross != -1e+9f) { + if (mGroundCross != -G_CM3D_F_INF) { cM3dGPla tri_pla; if (dComIfG_Bgsp().GetTriPla(mGndChk, &tri_pla)) { dComIfGd_setSimpleShadow( @@ -271,7 +271,7 @@ void daNpc_Shop0_c::setRoomInf() { mGroundCross = dComIfG_Bgsp().GroundCross(&mGndChk); - if (mGroundCross != -1e+09f) { + if (mGroundCross != -G_CM3D_F_INF) { room_no = dComIfG_Bgsp().GetRoomId(mGndChk); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk); } else { diff --git a/src/d/actor/d_a_npc_shop_maro.cpp b/src/d/actor/d_a_npc_shop_maro.cpp index bc9049d182..7df44f63c8 100644 --- a/src/d/actor/d_a_npc_shop_maro.cpp +++ b/src/d/actor/d_a_npc_shop_maro.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_shop_maro.h" diff --git a/src/d/actor/d_a_npc_sola.cpp b/src/d/actor/d_a_npc_sola.cpp index 1fe32e02c9..29b42bf469 100644 --- a/src/d/actor/d_a_npc_sola.cpp +++ b/src/d/actor/d_a_npc_sola.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_sola.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_soldierA.cpp b/src/d/actor/d_a_npc_soldierA.cpp index 16f15a4472..3f675f3bb9 100644 --- a/src/d/actor/d_a_npc_soldierA.cpp +++ b/src/d/actor/d_a_npc_soldierA.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_soldierA.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_soldierB.cpp b/src/d/actor/d_a_npc_soldierB.cpp index 7fd39335e8..5e7a7eade9 100644 --- a/src/d/actor/d_a_npc_soldierB.cpp +++ b/src/d/actor/d_a_npc_soldierB.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_soldierB.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_sq.cpp b/src/d/actor/d_a_npc_sq.cpp index 4270952d98..8e4744d67f 100644 --- a/src/d/actor/d_a_npc_sq.cpp +++ b/src/d/actor/d_a_npc_sq.cpp @@ -3,7 +3,7 @@ * NPC - Squirrel */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_sq.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_npc_taro.cpp b/src/d/actor/d_a_npc_taro.cpp index fd790f0856..5d8bb745de 100644 --- a/src/d/actor/d_a_npc_taro.cpp +++ b/src/d/actor/d_a_npc_taro.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_taro.h" #include "JSystem/JUtility/JUTAssert.h" @@ -342,7 +342,7 @@ int daNpc_Taro_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -506,7 +506,7 @@ void* daNpc_Taro_c::srchNpc(void* param_1, void* param_2) { /* 80566BD4-80566CCC 000E34 00F8+00 1/1 0/0 0/0 .text getArrowP__12daNpc_Taro_cFv */ fopAc_ac_c* daNpc_Taro_c::getArrowP() { fopAc_ac_c* pActor = NULL; - f32 minDist = 1e9f; + f32 minDist = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchArrow, this); for (int i = 0; i < mFindCount; i++) { @@ -1244,7 +1244,7 @@ int daNpc_Taro_c::cutConversationAboutPachinko(int param_1) { break; case 1: { actor_p = mActors[1].getActorP(); - JUT_ASSERT(3282, 0 != actor_p); + JUT_ASSERT(3282, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0, 0); if (home.angle.y == mCurAngle.y) { rv = TRUE; @@ -1364,7 +1364,7 @@ int daNpc_Taro_c::cutSwdTutorial(int param_1) { initTalk(0x1f5, local_4c); if (local_70 == 0x3d) { actor_p = mActors[0].getActorP(); - JUT_ASSERT(3480, 0 != actor_p); + JUT_ASSERT(3480, NULL != actor_p); shape_angle.y = fopAcM_searchActorAngleY(this, actor_p); } break; @@ -1524,7 +1524,7 @@ int daNpc_Taro_c::cutHail(int param_1) { switch(prm) { case 0: { daTag_Push_c* actor_p = (daTag_Push_c*)field_0xba0.getActorP(); - JUT_ASSERT(3723, 0 != actor_p) + JUT_ASSERT(3723, NULL != actor_p) actor_p->pushBackPlayer(0); break; } @@ -1533,7 +1533,7 @@ int daNpc_Taro_c::cutHail(int param_1) { mMotionSeqMngr.setNo(0, 0.0f, 0, 0); mJntAnm.lookNone(1); daTag_Push_c* actor_p = (daTag_Push_c*)field_0xba0.getActorP(); - JUT_ASSERT(3732, 0 != actor_p) + JUT_ASSERT(3732, NULL != actor_p) initTalk(actor_p->getFlowNodeNo(), NULL); setAngle(fopAcM_searchPlayerAngleY(this)); break; @@ -1630,7 +1630,7 @@ int daNpc_Taro_c::cutFindMonkey(int param_1) { case 1: { if (cLib_calcTimer(&mEventTimer) == 0) { fopAc_ac_c* p_actor = mActors[20].getActorP(); - JUT_ASSERT(3870, 0 != p_actor); + JUT_ASSERT(3870, NULL != p_actor); mJntAnm.lookActor(p_actor, -40.0f, 0); rv = TRUE; } else { @@ -1640,14 +1640,14 @@ int daNpc_Taro_c::cutFindMonkey(int param_1) { } case 2: { fopAc_ac_c* p_actor = mActors[20].getActorP(); - JUT_ASSERT(3881, 0 != p_actor); + JUT_ASSERT(3881, NULL != p_actor); mJntAnm.lookActor(p_actor, -40.0f, 0); rv = TRUE; break; } case 3: { fopAc_ac_c* p_actor = mActors[20].getActorP(); - JUT_ASSERT(3888, 0 != p_actor); + JUT_ASSERT(3888, NULL != p_actor); mJntAnm.lookActor(p_actor, -40.0f, 0); if (talkProc(msgNos, 0, NULL, 0) != 0 && mFlow.checkEndFlow()) { rv = TRUE; @@ -1656,10 +1656,10 @@ int daNpc_Taro_c::cutFindMonkey(int param_1) { } case 4: { fopAc_ac_c* p_actor = mActors[20].getActorP(); - JUT_ASSERT(3899, 0 != p_actor); + JUT_ASSERT(3899, NULL != p_actor); mJntAnm.lookActor(p_actor, -40.0f, 0); p_actor = dComIfGp_getHorseActor(); - JUT_ASSERT(3902, 0 != p_actor); + JUT_ASSERT(3902, NULL != p_actor); if (cLib_calcTimer(&mEventTimer) == 0) { rv = TRUE; } @@ -1818,7 +1818,7 @@ int daNpc_Taro_c::cutAppearanceMoi(int param_1) { work += home.pos; mGndChk.SetPos(&work); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(4156, -(1000000000.0f) != work.y) + JUT_ASSERT(4156, -G_CM3D_F_INF != work.y) cStack_68.y = cLib_targetAngleY(&work, ¤t.pos); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, cStack_68.y, 0); mEventTimer = timer; @@ -1978,13 +1978,13 @@ int daNpc_Taro_c::cutGiveMeWoodSwd(int param_1) { case 5: case 8: { fopAc_ac_c* actor_p = mActors[2].getActorP(); - JUT_ASSERT(4405, 0 != actor_p); + JUT_ASSERT(4405, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); break; } case 6: { fopAc_ac_c* actor_p = mActors[0].getActorP(); - JUT_ASSERT(4411, 0 != actor_p); + JUT_ASSERT(4411, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); break; } @@ -2671,7 +2671,7 @@ int daNpc_Taro_c::cutNotGonnaLet(int param_1) { break; case 3: { fopAc_ac_c* actor_p = mActors[2].getActorP(); - JUT_ASSERT(5445, 0 != actor_p); + JUT_ASSERT(5445, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); break; } @@ -2680,20 +2680,20 @@ int daNpc_Taro_c::cutNotGonnaLet(int param_1) { break; case 5: { fopAc_ac_c* actor_p = mActors[2].getActorP(); - JUT_ASSERT(5456, 0 != actor_p); + JUT_ASSERT(5456, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); break; } case 6: { fopAc_ac_c* actor_p = mActors[0].getActorP(); - JUT_ASSERT(5464, 0 != actor_p); + JUT_ASSERT(5464, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); dComIfGp_getEvent().setPt2(actor_p); break; } case 7: { fopAc_ac_c* actor_p = mActors[2].getActorP(); - JUT_ASSERT(5473, 0 != actor_p); + JUT_ASSERT(5473, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); dComIfGp_getEvent().setPt2(this); break; @@ -2720,14 +2720,14 @@ int daNpc_Taro_c::cutNotGonnaLet(int param_1) { break; case 20: { fopAc_ac_c* actor_p = mActors[2].getActorP(); - JUT_ASSERT(5508, 0 != actor_p); + JUT_ASSERT(5508, NULL != actor_p); mJntAnm.lookActor(actor_p, -40.0f, 0); initTalk(mFlowNodeNo, pActors); break; } case 21: { fopAc_ac_c* actor_p = mActors[0].getActorP(); - JUT_ASSERT(5517, 0 != actor_p); + JUT_ASSERT(5517, NULL != actor_p); dComIfGp_getEvent().setPt2(actor_p); break; } diff --git a/src/d/actor/d_a_npc_the.cpp b/src/d/actor/d_a_npc_the.cpp index 19f8419e12..c4ea6c1396 100644 --- a/src/d/actor/d_a_npc_the.cpp +++ b/src/d/actor/d_a_npc_the.cpp @@ -3,7 +3,7 @@ * NPC - Telma */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_the.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_npc_theB.cpp b/src/d/actor/d_a_npc_theB.cpp index 9e6ce86880..ad7e069043 100644 --- a/src/d/actor/d_a_npc_theB.cpp +++ b/src/d/actor/d_a_npc_theB.cpp @@ -3,7 +3,7 @@ * Telma B */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_theB.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_tk.cpp b/src/d/actor/d_a_npc_tk.cpp index e37710d87a..a797d5ba4b 100644 --- a/src/d/actor/d_a_npc_tk.cpp +++ b/src/d/actor/d_a_npc_tk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tk.h" #include "Z2AudioLib/Z2Instances.h" @@ -123,7 +123,7 @@ int daNPC_TK_c::checkBeforeBg() { gndChkPos.y += 100.0f; gndChk.SetPos(&gndChkPos); linChkEnd.y = dComIfG_Bgsp().GroundCross(&gndChk); - if (linChkEnd.y != -1e+09f) { + if (linChkEnd.y != -G_CM3D_F_INF) { if (current.pos.y < linChkEnd.y) { if (speed.y < 0.0f) { speed.y = 0.0f; @@ -2033,7 +2033,7 @@ void daNPC_TK_c::executeWolfPerch() { field_0x6c5 = 2; mWolfPathData = dPath_GetRoomPath(mpPath1->m_nextID, fopAcM_GetRoomNo(this)); - JUT_ASSERT(2498, mWolfPathData != 0); + JUT_ASSERT(2498, mWolfPathData != NULL); field_0x6ea = mWolfPathData->field_0x6; field_0x6e8 = mWolfPathData->field_0x4; @@ -3235,7 +3235,7 @@ int daNPC_TK_c::JointCallBack(J3DJoint* param_0, int param_1) { /* 80B0BBC8-80B0BD04 00A8A8 013C+00 1/1 0/0 0/0 .text CreateHeap__10daNPC_TK_cFv */ int daNPC_TK_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Npc_tk", "tk.bmd"); - JUT_ASSERT_MSG(0xf4f, modelData != 0, " 鷹匠"); // falconer + JUT_ASSERT_MSG(0xf4f, modelData != NULL, " 鷹匠"); // falconer mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Npc_tk", 6), 0, 1.0f, 0, diff --git a/src/d/actor/d_a_npc_tkc.cpp b/src/d/actor/d_a_npc_tkc.cpp index b004de46f9..6c02660f2a 100644 --- a/src/d/actor/d_a_npc_tkc.cpp +++ b/src/d/actor/d_a_npc_tkc.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tkc.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_npc_tkj.cpp b/src/d/actor/d_a_npc_tkj.cpp index c4c5f791cf..8dd6c060f9 100644 --- a/src/d/actor/d_a_npc_tkj.cpp +++ b/src/d/actor/d_a_npc_tkj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tkj.h" @@ -204,7 +204,7 @@ int daNpcTkj_c::CreateHeap() { int bmd_index = l_bmdData[temp_r23][0]; J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(arcname, bmd_index); - JUT_ASSERT(446, 0 != mdlData_p); + 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); @@ -584,7 +584,7 @@ int daNpcTkj_c::cutLv7Start(int i_staffId) { fopAcM_delete(this); break; default: - JUT_ASSERT(1188, 0); + JUT_ASSERT(1188, FALSE); break; } } @@ -628,7 +628,7 @@ int daNpcTkj_c::cutLv7Start(int i_staffId) { rt = 1; break; default: - JUT_ASSERT(1225, 0); + JUT_ASSERT(1225, FALSE); break; } diff --git a/src/d/actor/d_a_npc_tkj2.cpp b/src/d/actor/d_a_npc_tkj2.cpp index bc366fe0a8..0101772f03 100644 --- a/src/d/actor/d_a_npc_tkj2.cpp +++ b/src/d/actor/d_a_npc_tkj2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tkj2.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_npc_tks.cpp b/src/d/actor/d_a_npc_tks.cpp index 5cf678eba4..caa6f2c4ff 100644 --- a/src/d/actor/d_a_npc_tks.cpp +++ b/src/d/actor/d_a_npc_tks.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tks.h" #include "d/d_a_obj.h" @@ -360,7 +360,7 @@ int daNpcTks_c::CreateHeap() { // NONMATCHING J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_TKS); - JUT_ASSERT(410, 0 != mdlData_p); + JUT_ASSERT(410, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -392,7 +392,7 @@ int daNpcTks_c::CreateHeap() { if (mTksTsubo.mTsuboType < 2) { mdlData_p = static_cast(dComIfG_getObjectRes(mTksTsubo.mTsuboType != 0 ? l_arcNames[2] : l_arcNames[1], 3)); - JUT_ASSERT(453, 0 != mdlData_p); + 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); if (mTksTsubo.mpModelMorf == NULL) { @@ -758,7 +758,7 @@ void daNpcTks_c::reset() { break; default: - JUT_ASSERT(1298, 0); + JUT_ASSERT(1298, FALSE); break; } } @@ -981,7 +981,7 @@ void daNpcTks_c::wait() { break; default: - JUT_ASSERT(1766, 0); + JUT_ASSERT(1766, FALSE); break; } } @@ -1088,7 +1088,7 @@ void daNpcTks_c::waitNude() { break; default: - JUT_ASSERT(1805, 0); + JUT_ASSERT(1805, FALSE); break; } } @@ -1141,7 +1141,7 @@ void daNpcTks_c::waitLv6() { break; default: - JUT_ASSERT(1858, 0); + JUT_ASSERT(1858, FALSE); break; } } @@ -1238,7 +1238,7 @@ void daNpcTks_c::talk() { break; default: - JUT_ASSERT(1920, 0); + JUT_ASSERT(1920, FALSE); break; } } @@ -1294,7 +1294,7 @@ void daNpcTks_c::hide() { break; default: - JUT_ASSERT(1960, 0); + JUT_ASSERT(1960, FALSE); break; } } @@ -1323,7 +1323,7 @@ void daNpcTks_c::shake() { break; default: - JUT_ASSERT(1986, 0); + JUT_ASSERT(1986, FALSE); break; } } @@ -1348,7 +1348,7 @@ void daNpcTks_c::showUp() { break; default: - JUT_ASSERT(2011, 0); + JUT_ASSERT(2011, FALSE); break; } } @@ -1405,7 +1405,7 @@ void daNpcTks_c::showUpWait() { break; default: - JUT_ASSERT(2056, 0); + JUT_ASSERT(2056, FALSE); break; } } @@ -1434,7 +1434,7 @@ void daNpcTks_c::lookAroundA() { break; default: - JUT_ASSERT(2082, 0); + JUT_ASSERT(2082, FALSE); break; } } @@ -1463,7 +1463,7 @@ void daNpcTks_c::lookAroundB() { break; default: - JUT_ASSERT(2082, 0); + JUT_ASSERT(2082, FALSE); break; } } @@ -1488,7 +1488,7 @@ void daNpcTks_c::in() { break; default: - JUT_ASSERT(2133, 0); + JUT_ASSERT(2133, FALSE); break; } } @@ -1519,7 +1519,7 @@ void daNpcTks_c::damage() { break; default: - JUT_ASSERT(2162, 0); + JUT_ASSERT(2162, FALSE); break; } } @@ -1558,7 +1558,7 @@ void daNpcTks_c::broken() { break; default: - JUT_ASSERT(2199, 0); + JUT_ASSERT(2199, FALSE); } } @@ -1634,7 +1634,7 @@ void daNpcTks_c::demo_appear() { break; default: - JUT_ASSERT(2277, 0); + JUT_ASSERT(2277, FALSE); break; } } @@ -1704,7 +1704,7 @@ void daNpcTks_c::demo_appear() { break; default: - JUT_ASSERT(2339, 0); + JUT_ASSERT(2339, FALSE); break; } @@ -1724,7 +1724,7 @@ void daNpcTks_c::demo_appear() { break; default: - JUT_ASSERT(2356, 0); + JUT_ASSERT(2356, FALSE); } } @@ -1768,7 +1768,7 @@ void daNpcTks_c::demo_scannon() { break; default: - JUT_ASSERT(2405, 0); + JUT_ASSERT(2405, FALSE); break; } } @@ -1819,7 +1819,7 @@ void daNpcTks_c::demo_scannon() { break; default: - JUT_ASSERT(2473, 0); + JUT_ASSERT(2473, FALSE); break; } } @@ -1830,7 +1830,7 @@ void daNpcTks_c::demo_scannon() { break; default: - JUT_ASSERT(2479, 0); + JUT_ASSERT(2479, FALSE); break; } } @@ -1866,7 +1866,7 @@ void daNpcTks_c::demo_Lv6Gate() { break; default: - JUT_ASSERT(2520, 0); + JUT_ASSERT(2520, FALSE); break; } } @@ -1886,7 +1886,7 @@ void daNpcTks_c::demo_Lv6Gate() { break; default: - JUT_ASSERT(2535, 0); + JUT_ASSERT(2535, FALSE); } } } @@ -1896,7 +1896,7 @@ void daNpcTks_c::demo_Lv6Gate() { break; default: - JUT_ASSERT(2541, 0); + JUT_ASSERT(2541, FALSE); break; } } @@ -1977,7 +1977,7 @@ void daNpcTks_c::demo_farewell() { break; default: - JUT_ASSERT(2627, 0); + JUT_ASSERT(2627, FALSE); break; } } @@ -2056,7 +2056,7 @@ void daNpcTks_c::demo_farewell() { break; default: - JUT_ASSERT(2711, 0); + JUT_ASSERT(2711, FALSE); break; } @@ -2073,7 +2073,7 @@ void daNpcTks_c::demo_farewell() { break; default: - JUT_ASSERT(2737, 0); + JUT_ASSERT(2737, FALSE); } } @@ -2135,7 +2135,7 @@ void daNpcTks_c::demo_warpBack() { break; default: - JUT_ASSERT(2809, 0); + JUT_ASSERT(2809, FALSE); } } @@ -2181,7 +2181,7 @@ void daNpcTks_c::demo_warpBack() { break; default: - JUT_ASSERT(2853, 0); + JUT_ASSERT(2853, FALSE); break; } @@ -2198,7 +2198,7 @@ void daNpcTks_c::demo_warpBack() { break; default: - JUT_ASSERT(2870, 0); + JUT_ASSERT(2870, FALSE); } } @@ -2264,7 +2264,7 @@ void daNpcTks_c::demo_walkBack() { break; default: - JUT_ASSERT(2809, 0); + JUT_ASSERT(2809, FALSE); } } @@ -2310,7 +2310,7 @@ void daNpcTks_c::demo_walkBack() { break; default: - JUT_ASSERT(2986, 0); + JUT_ASSERT(2986, FALSE); break; } @@ -2328,7 +2328,7 @@ void daNpcTks_c::demo_walkBack() { break; default: - JUT_ASSERT(3004, 0); + JUT_ASSERT(3004, FALSE); } } @@ -2424,7 +2424,7 @@ void daNpcTks_c::demo_Lv7Start() { break; default: - JUT_ASSERT(3091, 0); + JUT_ASSERT(3091, FALSE); break; } } @@ -2626,7 +2626,7 @@ void daNpcTks_c::demo_Lv7Start() { } default: - JUT_ASSERT(3263, 0); + JUT_ASSERT(3263, FALSE); break; } } @@ -2637,7 +2637,7 @@ void daNpcTks_c::demo_Lv7Start() { break; default: - JUT_ASSERT(3269, 0); + JUT_ASSERT(3269, FALSE); break; } } @@ -2707,7 +2707,7 @@ void daNpcTks_c::demo_Lv3PickUp() { break; default: - JUT_ASSERT(3348, 0); + JUT_ASSERT(3348, FALSE); break; } } @@ -2759,7 +2759,7 @@ void daNpcTks_c::demo_Lv3PickUp() { break; default: - JUT_ASSERT(3406, 0); + JUT_ASSERT(3406, FALSE); break; } @@ -2777,7 +2777,7 @@ void daNpcTks_c::demo_Lv3PickUp() { break; default: - JUT_ASSERT(3424, 0); + JUT_ASSERT(3424, FALSE); break; } } @@ -2839,7 +2839,7 @@ void daNpcTks_c::demo_Lv6PickUp() { break; default: - JUT_ASSERT(3499, 0); + JUT_ASSERT(3499, FALSE); break; } } @@ -2890,7 +2890,7 @@ void daNpcTks_c::demo_Lv6PickUp() { break; default: - JUT_ASSERT(3650, 0); + JUT_ASSERT(3650, FALSE); break; } @@ -2908,7 +2908,7 @@ void daNpcTks_c::demo_Lv6PickUp() { break; default: - JUT_ASSERT(3568, 0); + JUT_ASSERT(3568, FALSE); break; } } diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 6f07a962fc..cbb550e013 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_toby.h" #include "dol2asm.h" @@ -1053,7 +1053,7 @@ COMPILER_STRIP_GATE(0x80B24AAC, &lit_4159); /* 80B24AB0-80B24AB4 0000CC 0004+00 0/1 0/0 0/0 .rodata @4160 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4160 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4160 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80B24AB0, &lit_4160); #pragma pop @@ -1197,7 +1197,7 @@ void daNpc_Toby_c::srchToby(void* param_0, void* param_1) { /* ############################################################################################## */ /* 80B24AC8-80B24ACC 0000E4 0004+00 1/1 0/0 0/0 .rodata @4593 */ -SECTION_RODATA static f32 const lit_4593 = 1000000000.0f; +SECTION_RODATA static f32 const lit_4593 = G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80B24AC8, &lit_4593); /* 80B1F124-80B1F200 000BC4 00DC+00 1/1 0/0 0/0 .text getOtherTobyP__12daNpc_Toby_cFi */ diff --git a/src/d/actor/d_a_npc_tr.cpp b/src/d/actor/d_a_npc_tr.cpp index cd8cdcd7c7..658f67a160 100644 --- a/src/d/actor/d_a_npc_tr.cpp +++ b/src/d/actor/d_a_npc_tr.cpp @@ -3,7 +3,7 @@ // NPC - Trout // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_tr.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_npc_uri.cpp b/src/d/actor/d_a_npc_uri.cpp index 693f2f9f2f..3f253d8854 100644 --- a/src/d/actor/d_a_npc_uri.cpp +++ b/src/d/actor/d_a_npc_uri.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_uri.h" #include "Z2AudioLib/Z2Instances.h" @@ -253,7 +253,7 @@ int daNpc_Uri_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_worm.cpp b/src/d/actor/d_a_npc_worm.cpp index 81b94eed54..8fad716a9d 100644 --- a/src/d/actor/d_a_npc_worm.cpp +++ b/src/d/actor/d_a_npc_worm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_worm.h" #include "dol2asm.h" @@ -356,13 +356,13 @@ static int daNPC_WORM_Delete(npc_worm_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { npc_worm_class* i_this = (npc_worm_class*)a_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x30); - JUT_ASSERT(776, modelData != 0); + JUT_ASSERT(776, modelData != NULL); i_this->mModel1 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mModel1 == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x31); - JUT_ASSERT(794, modelData != 0); + JUT_ASSERT(794, modelData != NULL); i_this->mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mModel2 == NULL) { return 0; diff --git a/src/d/actor/d_a_npc_wrestler.cpp b/src/d/actor/d_a_npc_wrestler.cpp index 397fdda7bd..018c43393a 100644 --- a/src/d/actor/d_a_npc_wrestler.cpp +++ b/src/d/actor/d_a_npc_wrestler.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_wrestler.h" #include "d/d_timer.h" @@ -566,7 +566,7 @@ cPhs__Step daNpcWrestler_c::Create() { /* 80B2F974-80B2FBF4 0007D4 0280+00 1/1 0/0 0/0 .text CreateHeap__15daNpcWrestler_cFv */ int daNpcWrestler_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resName[mType], l_bmdGetParamList[mType]); - JUT_ASSERT(830, 0 != mdlData_p); + JUT_ASSERT(830, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -955,7 +955,7 @@ inline void daNpcWrestler_c::setBackToLiving() { if (mType != 1) { daPy_py_c* player = daPy_getPlayerActorClass(); daNpcBouS_c* bou = (daNpcBouS_c*)fpcM_SearchByID(parentActorID); - JUT_ASSERT(2205, bou != 0); + JUT_ASSERT(2205, bou != NULL); bou->setMessageNo(7); bou->setForcibleTalk(); @@ -1152,7 +1152,7 @@ static void* s_sub2(void* i_actor, void* i_data) { void daNpcWrestler_c::setOnToArena(f32 param_1) { if (mType == 0) { daNpcBouS_c* bou = (daNpcBouS_c*)fpcM_SearchByID(parentActorID); - JUT_ASSERT(2166, bou != 0); + JUT_ASSERT(2166, bou != NULL); bou->setHome(); bou->offDispFlag(); } else if (mType == 1) { @@ -1791,7 +1791,7 @@ inline bool daNpcWrestler_c::demo(void* param_1) { case 2: { s32 staffID = eventManager->getMyStaffId(l_myName, NULL, 0); mStaffID = staffID; - JUT_ASSERT(2886, 0 != mEvtSeqList[mOrderEvtNo]); + JUT_ASSERT(2886, NULL != mEvtSeqList[mOrderEvtNo]); if (staffID != -1 && (this->*mEvtSeqList[mOrderEvtNo])(staffID)) { eventManager->cutEnd(mStaffID); diff --git a/src/d/actor/d_a_npc_yamid.cpp b/src/d/actor/d_a_npc_yamid.cpp index 9dbb17f057..e06a765be5 100644 --- a/src/d/actor/d_a_npc_yamid.cpp +++ b/src/d/actor/d_a_npc_yamid.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_yamid.h" @@ -205,7 +205,7 @@ cPhs__Step daNpc_yamiD_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -226,7 +226,7 @@ int daNpc_yamiD_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdIdx][1]], l_bmdData[bmdIdx][0]); - JUT_ASSERT(477, 0 != mdlData_p); + JUT_ASSERT(477, NULL != mdlData_p); mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_yamis.cpp b/src/d/actor/d_a_npc_yamis.cpp index d70862a7f4..71fd8823e3 100644 --- a/src/d/actor/d_a_npc_yamis.cpp +++ b/src/d/actor/d_a_npc_yamis.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_yamis.h" #include "dol2asm.h" @@ -614,7 +614,7 @@ COMPILER_STRIP_GATE(0x80B4974C, &lit_4032); /* 80B49750-80B49754 0000A0 0004+00 0/1 0/0 0/0 .rodata @4033 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4033 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4033 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80B49750, &lit_4033); #pragma pop diff --git a/src/d/actor/d_a_npc_yamit.cpp b/src/d/actor/d_a_npc_yamit.cpp index 2b6ebaabf2..e875e7399a 100644 --- a/src/d/actor/d_a_npc_yamit.cpp +++ b/src/d/actor/d_a_npc_yamit.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_yamit.h" #include "dol2asm.h" @@ -619,7 +619,7 @@ COMPILER_STRIP_GATE(0x80B4CE40, &lit_4031); /* 80B4CE44-80B4CE48 0000A0 0004+00 0/1 0/0 0/0 .rodata @4032 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4032 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4032 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80B4CE44, &lit_4032); #pragma pop diff --git a/src/d/actor/d_a_npc_yelia.cpp b/src/d/actor/d_a_npc_yelia.cpp index 7648ac126d..0e7cf13987 100644 --- a/src/d/actor/d_a_npc_yelia.cpp +++ b/src/d/actor/d_a_npc_yelia.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_yelia.h" #include "d/actor/d_a_demo_item.h" diff --git a/src/d/actor/d_a_npc_ykm.cpp b/src/d/actor/d_a_npc_ykm.cpp index 11d95b4532..fd70ab5f76 100644 --- a/src/d/actor/d_a_npc_ykm.cpp +++ b/src/d/actor/d_a_npc_ykm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_ykm.h" #include "Z2AudioLib/Z2Instances.h" @@ -541,7 +541,7 @@ cPhs__Step daNpc_ykM_c::create() { mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -609,7 +609,7 @@ int daNpc_ykM_c::CreateHeap() { resIndex = l_bmdData[sp40][0]; mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[arcNameIdx], resIndex); - JUT_ASSERT(1595, 0 != mdlData_p); + JUT_ASSERT(1595, NULL != mdlData_p); sp34 = 0x11000084; mFishModelMorf = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, @@ -623,7 +623,7 @@ int daNpc_ykM_c::CreateHeap() { resIndex = l_bmdData[BMD_INDEX_LEAF][0]; mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[arcNameIdx], resIndex); - JUT_ASSERT(1622, 0 != mdlData_p); + JUT_ASSERT(1622, NULL != mdlData_p); sp34 = 0x11000084; mLeafModelMorf = new mDoExt_McaMorfSO((J3DModelData*)mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, @@ -734,7 +734,7 @@ void* daNpc_ykM_c::srchGadget(void* i_actor, void* i_data) { /* 80B5430C-80B543DC 000F0C 00D0+00 1/1 0/0 0/0 .text getTomatoPureeP__11daNpc_ykM_cFv */ fopAc_ac_c* daNpc_ykM_c::getTomatoPureeP() { fopAc_ac_c* actor = NULL; - f32 fVar1 = 1000000000.0f; + f32 fVar1 = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchGadget, this); @@ -752,7 +752,7 @@ fopAc_ac_c* daNpc_ykM_c::getTomatoPureeP() { /* 80B543DC-80B544B0 000FDC 00D4+00 1/1 0/0 0/0 .text getCheeseP__11daNpc_ykM_cFv */ fopAc_ac_c* daNpc_ykM_c::getCheeseP() { fopAc_ac_c* actor = NULL; - f32 fVar1 = 1000000000.0f; + f32 fVar1 = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchGadget, this); @@ -782,7 +782,7 @@ void* daNpc_ykM_c::srchYkm(void* i_actor, void* i_data) { /* 80B5454C-80B54628 00114C 00DC+00 4/4 0/0 0/0 .text getOtherYkmP__11daNpc_ykM_cFi */ fopAc_ac_c* daNpc_ykM_c::getOtherYkmP(int param_1) { fopAc_ac_c* actor = NULL; - f32 fVar1 = 1000000000.0f; + f32 fVar1 = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchYkm, this); @@ -812,7 +812,7 @@ void* daNpc_ykM_c::srchYkw(void* i_actor, void* i_data) { /* 80B546C4-80B547A0 0012C4 00DC+00 1/1 0/0 0/0 .text getOtherYkwP__11daNpc_ykM_cFi */ fopAc_ac_c* daNpc_ykM_c::getOtherYkwP(int param_1) { fopAc_ac_c* actor = NULL; - f32 fVar1 = 1000000000.0f; + f32 fVar1 = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchYkw, this); @@ -1773,7 +1773,7 @@ int daNpc_ykM_c::cutSlideDown(int i_cutIndex) { mGndChk.SetPos(&work); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(3443, -(1000000000.0f) != work.y); + JUT_ASSERT(3443, -G_CM3D_F_INF != work.y); daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, angle.y, 0); work.set(400.0f, 500.0f, 0.0f); @@ -1784,7 +1784,7 @@ int daNpc_ykM_c::cutSlideDown(int i_cutIndex) { mGndChk.SetPos(&work); work.y = dComIfG_Bgsp().GroundCross(&mGndChk); - JUT_ASSERT(3454, -(1000000000.0f) != work.y); + JUT_ASSERT(3454, -G_CM3D_F_INF != work.y); dComIfGp_evmng_setGoal(&work); break; @@ -1807,7 +1807,7 @@ int daNpc_ykM_c::cutSlideDown(int i_cutIndex) { mMotionSeqMngr.setNo(MOTION_FISH_JUMP, 0.0f, TRUE, 0); actor_p = getOtherYkmP(5); - JUT_ASSERT(3475, 0 != actor_p); + JUT_ASSERT(3475, NULL != actor_p); setPos(actor_p->current.pos); setAngle(actor_p->shape_angle.y); @@ -1865,7 +1865,7 @@ int daNpc_ykM_c::cutSlideDown(int i_cutIndex) { if (mLeafModelMorf->isStop()) { actor_p = getOtherYkmP(5); - JUT_ASSERT(3565, 0 != actor_p); + JUT_ASSERT(3565, NULL != actor_p); angle.y = fopAcM_searchActorAngleY(daPy_getPlayerActorClass(), actor_p); work = daPy_getPlayerActorClass()->current.pos; @@ -2515,7 +2515,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) { mMotionSeqMngr.setNo(MOTION_STOP, 0.0f, FALSE, 0); actor_p = mActorMngr[5].getActorP(); - JUT_ASSERT(4401, 0 != actor_p); + JUT_ASSERT(4401, NULL != actor_p); setPos(actor_p->home.pos); setAngle(actor_p->home.angle.y); @@ -2539,7 +2539,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) { mMotionSeqMngr.setNo(MOTION_WAITHOLD_B_B, 0.0f, FALSE, 0); actor_p = mActorMngr[5].getActorP(); - JUT_ASSERT(4424, 0 != actor_p); + JUT_ASSERT(4424, NULL != actor_p); setPos(actor_p->home.pos); setAngle(actor_p->home.angle.y); @@ -2563,7 +2563,7 @@ int daNpc_ykM_c::cutLv5DungeonClear(int i_cutIndex) { if (mEventTimer != 0 || dComIfGp_getEventManager().getIsAddvance(i_cutIndex)) { actor_p = mActorMngr[5].getActorP(); - JUT_ASSERT(4455, 0 != actor_p); + JUT_ASSERT(4455, NULL != actor_p); if (cLib_calcTimer(&mEventTimer) == 0) { speedF = 0.0f; @@ -2762,7 +2762,7 @@ int daNpc_ykM_c::cutStartSnowboardRace(int i_cutIndex) { field_0x157e = 0; actor_p = getOtherYkmP(5); - JUT_ASSERT(4736, 0 != actor_p); + JUT_ASSERT(4736, NULL != actor_p); setPos(actor_p->current.pos); setAngle(actor_p->shape_angle.y); @@ -2878,7 +2878,7 @@ int daNpc_ykM_c::cutEndSnowboardRace(int i_cutIndex) { mPath.setIdx(0); actor_p = getOtherYkmP(6); - JUT_ASSERT(4900, 0 != actor_p); + JUT_ASSERT(4900, NULL != actor_p); setPos(actor_p->current.pos); angle.setall(0); @@ -2919,7 +2919,7 @@ int daNpc_ykM_c::cutEndSnowboardRace(int i_cutIndex) { mMotionSeqMngr.setNo(MOTION_WAIT_A, 0.0f, FALSE, 0); actor_p = getOtherYkmP(6); - JUT_ASSERT(4943, 0 != actor_p); + JUT_ASSERT(4943, NULL != actor_p); home.pos = actor_p->current.pos; angle.setall(0); @@ -3372,7 +3372,7 @@ BOOL daNpc_ykM_c::race(void* param_1) { field_0x1560 = -1; mGndChk.SetPos(&daPy_getPlayerActorClass()->current.pos); - if (dComIfG_Bgsp().GroundCross(&mGndChk) != -1000000000.0f) { + if (dComIfG_Bgsp().GroundCross(&mGndChk) != -G_CM3D_F_INF) { if (field_0x1534 != -1) { if ((dTimer_c*)fpcM_SearchByID(field_0x1534) == dComIfG_getTimerPtr()) { if (dComIfG_getTimerPtr()->isStart()) { diff --git a/src/d/actor/d_a_npc_ykw.cpp b/src/d/actor/d_a_npc_ykw.cpp index ce3db4a1d8..9c7b58c591 100644 --- a/src/d/actor/d_a_npc_ykw.cpp +++ b/src/d/actor/d_a_npc_ykw.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "JSystem/JHostIO/JORFile.h" #include "Z2AudioLib/Z2Instances.h" @@ -381,7 +381,7 @@ int daNpc_ykW_c::create() { mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e+09f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); @@ -544,7 +544,7 @@ void* daNpc_ykW_c::srchYkw(void* param_0, void* param_1) { /* 80B5FA74-80B5FB50 000C54 00DC+00 2/2 0/0 0/0 .text getOtherYkwP__11daNpc_ykW_cFi */ fopAc_ac_c* daNpc_ykW_c::getOtherYkwP(int param_0) { fopAc_ac_c* actor = 0; - f32 unkFloat1 = 1000000000.0f; + f32 unkFloat1 = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchYkw, this); for (int i = 0; i < mFindCount; i++) { @@ -575,7 +575,7 @@ void* daNpc_ykW_c::srchYkm(void* param_0, void* param_1) { /* 80B5FBEC-80B5FCC8 000DCC 00DC+00 1/1 0/0 0/0 .text getOtherYkmP__11daNpc_ykW_cFi */ fopAc_ac_c* daNpc_ykW_c::getOtherYkmP(int param_0) { fopAc_ac_c* actor = 0; - f32 minDist = 1000000000.0f; + f32 minDist = G_CM3D_F_INF; mFindCount = 0; fopAcM_Search(srchYkm, this); for (int i = 0; i < mFindCount; i++) { @@ -672,7 +672,7 @@ void daNpc_ykW_c::reset() { break; case 2: if (daNpcT_chkEvtBit(0x6c)) { - JUT_ASSERT(0x6bf, mPath.getPathInfo() != 0); + JUT_ASSERT(0x6bf, mPath.getPathInfo() != NULL); unkXyz1 = mPath.getPntPos(mPath.getNumPnts() - 2); setPos(unkXyz1); @@ -2824,7 +2824,7 @@ int daNpc_ykW_c::race(void* param_0) { { field_0x104c = -1; mGndChk.SetPos(&daPy_getPlayerActorClass()->current.pos); - if (dComIfG_Bgsp().GroundCross(&mGndChk) != -1e+09f) { + if (dComIfG_Bgsp().GroundCross(&mGndChk) != -G_CM3D_F_INF) { if (mTimer != fpcM_ERROR_PROCESS_ID_e) { if ((dTimer_c*)fpcM_SearchByID(mTimer) == dComIfG_getTimerPtr()) { if (dComIfG_getTimerPtr()->isStart()) { diff --git a/src/d/actor/d_a_npc_zanb.cpp b/src/d/actor/d_a_npc_zanb.cpp index 0de3f31f43..786ce42672 100644 --- a/src/d/actor/d_a_npc_zanb.cpp +++ b/src/d/actor/d_a_npc_zanb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zanb.h" #include "dol2asm.h" @@ -582,7 +582,7 @@ COMPILER_STRIP_GATE(0x80B6BD64, &lit_4035); /* 80B6BD68-80B6BD6C 0000A4 0004+00 0/1 0/0 0/0 .rodata @4036 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4036 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4036 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80B6BD68, &lit_4036); #pragma pop diff --git a/src/d/actor/d_a_npc_zant.cpp b/src/d/actor/d_a_npc_zant.cpp index a8ae64398e..8e8aac3853 100644 --- a/src/d/actor/d_a_npc_zant.cpp +++ b/src/d/actor/d_a_npc_zant.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zant.h" #include "SSystem/SComponent/c_counter.h" @@ -122,7 +122,7 @@ int daNpc_Zant_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.m_ground_h; - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_zelR.cpp b/src/d/actor/d_a_npc_zelR.cpp index b66f6f7912..2ce86cad40 100644 --- a/src/d/actor/d_a_npc_zelR.cpp +++ b/src/d/actor/d_a_npc_zelR.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zelR.h" @@ -189,7 +189,7 @@ int daNpc_ZelR_c::CreateHeap() { )); - JUT_ASSERT(0x1b0, 0 != mdlData_p); + JUT_ASSERT(0x1b0, NULL != mdlData_p); mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_zelRo.cpp b/src/d/actor/d_a_npc_zelRo.cpp index 991498fc5f..bd394f4b55 100644 --- a/src/d/actor/d_a_npc_zelRo.cpp +++ b/src/d/actor/d_a_npc_zelRo.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zelRo.h" @@ -213,7 +213,7 @@ int daNpc_ZelRo_c::CreateHeap() { int bmdIdx = mTwilight == true ? NONE : NONE; J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[bmdIdx][1]], l_bmdData[bmdIdx][0]); - JUT_ASSERT(432, 0 != mdlData_p); + JUT_ASSERT(432, NULL != mdlData_p); mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { diff --git a/src/d/actor/d_a_npc_zelda.cpp b/src/d/actor/d_a_npc_zelda.cpp index f2519b17bf..09d49be5d4 100644 --- a/src/d/actor/d_a_npc_zelda.cpp +++ b/src/d/actor/d_a_npc_zelda.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zelda.h" #include "JSystem/JHostIO/JORFile.h" @@ -229,7 +229,7 @@ int daNpc_Zelda_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp index 983785b0cb..7ac1bf8341 100644 --- a/src/d/actor/d_a_npc_zra.cpp +++ b/src/d/actor/d_a_npc_zra.cpp @@ -3,7 +3,7 @@ * NPC - Zora */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zra.h" #include "SSystem/SComponent/c_math.h" @@ -229,7 +229,7 @@ f32 daNpc_zrA_Path_c::chkPassDst(u16 i_idx, cXyz i_pos) { daNpcF_pntVsLineSegmentLengthSquare2D(i_pos.x, i_pos.z, prev_pos.x, prev_pos.z, next_pos.x, next_pos.z, &proj_x, &proj_z, &dist); if (cM3d_IsZero(dist)) { - return -1e9f; + return -G_CM3D_F_INF; } else { daNpcF_pntVsLineSegmentLengthSquare2D(cur_pos.x, cur_pos.z, prev_pos.x, prev_pos.z, next_pos.x, next_pos.z, &proj2_x, &proj2_z, &dist); @@ -249,7 +249,7 @@ f32 daNpc_zrA_Path_c::chkPassDst(u16 i_idx, cXyz i_pos) { } } } else { - return -1e9f; + return -G_CM3D_F_INF; } } @@ -2133,7 +2133,7 @@ BOOL daNpc_zrA_c::doEvent() { int act_idx = event_manager->getMyActIdx(staff_id, mEvtCutNameList, ARRAY_SIZEU(mEvtCutNameList), 0, 0); JUT_ASSERT(0xf0e, act_idx >= 0 && act_idx < 11); - JUT_ASSERT(0xf0f, mEvtCutList[act_idx] != 0); + JUT_ASSERT(0xf0f, mEvtCutList[act_idx] != NULL); if ((this->*mEvtCutList[act_idx])(staff_id)) { event_manager->cutEnd(staff_id); } diff --git a/src/d/actor/d_a_npc_zrc.cpp b/src/d/actor/d_a_npc_zrc.cpp index 6afc02ac9f..ea907e2526 100644 --- a/src/d/actor/d_a_npc_zrc.cpp +++ b/src/d/actor/d_a_npc_zrc.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zrc.h" #include "SSystem/SComponent/c_math.h" @@ -1196,7 +1196,7 @@ BOOL daNpc_zrC_c::doEvent() { mStaffID = staff_id; int evtCutNo = event_mgr->getMyActIdx(staff_id, mEvtCutNameList, 2, 0, 0); JUT_ASSERT(0x8ca, (0 <= evtCutNo) && (evtCutNo < NUM_EVT_CUTS_e)); - JUT_ASSERT(0x8cb, 0 != mEvtCutList[evtCutNo]); + JUT_ASSERT(0x8cb, NULL != mEvtCutList[evtCutNo]); if ((this->*mEvtCutList[evtCutNo])(staff_id)) { event_mgr->cutEnd(staff_id); } diff --git a/src/d/actor/d_a_npc_zrz.cpp b/src/d/actor/d_a_npc_zrz.cpp index ea24313edf..6963a9d9f5 100644 --- a/src/d/actor/d_a_npc_zrz.cpp +++ b/src/d/actor/d_a_npc_zrz.cpp @@ -3,7 +3,7 @@ * NPC - Rutela */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_npc_zrz.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_Lv5Key.cpp b/src/d/actor/d_a_obj_Lv5Key.cpp index 472951913a..c7f8a3f8a0 100644 --- a/src/d/actor/d_a_obj_Lv5Key.cpp +++ b/src/d/actor/d_a_obj_Lv5Key.cpp @@ -3,7 +3,7 @@ * Snowpeak Ruins Key Lock */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Lv5Key.h" #include "d/d_com_inf_game.h" @@ -17,7 +17,7 @@ static char* l_arcName = "Lv5_KEY"; int daObjLv5Key_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_Turara.cpp b/src/d/actor/d_a_obj_Turara.cpp index 978d83f398..c3bfc55a24 100644 --- a/src/d/actor/d_a_obj_Turara.cpp +++ b/src/d/actor/d_a_obj_Turara.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Turara.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_TvCdlst.cpp b/src/d/actor/d_a_obj_TvCdlst.cpp index be16e3fcc2..ed993ba236 100644 --- a/src/d/actor/d_a_obj_TvCdlst.cpp +++ b/src/d/actor/d_a_obj_TvCdlst.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_TvCdlst.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_Y_taihou.cpp b/src/d/actor/d_a_obj_Y_taihou.cpp index cbc4f1ab03..24e1b27aec 100644 --- a/src/d/actor/d_a_obj_Y_taihou.cpp +++ b/src/d/actor/d_a_obj_Y_taihou.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_Y_taihou.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_amiShutter.cpp b/src/d/actor/d_a_obj_amiShutter.cpp index d22023cd7c..d52f3fa4f1 100644 --- a/src/d/actor/d_a_obj_amiShutter.cpp +++ b/src/d/actor/d_a_obj_amiShutter.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_amiShutter.h" #include "d/actor/d_a_player.h" @@ -61,7 +61,7 @@ void daAmiShutter_c::setBaseMtx() { /* 80BA15E4-80BA1650 000204 006C+00 1/0 0/0 0/0 .text CreateHeap__14daAmiShutter_cFv */ int daAmiShutter_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("S_Zami", 4); - JUT_ASSERT(167, modelData != 0); + JUT_ASSERT(167, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084); diff --git a/src/d/actor/d_a_obj_ari.cpp b/src/d/actor/d_a_obj_ari.cpp index cd2b31907d..63d8ef727f 100644 --- a/src/d/actor/d_a_obj_ari.cpp +++ b/src/d/actor/d_a_obj_ari.cpp @@ -3,7 +3,7 @@ * Object - Golden Ant */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ari.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_automata.cpp b/src/d/actor/d_a_obj_automata.cpp index 7ba271e40e..95a9589662 100644 --- a/src/d/actor/d_a_obj_automata.cpp +++ b/src/d/actor/d_a_obj_automata.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_automata.h" #include "SSystem/SComponent/c_counter.h" @@ -88,7 +88,7 @@ int daObj_AutoMata_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -134,7 +134,7 @@ int daObj_AutoMata_c::Execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { if (fopAcIt_Judge((fopAcIt_JudgeFunc)srchTHouse, ¤t.pos) != NULL) { current.pos.y = mGroundH; } @@ -179,7 +179,7 @@ int daObj_AutoMata_c::Draw() { mBtk.entry(modelData); mpMorf->entryDL(); mBtk.remove(modelData); - if (mGroundH != -1e+09f) { + if (mGroundH != -G_CM3D_F_INF) { mShadowId = dComIfGd_setShadow( mShadowId, 1, morfModel, ¤t.pos, 600.0f, 20.0f, current.pos.y, mGroundH, mGndChk, diff --git a/src/d/actor/d_a_obj_avalanche.cpp b/src/d/actor/d_a_obj_avalanche.cpp index 63ba5258d6..83a685fa3f 100644 --- a/src/d/actor/d_a_obj_avalanche.cpp +++ b/src/d/actor/d_a_obj_avalanche.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_avalanche.h" #include "d/d_bg_w.h" @@ -92,14 +92,14 @@ int daObjAvalanche_c::Create() { /* 80BA7178-80BA7328 000318 01B0+00 1/0 0/0 0/0 .text CreateHeap__16daObjAvalanche_cFv */ int daObjAvalanche_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9); - JUT_ASSERT(233, modelData != 0); + JUT_ASSERT(233, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mModel == NULL) { return 0; } J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 6); - JUT_ASSERT(247, anm != 0); + JUT_ASSERT(247, anm != NULL); mBckAnm = new mDoExt_bckAnm(); if (mBckAnm == NULL || !mBckAnm->init(anm, 1, 0, 1.0, 0, -1, false)) { return 0; diff --git a/src/d/actor/d_a_obj_balloon.cpp b/src/d/actor/d_a_obj_balloon.cpp index ef273a62cc..dab48799f4 100644 --- a/src/d/actor/d_a_obj_balloon.cpp +++ b/src/d/actor/d_a_obj_balloon.cpp @@ -3,7 +3,7 @@ * Plumm Minigame Balloon */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_balloon.h" #include "JSystem/JAudio2/JASAudioThread.h" @@ -248,7 +248,7 @@ int daObj_Balloon_c::CreateHeap() { } else if (mType == SIZE_SMALL_e) { modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_bal", 5); } - JUT_ASSERT(501, modelData != 0); + JUT_ASSERT(501, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); return mModel != NULL ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_barDesk.cpp b/src/d/actor/d_a_obj_barDesk.cpp index d0273df1f0..68de99a3c1 100644 --- a/src/d/actor/d_a_obj_barDesk.cpp +++ b/src/d/actor/d_a_obj_barDesk.cpp @@ -3,7 +3,7 @@ * Object - Table */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_barDesk.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_batta.cpp b/src/d/actor/d_a_obj_batta.cpp index 41cf4c2882..82d38f4791 100644 --- a/src/d/actor/d_a_obj_batta.cpp +++ b/src/d/actor/d_a_obj_batta.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_batta.h" #include "d/actor/d_a_player.h" @@ -97,7 +97,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 != 0); + JUT_ASSERT(256, modelData != NULL); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Bat", 8), 2, 1.0f, 0, -1, &mCreature, 0x80000, 0x11000284); diff --git a/src/d/actor/d_a_obj_bbox.cpp b/src/d/actor/d_a_obj_bbox.cpp index b02b6e237f..8d3e0cec7c 100644 --- a/src/d/actor/d_a_obj_bbox.cpp +++ b/src/d/actor/d_a_obj_bbox.cpp @@ -3,7 +3,7 @@ * Object - Breakable Wooden Box */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bbox.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_bed.cpp b/src/d/actor/d_a_obj_bed.cpp index 7ea773a3dc..85fb018977 100644 --- a/src/d/actor/d_a_obj_bed.cpp +++ b/src/d/actor/d_a_obj_bed.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bed.h" #include "d/d_bg_w.h" @@ -50,7 +50,7 @@ cPhs__Step daObj_Bed_c::create() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -92,7 +92,7 @@ int daObj_Bed_c::Execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -111,7 +111,7 @@ int daObj_Bed_c::Draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { mShadow = dComIfGd_setShadow(mShadow, 1, mpModel, ¤t.pos, daObj_Bed_Param_c::m.field_0xc, 20.0f, current.pos.y, mGroundH, mGndChk, &tevStr, 0, diff --git a/src/d/actor/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp index 4c30ec2c85..20f8668f15 100644 --- a/src/d/actor/d_a_obj_bemos.cpp +++ b/src/d/actor/d_a_obj_bemos.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "SSystem/SComponent/c_lib.h" #include "d/actor/d_a_obj_bemos.h" @@ -375,7 +375,7 @@ int daObjBm_c::Create() { /* 80BAEADC-80BAEF90 00085C 04B4+00 1/0 0/0 0/0 .text CreateHeap__9daObjBm_cFv */ int daObjBm_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0xd); - JUT_ASSERT(767, modelData != 0); + JUT_ASSERT(767, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -383,7 +383,7 @@ int daObjBm_c::CreateHeap() { } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 0x13); - JUT_ASSERT(780, pbrk != 0); + JUT_ASSERT(780, pbrk != NULL); mpBrkAnm = new mDoExt_brkAnm(); if (mpBrkAnm == NULL || mpBrkAnm->init(modelData, pbrk, 1, 0, 1.0f, 0, -1) == 0) { return 0; @@ -392,25 +392,25 @@ int daObjBm_c::CreateHeap() { J3DAnmTransform* pbck; #if DEBUG pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7); - JUT_ASSERT(791, pbck != 0); + JUT_ASSERT(791, pbck != NULL); #endif pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7); - JUT_ASSERT(798, pbck != 0); + JUT_ASSERT(798, pbck != NULL); mpBckAnm = new mDoExt_bckAnm(); if (mpBckAnm == NULL || mpBckAnm->init(pbck, 1, 0, 1.0f, 0, -1, false) == 0) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0xe); - JUT_ASSERT(813, modelData != 0); + JUT_ASSERT(813, modelData != NULL); mpModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mpModel2 == NULL) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0x1a); - JUT_ASSERT(827, pbtk != 0); + JUT_ASSERT(827, pbtk != NULL); mpBtkAnm = new mDoExt_btkAnm(); if (mpBtkAnm == NULL || mpBtkAnm->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { return 0; @@ -419,32 +419,32 @@ int daObjBm_c::CreateHeap() { #ifdef DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0x18); - JUT_ASSERT(840, pbtk != 0); + JUT_ASSERT(840, pbtk != NULL); #endif pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 0x18); - JUT_ASSERT(846, pbtk != 0); + JUT_ASSERT(846, pbtk != NULL); mpBtkAnm2 = 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, 9); - JUT_ASSERT(858, pbck != 0); + JUT_ASSERT(858, pbck != NULL); mpBckAnm2 = new mDoExt_bckAnm(); if (mpBckAnm2 == NULL || mpBckAnm2->init(pbck2, 1, 2, 1.0f, 0, -1, false) == 0) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0xf); - JUT_ASSERT(873, modelData != 0); + JUT_ASSERT(873, modelData != NULL); mpModel3 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel3 == NULL) { return 0; } J3DAnmTransform* pbck3 = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(885, pbck3 != 0); + JUT_ASSERT(885, pbck3 != NULL); mpBckAnm3 = new mDoExt_bckAnm(); if (mpBckAnm3 == NULL || mpBckAnm3->init(pbck3, 1, 0, 1.0f, 0, -1, false) == 0) { return 0; @@ -1143,7 +1143,7 @@ const daObjBm_c::BgcSrc_c daObjBm_c::Bgc_c::M_lin20[] = { }; static f32 dummy_rodata_5157() { - return -1000000000.0f; + return -G_CM3D_F_INF; } /* 80BB3F9C-80BB4728 0000BC 078C+00 1/2 0/0 0/0 .bss M_gnd_work__Q29daObjBm_c5Bgc_c */ diff --git a/src/d/actor/d_a_obj_bhashi.cpp b/src/d/actor/d_a_obj_bhashi.cpp index dbf37aae61..3c1c904585 100644 --- a/src/d/actor/d_a_obj_bhashi.cpp +++ b/src/d/actor/d_a_obj_bhashi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bhashi.h" #include "d/actor/d_a_player.h" @@ -373,10 +373,10 @@ static char* l_arcName = "B_Hashi"; /* 80578330-8057842C 001950 00FC+00 1/0 0/0 0/0 .text CreateHeap__13daObjBHASHI_cFv */ int daObjBHASHI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Lv9_R07_pillar.bmd"); - JUT_ASSERT(98, modelData != 0); + JUT_ASSERT(98, modelData != NULL); J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Lv9_R07_pillar_hahen.bmd"); - JUT_ASSERT(102, modelData2 != 0); + JUT_ASSERT(102, modelData2 != NULL); for (int i = 0; i < 60; i++) { mpHahenMdls[i] = mDoExt_J3DModel__create(modelData2, J3DMdlFlag_UseSharedDL, BMD_DEFAULT_DIFF_FLAGS); @@ -426,7 +426,7 @@ int daObjBHASHI_c::create() { fopAcM_setCullSizeBox(this, -500.0f, 0.0f, -500.0f, 500.0f, 3000.0f, 500.0f); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Lv9_R07_pillar_hahen.bmd"); - JUT_ASSERT(1219, modelData != 0); + JUT_ASSERT(1219, modelData != NULL); if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(this), 0) == -1) { // "Fire Demon Room Pillar Fragment: simple model entry failed." diff --git a/src/d/actor/d_a_obj_bhbridge.cpp b/src/d/actor/d_a_obj_bhbridge.cpp index 53be8ccb7c..6b917e2aba 100644 --- a/src/d/actor/d_a_obj_bhbridge.cpp +++ b/src/d/actor/d_a_obj_bhbridge.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bhbridge.h" #include "SSystem/SComponent/c_lib.h" @@ -113,7 +113,7 @@ inline int daObjBhbridge_c::create() { dBgS_ObjGndChk_Spl adStack_84; adStack_84.SetPos(&cStack_90); f32 ground = dComIfG_Bgsp().GroundCross(&adStack_84); - if (ground != -1000000000.0f) { + if (ground != -G_CM3D_F_INF) { current.pos.y = ground + 100.0f; } } @@ -123,7 +123,7 @@ inline int daObjBhbridge_c::create() { /* 80BB5934-80BB59AC 000694 0078+00 1/0 0/0 0/0 .text CreateHeap__15daObjBhbridge_cFv */ inline int daObjBhbridge_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_BHbridge.bmd"); - JUT_ASSERT(83, modelData != 0); + JUT_ASSERT(83, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != NULL ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_bk_leaf.cpp b/src/d/actor/d_a_obj_bk_leaf.cpp index 79609603ad..ddff82cb23 100644 --- a/src/d/actor/d_a_obj_bk_leaf.cpp +++ b/src/d/actor/d_a_obj_bk_leaf.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bk_leaf.h" #include "d/actor/d_a_obj_carry.h" diff --git a/src/d/actor/d_a_obj_bkdoor.cpp b/src/d/actor/d_a_obj_bkdoor.cpp index 97ad037926..f2711af4bd 100644 --- a/src/d/actor/d_a_obj_bkdoor.cpp +++ b/src/d/actor/d_a_obj_bkdoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bkdoor.h" diff --git a/src/d/actor/d_a_obj_bky_rock.cpp b/src/d/actor/d_a_obj_bky_rock.cpp index 114c302be9..4e6cd2318c 100644 --- a/src/d/actor/d_a_obj_bky_rock.cpp +++ b/src/d/actor/d_a_obj_bky_rock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bky_rock.h" #include "SSystem/SComponent/c_math.h" @@ -166,7 +166,7 @@ int daBkyRock_c::createHeap() { for (int i = 0; i < 3; i++) { J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMD_IDX[nameNo][i]); - JUT_ASSERT(481, a_model_data_p != 0); + JUT_ASSERT(481, a_model_data_p != NULL); mModels[i] = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084); if (mModels[i] == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_bmWindow.cpp b/src/d/actor/d_a_obj_bmWindow.cpp index 7f2bece799..78d8b57d8e 100644 --- a/src/d/actor/d_a_obj_bmWindow.cpp +++ b/src/d/actor/d_a_obj_bmWindow.cpp @@ -2,7 +2,7 @@ // Bm Window // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bmWindow.h" #include "d/d_com_inf_game.h" @@ -43,7 +43,7 @@ void daBmWindow_c::setBaseMtx() { /* 80BB8400-80BB846C 0002E0 006C+00 1/0 0/0 0/0 .text CreateHeap__12daBmWindow_cFv */ int daBmWindow_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("H_Window", 4); - JUT_ASSERT(285, modelData != 0); + JUT_ASSERT(285, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); return mModel != NULL ? 1 : 0; } diff --git a/src/d/actor/d_a_obj_bmshutter.cpp b/src/d/actor/d_a_obj_bmshutter.cpp index 9527019840..7079d52493 100644 --- a/src/d/actor/d_a_obj_bmshutter.cpp +++ b/src/d/actor/d_a_obj_bmshutter.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bmshutter.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_bombf.cpp b/src/d/actor/d_a_obj_bombf.cpp index 317ed7abcb..0b4eed5d05 100644 --- a/src/d/actor/d_a_obj_bombf.cpp +++ b/src/d/actor/d_a_obj_bombf.cpp @@ -3,7 +3,7 @@ * Bomb Flower */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bombf.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_bosswarp.cpp b/src/d/actor/d_a_obj_bosswarp.cpp index 4e65b9a7ce..8c956b61d1 100644 --- a/src/d/actor/d_a_obj_bosswarp.cpp +++ b/src/d/actor/d_a_obj_bosswarp.cpp @@ -3,7 +3,7 @@ * Object - Boss Warp */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bosswarp.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_boumato.cpp b/src/d/actor/d_a_obj_boumato.cpp index c122fec7cf..e2e845c7cc 100644 --- a/src/d/actor/d_a_obj_boumato.cpp +++ b/src/d/actor/d_a_obj_boumato.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_boumato.h" #include "SSystem/SComponent/c_counter.h" @@ -98,7 +98,7 @@ int daObj_BouMato_c::create() { /* 80BBB770-80BBB800 000870 0090+00 1/1 0/0 0/0 .text CreateHeap__15daObj_BouMato_cFv */ int daObj_BouMato_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), 4); - JUT_ASSERT(374, 0 != mdlData_p); + JUT_ASSERT(374, NULL != mdlData_p); mModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mModel == NULL) { return 0; @@ -161,7 +161,7 @@ int daObj_BouMato_c::Execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; mGroundH = mAcch.GetGroundH(); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -206,7 +206,7 @@ int daObj_BouMato_c::Draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mModel, &tevStr); mDoExt_modelUpdateDL(mModel); - if (mGroundH != -1e9f) { + if (mGroundH != -G_CM3D_F_INF) { mShadowId = dComIfGd_setShadow(mShadowId, 1, mModel, ¤t.pos, daObj_BouMato_Param_c::m[3], 20.0f, current.pos.y, mGroundH, mGndChk, &tevStr, 0, 1.0f, diff --git a/src/d/actor/d_a_obj_brakeeff.cpp b/src/d/actor/d_a_obj_brakeeff.cpp index c5574e49f6..8986f83f1d 100644 --- a/src/d/actor/d_a_obj_brakeeff.cpp +++ b/src/d/actor/d_a_obj_brakeeff.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_brakeeff.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_brg.cpp b/src/d/actor/d_a_obj_brg.cpp index 7c24a756a9..6ac6a7e983 100644 --- a/src/d/actor/d_a_obj_brg.cpp +++ b/src/d/actor/d_a_obj_brg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_brg.h" #include "d/d_com_inf_game.h" @@ -1519,12 +1519,12 @@ static int CallbackCreateHeap(fopAc_ac_c* i_this) { static const int obj_brg_bmd[] = {5, 6, 7}; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_brg", obj_brg_bmd[sp30]); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); J3DModelData* modelData2; if (a_this->mType == 8) { modelData2 = (J3DModelData*)dComIfG_getObjectRes("Obj_brg", 8); - JUT_ASSERT(0, modelData2 != 0); + JUT_ASSERT(0, modelData2 != NULL); } br_s* part = a_this->mBr; diff --git a/src/d/actor/d_a_obj_bsGate.cpp b/src/d/actor/d_a_obj_bsGate.cpp index ca0d00504a..af607fc023 100644 --- a/src/d/actor/d_a_obj_bsGate.cpp +++ b/src/d/actor/d_a_obj_bsGate.cpp @@ -3,7 +3,7 @@ * Object - Lakebed Temple Gate */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bsGate.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_bubblePilar.cpp b/src/d/actor/d_a_obj_bubblePilar.cpp index 21eee08dd6..19724682be 100644 --- a/src/d/actor/d_a_obj_bubblePilar.cpp +++ b/src/d/actor/d_a_obj_bubblePilar.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_bubblePilar.h" #include "d/d_com_inf_game.h" @@ -45,13 +45,13 @@ void daBubbPilar_c::setBaseMtx() { /* 80BC3518-80BC35D0 000218 00B8+00 1/0 0/0 0/0 .text CreateHeap__13daBubbPilar_cFv */ int daBubbPilar_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("M_Crack", 4); - JUT_ASSERT(226, modelData != 0); + JUT_ASSERT(226, modelData != NULL); mModels[MODE_WAIT] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mModels[MODE_WAIT] == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes("M_Crack", 5); - JUT_ASSERT(237, modelData != 0); + JUT_ASSERT(237, modelData != NULL); mModels[MODE_EFF_ON] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mModels[MODE_EFF_ON] == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_burnbox.cpp b/src/d/actor/d_a_obj_burnbox.cpp index a199ffb119..eccb3f5cca 100644 --- a/src/d/actor/d_a_obj_burnbox.cpp +++ b/src/d/actor/d_a_obj_burnbox.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_burnbox.h" #include "d/d_com_inf_game.h" @@ -102,7 +102,7 @@ const char* l_arcName[3] = { int daObjBurnBox_c::CreateHeap() { u8 type = getType(); J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName[type], l_bmd[type]); - JUT_ASSERT(0x106, modelData != 0); + JUT_ASSERT(0x106, modelData != NULL); mpBoxModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000084); if (mpBoxModel == NULL) { diff --git a/src/d/actor/d_a_obj_carry.cpp b/src/d/actor/d_a_obj_carry.cpp index 2bfb256673..696b2b3870 100644 --- a/src/d/actor/d_a_obj_carry.cpp +++ b/src/d/actor/d_a_obj_carry.cpp @@ -3,7 +3,7 @@ * @brief Actor - Various carriable objects */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_carry.h" #include "d/actor/d_a_player.h" @@ -1330,7 +1330,7 @@ int daObjCarry_c::CreateInit_Lv8Ball() { /* 80470B5C-80470BF4 001BDC 0098+00 1/1 0/0 0/0 .text CreateHeap__12daObjCarry_cFv */ int daObjCarry_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(getArcName(), getBmdName()); - JUT_ASSERT(2813, modelData != 0); + JUT_ASSERT(2813, modelData != NULL); u32 mdl_flags = prm_chk_type_ironball() ? J3DMdlFlag_None : J3DMdlFlag_DifferedDLBuffer; mpModel = mDoExt_J3DModel__create(modelData, mdl_flags, 0x11000084); @@ -2167,7 +2167,7 @@ int daObjCarry_c::_delete() { } if (prm_chk_type_ironball()) { - if (-1000000000.0f != mAcch.GetGroundH()) { + if (-G_CM3D_F_INF != mAcch.GetGroundH()) { savePos(getSaveID(), current.pos); setRoomNo(getSaveID(), fopAcM_GetRoomNo(this)); } else { @@ -2305,7 +2305,7 @@ BOOL daObjCarry_c::checkRollAngle() { bool valid_plane = fopAcM_gc_c::getTriPla(&plane); f32 ground_y = fopAcM_gc_c::getGroundY(); - if (gnd_chk && ground_y != -1000000000.0f && valid_plane) { + if (gnd_chk && ground_y != -G_CM3D_F_INF && valid_plane) { f32 roll_threshold = cM_scos(cM_deg2s(roll_angle - 0.5f)); cXyz normal(plane.mNormal); if (normal.y < roll_threshold) { @@ -2522,7 +2522,7 @@ int daObjCarry_c::mode_proc_walk() { f32 var_f31 = data().m_slopeInfluence; f32 temp_f25 = fopAcM_gc_c::getGroundY(); - if (gnd_check && -1000000000.0f != temp_f25 && gnd_hit && !gnd_landing) { + if (gnd_check && -G_CM3D_F_INF != temp_f25 && gnd_hit && !gnd_landing) { bool var_r27 = 1; if (fopAcM_gc_c::getPolyAtt0() == 3) { var_r27 = 0; @@ -3848,8 +3848,8 @@ void daObjCarry_c::eff_break_tuboBmd(u16 param_0, cXyz param_1) { J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20); J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42); - JUT_ASSERT(6963, tubo_bmd != 0); - JUT_ASSERT(6964, tubo_btp != 0); + JUT_ASSERT(6963, tubo_bmd != NULL); + JUT_ASSERT(6964, tubo_btp != NULL); JPABaseEmitter* emitter = dComIfGp_particle_set(0x15C, ¤t.pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), NULL, NULL, ¶m_1); @@ -3863,7 +3863,7 @@ void daObjCarry_c::eff_break_kibakoBmd(cXyz i_size) { cXyz pos(current.pos); J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); - JUT_ASSERT(7005, kibako_bmd != 0); + JUT_ASSERT(7005, kibako_bmd != NULL); JPABaseEmitter* emitter = dComIfGp_particle_set(0x82AF, &pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), NULL, NULL, &i_size); @@ -3927,8 +3927,8 @@ void daObjCarry_c::eff_break_bokkuri() { J3DModelData* tubo_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 0x20); J3DAnmTexPattern* tubo_btp = (J3DAnmTexPattern*)dComIfG_getObjectRes("Always", 0x42); - JUT_ASSERT(7108, tubo_bmd != 0); - JUT_ASSERT(7109, tubo_btp != 0); + JUT_ASSERT(7108, tubo_bmd != NULL); + JUT_ASSERT(7109, tubo_btp != NULL); JPABaseEmitter* emitter = dComIfGp_particle_set(0x15C, ¤t.pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), NULL, NULL, &scale); @@ -4248,7 +4248,7 @@ void daObjCarry_c::exec_proc_kibako() {} /* 8047884C-804788C4 0098CC 0078+00 1/0 0/0 0/0 .text exec_proc_ironball__12daObjCarry_cFv */ void daObjCarry_c::exec_proc_ironball() { - if (mAcch.GetGroundH() != -1000000000.0f) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF) { savePos(getSaveID(), current.pos); setRoomNo(getSaveID(), fopAcM_GetRoomNo(this)); } diff --git a/src/d/actor/d_a_obj_catdoor.cpp b/src/d/actor/d_a_obj_catdoor.cpp index 1c478f2eb6..88f5146f68 100644 --- a/src/d/actor/d_a_obj_catdoor.cpp +++ b/src/d/actor/d_a_obj_catdoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_catdoor.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_cb.cpp b/src/d/actor/d_a_obj_cb.cpp index 5dbe56f78e..1edc387ef4 100644 --- a/src/d/actor/d_a_obj_cb.cpp +++ b/src/d/actor/d_a_obj_cb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cb.h" #include "SSystem/SComponent/c_lib.h" @@ -181,7 +181,7 @@ static int daObj_Cb_Delete(obj_cb_class* i_this) { static int useHeapInit(fopAc_ac_c* actor) { obj_cb_class* i_this = (obj_cb_class*)actor; J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("Obj_cb", 4); - JUT_ASSERT(502, modelData != 0); + JUT_ASSERT(502, modelData != NULL); i_this->mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_cblock.cpp b/src/d/actor/d_a_obj_cblock.cpp index b2966816b3..749dcb2ae3 100644 --- a/src/d/actor/d_a_obj_cblock.cpp +++ b/src/d/actor/d_a_obj_cblock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cblock.h" #include "d/d_cc_d.h" @@ -71,7 +71,7 @@ int daObjCBlk_c::Create() { pnt_index = 0; } dPnt* pnt = dPath_GetPnt(roomPath, pnt_index); - JUT_ASSERT(284, pnt != 0) + JUT_ASSERT(284, pnt != NULL) current.pos = pnt->m_position; } initBaseMtx(); @@ -102,7 +102,7 @@ int daObjCBlk_c::Create() { /* 80BC5CF8-80BC5E58 0003D8 0160+00 1/0 0/0 0/0 .text CreateHeap__11daObjCBlk_cFv */ int daObjCBlk_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(350, modelData != 0); + JUT_ASSERT(350, modelData != NULL); model1 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (model1 == NULL) { return 0; @@ -112,7 +112,7 @@ int daObjCBlk_c::CreateHeap() { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(369, modelData != 0); + JUT_ASSERT(369, modelData != NULL); chain_s* pChain = chains; for (int i = 0; i < 6; i++) { pChain->model = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -122,7 +122,7 @@ int daObjCBlk_c::CreateHeap() { pChain++; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); - JUT_ASSERT(386, modelData != 0); + JUT_ASSERT(386, modelData != NULL); model2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (model2 == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_cboard.cpp b/src/d/actor/d_a_obj_cboard.cpp index be57c9560a..09be07ecac 100644 --- a/src/d/actor/d_a_obj_cboard.cpp +++ b/src/d/actor/d_a_obj_cboard.cpp @@ -3,7 +3,7 @@ * Clear (Invisible) Wall */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cboard.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_cdoor.cpp b/src/d/actor/d_a_obj_cdoor.cpp index cf9b90e9cd..eccafeb7f8 100644 --- a/src/d/actor/d_a_obj_cdoor.cpp +++ b/src/d/actor/d_a_obj_cdoor.cpp @@ -3,7 +3,7 @@ * Object - Sewer Gate / Sluice Gate */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cdoor.h" #include "d/actor/d_a_obj_wchain.h" diff --git a/src/d/actor/d_a_obj_chandelier.cpp b/src/d/actor/d_a_obj_chandelier.cpp index 3a7fd4c1ee..f1a8306610 100644 --- a/src/d/actor/d_a_obj_chandelier.cpp +++ b/src/d/actor/d_a_obj_chandelier.cpp @@ -3,7 +3,7 @@ * Object - Chandelier (Hyrule Castle) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_chandelier.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_chest.cpp b/src/d/actor/d_a_obj_chest.cpp index 1e59c64e78..154b0a4360 100644 --- a/src/d/actor/d_a_obj_chest.cpp +++ b/src/d/actor/d_a_obj_chest.cpp @@ -4,7 +4,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_chest.h" #include "JSystem/JKernel/JKRHeap.h" diff --git a/src/d/actor/d_a_obj_cho.cpp b/src/d/actor/d_a_obj_cho.cpp index 151d472f44..dc2528d8f1 100644 --- a/src/d/actor/d_a_obj_cho.cpp +++ b/src/d/actor/d_a_obj_cho.cpp @@ -3,7 +3,7 @@ * Object - Golden Butterfly */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cho.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_cowdoor.cpp b/src/d/actor/d_a_obj_cowdoor.cpp index 8654fa6196..d9f60bc761 100644 --- a/src/d/actor/d_a_obj_cowdoor.cpp +++ b/src/d/actor/d_a_obj_cowdoor.cpp @@ -3,7 +3,7 @@ * Cow Door */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cowdoor.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_crope.cpp b/src/d/actor/d_a_obj_crope.cpp index e76ba5f9b9..155ab100e0 100644 --- a/src/d/actor/d_a_obj_crope.cpp +++ b/src/d/actor/d_a_obj_crope.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_crope.h" #include "d/actor/d_a_player.h" @@ -18,7 +18,7 @@ static char const l_arcName[] = "Crope"; /* 80BCCCD8-80BCCD44 000078 006C+00 1/1 0/0 0/0 .text createHeap__12daObjCrope_cFv */ int daObjCrope_c::createHeap() { ResTIMG* texImg = (ResTIMG*) dComIfG_getObjectRes(l_arcName, 3); - JUT_ASSERT(80, texImg != 0); + JUT_ASSERT(80, texImg != NULL); return mLineMat.init(1, 100, texImg, 0) != 0 ? 1 : 0; } diff --git a/src/d/actor/d_a_obj_crvfence.cpp b/src/d/actor/d_a_obj_crvfence.cpp index 4192d25dd4..3adbd2b4f5 100644 --- a/src/d/actor/d_a_obj_crvfence.cpp +++ b/src/d/actor/d_a_obj_crvfence.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_crvfence.h" #include "d/d_s_play.h" @@ -316,7 +316,7 @@ static int daObjCRVFENCE_Execute(daObjCRVFENCE_c* i_this) { int daObjCRVFENCE_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "CaravanFence.bmd"); - JUT_ASSERT(88, modelData != 0); + JUT_ASSERT(88, modelData != NULL); field_0x65c = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (field_0x65c == NULL) { @@ -325,7 +325,7 @@ int daObjCRVFENCE_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CaravanGate_PieceB.bmd"); - JUT_ASSERT(99, modelData != 0); + JUT_ASSERT(99, modelData != NULL); field_0x660 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (field_0x660 == NULL) { diff --git a/src/d/actor/d_a_obj_crvgate.cpp b/src/d/actor/d_a_obj_crvgate.cpp index e9c6f23acd..b6b35d169c 100644 --- a/src/d/actor/d_a_obj_crvgate.cpp +++ b/src/d/actor/d_a_obj_crvgate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_crvgate.h" diff --git a/src/d/actor/d_a_obj_crvhahen.cpp b/src/d/actor/d_a_obj_crvhahen.cpp index 9bce08628c..f8309e1aa6 100644 --- a/src/d/actor/d_a_obj_crvhahen.cpp +++ b/src/d/actor/d_a_obj_crvhahen.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_crvhahen.h" diff --git a/src/d/actor/d_a_obj_crvlh_down.cpp b/src/d/actor/d_a_obj_crvlh_down.cpp index 791e9f354a..3989e67cb7 100644 --- a/src/d/actor/d_a_obj_crvlh_down.cpp +++ b/src/d/actor/d_a_obj_crvlh_down.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_e_wb.h" #include "d/actor/d_a_obj_crvhahen.h" @@ -141,7 +141,7 @@ static int daObjCRVLH_DW_Execute(daObjCRVLH_DW_c* i_this) { int daObjCRVLH_DW_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CrvLH_Down.bmd"); if (modelData == NULL) { - JUT_ASSERT(87, modelData != 0); + JUT_ASSERT(87, modelData != NULL); } mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_crvlh_up.cpp b/src/d/actor/d_a_obj_crvlh_up.cpp index 73467739fb..51278d9507 100644 --- a/src/d/actor/d_a_obj_crvlh_up.cpp +++ b/src/d/actor/d_a_obj_crvlh_up.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_crvhahen.h" #include "d/actor/d_a_obj_crvlh_up.h" @@ -100,7 +100,7 @@ static int daObjCRVLH_UP_Execute(daObjCRVLH_UP_c* i_this) { int daObjCRVLH_UP_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CrvLH_UP.bmd"); if (modelData == NULL) { - JUT_ASSERT(87, modelData != 0); + JUT_ASSERT(87, modelData != NULL); } mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_crvsteel.cpp b/src/d/actor/d_a_obj_crvsteel.cpp index 441f22041e..d71d75bc27 100644 --- a/src/d/actor/d_a_obj_crvsteel.cpp +++ b/src/d/actor/d_a_obj_crvsteel.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_crvsteel.h" #include "d/d_com_inf_game.h" @@ -91,7 +91,7 @@ static char* l_arcName = "CrvSteel"; /* 80BD5DB8-80BD5E30 000278 0078+00 1/0 0/0 0/0 .text CreateHeap__15daObjCRVSTEEL_cFv */ int daObjCRVSTEEL_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "U_CrvSteelGate.bmd"); - JUT_ASSERT(86, modelData != 0); + JUT_ASSERT(86, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != NULL ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_crystal.cpp b/src/d/actor/d_a_obj_crystal.cpp index 19d5f87d10..c583237868 100644 --- a/src/d/actor/d_a_obj_crystal.cpp +++ b/src/d/actor/d_a_obj_crystal.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_crystal.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_cwall.cpp b/src/d/actor/d_a_obj_cwall.cpp index d586544a6c..4948fc189d 100644 --- a/src/d/actor/d_a_obj_cwall.cpp +++ b/src/d/actor/d_a_obj_cwall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_cwall.h" #include "SSystem/SComponent/c_math.h" @@ -181,7 +181,7 @@ int daObjCwall_c::Create() { /* 80BD6D08-80BD6E94 0003A8 018C+00 1/0 0/0 0/0 .text CreateHeap__12daObjCwall_cFv */ int daObjCwall_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_wallBmd[mType]); - JUT_ASSERT(573, modelData != 0); + JUT_ASSERT(573, modelData != NULL); mWallModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mWallModel == NULL) { return 0; @@ -192,7 +192,7 @@ int daObjCwall_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_chainBmd[mType]); - JUT_ASSERT(592, modelData != 0); + JUT_ASSERT(592, modelData != NULL); chain_s* pChain = mChains; for (int i = 0; i < 6; i++, pChain++) { pChain->mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -202,7 +202,7 @@ int daObjCwall_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_handleBmd[mType]); - JUT_ASSERT(609, modelData != 0); + JUT_ASSERT(609, modelData != NULL); mHandleModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mHandleModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_damCps.cpp b/src/d/actor/d_a_obj_damCps.cpp index a12162d285..854947cda7 100644 --- a/src/d/actor/d_a_obj_damCps.cpp +++ b/src/d/actor/d_a_obj_damCps.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_damCps.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_dan.cpp b/src/d/actor/d_a_obj_dan.cpp index 0dbf2ef718..3fe2560e19 100644 --- a/src/d/actor/d_a_obj_dan.cpp +++ b/src/d/actor/d_a_obj_dan.cpp @@ -3,7 +3,7 @@ * Insect - Pillbug */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_dan.h" #include "SSystem/SComponent/c_math.h" @@ -602,7 +602,7 @@ cPhs__Step daObjDAN_c::create() { pos.y += 100.0f; gnd_chk.SetPos(&pos); f32 cross = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (cross != -1e9f) { + if (cross != -G_CM3D_F_INF) { current.pos.y = cross; } diff --git a/src/d/actor/d_a_obj_digholl.cpp b/src/d/actor/d_a_obj_digholl.cpp index 439dffbf5c..48162b65b2 100644 --- a/src/d/actor/d_a_obj_digholl.cpp +++ b/src/d/actor/d_a_obj_digholl.cpp @@ -3,7 +3,7 @@ * Object - Dig Hole */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_digholl.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_digplace.cpp b/src/d/actor/d_a_obj_digplace.cpp index 6838297543..af25c2cfbf 100644 --- a/src/d/actor/d_a_obj_digplace.cpp +++ b/src/d/actor/d_a_obj_digplace.cpp @@ -3,7 +3,7 @@ * Generic Wolf Digging Spots */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_digplace.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_digsnow.cpp b/src/d/actor/d_a_obj_digsnow.cpp index 537d27f231..bdcbb70fbe 100644 --- a/src/d/actor/d_a_obj_digsnow.cpp +++ b/src/d/actor/d_a_obj_digsnow.cpp @@ -3,7 +3,7 @@ // Object - Dig Snow // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_digsnow.h" #include "d/actor/d_a_player.h" @@ -43,7 +43,7 @@ static char* l_arcName = "Y_horiyuk"; /* 80BDCD64-80BDCDD4 000184 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjDigSnow_cFv */ int daObjDigSnow_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x9F, modelData != 0); + JUT_ASSERT(0x9F, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -121,7 +121,7 @@ void daObjDigSnow_c::mode_init_dig() { obj_gnd_chk.SetPos(¤t.pos); f32 gnd_height = dComIfG_Bgsp().GroundCross(&obj_gnd_chk); - if (gnd_height != -1000000000.0f) { + if (gnd_height != -G_CM3D_F_INF) { mGroundHeight = gnd_height; } else { #ifdef DEBUG diff --git a/src/d/actor/d_a_obj_dmelevator.cpp b/src/d/actor/d_a_obj_dmelevator.cpp index defdf6ca5c..583d7f5d8c 100644 --- a/src/d/actor/d_a_obj_dmelevator.cpp +++ b/src/d/actor/d_a_obj_dmelevator.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_dmelevator.h" #include "Z2AudioLib/Z2Instances.h" diff --git a/src/d/actor/d_a_obj_drop.cpp b/src/d/actor/d_a_obj_drop.cpp index 8da1390dca..e1357a124c 100644 --- a/src/d/actor/d_a_obj_drop.cpp +++ b/src/d/actor/d_a_obj_drop.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_drop.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_dust.cpp b/src/d/actor/d_a_obj_dust.cpp index c489f62ced..b3736bed6a 100644 --- a/src/d/actor/d_a_obj_dust.cpp +++ b/src/d/actor/d_a_obj_dust.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_dust.h" @@ -189,7 +189,7 @@ static int daObjDust_Create(fopAc_ac_c* i_this) { /* 80BE2A70-80BE2AE8 000830 0078+00 1/0 0/0 0/0 .text CreateHeap__11daObjDust_cFv */ int daObjDust_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_FloatingDust01.bmd"); - JUT_ASSERT(86, modelData != 0); + JUT_ASSERT(86, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp index 9532b5e21d..d5b79cc5c7 100644 --- a/src/d/actor/d_a_obj_eff.cpp +++ b/src/d/actor/d_a_obj_eff.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_eff.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_enemy_create.cpp b/src/d/actor/d_a_obj_enemy_create.cpp index c29b49307a..c8a46048fe 100644 --- a/src/d/actor/d_a_obj_enemy_create.cpp +++ b/src/d/actor/d_a_obj_enemy_create.cpp @@ -3,7 +3,7 @@ * Enemy spawner */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_enemy_create.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_fallobj.cpp b/src/d/actor/d_a_obj_fallobj.cpp index 3a08f384c4..68dda45de1 100644 --- a/src/d/actor/d_a_obj_fallobj.cpp +++ b/src/d/actor/d_a_obj_fallobj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_fallobj.h" #include "d/actor/d_a_player.h" @@ -114,7 +114,7 @@ f32 daObjFallObj_c::getFallHeight() { /* 80BE3C28-80BE3C98 0002E8 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjFallObj_cFv */ int daObjFallObj_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(260, modelData != 0); + JUT_ASSERT(260, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mpModel != NULL ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_fan.cpp b/src/d/actor/d_a_obj_fan.cpp index fbb29f4fdf..641d12338e 100644 --- a/src/d/actor/d_a_obj_fan.cpp +++ b/src/d/actor/d_a_obj_fan.cpp @@ -2,7 +2,7 @@ // Fan // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_fan.h" #include "d/actor/d_a_obj_tornado2.h" @@ -136,7 +136,7 @@ static char* l_arcName[3] = { /* 80BE4FD4-80BE50EC 000414 0118+00 1/0 0/0 0/0 .text CreateHeap__10daObjFan_cFv */ int daObjFan_c::CreateHeap() { void* modelData = dComIfG_getObjectRes(l_arcName[field_0xad4], l_bmd[field_0xad4]); - JUT_ASSERT(352, modelData != 0); + JUT_ASSERT(352, modelData != NULL); mModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); if (mModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_fchain.cpp b/src/d/actor/d_a_obj_fchain.cpp index 639f1f8957..af0c459010 100644 --- a/src/d/actor/d_a_obj_fchain.cpp +++ b/src/d/actor/d_a_obj_fchain.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_fchain.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_fireWood.cpp b/src/d/actor/d_a_obj_fireWood.cpp index 5533d17122..465777027e 100644 --- a/src/d/actor/d_a_obj_fireWood.cpp +++ b/src/d/actor/d_a_obj_fireWood.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_fireWood.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_obj_fireWood2.cpp b/src/d/actor/d_a_obj_fireWood2.cpp index 3e37635358..0325e8624d 100644 --- a/src/d/actor/d_a_obj_fireWood2.cpp +++ b/src/d/actor/d_a_obj_fireWood2.cpp @@ -3,7 +3,7 @@ * Firewood 2 (Flame) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_fireWood2.h" #include "m_Do/m_Do_hostIO.h" diff --git a/src/d/actor/d_a_obj_firepillar.cpp b/src/d/actor/d_a_obj_firepillar.cpp index 1c4312b5f3..d3c06551f2 100644 --- a/src/d/actor/d_a_obj_firepillar.cpp +++ b/src/d/actor/d_a_obj_firepillar.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_firepillar.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_firepillar2.cpp b/src/d/actor/d_a_obj_firepillar2.cpp index 3cfa5e354b..353836b08a 100644 --- a/src/d/actor/d_a_obj_firepillar2.cpp +++ b/src/d/actor/d_a_obj_firepillar2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_firepillar2.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" @@ -117,19 +117,19 @@ int daObjFPillar2_c::Create() { /* 80BEA034-80BEA1E0 0003F4 01AC+00 1/1 0/0 0/0 .text CreateHeap__15daObjFPillar2_cFv */ int daObjFPillar2_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(363, modelData != 0); + JUT_ASSERT(363, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mModel == NULL) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 11); - JUT_ASSERT(377, pbtk != 0); + JUT_ASSERT(377, pbtk != NULL); mBtk = 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 != 0); + JUT_ASSERT(389, pbck != NULL); mBck = 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_flag.cpp b/src/d/actor/d_a_obj_flag.cpp index 8edc09b0fa..a480e6df7f 100644 --- a/src/d/actor/d_a_obj_flag.cpp +++ b/src/d/actor/d_a_obj_flag.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_flag.h" @@ -209,7 +209,7 @@ inline int daObjFlag_c::createHeap() { current.angle.setall(0); J3DModelData* modelData_flag = (J3DModelData*)dComIfG_getObjectRes("FlagObj", resName); - JUT_ASSERT(447, modelData_flag != 0) + JUT_ASSERT(447, modelData_flag != NULL) mpModel1 = mDoExt_J3DModel__create(modelData_flag, 0x80000, 0x11000084); for (u16 i = 0; i < 5; i++) { @@ -223,7 +223,7 @@ inline int daObjFlag_c::createHeap() { J3DModelData* modelData_pole = (J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "model0.bmd"); - JUT_ASSERT(464, modelData_pole != 0); + JUT_ASSERT(464, modelData_pole != NULL); mpModel2 = mDoExt_J3DModel__create(modelData_pole, 0x80000, 0x11000084); if (mpModel2 == NULL && tmp && mpModel1 == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_flag2.cpp b/src/d/actor/d_a_obj_flag2.cpp index 61677a04ec..bdf38d65ab 100644 --- a/src/d/actor/d_a_obj_flag2.cpp +++ b/src/d/actor/d_a_obj_flag2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_flag2.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" @@ -398,7 +398,7 @@ int daObjFlag2_c::createHeap() { shape_angle.setall(0); current.angle.setall(0); ResTIMG* image = (ResTIMG*)dComIfG_getObjectRes(mFlagName, "flag.bti"); - JUT_ASSERT(838, image != 0); + JUT_ASSERT(838, image != NULL); GXInitTexObj(mFlagCloth.getImageTexObj(), (u8*)image + image->imageOffset, image->width, image->height, (GXTexFmt)image->format, (GXTexWrapMode)image->wrapS, (GXTexWrapMode)image->wrapT, image->mipmapCount > 1 ? GX_TRUE : GX_FALSE); @@ -413,11 +413,11 @@ int daObjFlag2_c::createHeap() { } else if (image->width == (image->height << 1)) { mFlagCloth.setTexCoord_p(l_texCoord); } else { - JUT_ASSERT(861, 0); + JUT_ASSERT(861, FALSE); } } J3DModelData* modelData_pole = (J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "model0.bmd"); - JUT_ASSERT(865, modelData_pole != 0); + JUT_ASSERT(865, modelData_pole != NULL); mModel = mDoExt_J3DModel__create(modelData_pole, 0x80000, 0x11000084); return mModel != NULL ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_flag3.cpp b/src/d/actor/d_a_obj_flag3.cpp index 99decdbfe1..733fb342bf 100644 --- a/src/d/actor/d_a_obj_flag3.cpp +++ b/src/d/actor/d_a_obj_flag3.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_flag3.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" @@ -310,7 +310,7 @@ int daObjFlag3_c::createHeap() { shape_angle.setall(0); current.angle.setall(0); ResTIMG* image = (ResTIMG*)dComIfG_getObjectRes(mFlagName, "flag.bti"); - JUT_ASSERT(838, image != 0); + JUT_ASSERT(838, image != NULL); GXInitTexObj(mFlagCloth.getImageTexObj(), (u8*)image + image->imageOffset, image->width, image->height, (GXTexFmt)image->format, (GXTexWrapMode)image->wrapS, (GXTexWrapMode)image->wrapT, image->mipmapCount > 1 ? GX_TRUE : GX_FALSE); @@ -322,7 +322,7 @@ int daObjFlag3_c::createHeap() { } } J3DModelData* modelData_pole = (J3DModelData*)dComIfG_getObjectRes(daSetBgObj_c::getArcName(this), "model0.bmd"); - JUT_ASSERT(865, modelData_pole != 0); + JUT_ASSERT(865, modelData_pole != NULL); mModel = mDoExt_J3DModel__create(modelData_pole, 0x80000, 0x11000084); return mModel != NULL ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_fmobj.cpp b/src/d/actor/d_a_obj_fmobj.cpp index 3d1987634b..5edb9970a9 100644 --- a/src/d/actor/d_a_obj_fmobj.cpp +++ b/src/d/actor/d_a_obj_fmobj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_fmobj.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_food.cpp b/src/d/actor/d_a_obj_food.cpp index e2de67ce48..e128f3ba4d 100644 --- a/src/d/actor/d_a_obj_food.cpp +++ b/src/d/actor/d_a_obj_food.cpp @@ -3,7 +3,7 @@ * Object - Bone / Ball */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_food.h" #include "SSystem/SComponent/c_math.h" @@ -69,7 +69,7 @@ static void ground_ang_set(obj_food_class* i_this) { vec1.z = vec2.z + 10.0f; gnd_chk.SetPos(&vec1); vec1.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (vec1.y != -1e9f) { + if (vec1.y != -G_CM3D_F_INF) { i_this->mGroundAngleX = -cM_atan2s(vec1.y - vec2.y, vec1.z - vec2.z); } @@ -78,7 +78,7 @@ static void ground_ang_set(obj_food_class* i_this) { vec1.z = vec2.z; gnd_chk.SetPos(&vec1); vec1.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (vec1.y != -1e9f) { + if (vec1.y != -G_CM3D_F_INF) { i_this->mGroundAngleZ = cM_atan2s(vec1.y - vec2.y, vec1.x - vec2.x); } } diff --git a/src/d/actor/d_a_obj_fw.cpp b/src/d/actor/d_a_obj_fw.cpp index 6e56837335..e577bcd847 100644 --- a/src/d/actor/d_a_obj_fw.cpp +++ b/src/d/actor/d_a_obj_fw.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_fw.h" #include "d/d_com_inf_game.h" @@ -225,7 +225,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("RYUW00", bmdd[i_this->field_0x570]); - JUT_ASSERT(543, modelData != 0); + JUT_ASSERT(543, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_gadget.cpp b/src/d/actor/d_a_obj_gadget.cpp index 72138647d0..e1ace413aa 100644 --- a/src/d/actor/d_a_obj_gadget.cpp +++ b/src/d/actor/d_a_obj_gadget.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gadget.h" #include "d/d_cc_d.h" @@ -334,7 +334,7 @@ COMPILER_STRIP_GATE(0x80BF49AC, &lit_3938); /* 80BF49B0-80BF49B4 00006C 0004+00 0/3 0/0 0/0 .rodata @3939 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_3939 = -1000000000.0f; +SECTION_RODATA static f32 const lit_3939 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80BF49B0, &lit_3939); #pragma pop diff --git a/src/d/actor/d_a_obj_ganonwall.cpp b/src/d/actor/d_a_obj_ganonwall.cpp index 5602e97c32..ffceb521b3 100644 --- a/src/d/actor/d_a_obj_ganonwall.cpp +++ b/src/d/actor/d_a_obj_ganonwall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ganonwall.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_ganonwall2.cpp b/src/d/actor/d_a_obj_ganonwall2.cpp index 3b0fdc2af5..a004cc0158 100644 --- a/src/d/actor/d_a_obj_ganonwall2.cpp +++ b/src/d/actor/d_a_obj_ganonwall2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ganonwall2.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_gb.cpp b/src/d/actor/d_a_obj_gb.cpp index b6257be8ae..8f137478da 100644 --- a/src/d/actor/d_a_obj_gb.cpp +++ b/src/d/actor/d_a_obj_gb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gb.h" #include "SSystem/SComponent/c_lib.h" @@ -137,7 +137,7 @@ static int dzb[2] = { static int useHeapInit(fopAc_ac_c* actor) { obj_gb_class* i_this = (obj_gb_class*)actor; J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes("Obj_gb", bmd[i_this->field_0x57c]); - JUT_ASSERT(324, modelData != 0); + JUT_ASSERT(324, modelData != NULL); i_this->mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (i_this->mModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_geyser.cpp b/src/d/actor/d_a_obj_geyser.cpp index 8d531053ba..d7533d65e4 100644 --- a/src/d/actor/d_a_obj_geyser.cpp +++ b/src/d/actor/d_a_obj_geyser.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_geyser.h" #include "d/actor/d_a_player.h" @@ -78,7 +78,7 @@ int daObjGeyser_c::Create() { actionOff2Init(); break; default: - JUT_ASSERT(309, 0); + JUT_ASSERT(309, FALSE); break; } @@ -98,7 +98,7 @@ int daObjGeyser_c::Create() { /* 80BF70E0-80BF7174 000240 0094+00 1/0 0/0 0/0 .text CreateHeap__13daObjGeyser_cFv */ int daObjGeyser_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(345, modelData != 0); + JUT_ASSERT(345, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -215,7 +215,7 @@ void daObjGeyser_c::action() { (this->*l_func2[mAction])(); break; default: - JUT_ASSERT(309, 0); + JUT_ASSERT(309, FALSE); break; } } diff --git a/src/d/actor/d_a_obj_glowSphere.cpp b/src/d/actor/d_a_obj_glowSphere.cpp index ad66df989b..888d849888 100644 --- a/src/d/actor/d_a_obj_glowSphere.cpp +++ b/src/d/actor/d_a_obj_glowSphere.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_glowSphere.h" #include "Z2AudioLib/Z2Instances.h" @@ -76,7 +76,7 @@ int daGlwSph_c::createHeapCallBack(fopAc_ac_c* i_this) { /* 80BF94CC-80BF95D4 00026C 0108+00 1/1 0/0 0/0 .text CreateHeap__10daGlwSph_cFv */ int daGlwSph_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("glwSphere", 5); - JUT_ASSERT(0xF4, modelData != 0); + JUT_ASSERT(0xF4, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mpModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_gm.cpp b/src/d/actor/d_a_obj_gm.cpp index ffa33e19ca..2602c832cc 100644 --- a/src/d/actor/d_a_obj_gm.cpp +++ b/src/d/actor/d_a_obj_gm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gm.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_goGate.cpp b/src/d/actor/d_a_obj_goGate.cpp index 83c679bbda..cc96dacebd 100644 --- a/src/d/actor/d_a_obj_goGate.cpp +++ b/src/d/actor/d_a_obj_goGate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_goGate.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_gomikabe.cpp b/src/d/actor/d_a_obj_gomikabe.cpp index 014e5182fb..e3be68bfe0 100644 --- a/src/d/actor/d_a_obj_gomikabe.cpp +++ b/src/d/actor/d_a_obj_gomikabe.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gomikabe.h" #include "SSystem/SComponent/c_lib.h" @@ -276,14 +276,14 @@ static int daObjGOMIKABE_Execute(daObjGOMIKABE_c* i_this) { /* 80BFF064-80BFF164 000F24 0100+00 1/0 0/0 0/0 .text CreateHeap__15daObjGOMIKABE_cFv */ int daObjGOMIKABE_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_Gomikabe.bmd"); - JUT_ASSERT(250, modelData != 0); + JUT_ASSERT(250, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "M_Gomikabe_Hahen.bmd"); - JUT_ASSERT(259, modelData != 0); + JUT_ASSERT(259, modelData != NULL); for (int i = 0; i < 4; i++) { mBreakModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_gpTaru.cpp b/src/d/actor/d_a_obj_gpTaru.cpp index 43ebbce7e1..99b42bcb83 100644 --- a/src/d/actor/d_a_obj_gpTaru.cpp +++ b/src/d/actor/d_a_obj_gpTaru.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gpTaru.h" #include "d/actor/d_a_obj_eff.h" @@ -53,7 +53,7 @@ void daGpTaru_c::setBaseMtx() { /* 8057D2D0-8057D33C 0002F0 006C+00 1/0 0/0 0/0 .text CreateHeap__10daGpTaru_cFv */ int daGpTaru_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("K_ktar00", 3); - JUT_ASSERT(295, modelData != 0); + JUT_ASSERT(295, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpModel == NULL) { @@ -403,7 +403,7 @@ void daGpTaru_c::mode_proc_roll() { bool var_r26 = fopAcM_gc_c::gndCheck(&sp38); bool found_tripla = fopAcM_gc_c::getTriPla(&tripla); - if (-1000000000.0f != gnd_height && found_tripla) { + if (-G_CM3D_F_INF != gnd_height && found_tripla) { f32 temp_f28 = cM_scos(cM_deg2s(temp_f30 - 0.5f)); sp2C = tripla.mNormal; if (sp2C.y < temp_f28) { @@ -556,7 +556,7 @@ void daGpTaru_c::breakEffSet() { cXyz size(0.75f, 0.75f, 0.75f); J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); - JUT_ASSERT(1259, kibako_bmd != 0); + JUT_ASSERT(1259, kibako_bmd != NULL); JPABaseEmitter* emt_p = dComIfGp_particle_set(dPa_RM(ID_ZF_S_M_EXBARREL00BOARD), &pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), NULL, NULL, &size); dPa_modelEcallBack::setModel(emt_p, kibako_bmd, tevStr, 3, NULL, 0, 0); diff --git a/src/d/actor/d_a_obj_gra2.cpp b/src/d/actor/d_a_obj_gra2.cpp index bd8c694986..f6467d9d7a 100644 --- a/src/d/actor/d_a_obj_gra2.cpp +++ b/src/d/actor/d_a_obj_gra2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gra2.h" #include "Z2AudioLib/Z2Instances.h" @@ -303,7 +303,7 @@ int daObj_GrA_c::CreateHeap() { field_0x844 = dKy_darkworld_check(); J3DModelData* aMdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNames[l_bmdGetParamList[1]], l_bmdGetParamList[0]); - JUT_ASSERT(854, 0 != aMdlData_p); + JUT_ASSERT(854, NULL != aMdlData_p); mpModelMorf = new mDoExt_McaMorfSO(aMdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpModelMorf != NULL && mpModelMorf->getModel() == NULL) { mpModelMorf->stopZelAnime(); @@ -354,7 +354,7 @@ int daObj_GrA_c::Execute(Mtx** param_1) { } } - if (mGroundY != -1000000000.0f) { + if (mGroundY != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -1460,7 +1460,7 @@ int daObj_GrA_c::ctrlMsgAnm(int& param_1, int& param_2, fopAc_ac_c* param_3) { param_2 = -1; dMsgObject_c* msg_p = (dMsgObject_c*)dMsgObject_c::getActor(); - JUT_ASSERT(3163, 0 != msg_p); + JUT_ASSERT(3163, NULL != msg_p); if (msg_p->mode == 2 || msg_p->mode == 3) { field_0xa9c = -1; @@ -1512,7 +1512,7 @@ bool daObj_GrA_c::checkTagGraSub(fopAc_ac_c* a_this) { /* 80C03764-80C03830 003944 00CC+00 1/1 0/0 0/0 .text fallAbyssCheck__11daObj_GrA_cFv */ bool daObj_GrA_c::fallAbyssCheck() { - if (mGroundY == -1000000000.0f && field_0x1528.isPath()) { + if (mGroundY == -G_CM3D_F_INF && field_0x1528.isPath()) { field_0x1fc0++; if (field_0x1fc0 == 30) { current.pos = field_0x1528.getPntPos(0); diff --git a/src/d/actor/d_a_obj_gra2_soldier.inc b/src/d/actor/d_a_obj_gra2_soldier.inc index 7a5fc383a9..dd250c44d6 100644 --- a/src/d/actor/d_a_obj_gra2_soldier.inc +++ b/src/d/actor/d_a_obj_gra2_soldier.inc @@ -171,7 +171,7 @@ int daObj_GrA_c::defence(void* param_1) { calcMotion(); aTgHitActor_p = field_0xab0.getActor(); - JUT_ASSERT(309, 0 != aTgHitActor_p); + JUT_ASSERT(309, NULL != aTgHitActor_p); sVar1 = cLib_targetAngleY(¤t.pos, &aTgHitActor_p->current.pos); current.angle.y = sVar1; diff --git a/src/d/actor/d_a_obj_graWall.cpp b/src/d/actor/d_a_obj_graWall.cpp index 1af81bb29a..b5eac56604 100644 --- a/src/d/actor/d_a_obj_graWall.cpp +++ b/src/d/actor/d_a_obj_graWall.cpp @@ -3,7 +3,7 @@ * Object - Goron Adult Wall (Deleted) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_graWall.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_gra_rock.cpp b/src/d/actor/d_a_obj_gra_rock.cpp index 7160f7a104..7d7fea70a7 100644 --- a/src/d/actor/d_a_obj_gra_rock.cpp +++ b/src/d/actor/d_a_obj_gra_rock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_gra_rock.h" #include "d/actor/d_a_npc.h" @@ -193,14 +193,14 @@ static char* l_arcName[5] = { /* 80C11B68-80C11C64 000AE8 00FC+00 1/0 0/0 0/0 .text CreateHeap__14daObjGraRock_cFv */ int daObjGraRock_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[0], "M_VBom_Zora.bmd"); - JUT_ASSERT(488, modelData != 0); + JUT_ASSERT(488, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020084); if (mModel == NULL) { return 0; } J3DAnmTexPattern* btp_p = (J3DAnmTexPattern*)dComIfG_getObjectRes(l_arcName[0], "M_VBom_Zora.btp"); - JUT_ASSERT(501, btp_p != 0); + JUT_ASSERT(501, btp_p != NULL); if (mBtp.init(modelData, btp_p, 1, 2, 1.0f, 0, -1) == 0) { return 0; } diff --git a/src/d/actor/d_a_obj_grave_stone.cpp b/src/d/actor/d_a_obj_grave_stone.cpp index 61cd75d880..fded99e722 100644 --- a/src/d/actor/d_a_obj_grave_stone.cpp +++ b/src/d/actor/d_a_obj_grave_stone.cpp @@ -3,7 +3,7 @@ * Object - Zora Gravestone */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_grave_stone.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_groundwater.cpp b/src/d/actor/d_a_obj_groundwater.cpp index 3e03ce1e90..aac9698a09 100644 --- a/src/d/actor/d_a_obj_groundwater.cpp +++ b/src/d/actor/d_a_obj_groundwater.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_groundwater.h" #include "d/d_com_inf_game.h" @@ -47,7 +47,7 @@ void daGrdWater_c::setBaseMtx() { /* 80C13618-80C139E4 000258 03CC+00 1/0 0/0 0/0 .text CreateHeap__12daGrdWater_cFv */ int daGrdWater_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Water", 18); - JUT_ASSERT(189, modelData != 0); + JUT_ASSERT(189, modelData != NULL); mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x19000284); if (mModel2 == NULL) { return 0; @@ -68,7 +68,7 @@ int daGrdWater_c::CreateHeap() { res = mBck2d.init(anmTransform, 1, 0, 1.0f, 0, -1, false); JUT_ASSERT(231, res == 1); J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Water", 0x11); - JUT_ASSERT(236, modelData2 != 0); + JUT_ASSERT(236, modelData2 != NULL); mModel1 = mDoExt_J3DModel__create(modelData2, 0x80000, 0x11000284); if (mModel1 == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_grz_rock.cpp b/src/d/actor/d_a_obj_grz_rock.cpp index 4e451bcb1e..66f03b155f 100644 --- a/src/d/actor/d_a_obj_grz_rock.cpp +++ b/src/d/actor/d_a_obj_grz_rock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_grz_rock.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_h_saku.cpp b/src/d/actor/d_a_obj_h_saku.cpp index 83c41e899e..bb223d576b 100644 --- a/src/d/actor/d_a_obj_h_saku.cpp +++ b/src/d/actor/d_a_obj_h_saku.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_h_saku.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_hakai_brl.cpp b/src/d/actor/d_a_obj_hakai_brl.cpp index 538855111c..bf54de036d 100644 --- a/src/d/actor/d_a_obj_hakai_brl.cpp +++ b/src/d/actor/d_a_obj_hakai_brl.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hakai_brl.h" #include "d/d_com_inf_game.h" @@ -27,7 +27,7 @@ daObjHBarrel_c::~daObjHBarrel_c() { /* 80C16A98-80C16B08 0003D8 0070+00 1/1 0/0 0/0 .text createHeap__14daObjHBarrel_cFv */ int daObjHBarrel_c::createHeap() { J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 3); - JUT_ASSERT(0x9a, a_model_data_p != 0); + JUT_ASSERT(0x9a, a_model_data_p != NULL); mpModel = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084); if (mpModel == 0) { @@ -173,7 +173,7 @@ void daObjHBarrel_c::callEmt() { cXyz cStack_40(1.125f, 1.125f, 1.125f); J3DModelData* a_bmd_p = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); - JUT_ASSERT(0x1f3, a_bmd_p != 0); + JUT_ASSERT(0x1f3, a_bmd_p != NULL); JPABaseEmitter* emitter = dComIfGp_particle_set(0x82af, &acStack_34, NULL, NULL, 0xff, &dPa_modelEcallBack::getEcallback(), diff --git a/src/d/actor/d_a_obj_hakai_ftr.cpp b/src/d/actor/d_a_obj_hakai_ftr.cpp index b7c85e999c..276de0ffff 100644 --- a/src/d/actor/d_a_obj_hakai_ftr.cpp +++ b/src/d/actor/d_a_obj_hakai_ftr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hakai_ftr.h" #include "d/d_bg_w.h" @@ -43,7 +43,7 @@ int daObjHFtr_c::createHeap() { J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName[nameId], l_bmdIdx[nameId]); - JUT_ASSERT(0xb2, a_model_data_p != 0); + JUT_ASSERT(0xb2, a_model_data_p != NULL); mpModel = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_hasu2.cpp b/src/d/actor/d_a_obj_hasu2.cpp index 0ca74929ae..d529578827 100644 --- a/src/d/actor/d_a_obj_hasu2.cpp +++ b/src/d/actor/d_a_obj_hasu2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hasu2.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_hata.cpp b/src/d/actor/d_a_obj_hata.cpp index 9270ab69a3..48ef167fab 100644 --- a/src/d/actor/d_a_obj_hata.cpp +++ b/src/d/actor/d_a_obj_hata.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_obj_hata // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hata.h" #include "f_op/f_op_actor.h" diff --git a/src/d/actor/d_a_obj_hb.cpp b/src/d/actor/d_a_obj_hb.cpp index c4676eb443..956b6492f4 100644 --- a/src/d/actor/d_a_obj_hb.cpp +++ b/src/d/actor/d_a_obj_hb.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hb.h" #include "d/d_cc_d.h" @@ -312,7 +312,7 @@ COMPILER_STRIP_GATE(0x80C1B650, &lit_3855); /* 80C1B654-80C1B658 000054 0004+00 0/1 0/0 0/0 .rodata @3856 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_3856 = -1000000000.0f; +SECTION_RODATA static f32 const lit_3856 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80C1B654, &lit_3856); #pragma pop diff --git a/src/d/actor/d_a_obj_hbombkoya.cpp b/src/d/actor/d_a_obj_hbombkoya.cpp index afaf9fc78d..d623f3c585 100644 --- a/src/d/actor/d_a_obj_hbombkoya.cpp +++ b/src/d/actor/d_a_obj_hbombkoya.cpp @@ -3,7 +3,7 @@ * Kakariko Exploding Bomb Warehouse */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hbombkoya.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_heavySw.cpp b/src/d/actor/d_a_obj_heavySw.cpp index 8762ad02ac..5ac902d84d 100644 --- a/src/d/actor/d_a_obj_heavySw.cpp +++ b/src/d/actor/d_a_obj_heavySw.cpp @@ -3,7 +3,7 @@ * Object - Heavy Switch (Triggered by Player wearing Iron Boots) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_heavySw.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_hfuta.cpp b/src/d/actor/d_a_obj_hfuta.cpp index 92cd067dec..846ac50a0e 100644 --- a/src/d/actor/d_a_obj_hfuta.cpp +++ b/src/d/actor/d_a_obj_hfuta.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hfuta.h" #include "d/d_com_inf_game.h" @@ -49,7 +49,7 @@ static char* l_arcName = "Obj_hfuta"; /* 80C1DF2C-80C1DF9C 00028C 0070+00 1/0 0/0 0/0 .text CreateHeap__11daObjFuta_cFv */ int daObjFuta_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(204, modelData != 0); + JUT_ASSERT(204, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != NULL ? 1 : 0; } diff --git a/src/d/actor/d_a_obj_hhashi.cpp b/src/d/actor/d_a_obj_hhashi.cpp index 053723dff0..32f8234f1a 100644 --- a/src/d/actor/d_a_obj_hhashi.cpp +++ b/src/d/actor/d_a_obj_hhashi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hhashi.h" #include "d/actor/d_a_e_fm.h" @@ -299,9 +299,9 @@ static char* l_arcName = "L_hhashi"; /* 80580DA4-80580EA0 001464 00FC+00 1/0 0/0 0/0 .text CreateHeap__13daObjHHASHI_cFv */ int daObjHHASHI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi00.bmd"); - JUT_ASSERT(90, modelData != 0); + JUT_ASSERT(90, modelData != NULL); J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi02.bmd"); - JUT_ASSERT(93, modelData2 != 0); + JUT_ASSERT(93, modelData2 != NULL); for (int i = 0; i < 50; i++) { mShardModels[i] = mDoExt_J3DModel__create(modelData2, 0x20000, 0x11000084); if (mShardModels[i] == NULL) { @@ -327,7 +327,7 @@ int daObjHHASHI_c::create() { initCcCylinder(); fopAcM_SetMtx(this, mModel->getBaseTRMtx()); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "L_hhashi02.bmd"); - JUT_ASSERT(1133, modelData != 0); + JUT_ASSERT(1133, modelData != NULL); dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(this), 0); field_0x1199 = 1; daObjHHASHI_Execute(this); diff --git a/src/d/actor/d_a_obj_hsTarget.cpp b/src/d/actor/d_a_obj_hsTarget.cpp index eaf656605b..246d0bdd13 100644 --- a/src/d/actor/d_a_obj_hsTarget.cpp +++ b/src/d/actor/d_a_obj_hsTarget.cpp @@ -3,7 +3,7 @@ * Object - Hookshot Target */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_hsTarget.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_ice_l.cpp b/src/d/actor/d_a_obj_ice_l.cpp index a724d41433..52fe881298 100644 --- a/src/d/actor/d_a_obj_ice_l.cpp +++ b/src/d/actor/d_a_obj_ice_l.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ice_l.h" #include "SSystem/SComponent/c_math.h" @@ -197,7 +197,7 @@ int daObjIce_l_c::create() { /* 80C2030C-80C20384 00098C 0078+00 1/0 0/0 0/0 .text CreateHeap__12daObjIce_l_cFv */ int daObjIce_l_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Ice_l.bmd"); - JUT_ASSERT(82, modelData != 0); + JUT_ASSERT(82, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_ice_s.cpp b/src/d/actor/d_a_obj_ice_s.cpp index 337b44100a..ba19c1d1ce 100644 --- a/src/d/actor/d_a_obj_ice_s.cpp +++ b/src/d/actor/d_a_obj_ice_s.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ice_s.h" #include "d/actor/d_a_player.h" @@ -230,7 +230,7 @@ int daObjIce_s_c::create() { /* 80C2157C-80C215F4 000CBC 0078+00 1/0 0/0 0/0 .text CreateHeap__12daObjIce_s_cFv */ int daObjIce_s_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "Ice_s.bmd"); - JUT_ASSERT(157, modelData != 0); + JUT_ASSERT(157, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != NULL ? 1 : 0; } diff --git a/src/d/actor/d_a_obj_iceblock.cpp b/src/d/actor/d_a_obj_iceblock.cpp index 971a5890a4..b435ea7240 100644 --- a/src/d/actor/d_a_obj_iceblock.cpp +++ b/src/d/actor/d_a_obj_iceblock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_iceblock.h" #include "SSystem/SComponent/c_math.h" @@ -324,7 +324,7 @@ int daObjIceBlk_c::CreateHeap() { if (getSwbit2() != 0xFF && !fopAcM_isSwitch(this, getSwbit2())) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpIceModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpIceModel == NULL) { @@ -345,10 +345,10 @@ int daObjIceBlk_c::CreateHeap() { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[1]); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); J3DModelData* shareModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[0]); - JUT_ASSERT(0, shareModelData != 0); + JUT_ASSERT(0, shareModelData != NULL); mDoExt_setupShareTexture(modelData, shareModelData); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -672,7 +672,7 @@ int daObjIceBlk_c::checkWallPre(s16 i_angle) { /* 80C236C8-80C237B0 001A68 00E8+00 2/2 0/0 0/0 .text checkBgHit__13daObjIceBlk_cFv */ int daObjIceBlk_c::checkBgHit() { cXyz check_pos; - mGroundY = -1000000000.0f; + mGroundY = -G_CM3D_F_INF; int var_r29 = -1; diff --git a/src/d/actor/d_a_obj_iceleaf.cpp b/src/d/actor/d_a_obj_iceleaf.cpp index 2f2ce09dc5..e2bab0e169 100644 --- a/src/d/actor/d_a_obj_iceleaf.cpp +++ b/src/d/actor/d_a_obj_iceleaf.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_iceleaf.h" #include "SSystem/SComponent/c_math.h" @@ -59,7 +59,7 @@ void daObjIceLeaf_c::setBaseMtx() { mDoMtx_stack_c::ZXYrotM(shape_angle); } else { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x106, pbck != 0); + JUT_ASSERT(0x106, pbck != NULL); pbck->getTransform(0, &mTransformInfo); cXyz pos; @@ -139,7 +139,7 @@ int daObjIceLeaf_c::Create() { /* 80C24BC4-80C24C9C 000524 00D8+00 2/2 0/0 0/0 .text setAnmPos__14daObjIceLeaf_cFv */ void daObjIceLeaf_c::setAnmPos() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x168, pbck != 0); + JUT_ASSERT(0x168, pbck != NULL); pbck->getTransform(0, &mTransformInfo); mDoMtx_stack_c::transS(mTransformInfo.mTranslate.x, mTransformInfo.mTranslate.y, @@ -155,14 +155,14 @@ void daObjIceLeaf_c::setAnmPos() { /* 80C24C9C-80C24DCC 0005FC 0130+00 1/1 0/0 0/0 .text CreateHeap__14daObjIceLeaf_cFv */ int daObjIceLeaf_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); - JUT_ASSERT(0x189, modelData != 0); + JUT_ASSERT(0x189, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpModel == NULL) { return 0; } J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x196, pbck != 0); + JUT_ASSERT(0x196, pbck != NULL); mpBck = new mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { @@ -276,7 +276,7 @@ void daObjIceLeaf_c::modeDropWait() { void daObjIceLeaf_c::modeDrop() { if (mpBck->play()) { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x2C8, pbck != 0); + JUT_ASSERT(0x2C8, pbck != NULL); pbck->getTransform(0, &mTransformInfo); mDoMtx_stack_c::transS(mTransformInfo.mTranslate.x, mTransformInfo.mTranslate.y, @@ -299,7 +299,7 @@ void daObjIceLeaf_c::modeDrop() { cXyz sp24(KREG_F(10) + 1.0f, KREG_F(10) + 1.0f, KREG_F(10) + 1.0f); J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x2EB, pbck != 0); + JUT_ASSERT(0x2EB, pbck != NULL); pbck->getTransform(0, &mTransformInfo); cXyz sp30; @@ -378,7 +378,7 @@ void daObjIceLeaf_c::actionDead() {} /* 80C25AC8-80C25BB8 001428 00F0+00 1/1 0/0 0/0 .text setFallSE__14daObjIceLeaf_cFv */ void daObjIceLeaf_c::setFallSE() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x36C, pbck != 0); + JUT_ASSERT(0x36C, pbck != NULL); pbck->getTransform(0, &mTransformInfo); mDoMtx_stack_c::transS(mTransformInfo.mTranslate.x, mTransformInfo.mTranslate.y, diff --git a/src/d/actor/d_a_obj_ihasi.cpp b/src/d/actor/d_a_obj_ihasi.cpp index eea026a3af..bfc9ddc64a 100644 --- a/src/d/actor/d_a_obj_ihasi.cpp +++ b/src/d/actor/d_a_obj_ihasi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ihasi.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp index effcc20b5f..609a5200c8 100644 --- a/src/d/actor/d_a_obj_ikada.cpp +++ b/src/d/actor/d_a_obj_ikada.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ikada.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_inobone.cpp b/src/d/actor/d_a_obj_inobone.cpp index 5af5c01482..54b5ded6a2 100644 --- a/src/d/actor/d_a_obj_inobone.cpp +++ b/src/d/actor/d_a_obj_inobone.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_inobone.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_ita.cpp b/src/d/actor/d_a_obj_ita.cpp index 44ebeb3696..4b9ac7042c 100644 --- a/src/d/actor/d_a_obj_ita.cpp +++ b/src/d/actor/d_a_obj_ita.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ita.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_itamato.cpp b/src/d/actor/d_a_obj_itamato.cpp index e769d60892..4b0b0633d4 100644 --- a/src/d/actor/d_a_obj_itamato.cpp +++ b/src/d/actor/d_a_obj_itamato.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_itamato.h" #include "d/d_cc_d.h" @@ -305,7 +305,7 @@ COMPILER_STRIP_GATE(0x80C2ABBC, &lit_3984); /* 80C2ABC0-80C2ABC4 000050 0004+00 0/3 0/0 0/0 .rodata @3985 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_3985 = -1000000000.0f; +SECTION_RODATA static f32 const lit_3985 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80C2ABC0, &lit_3985); #pragma pop diff --git a/src/d/actor/d_a_obj_item.cpp b/src/d/actor/d_a_obj_item.cpp index ae941d9bcb..98fff677e2 100644 --- a/src/d/actor/d_a_obj_item.cpp +++ b/src/d/actor/d_a_obj_item.cpp @@ -3,7 +3,7 @@ * Item (Rupee, Arrow, Heart, etc) Object Actor */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_item.h" #include "SSystem/SComponent/c_math.h" @@ -288,7 +288,7 @@ int daItem_c::_daItem_create() { { // "fpcNm_ITEM_(ITEM) is an unhandled item<%d>\n" OS_REPORT_ERROR("fpcNm_(ITEM)では扱わないアイテムです<%d>\n", m_itemNo); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); return cPhs_ERROR_e; } else if (m_itemNo == fpcNm_ITEM_BOMB_5 || m_itemNo == fpcNm_ITEM_BOMB_10 || m_itemNo == fpcNm_ITEM_BOMB_20 || m_itemNo == fpcNm_ITEM_BOMB_30) @@ -1175,7 +1175,7 @@ void daItem_c::initFlag() { default: // "Item: Set Type<%d>\n" OS_REPORT("アイテム：セットタイプ<%d>\n", type); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); case TYPE_LAUNCH_e: case TYPE_LAUNCH_SMALL_e: case TYPE_LAUNCH_FROM_PLAYER_e: @@ -1226,7 +1226,7 @@ void daItem_c::initScale() { scale.setall(0.0f); break; default: - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); case TYPE_FIXED_PLACE_e: case TYPE_WAIT_e: case TYPE_SIMPLE_GET_e: diff --git a/src/d/actor/d_a_obj_ito.cpp b/src/d/actor/d_a_obj_ito.cpp index 1aacb8c758..09d703df0a 100644 --- a/src/d/actor/d_a_obj_ito.cpp +++ b/src/d/actor/d_a_obj_ito.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ito.h" #include "d/actor/d_a_obj_gm.h" @@ -567,7 +567,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("OBJ_ITO", 3); - JUT_ASSERT(1072, modelData != 0); + JUT_ASSERT(1072, modelData != NULL); for (int i = 0; i < 2; i++) { i_this->field_0x574[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_kabuto.cpp b/src/d/actor/d_a_obj_kabuto.cpp index 7a1240fab0..af348f81e0 100644 --- a/src/d/actor/d_a_obj_kabuto.cpp +++ b/src/d/actor/d_a_obj_kabuto.cpp @@ -3,7 +3,7 @@ * Object - Golden Beetle */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kabuto.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_kag.cpp b/src/d/actor/d_a_obj_kag.cpp index 9e208624b0..02dc21c308 100644 --- a/src/d/actor/d_a_obj_kag.cpp +++ b/src/d/actor/d_a_obj_kag.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kag.h" #include "d/d_menu_insect.h" @@ -95,7 +95,7 @@ static int const l_kag_btk_index[2] = { int daObjKAG_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kag", BMDE_KAG); - JUT_ASSERT(246, modelData != 0); + 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); if (mpModelMorf == NULL || mpModelMorf->getModel() == NULL) { @@ -539,7 +539,7 @@ void daObjKAG_c::checkGroundPos() { mGndChk.SetPos(&sp28); f32 fVar1 = dComIfG_Bgsp().GroundCross(&mGndChk); - if (fVar1 != -1e9f) { + if (fVar1 != -G_CM3D_F_INF) { field_0x81c = fVar1; } } diff --git a/src/d/actor/d_a_obj_kage.cpp b/src/d/actor/d_a_obj_kage.cpp index a41930a994..5044b87a7f 100644 --- a/src/d/actor/d_a_obj_kage.cpp +++ b/src/d/actor/d_a_obj_kage.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kage.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_kago.cpp b/src/d/actor/d_a_obj_kago.cpp index d6e2fbee0b..e160f0fdfa 100644 --- a/src/d/actor/d_a_obj_kago.cpp +++ b/src/d/actor/d_a_obj_kago.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kago.h" #include "SSystem/SComponent/c_counter.h" @@ -120,7 +120,7 @@ cPhs__Step daObj_Kago_c::create() { mObjAcch.CrrPos(dComIfG_Bgsp()); field_0x7cc = mObjAcch.m_gnd; mGroundH = mObjAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -236,7 +236,7 @@ int daObj_Kago_c::Execute() { cXyz sp80; sp_0x8 = 0x80; fopAcM_getWaterY(¤t.pos, &mWaterY); - if (mWaterY != -1000000000.0f && reg_f30 < (mWaterY - mGroundH) && current.pos.y <= mWaterY) { + if (mWaterY != -G_CM3D_F_INF && reg_f30 < (mWaterY - mGroundH) && current.pos.y <= mWaterY) { if (field_0xb9d == 0) { speedF *= 0.3f; speed.y *= 0.5f; @@ -430,7 +430,7 @@ int daObj_Kago_c::Execute() { mObjAcch.CrrPos(dComIfG_Bgsp()); field_0x7cc = mObjAcch.m_gnd; mGroundH = mObjAcch.GetGroundH(); - if (mGroundH != -1000000000.0f) { + if (mGroundH != -G_CM3D_F_INF) { field_0xb6e = daNpcF_getGroundAngle(&field_0x7cc, shape_angle.y); setEnvTevColor(); setRoomNo(); @@ -494,7 +494,7 @@ int daObj_Kago_c::Draw() { fopAcM_SearchByID(daPy_getPlayerActorClass()->getGrabActorID(), &basket_p); if (this == basket_p) { model = field_0x574; - } else if (mGroundH != -1000000000.0f) { + } else if (mGroundH != -G_CM3D_F_INF) { field_0xb78 = dComIfGd_setShadow(field_0xb78, 1, field_0x574, ¤t.pos, daObj_Kago_Param_c::m.field_0x0c, 20.0f, current.pos.y, mGroundH, field_0x7cc, &tevStr, diff --git a/src/d/actor/d_a_obj_kaisou.cpp b/src/d/actor/d_a_obj_kaisou.cpp index dcec8a7fb7..6cc2f37f83 100644 --- a/src/d/actor/d_a_obj_kaisou.cpp +++ b/src/d/actor/d_a_obj_kaisou.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kaisou.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_kamakiri.cpp b/src/d/actor/d_a_obj_kamakiri.cpp index 58cdc78758..9f54e1afe0 100644 --- a/src/d/actor/d_a_obj_kamakiri.cpp +++ b/src/d/actor/d_a_obj_kamakiri.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kamakiri.h" #include "d/actor/d_a_player.h" @@ -64,10 +64,10 @@ int daObjKAM_c::CreateHeap() { J3DModelData* modelData; if (mSex == SEX_FEMALE) { modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kam", 10); - JUT_ASSERT(0xff, modelData != 0); + JUT_ASSERT(0xff, modelData != NULL); } else { modelData = (J3DModelData*)dComIfG_getObjectRes("I_Kam", 10); - JUT_ASSERT(0x103, modelData != 0); + JUT_ASSERT(0x103, modelData != NULL); } mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Kam", 7), 2, 1.0f, 0, diff --git a/src/d/actor/d_a_obj_kanban2.cpp b/src/d/actor/d_a_obj_kanban2.cpp index 257d7665a3..290a920f42 100644 --- a/src/d/actor/d_a_obj_kanban2.cpp +++ b/src/d/actor/d_a_obj_kanban2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kanban2.h" #include "d/d_com_inf_game.h" @@ -655,7 +655,7 @@ void daObj_Kanban2_c::setGroundAngle() { gnd_chk.SetPos(&gnd_pos); gnd_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1000000000.0f != gnd_pos.y && std::abs(gnd_pos.y - sp8.y) < 50.0f) { + if (-G_CM3D_F_INF != gnd_pos.y && std::abs(gnd_pos.y - sp8.y) < 50.0f) { field_0x5ee.x = -cM_atan2s(gnd_pos.y - sp8.y, gnd_pos.z - sp8.z); } @@ -665,7 +665,7 @@ void daObj_Kanban2_c::setGroundAngle() { gnd_chk.SetPos(&gnd_pos); gnd_pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1000000000.0f != gnd_pos.y && std::abs(gnd_pos.y - sp8.y) < 50.0f) { + if (-G_CM3D_F_INF != gnd_pos.y && std::abs(gnd_pos.y - sp8.y) < 50.0f) { field_0x5ee.z = cM_atan2s(gnd_pos.y - sp8.y, gnd_pos.x - sp8.x); } } @@ -704,7 +704,7 @@ bool daObj_Kanban2_c::checkPataGround(s16 param_0, s16 param_1) { sp24.SetPos(&spC); f32 ground_y = dComIfG_Bgsp().GroundCross(&sp24); - if (ground_y != -1000000000.0f && sp18.y < ground_y) { + if (ground_y != -G_CM3D_F_INF && sp18.y < ground_y) { return true; } @@ -1403,7 +1403,7 @@ void daObj_Kanban2_c::executePart() { void daObj_Kanban2_c::executeFloat() { checkWaterSurface(); - if (-1000000000.0f == field_0x604) { + if (-G_CM3D_F_INF == field_0x604) { setActionMode(ACTION_PART_e, 7); return; } @@ -1747,7 +1747,7 @@ int daObj_Kanban2_c::CreateHeap() { if (part_flags == PARTS_ALL) { modelData = dComIfG_getObjectRes("Obj_kn2", l_kn2_bmdidx[0]); - JUT_ASSERT(2214, modelData != 0); + JUT_ASSERT(2214, modelData != NULL); mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -1758,7 +1758,7 @@ int daObj_Kanban2_c::CreateHeap() { for (int i = 0; i < 18; i++) { if (part_flags & (1 << i)) { modelData = dComIfG_getObjectRes("Obj_kn2", l_kn2_bmdidx[i + 1]); - JUT_ASSERT(2228, modelData != 0); + JUT_ASSERT(2228, modelData != NULL); void* shareModelData = dComIfG_getObjectRes("Obj_kn2", l_kn2_bmdidx[0]); mDoExt_setupShareTexture((J3DModelData*)modelData, (J3DModelData*)shareModelData); mpPartModel[i] = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_kantera.cpp b/src/d/actor/d_a_obj_kantera.cpp index c79d38144f..4946e0a1ac 100644 --- a/src/d/actor/d_a_obj_kantera.cpp +++ b/src/d/actor/d_a_obj_kantera.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kantera.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_katatsumuri.cpp b/src/d/actor/d_a_obj_katatsumuri.cpp index 4f9e4b1911..bb8babac9d 100644 --- a/src/d/actor/d_a_obj_katatsumuri.cpp +++ b/src/d/actor/d_a_obj_katatsumuri.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_katatsumuri.h" #include "d/actor/d_a_player.h" @@ -94,7 +94,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { /* 80C39B98-80C39E80 000318 02E8+00 1/1 0/0 0/0 .text CreateHeap__10daObjKAT_cFv */ int daObjKAT_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Kat", 9); - JUT_ASSERT(0x136, modelData != 0); + JUT_ASSERT(0x136, modelData != NULL); mpMorfSO = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Kat", 6), 2, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000284); diff --git a/src/d/actor/d_a_obj_kazeneko.cpp b/src/d/actor/d_a_obj_kazeneko.cpp index 451d56cd43..7b4591b2a1 100644 --- a/src/d/actor/d_a_obj_kazeneko.cpp +++ b/src/d/actor/d_a_obj_kazeneko.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kazeneko.h" #include "SSystem/SComponent/c_math.h" @@ -117,13 +117,13 @@ static char* l_arcName = "J_Kazami"; inline int daObjKazeNeko_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "pole.bmd"); - JUT_ASSERT(458, modelData != 0); + JUT_ASSERT(458, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "arm.bmd"); - JUT_ASSERT(465, modelData != 0); + JUT_ASSERT(465, modelData != NULL); for (int i = 0; i < 4; i++) { mArmModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mArmModels[i] == NULL) { diff --git a/src/d/actor/d_a_obj_kbacket.cpp b/src/d/actor/d_a_obj_kbacket.cpp index b3df8ee64f..a97a9cd18c 100644 --- a/src/d/actor/d_a_obj_kbacket.cpp +++ b/src/d/actor/d_a_obj_kbacket.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kbacket.h" #include "SSystem/SComponent/c_counter.h" @@ -103,7 +103,7 @@ int daObj_KBacket_c::create() { mObjAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mObjAcch.m_gnd; field_0xa00 = mObjAcch.GetGroundH(); - if (field_0xa00 != -1e+09f) { + if (field_0xa00 != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -230,7 +230,7 @@ int daObj_KBacket_c::Execute() { s16 unkShort1 = 0x80; fopAcM_getWaterY(¤t.pos, &field_0xa04); - if (field_0xa04 != -1e+09f && + if (field_0xa04 != -G_CM3D_F_INF && movePMag < field_0xa04 - field_0xa00 && current.pos.y <= field_0xa04) { @@ -470,7 +470,7 @@ int daObj_KBacket_c::Execute() { mGndChk = mObjAcch.m_gnd; field_0xa00 = mObjAcch.GetGroundH(); - if (field_0xa00 != -1e+09f) { + if (field_0xa00 != -G_CM3D_F_INF) { field_0xa16 = daNpcF_getGroundAngle(&mGndChk, shape_angle.y); setEnvTevColor(); diff --git a/src/d/actor/d_a_obj_kbox.cpp b/src/d/actor/d_a_obj_kbox.cpp index da94fcab82..e9a202beea 100644 --- a/src/d/actor/d_a_obj_kbox.cpp +++ b/src/d/actor/d_a_obj_kbox.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/d_s_play.h" #include "d/actor/d_a_obj_kbox.h" @@ -63,7 +63,7 @@ static void break_eff(obj_kbox_class* i_this) { cXyz emitterPos(i_this->mActor.current.pos); cXyz particleScale(1.0f, 1.0f, 1.0f); J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); - JUT_ASSERT(146, kibako_bmd != 0); + JUT_ASSERT(146, kibako_bmd != NULL); JPABaseEmitter* pEmitter = dComIfGp_particle_set(0x82af, &emitterPos, NULL, NULL, 0xff, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(&i_this->mActor), NULL, NULL, &particleScale); dPa_modelEcallBack::setModel(pEmitter, kibako_bmd, i_this->mActor.tevStr, 3, NULL, 0, 0); @@ -462,7 +462,7 @@ static int daObj_Kbox_Delete(obj_kbox_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { obj_kbox_class* i_this = (obj_kbox_class*)a_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_kbox", 4); - JUT_ASSERT(911, modelData != 0); + JUT_ASSERT(911, modelData != NULL); i_this->mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_key.cpp b/src/d/actor/d_a_obj_key.cpp index 684dae076b..9173bdbbe4 100644 --- a/src/d/actor/d_a_obj_key.cpp +++ b/src/d/actor/d_a_obj_key.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_key.h" #include "d/d_com_inf_game.h" @@ -589,12 +589,12 @@ static int useHeapInit(fopAc_ac_c* i_this) { obj_key_class* a_this = (obj_key_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_key", 5); - JUT_ASSERT(969, modelData != 0); + JUT_ASSERT(969, modelData != NULL); for (int i = 0; i < 2; i++) { if (i == 1) { modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_key", 3); - JUT_ASSERT(975, modelData != 0); + JUT_ASSERT(975, modelData != NULL); } a_this->key_s.model[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_keyhole.cpp b/src/d/actor/d_a_obj_keyhole.cpp index 7704e76b9f..cedaf6ef55 100644 --- a/src/d/actor/d_a_obj_keyhole.cpp +++ b/src/d/actor/d_a_obj_keyhole.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_keyhole.h" #include "d/d_com_inf_game.h" @@ -690,7 +690,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (a_this->arg0 == 0 || a_this->arg0 == 3) { modelData = dComIfG_getObjectRes(a_this->arcname, bmd_d[a_this->arg0]); - JUT_ASSERT(1189, modelData != 0); + JUT_ASSERT(1189, modelData != NULL); a_this->lock_model = mDoExt_J3DModel__create((J3DModelData*)modelData, mdl_f[a_this->arg0], 0x11000084); if (a_this->lock_model == NULL) { @@ -715,7 +715,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { a_this->field_0x580 = cbmd_d[a_this->arg0]; modelData = dComIfG_getObjectRes(a_this->arcname, a_this->field_0x580); - JUT_ASSERT(1270, modelData != 0); + JUT_ASSERT(1270, modelData != NULL); for (int i = 0; i < 6; i++) { for (int j = 0; j < a_this->chain_num; j++) { @@ -766,7 +766,7 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) { 0xA420, 0xA4E0, 0xA4E0, 0xA4E0, 0xA4E0, }; - ASSERTLINE(1360, i_this->arg0 < sizeof(estimateSizeTbl) / sizeof(estimateSizeTbl[0])); + ASSERTLINE(1360, i_this->arg0 < ARRAY_SIZEU(estimateSizeTbl)); u32 heapsize = estimateSizeTbl[i_this->arg0]; OS_REPORT("OBJ_KEYHOLE: arg0=%u 0x%04x\n", i_this->arg0, heapsize); @@ -843,7 +843,7 @@ static int daObj_Keyhole_Create(fopAc_ac_c* a_this) { } void* modelData = dComIfG_getObjectRes(i_this->arcname, i_this->field_0x580); - JUT_ASSERT(1507, modelData != 0); + JUT_ASSERT(1507, modelData != NULL); if (dComIfGp_addSimpleModel((J3DModelData*)modelData, fopAcM_GetRoomNo(a_this), 1) == -1) { OS_REPORT("\x1B[43;30m施錠鎖：シンプルモデル登録失敗しました。\n\x1B[m"); diff --git a/src/d/actor/d_a_obj_kgate.cpp b/src/d/actor/d_a_obj_kgate.cpp index 8cc18a34b2..b2128f8252 100644 --- a/src/d/actor/d_a_obj_kgate.cpp +++ b/src/d/actor/d_a_obj_kgate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kgate.h" #include "SSystem/SComponent/c_math.h" @@ -285,7 +285,7 @@ int daObjKGate_c::Create() { int daObjKGate_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateBmdIdx[mNameArg]); - JUT_ASSERT(500, modelData != 0); + JUT_ASSERT(500, modelData != NULL); mpGateModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); mpGateModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -296,11 +296,11 @@ int daObjKGate_c::CreateHeap() { if ((mNameArg == 0 || mNameArg == 2) && getSwNo() != 0xFF) { modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateKeyIdx[mNameArg]); - JUT_ASSERT(524, modelData != 0); + JUT_ASSERT(524, modelData != NULL); J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateBmdIdx[mNameArg]); - JUT_ASSERT(530, modelData2 != 0); + JUT_ASSERT(530, modelData2 != NULL); mDoExt_setupShareTexture(modelData, modelData2); mpKeyModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -310,7 +310,7 @@ int daObjKGate_c::CreateHeap() { modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mNameArg], l_gateHookIdx[mNameArg]); - JUT_ASSERT(546, modelData != 0); + JUT_ASSERT(546, modelData != NULL); mDoExt_setupShareTexture(modelData, modelData2); mpHookModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_ki.cpp b/src/d/actor/d_a_obj_ki.cpp index edbb13e3d7..37190029e9 100644 --- a/src/d/actor/d_a_obj_ki.cpp +++ b/src/d/actor/d_a_obj_ki.cpp @@ -3,7 +3,7 @@ * Object - Tree */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ki.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_kiPot.cpp b/src/d/actor/d_a_obj_kiPot.cpp index b5b11becd9..1f1ffc7ed7 100644 --- a/src/d/actor/d_a_obj_kiPot.cpp +++ b/src/d/actor/d_a_obj_kiPot.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kiPot.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_kita.cpp b/src/d/actor/d_a_obj_kita.cpp index 42f309589e..59cc19605d 100644 --- a/src/d/actor/d_a_obj_kita.cpp +++ b/src/d/actor/d_a_obj_kita.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kita.h" #include "SSystem/SComponent/c_lib.h" @@ -198,7 +198,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { obj_kita_class* i_this = (obj_kita_class*)a_this; for (int i = 0; i < i_this->mNumKitas - 1; i++) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_kita", 4); - JUT_ASSERT(475, modelData != 0); + JUT_ASSERT(475, modelData != NULL); i_this->mKitas[i].mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mKitas[i].mModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_kjgjs.cpp b/src/d/actor/d_a_obj_kjgjs.cpp index 9ed17ec253..b4837ba5fc 100644 --- a/src/d/actor/d_a_obj_kjgjs.cpp +++ b/src/d/actor/d_a_obj_kjgjs.cpp @@ -3,7 +3,7 @@ * Object - Kjgjs */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kjgjs.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_kkanban.cpp b/src/d/actor/d_a_obj_kkanban.cpp index 15492b200c..efb8648d22 100644 --- a/src/d/actor/d_a_obj_kkanban.cpp +++ b/src/d/actor/d_a_obj_kkanban.cpp @@ -3,7 +3,7 @@ * Object - Kakariko Sign */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kkanban.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_klift00.cpp b/src/d/actor/d_a_obj_klift00.cpp index bfc1b8b60c..4174116ec4 100644 --- a/src/d/actor/d_a_obj_klift00.cpp +++ b/src/d/actor/d_a_obj_klift00.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_klift00.h" #include "JSystem/JHostIO/JORMContext.h" @@ -244,14 +244,14 @@ void daObjKLift00_c::rideActor(fopAc_ac_c* riding_actor) { /* 8058B5EC-8058B77C 00072C 0190+00 1/0 0/0 0/0 .text CreateHeap__14daObjKLift00_cFv */ int daObjKLift00_c::CreateHeap() { J3DModelData* const model_data = static_cast(dComIfG_getObjectRes(l_arcName, l_bmdidx[2])); - JUT_ASSERT(304, model_data != 0); + JUT_ASSERT(304, model_data != NULL); mpLiftPlatform = mDoExt_J3DModel__create(model_data, (1 << 19), 0x11000084); if(!mpLiftPlatform) return 0; if(!getNoBaseDisp()) { J3DModelData* const model_data = static_cast(dComIfG_getObjectRes(l_arcName, l_bmdidx[0])); - JUT_ASSERT(315, model_data != 0); + JUT_ASSERT(315, model_data != NULL); mpChainBase = mDoExt_J3DModel__create(model_data, (1 << 19), 0x11000084); if(!mpChainBase) return 0; @@ -265,7 +265,7 @@ int daObjKLift00_c::CreateHeap() { return 0; mChainModelData = static_cast(dComIfG_getObjectRes(l_arcName, l_bmdidx[1])); - JUT_ASSERT(334, mChainModelData != 0); + JUT_ASSERT(334, mChainModelData != NULL); mChainMdlObjs = new dMdl_obj_c[mNumChainModels]; diff --git a/src/d/actor/d_a_obj_knBullet.cpp b/src/d/actor/d_a_obj_knBullet.cpp index 6e1a503dd4..92f2cf145d 100644 --- a/src/d/actor/d_a_obj_knBullet.cpp +++ b/src/d/actor/d_a_obj_knBullet.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_knBullet.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_kshutter.cpp b/src/d/actor/d_a_obj_kshutter.cpp index 2f532c757f..642209711a 100644 --- a/src/d/actor/d_a_obj_kshutter.cpp +++ b/src/d/actor/d_a_obj_kshutter.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kshutter.h" #include "d/actor/d_a_player.h" @@ -258,7 +258,7 @@ static char* l_anmArcName[5] = { int daObjKshtr_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]); - JUT_ASSERT(429, modelData != 0); + JUT_ASSERT(429, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -275,7 +275,7 @@ int daObjKshtr_c::CreateHeap() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_anmArcName[mType], l_anmName[index]); - JUT_ASSERT(446, anm != 0); + JUT_ASSERT(446, anm != NULL); mpBckAnm = new mDoExt_bckAnm(); if (mpBckAnm == NULL || mpBckAnm->init(anm, 1, 0, 1.0f, 0, -1, false) == 0) { @@ -872,11 +872,11 @@ void daObjKshtr_c::anmInit() { J3DAnmTransform* anm = (J3DAnmTransform*)dComIfG_getObjectRes(l_anmArcName[mType], l_anmName[isWolf + mType * 2]); - JUT_ASSERT(1278, anm != 0); + JUT_ASSERT(1278, anm != NULL); #ifdef DEBUG if (!mpBckAnm->init(anm, 1, 0, 1.0f, 0, -1, true)) { - JUT_ASSERT(1281, 0); + JUT_ASSERT(1281, FALSE); mpBckAnm->setPlaySpeed(1.0f); } diff --git a/src/d/actor/d_a_obj_ktOnFire.cpp b/src/d/actor/d_a_obj_ktOnFire.cpp index f07fbda948..74dac98307 100644 --- a/src/d/actor/d_a_obj_ktOnFire.cpp +++ b/src/d/actor/d_a_obj_ktOnFire.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ktOnFire.h" #include "d/d_s_play.h" diff --git a/src/d/actor/d_a_obj_kuwagata.cpp b/src/d/actor/d_a_obj_kuwagata.cpp index 1eb8ed6ca7..f4e22225d9 100644 --- a/src/d/actor/d_a_obj_kuwagata.cpp +++ b/src/d/actor/d_a_obj_kuwagata.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kuwagata.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_kwheel00.cpp b/src/d/actor/d_a_obj_kwheel00.cpp index 82344c013c..1f63ea6c7e 100644 --- a/src/d/actor/d_a_obj_kwheel00.cpp +++ b/src/d/actor/d_a_obj_kwheel00.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kwheel00.h" #include "JSystem/JHostIO/JORMContext.h" @@ -119,7 +119,7 @@ void daObjKWheel00_c::setMtx() { /* 80C4D9B8-80C4DA38 000338 0080+00 1/0 0/0 0/0 .text CreateHeap__15daObjKWheel00_cFv */ int daObjKWheel00_c::CreateHeap() { J3DModelData* const model_data = static_cast(dComIfG_getObjectRes(l_arcName[m_type], l_bmdidx[m_type])); - JUT_ASSERT(206, model_data != 0); + JUT_ASSERT(206, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, (1 << 19), 0x11000084); return !mpModel ? 0 : 1; diff --git a/src/d/actor/d_a_obj_kwheel01.cpp b/src/d/actor/d_a_obj_kwheel01.cpp index b3cc317dd9..27415043f4 100644 --- a/src/d/actor/d_a_obj_kwheel01.cpp +++ b/src/d/actor/d_a_obj_kwheel01.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_kwheel01.h" #include "JSystem/JHostIO/JORMContext.h" @@ -142,7 +142,7 @@ void daObjKWheel01_c::setMtx() { /* 80C4EDCC-80C4EF38 0003CC 016C+00 1/0 0/0 0/0 .text CreateHeap__15daObjKWheel01_cFv */ int daObjKWheel01_c::CreateHeap() { J3DModelData* model_data = static_cast(dComIfG_getObjectRes(l_arcName, l_bmdidx[getOut()])); - JUT_ASSERT(229, model_data != 0); + JUT_ASSERT(229, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, (1 << 19), 0x11000084); if(!mpModel) diff --git a/src/d/actor/d_a_obj_kznkarm.cpp b/src/d/actor/d_a_obj_kznkarm.cpp index 61469eacec..cbe117afe7 100644 --- a/src/d/actor/d_a_obj_kznkarm.cpp +++ b/src/d/actor/d_a_obj_kznkarm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_player.h" #include "d/actor/d_a_obj_kznkarm.h" @@ -113,13 +113,13 @@ void daObjKznkarm_c::setAction(daObjKznkarm_c::Mode_e i_action) { /* 80C4F88C-80C4F8B4 0000AC 0028+00 1/1 0/0 0/0 .text callInit__14daObjKznkarm_cFv */ void daObjKznkarm_c::callInit() { - JUT_ASSERT(225, mAction != 0); + JUT_ASSERT(225, mAction != NULL); (this->*mAction[0])(); } /* 80C4F8B4-80C4F8E0 0000D4 002C+00 1/1 0/0 0/0 .text callExecute__14daObjKznkarm_cFv */ void daObjKznkarm_c::callExecute() { - JUT_ASSERT(238, mAction != 0); + JUT_ASSERT(238, mAction != NULL); (this->*mAction[1])(); } @@ -386,7 +386,7 @@ s16 daObjKznkarm_c::getGroundSlope(s16 param_0) { inline int daObjKznkarm_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "arm.bmd"); - JUT_ASSERT(593, modelData != 0); + JUT_ASSERT(593, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return FALSE; diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index e1f634deb0..efd0ca9a1a 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ladder.h" #include "JSystem/J3DGraphAnimator/J3DModelData.h" @@ -166,7 +166,7 @@ static inline const AttrType& attr_type(daObjLadder::Act_c::Type_e type) { */ int daObjLadder::Act_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname, attr_type(mType).field_0x0); - JUT_ASSERT(382, model_data != 0); + JUT_ASSERT(382, model_data != NULL); mModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); return mModel != NULL; } diff --git a/src/d/actor/d_a_obj_laundry.cpp b/src/d/actor/d_a_obj_laundry.cpp index e395292638..0c098c9827 100644 --- a/src/d/actor/d_a_obj_laundry.cpp +++ b/src/d/actor/d_a_obj_laundry.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_laundry.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_laundry_rope.cpp b/src/d/actor/d_a_obj_laundry_rope.cpp index cb4c93a170..2d0f0caf2f 100644 --- a/src/d/actor/d_a_obj_laundry_rope.cpp +++ b/src/d/actor/d_a_obj_laundry_rope.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_laundry_rope.h" #include "SSystem/SComponent/c_lib.h" diff --git a/src/d/actor/d_a_obj_lbox.cpp b/src/d/actor/d_a_obj_lbox.cpp index bf733ff895..e90d89f924 100644 --- a/src/d/actor/d_a_obj_lbox.cpp +++ b/src/d/actor/d_a_obj_lbox.cpp @@ -3,7 +3,7 @@ * Object - Unused Block (HIO Label is "Block for boss battle") */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lbox.h" #include "SSystem/SComponent/c_math.h" @@ -137,7 +137,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { obj_lbox_class* a_this = static_cast(i_this); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_lbox", 4); - JUT_ASSERT(478, modelData != 0); + JUT_ASSERT(478, modelData != NULL); a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_life_container.cpp b/src/d/actor/d_a_obj_life_container.cpp index e81e141513..7f0b6a05b3 100644 --- a/src/d/actor/d_a_obj_life_container.cpp +++ b/src/d/actor/d_a_obj_life_container.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_life_container.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lp.cpp b/src/d/actor/d_a_obj_lp.cpp index 63398a7923..7d968618d8 100644 --- a/src/d/actor/d_a_obj_lp.cpp +++ b/src/d/actor/d_a_obj_lp.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lp.h" #include "d/actor/d_a_canoe.h" @@ -487,7 +487,7 @@ static int daObj_Lp_Create(fopAc_ac_c* a_this) { daObj_Lp_Execute(i_this); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_lp", 3); - JUT_ASSERT(0x3b0, modelData != 0); + JUT_ASSERT(0x3b0, modelData != NULL); dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 0); if (modelData == NULL) { diff --git a/src/d/actor/d_a_obj_lv1Candle00.cpp b/src/d/actor/d_a_obj_lv1Candle00.cpp index 1e1c5f6bad..9f6cb466a9 100644 --- a/src/d/actor/d_a_obj_lv1Candle00.cpp +++ b/src/d/actor/d_a_obj_lv1Candle00.cpp @@ -2,7 +2,7 @@ // Translation Unit: d_a_obj_lv1Candle00 // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv1Candle00.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv1Candle01.cpp b/src/d/actor/d_a_obj_lv1Candle01.cpp index 92858302bb..50b3a15d26 100644 --- a/src/d/actor/d_a_obj_lv1Candle01.cpp +++ b/src/d/actor/d_a_obj_lv1Candle01.cpp @@ -2,7 +2,7 @@ // Translation Unit: d_a_obj_lv1Candle01 // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv1Candle01.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv2Candle.cpp b/src/d/actor/d_a_obj_lv2Candle.cpp index 5451aed1b7..a951b76cdf 100644 --- a/src/d/actor/d_a_obj_lv2Candle.cpp +++ b/src/d/actor/d_a_obj_lv2Candle.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv2Candle.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv3Candle.cpp b/src/d/actor/d_a_obj_lv3Candle.cpp index 249736fda3..7dc1f387f6 100644 --- a/src/d/actor/d_a_obj_lv3Candle.cpp +++ b/src/d/actor/d_a_obj_lv3Candle.cpp @@ -3,7 +3,7 @@ // Object - Level 3 Candle // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv3Candle.h" diff --git a/src/d/actor/d_a_obj_lv3Water.cpp b/src/d/actor/d_a_obj_lv3Water.cpp index 82cabd7f87..0f6ec22d9b 100644 --- a/src/d/actor/d_a_obj_lv3Water.cpp +++ b/src/d/actor/d_a_obj_lv3Water.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv3Water.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_obj_lv3Water2.cpp b/src/d/actor/d_a_obj_lv3Water2.cpp index 85fcade09f..c6beeebbc1 100644 --- a/src/d/actor/d_a_obj_lv3Water2.cpp +++ b/src/d/actor/d_a_obj_lv3Water2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv3Water2.h" #include "d/d_com_inf_game.h" @@ -96,7 +96,7 @@ static const int l_btkIdx[] = {9}; /* 80C5A4F8-80C5A5E4 0001D8 00EC+00 1/0 0/0 0/0 .text CreateHeap__13daLv3Water2_cFv */ int daLv3Water2_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_resNameIdx[mResourceIndex], l_bmdIdx[mResourceIndex])); - JUT_ASSERT(171, modelData != 0); + JUT_ASSERT(171, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, (1 << 19), 0x19000284); if(!mpModel) return 0; diff --git a/src/d/actor/d_a_obj_lv3WaterB.cpp b/src/d/actor/d_a_obj_lv3WaterB.cpp index fcc29e65c5..deca7ab4ac 100644 --- a/src/d/actor/d_a_obj_lv3WaterB.cpp +++ b/src/d/actor/d_a_obj_lv3WaterB.cpp @@ -3,7 +3,7 @@ * Morpheel Arena Water */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv3WaterB.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -117,7 +117,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { obj_lv3WaterB_class* a_this = static_cast(i_this); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L3_bwater", 5); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); a_this->mpBWaterModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (a_this->mpBWaterModel == NULL) { @@ -147,7 +147,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { } modelData = (J3DModelData*)dComIfG_getObjectRes("S_octhibi", 4); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); a_this->mpOctHibiModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (a_this->mpOctHibiModel == NULL) { diff --git a/src/d/actor/d_a_obj_lv3saka00.cpp b/src/d/actor/d_a_obj_lv3saka00.cpp index e793320c04..5cb22983eb 100644 --- a/src/d/actor/d_a_obj_lv3saka00.cpp +++ b/src/d/actor/d_a_obj_lv3saka00.cpp @@ -3,7 +3,7 @@ // Object: lv3saka00 (Lakebed Temple) // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv3saka00.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_lv3waterEff.cpp b/src/d/actor/d_a_obj_lv3waterEff.cpp index 1582245476..be5a9ba3f8 100644 --- a/src/d/actor/d_a_obj_lv3waterEff.cpp +++ b/src/d/actor/d_a_obj_lv3waterEff.cpp @@ -3,7 +3,7 @@ * Lakebed Temple Pre-Deku Toad Room Water Bubbles */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv3waterEff.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp index f4106a4e38..403c812b28 100644 --- a/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleDemoTag.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4CandleDemoTag.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv4CandleTag.cpp b/src/d/actor/d_a_obj_lv4CandleTag.cpp index 1f08b5da70..dcfd91e2c7 100644 --- a/src/d/actor/d_a_obj_lv4CandleTag.cpp +++ b/src/d/actor/d_a_obj_lv4CandleTag.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_obj_lv4CandleTag // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4CandleTag.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv4EdShutter.cpp b/src/d/actor/d_a_obj_lv4EdShutter.cpp index 0c461c2e99..e2d1294b32 100644 --- a/src/d/actor/d_a_obj_lv4EdShutter.cpp +++ b/src/d/actor/d_a_obj_lv4EdShutter.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4EdShutter.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv4Gate.cpp b/src/d/actor/d_a_obj_lv4Gate.cpp index 8abfcf1c28..44fd76d991 100644 --- a/src/d/actor/d_a_obj_lv4Gate.cpp +++ b/src/d/actor/d_a_obj_lv4Gate.cpp @@ -3,7 +3,7 @@ * Arbiter's Grounds Generic Gate */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4Gate.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv4HsTarget.cpp b/src/d/actor/d_a_obj_lv4HsTarget.cpp index fe741bc0d0..aff8262691 100644 --- a/src/d/actor/d_a_obj_lv4HsTarget.cpp +++ b/src/d/actor/d_a_obj_lv4HsTarget.cpp @@ -3,7 +3,7 @@ * Arbiter's Grounds Clawshot Target */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4HsTarget.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv4PoGate.cpp b/src/d/actor/d_a_obj_lv4PoGate.cpp index bada3e4e48..316fc6debb 100644 --- a/src/d/actor/d_a_obj_lv4PoGate.cpp +++ b/src/d/actor/d_a_obj_lv4PoGate.cpp @@ -3,7 +3,7 @@ * Arbiter's Grounds Poe Gate */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4PoGate.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv4RailWall.cpp b/src/d/actor/d_a_obj_lv4RailWall.cpp index f674e2e5c2..ecfffdf65b 100644 --- a/src/d/actor/d_a_obj_lv4RailWall.cpp +++ b/src/d/actor/d_a_obj_lv4RailWall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4RailWall.h" #include "d/actor/d_a_obj_swspinner.h" @@ -62,7 +62,7 @@ int daObjLv4Wall_c::Create() { /* 80C60CD0-80C60D40 0002D0 0070+00 1/0 0/0 0/0 .text CreateHeap__14daObjLv4Wall_cFv */ int daObjLv4Wall_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(217, modelData != 0); + JUT_ASSERT(217, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_lv4SlideWall.cpp b/src/d/actor/d_a_obj_lv4SlideWall.cpp index 0ba0c52971..1bed6363b3 100644 --- a/src/d/actor/d_a_obj_lv4SlideWall.cpp +++ b/src/d/actor/d_a_obj_lv4SlideWall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4SlideWall.h" @@ -26,7 +26,7 @@ void daSldWall_c::setBaseMtx() { /* 80C61F4C-80C61FB8 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__11daSldWall_cFv */ int daSldWall_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L4SldWall", 4); - JUT_ASSERT(160, modelData != 0); + JUT_ASSERT(160, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_lv4bridge.cpp b/src/d/actor/d_a_obj_lv4bridge.cpp index 3daf53511f..0b3bd70c1f 100644 --- a/src/d/actor/d_a_obj_lv4bridge.cpp +++ b/src/d/actor/d_a_obj_lv4bridge.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4bridge.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv4chandelier.cpp b/src/d/actor/d_a_obj_lv4chandelier.cpp index 12e42f726c..1309241f16 100644 --- a/src/d/actor/d_a_obj_lv4chandelier.cpp +++ b/src/d/actor/d_a_obj_lv4chandelier.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4chandelier.h" #include "d/d_com_inf_game.h" @@ -214,7 +214,7 @@ void daObjLv4Chan_c::rideActor(fopAc_ac_c* param_1) { /* 80C63CFC-80C63F34 000A3C 0238+00 1/0 0/0 0/0 .text CreateHeap__14daObjLv4Chan_cFv */ int daObjLv4Chan_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]); - JUT_ASSERT(478, model_data != 0); + JUT_ASSERT(478, model_data != NULL); mModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mModel == NULL) { return 0; @@ -236,7 +236,7 @@ int daObjLv4Chan_c::CreateHeap() { } mChainModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[1]); - JUT_ASSERT(500, mChainModelData != 0); + JUT_ASSERT(500, mChainModelData != NULL); mMdls[0] = new dMdl_obj_c[mMdlLengths[0]]; if (mMdls[0] == NULL) { @@ -844,7 +844,7 @@ int daObjLv4Chan_c::Draw() { } } dComIfGd_setList(); - if (field_0x247c != -1e9f) { + if (field_0x247c != -G_CM3D_F_INF) { f32 fVar4 = 0.4f + ((field_0x23bc.y - field_0x247c) * -0.2f) / 500.0f; if (fVar4 > 0.4f) { fVar4 = 0.4f; diff --git a/src/d/actor/d_a_obj_lv4digsand.cpp b/src/d/actor/d_a_obj_lv4digsand.cpp index 9c7e558f80..9b39f70cde 100644 --- a/src/d/actor/d_a_obj_lv4digsand.cpp +++ b/src/d/actor/d_a_obj_lv4digsand.cpp @@ -3,7 +3,7 @@ * Arbiter's Grounds Dig Sand */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4digsand.h" #include "d/d_com_inf_game.h" @@ -43,7 +43,7 @@ static char* l_arcName = "P_DSand"; /* 80C66C24-80C66C94 000184 0070+00 1/0 0/0 0/0 .text CreateHeap__16daObjL4DigSand_cFv */ int daObjL4DigSand_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0x9B, modelData != 0); + JUT_ASSERT(0x9B, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -117,7 +117,7 @@ void daObjL4DigSand_c::mode_init_dig() { gndchk.SetPos(¤t.pos); f32 gnd_y = dComIfG_Bgsp().GroundCross(&gndchk); - if (gnd_y != -1000000000.0f) { + if (gnd_y != -G_CM3D_F_INF) { mGroundY = gnd_y; } else { #ifdef DEBUG diff --git a/src/d/actor/d_a_obj_lv4floor.cpp b/src/d/actor/d_a_obj_lv4floor.cpp index 6855d8de76..153542d86c 100644 --- a/src/d/actor/d_a_obj_lv4floor.cpp +++ b/src/d/actor/d_a_obj_lv4floor.cpp @@ -3,7 +3,7 @@ * Moving sand-floor in Stallord Arena */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4floor.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv4gear.cpp b/src/d/actor/d_a_obj_lv4gear.cpp index 4beeb619d0..d5c6ca2081 100644 --- a/src/d/actor/d_a_obj_lv4gear.cpp +++ b/src/d/actor/d_a_obj_lv4gear.cpp @@ -3,7 +3,7 @@ // Spinner gear (Arbiter's Grounds) // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4gear.h" #include "d/d_procname.h" @@ -59,7 +59,7 @@ static char* l_arcName = "P_Gear"; /* 80C680A4-80C68124 000204 0080+00 1/1 0/0 0/0 .text CreateHeap__14daObjLv4Gear_cFv */ int daObjLv4Gear_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd[mType]); - JUT_ASSERT(213, modelData != 0); + JUT_ASSERT(213, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_lv4prelvtr.cpp b/src/d/actor/d_a_obj_lv4prelvtr.cpp index f60ada5ef4..5855facfe6 100644 --- a/src/d/actor/d_a_obj_lv4prelvtr.cpp +++ b/src/d/actor/d_a_obj_lv4prelvtr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4prelvtr.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_lv4prwall.cpp b/src/d/actor/d_a_obj_lv4prwall.cpp index 35be6fa8af..326b1cd80e 100644 --- a/src/d/actor/d_a_obj_lv4prwall.cpp +++ b/src/d/actor/d_a_obj_lv4prwall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4prwall.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv4sand.cpp b/src/d/actor/d_a_obj_lv4sand.cpp index d09500656c..49d68a752c 100644 --- a/src/d/actor/d_a_obj_lv4sand.cpp +++ b/src/d/actor/d_a_obj_lv4sand.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv4sand.h" #include "d/d_s_play.h" @@ -45,14 +45,14 @@ int daObjLv4Sand_c::Create() { /* 80C69C28-80C69D44 000208 011C+00 1/0 0/0 0/0 .text CreateHeap__14daObjLv4Sand_cFv */ int daObjLv4Sand_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(167, modelData != 0); + JUT_ASSERT(167, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE)); if (mpModel == NULL) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(181, pbtk != 0); + JUT_ASSERT(181, pbtk != NULL); mpBtk = new mDoExt_btkAnm(); if (mpBtk == NULL || !mpBtk->init(modelData, pbtk, TRUE, 2, 1.0f, 0, -1)) { diff --git a/src/d/actor/d_a_obj_lv5FloorBoard.cpp b/src/d/actor/d_a_obj_lv5FloorBoard.cpp index cbf985d68d..b15e6f948d 100644 --- a/src/d/actor/d_a_obj_lv5FloorBoard.cpp +++ b/src/d/actor/d_a_obj_lv5FloorBoard.cpp @@ -3,7 +3,7 @@ * Snowpeak Ruins Destructable Floor */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv5FloorBoard.h" #include "d/d_com_inf_game.h" @@ -31,7 +31,7 @@ void daFlorBoad_c::setBaseMtx() { /* 80C6A784-80C6A7F0 000264 006C+00 1/0 0/0 0/0 .text CreateHeap__12daFlorBoad_cFv */ int daFlorBoad_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5haYuka", 4); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_lv5IceWall.cpp b/src/d/actor/d_a_obj_lv5IceWall.cpp index e82315a48f..d2ae74fa9f 100644 --- a/src/d/actor/d_a_obj_lv5IceWall.cpp +++ b/src/d/actor/d_a_obj_lv5IceWall.cpp @@ -3,7 +3,7 @@ * Snowpeak Ruins Ice Wall */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv5IceWall.h" #include "d/d_com_inf_game.h" @@ -33,7 +33,7 @@ void daIceWall_c::setBaseMtx() { /* 80C6B5E4-80C6B69C 0002A4 00B8+00 1/0 0/0 0/0 .text CreateHeap__11daIceWall_cFv */ int daIceWall_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 4); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel[0] = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpModel[0] == NULL) { @@ -41,7 +41,7 @@ int daIceWall_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes("l5IceWall", 5); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel[1] = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpModel[1] == NULL) { diff --git a/src/d/actor/d_a_obj_lv5SwIce.cpp b/src/d/actor/d_a_obj_lv5SwIce.cpp index bd486a55dd..59c9b313aa 100644 --- a/src/d/actor/d_a_obj_lv5SwIce.cpp +++ b/src/d/actor/d_a_obj_lv5SwIce.cpp @@ -3,7 +3,7 @@ * Snowpeak Ruins Ice Switch */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv5SwIce.h" #include "d/d_com_inf_game.h" @@ -26,7 +26,7 @@ void daLv5SwIce_c::setBaseMtx() { /* 80C6CAA8-80C6CB14 000248 006C+00 1/0 0/0 0/0 .text CreateHeap__12daLv5SwIce_cFv */ int daLv5SwIce_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L5SwIce", 4); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_lv5ychndlr.cpp b/src/d/actor/d_a_obj_lv5ychndlr.cpp index 57fe5e8db4..8705010f2c 100644 --- a/src/d/actor/d_a_obj_lv5ychndlr.cpp +++ b/src/d/actor/d_a_obj_lv5ychndlr.cpp @@ -3,7 +3,7 @@ * Snowpeak Ruins Chandelier (Swinging Platform) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv5ychndlr.h" #include "SSystem/SComponent/c_math.h" @@ -97,7 +97,7 @@ void daObjYchndlr_c::rideActor(fopAc_ac_c* i_actor) { /* 80C6DA5C-80C6DB5C 00037C 0100+00 1/0 0/0 0/0 .text CreateHeap__14daObjYchndlr_cFv */ int daObjYchndlr_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[0]); - JUT_ASSERT(0, model_data != 0); + JUT_ASSERT(0, model_data != NULL); mpChandlierModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpChandlierModel == NULL) { @@ -105,7 +105,7 @@ int daObjYchndlr_c::CreateHeap() { } model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmdidx[1]); - JUT_ASSERT(0, model_data != 0); + JUT_ASSERT(0, model_data != NULL); for (int i = 0; i < 4; i++) { mpShaftModels[i] = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_lv5yiblltray.cpp b/src/d/actor/d_a_obj_lv5yiblltray.cpp index ce3ad274f7..e72d29a3a5 100644 --- a/src/d/actor/d_a_obj_lv5yiblltray.cpp +++ b/src/d/actor/d_a_obj_lv5yiblltray.cpp @@ -3,7 +3,7 @@ * Snowpeak Ruins Cannon Ball Tray */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv5yiblltray.h" #include "SSystem/SComponent/c_math.h" @@ -68,7 +68,7 @@ void daObjYIblltray_c::setMtx() { /* 80C6EDA8-80C6EED4 000228 012C+00 1/0 0/0 0/0 .text CreateHeap__16daObjYIblltray_cFv */ int daObjYIblltray_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9); - JUT_ASSERT(0, model_data != 0); + JUT_ASSERT(0, model_data != NULL); mpTrayModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpTrayModel == NULL) { @@ -76,7 +76,7 @@ int daObjYIblltray_c::CreateHeap() { } model_data = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(0, model_data != 0); + JUT_ASSERT(0, model_data != NULL); mpHandleModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpHandleModel == NULL) { @@ -269,7 +269,7 @@ int daObjYIblltray_c::Execute(Mtx** param_0) { if (!getNoSameRoom() && mTrayID == fpcM_ERROR_PROCESS_ID_e) { daObjYIblltray_c* ptray = (daObjYIblltray_c*)fopAcM_Search((fopAcIt_JudgeFunc)searchObjYIblltray, this); - JUT_ASSERT(0, ptray != 0); + JUT_ASSERT(0, ptray != NULL); mTrayID = fopAcM_GetID(ptray); } diff --git a/src/d/actor/d_a_obj_lv6ChangeGate.cpp b/src/d/actor/d_a_obj_lv6ChangeGate.cpp index 4d97146db6..e253142712 100644 --- a/src/d/actor/d_a_obj_lv6ChangeGate.cpp +++ b/src/d/actor/d_a_obj_lv6ChangeGate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6ChangeGate.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp index 790f0cba67..06833a814f 100644 --- a/src/d/actor/d_a_obj_lv6FurikoTrap.cpp +++ b/src/d/actor/d_a_obj_lv6FurikoTrap.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6FurikoTrap.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv6Lblock.cpp b/src/d/actor/d_a_obj_lv6Lblock.cpp index 4e2e7a6cd4..22fa64c159 100644 --- a/src/d/actor/d_a_obj_lv6Lblock.cpp +++ b/src/d/actor/d_a_obj_lv6Lblock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6Lblock.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv6SwGate.cpp b/src/d/actor/d_a_obj_lv6SwGate.cpp index 06756305f9..0590252f12 100644 --- a/src/d/actor/d_a_obj_lv6SwGate.cpp +++ b/src/d/actor/d_a_obj_lv6SwGate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6SwGate.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv6SzGate.cpp b/src/d/actor/d_a_obj_lv6SzGate.cpp index be34dc1c75..61ea19cf46 100644 --- a/src/d/actor/d_a_obj_lv6SzGate.cpp +++ b/src/d/actor/d_a_obj_lv6SzGate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6SzGate.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_lv6Tenbin.cpp b/src/d/actor/d_a_obj_lv6Tenbin.cpp index 5a3e77ff89..914730dc78 100644 --- a/src/d/actor/d_a_obj_lv6Tenbin.cpp +++ b/src/d/actor/d_a_obj_lv6Tenbin.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6Tenbin.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv6TogeRoll.cpp b/src/d/actor/d_a_obj_lv6TogeRoll.cpp index 2ef6a1c601..a64d4c119b 100644 --- a/src/d/actor/d_a_obj_lv6TogeRoll.cpp +++ b/src/d/actor/d_a_obj_lv6TogeRoll.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6TogeRoll.h" #include "d/d_path.h" diff --git a/src/d/actor/d_a_obj_lv6TogeTrap.cpp b/src/d/actor/d_a_obj_lv6TogeTrap.cpp index b8f1e77153..ba8c61acda 100644 --- a/src/d/actor/d_a_obj_lv6TogeTrap.cpp +++ b/src/d/actor/d_a_obj_lv6TogeTrap.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6TogeTrap.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv6bemos.cpp b/src/d/actor/d_a_obj_lv6bemos.cpp index 033b2f0e12..cd914d68b8 100644 --- a/src/d/actor/d_a_obj_lv6bemos.cpp +++ b/src/d/actor/d_a_obj_lv6bemos.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6bemos.h" #include "SSystem/SComponent/c_lib.h" @@ -173,21 +173,21 @@ int daObjL6Bm_c::Create() { /* 80C7CFD0-80C7D2B0 000530 02E0+00 1/0 0/0 0/0 .text CreateHeap__11daObjL6Bm_cFv */ int daObjL6Bm_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_K_BIMO00); - JUT_ASSERT(620, modelData != 0); + JUT_ASSERT(620, modelData != NULL); mBeamosModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mBeamosModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_EF_BIMOBEAM); - JUT_ASSERT(634, modelData != 0); + JUT_ASSERT(634, modelData != NULL); mBeamEffectModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mBeamEffectModel == NULL) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM_ON); - JUT_ASSERT(648, pbtk != 0); + JUT_ASSERT(648, pbtk != NULL); mpBtkAnm = new mDoExt_btkAnm(); if (mpBtkAnm == NULL || mpBtkAnm->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { return 0; @@ -195,18 +195,18 @@ int daObjL6Bm_c::CreateHeap() { #ifdef DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM_OFF); - JUT_ASSERT(660, pbtk != 0); + JUT_ASSERT(660, pbtk != NULL); #endif pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOBEAM); - JUT_ASSERT(666, pbtk != 0); + JUT_ASSERT(666, pbtk != NULL); mpBtkAnm2 = 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 != 0); + JUT_ASSERT(678, pbck != NULL); mBeamBck = new mDoExt_bckAnm(); if (mBeamBck == NULL || mBeamBck->init(pbck, 1, 2, 1.0f, 0, -1, false) == 0) { return 0; @@ -390,7 +390,7 @@ int daObjL6Bm_c::Draw() { mpBtkAnm2->remove(mBeamEffectModel->getModelData()); } - if (field_0x90c != -1000000000.0f) { + if (field_0x90c != -G_CM3D_F_INF) { cM3dGPla plane; if (dComIfG_Bgsp().GetTriPla(mObjGndChk, &plane)) { dComIfGd_setSimpleShadow(¤t.pos, field_0x90c, 120.0f, &plane.mNormal, 0, diff --git a/src/d/actor/d_a_obj_lv6bemos2.cpp b/src/d/actor/d_a_obj_lv6bemos2.cpp index 9bd5559c9e..33544606ae 100644 --- a/src/d/actor/d_a_obj_lv6bemos2.cpp +++ b/src/d/actor/d_a_obj_lv6bemos2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6bemos2.h" #include "d/actor/d_a_player.h" @@ -253,7 +253,7 @@ int daObjLv6Bm_c::Create() { /* 80C7E764-80C7EB34 000624 03D0+00 1/0 0/0 0/0 .text CreateHeap__12daObjLv6Bm_cFv */ int daObjLv6Bm_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDE_BM6); - JUT_ASSERT(620, modelData != 0); + JUT_ASSERT(620, modelData != NULL); mBeamosModel = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (mBeamosModel == NULL) { @@ -261,7 +261,7 @@ int daObjLv6Bm_c::CreateHeap() { } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, BRK_BM6_SERCH); - JUT_ASSERT(633, pbrk != 0); + JUT_ASSERT(633, pbrk != NULL); mpBrkAnm = new mDoExt_brkAnm(); if (mpBrkAnm == NULL || mpBrkAnm->init(modelData, pbrk, 1, 0, 1.0f, 0, -1) == 0) { return 0; @@ -269,25 +269,25 @@ int daObjLv6Bm_c::CreateHeap() { #ifdef DEBUG pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, BRK_BM6_TURN); - JUT_ASSERT(644, pbrk != 0); + JUT_ASSERT(644, pbrk != NULL); #endif J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, BCK_BM6_UP); - JUT_ASSERT(651, pbck != 0); + JUT_ASSERT(651, pbck != NULL); mpBckAnm = new mDoExt_bckAnm(); if (mpBckAnm == NULL || mpBckAnm->init(pbck, 1, 0, 1.0f, 0, -1, false) == 0) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, BMDR_EF_BIMOL6); - JUT_ASSERT(0x29A, modelData != 0); + JUT_ASSERT(0x29A, modelData != NULL); mBeamEffectModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mBeamEffectModel == NULL) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOL6_OFF); - JUT_ASSERT(680, pbtk != 0); + JUT_ASSERT(680, pbtk != NULL); mpBtkAnm = new mDoExt_btkAnm(); if (mpBtkAnm == NULL || mpBtkAnm->init(modelData, pbtk, 1, 0, 1.0f, 0, -1) == 0) { return 0; @@ -296,18 +296,18 @@ int daObjLv6Bm_c::CreateHeap() { #ifdef DEBUG pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOL6_ON); - JUT_ASSERT(693, pbtk != 0); + JUT_ASSERT(693, pbtk != NULL); #endif pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, BTK_EF_BIMOL6); - JUT_ASSERT(699, pbtk != 0); + JUT_ASSERT(699, pbtk != NULL); mpBtkAnm2 = 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 != 0); + JUT_ASSERT(711, pbck != NULL); mpBckAnm2 = 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_lv6egate.cpp b/src/d/actor/d_a_obj_lv6egate.cpp index b61402617e..04405f5663 100644 --- a/src/d/actor/d_a_obj_lv6egate.cpp +++ b/src/d/actor/d_a_obj_lv6egate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6egate.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_lv6elevta.cpp b/src/d/actor/d_a_obj_lv6elevta.cpp index c8556ef465..b079b39dbc 100644 --- a/src/d/actor/d_a_obj_lv6elevta.cpp +++ b/src/d/actor/d_a_obj_lv6elevta.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6elevta.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv6swturn.cpp b/src/d/actor/d_a_obj_lv6swturn.cpp index e59ce5e222..02e91eaa0d 100644 --- a/src/d/actor/d_a_obj_lv6swturn.cpp +++ b/src/d/actor/d_a_obj_lv6swturn.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv6swturn.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv7BsGate.cpp b/src/d/actor/d_a_obj_lv7BsGate.cpp index 032fa7c144..88ace9dbf8 100644 --- a/src/d/actor/d_a_obj_lv7BsGate.cpp +++ b/src/d/actor/d_a_obj_lv7BsGate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv7BsGate.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv7PropellerY.cpp b/src/d/actor/d_a_obj_lv7PropellerY.cpp index c718cd2225..c9e5293d62 100644 --- a/src/d/actor/d_a_obj_lv7PropellerY.cpp +++ b/src/d/actor/d_a_obj_lv7PropellerY.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv7PropellerY.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv7bridge.cpp b/src/d/actor/d_a_obj_lv7bridge.cpp index 11888dd73f..36d82c3e9a 100644 --- a/src/d/actor/d_a_obj_lv7bridge.cpp +++ b/src/d/actor/d_a_obj_lv7bridge.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv7bridge.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp index d5b0b89881..95b1d291c3 100644 --- a/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp +++ b/src/d/actor/d_a_obj_lv8KekkaiTrap.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv8KekkaiTrap.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv8Lift.cpp b/src/d/actor/d_a_obj_lv8Lift.cpp index d68eca4cd6..4b6415c39b 100644 --- a/src/d/actor/d_a_obj_lv8Lift.cpp +++ b/src/d/actor/d_a_obj_lv8Lift.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv8Lift.h" #include "d/d_com_inf_game.h" @@ -45,7 +45,7 @@ f32 const daL8Lift_c::mSpeed[16] = { /* 80C88860-80C88928 000220 00C8+00 1/0 0/0 0/0 .text CreateHeap__10daL8Lift_cFv */ int daL8Lift_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("L8Lift", 5); - JUT_ASSERT(190, modelData != 0); + JUT_ASSERT(190, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284); if (!mpModel) { return 0; diff --git a/src/d/actor/d_a_obj_lv8OptiLift.cpp b/src/d/actor/d_a_obj_lv8OptiLift.cpp index 8317a897c5..54d666f5fd 100644 --- a/src/d/actor/d_a_obj_lv8OptiLift.cpp +++ b/src/d/actor/d_a_obj_lv8OptiLift.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv8OptiLift.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -45,7 +45,7 @@ const f32 daOptiLift_c::mSpeed[] = { /* 80C8A438-80C8A500 000218 00C8+00 1/0 0/0 0/0 .text CreateHeap__12daOptiLift_cFv */ int daOptiLift_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Lv8Lift", 5); - JUT_ASSERT(0xC4, modelData != 0); + JUT_ASSERT(0xC4, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x11000284); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_lv8UdFloor.cpp b/src/d/actor/d_a_obj_lv8UdFloor.cpp index 8a4db324d1..baa4dd64d3 100644 --- a/src/d/actor/d_a_obj_lv8UdFloor.cpp +++ b/src/d/actor/d_a_obj_lv8UdFloor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv8UdFloor.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_lv9SwShutter.cpp b/src/d/actor/d_a_obj_lv9SwShutter.cpp index 4d430cad7e..f49b74b2c3 100644 --- a/src/d/actor/d_a_obj_lv9SwShutter.cpp +++ b/src/d/actor/d_a_obj_lv9SwShutter.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_lv9SwShutter.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_magLift.cpp b/src/d/actor/d_a_obj_magLift.cpp index 27559044d0..4bc2e08fb3 100644 --- a/src/d/actor/d_a_obj_magLift.cpp +++ b/src/d/actor/d_a_obj_magLift.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_magLift.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_magLiftRot.cpp b/src/d/actor/d_a_obj_magLiftRot.cpp index 90e4b83140..91bb2f6ac8 100644 --- a/src/d/actor/d_a_obj_magLiftRot.cpp +++ b/src/d/actor/d_a_obj_magLiftRot.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_magLiftRot.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_magne_arm.cpp b/src/d/actor/d_a_obj_magne_arm.cpp index 39a8b8499b..d70b1aeb99 100644 --- a/src/d/actor/d_a_obj_magne_arm.cpp +++ b/src/d/actor/d_a_obj_magne_arm.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_magne_arm.h" #include "d/actor/d_a_obj_mhole.h" diff --git a/src/d/actor/d_a_obj_maki.cpp b/src/d/actor/d_a_obj_maki.cpp index d3a9420751..79da7505f2 100644 --- a/src/d/actor/d_a_obj_maki.cpp +++ b/src/d/actor/d_a_obj_maki.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_maki.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" diff --git a/src/d/actor/d_a_obj_master_sword.cpp b/src/d/actor/d_a_obj_master_sword.cpp index 2eca2963da..c154077e13 100644 --- a/src/d/actor/d_a_obj_master_sword.cpp +++ b/src/d/actor/d_a_obj_master_sword.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_master_sword.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_mato.cpp b/src/d/actor/d_a_obj_mato.cpp index 7849ac668c..e134970157 100644 --- a/src/d/actor/d_a_obj_mato.cpp +++ b/src/d/actor/d_a_obj_mato.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mato.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_metalbox.cpp b/src/d/actor/d_a_obj_metalbox.cpp index 1787e80c35..1ce9d4e39e 100644 --- a/src/d/actor/d_a_obj_metalbox.cpp +++ b/src/d/actor/d_a_obj_metalbox.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_metalbox.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_mgate.cpp b/src/d/actor/d_a_obj_mgate.cpp index a51679bf01..0a15ace4d5 100644 --- a/src/d/actor/d_a_obj_mgate.cpp +++ b/src/d/actor/d_a_obj_mgate.cpp @@ -3,7 +3,7 @@ * Ordon Spring / Bridge Gates */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mgate.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_mhole.cpp b/src/d/actor/d_a_obj_mhole.cpp index a0afdd5cfe..c273bd40d2 100644 --- a/src/d/actor/d_a_obj_mhole.cpp +++ b/src/d/actor/d_a_obj_mhole.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mhole.h" #include "d/d_cc_d.h" @@ -154,14 +154,14 @@ int daObjMHole_c::checkParent() { /* 80C93204-80C93498 000424 0294+00 1/1 0/0 0/0 .text CreateHeap__12daObjMHole_cFv */ int daObjMHole_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mKind], l_bmd[mKind]); - JUT_ASSERT(336, modelData != 0); + JUT_ASSERT(336, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0, 0x19000284); if (mpModel == NULL) { return FALSE; } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[mKind], l_brk[mKind]); - JUT_ASSERT(360, pbrk != 0); + JUT_ASSERT(360, pbrk != NULL); mpBrkAnm = new mDoExt_brkAnm(); if (mpBrkAnm == NULL || !mpBrkAnm->init(modelData, pbrk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) @@ -172,7 +172,7 @@ int daObjMHole_c::CreateHeap() { { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[mKind], l_btk1[mKind]); - JUT_ASSERT(375, pbtk != 0); + JUT_ASSERT(375, pbtk != NULL); mpBtk1Anm = new mDoExt_btkAnm(); if (mpBtk1Anm == NULL || !mpBtk1Anm->init(modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) @@ -184,7 +184,7 @@ int daObjMHole_c::CreateHeap() { { J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[mKind], l_btk2[mKind]); - JUT_ASSERT(391, pbtk != 0); + JUT_ASSERT(391, pbtk != NULL); mpBtk2Anm = 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_mie.cpp b/src/d/actor/d_a_obj_mie.cpp index 61c1cb02c4..5a3bf287f1 100644 --- a/src/d/actor/d_a_obj_mie.cpp +++ b/src/d/actor/d_a_obj_mie.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mie.h" #include "d/actor/d_a_npc_pouya.h" @@ -116,7 +116,7 @@ int daObj_Mie_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes( l_resNameList[l_bmdData[mType][1]], l_bmdData[mType][0]); - JUT_ASSERT(392, 0 != mdlData_p); + JUT_ASSERT(392, NULL != mdlData_p); mModel = mDoExt_J3DModel__create(mdlData_p, 0, 0x11000084); return mModel != NULL ? TRUE : FALSE; } @@ -165,7 +165,7 @@ int daObj_Mie_c::Execute() { daObj_Mie_Param_c::m.launch_angle, NULL); } else { fopAcM_getWaterY(¤t.pos, &field_0xa04); - if (field_0xa04 != -1e9f && dVar16 < field_0xa04 - field_0xa00 && + if (field_0xa04 != -G_CM3D_F_INF && dVar16 < field_0xa04 - field_0xa00 && current.pos.y <= field_0xa04 && field_0xa43 == 0) { if (field_0xa44 != 0 || field_0xa47 != 0 || field_0xa46 != 0) { @@ -335,7 +335,7 @@ int daObj_Mie_c::Execute() { field_0xa00 = mAcch.GetGroundH(); } - if (field_0xa00 != -1e9f) { + if (field_0xa00 != -G_CM3D_F_INF) { field_0xa12 = daNpcF_getGroundAngle(&mGndChk, shape_angle.y); setEnvTevColor(); setRoomNo(); @@ -371,7 +371,7 @@ int daObj_Mie_c::Draw() { fopAcM_SearchByID(daPy_getPlayerActorClass()->getGrabActorID(), &local_48); if (local_48 == this) { model = mModel; - } else if (field_0xa00 != -1e9f) { + } else if (field_0xa00 != -G_CM3D_F_INF) { cM3dGPla plain; if (dComIfG_Bgsp().GetTriPla(mGndChk, &plain)) { dComIfGd_setSimpleShadow(¤t.pos, field_0xa00, 20.0f, diff --git a/src/d/actor/d_a_obj_mirror_6pole.cpp b/src/d/actor/d_a_obj_mirror_6pole.cpp index 63c1fee262..2fbe3c2b3b 100644 --- a/src/d/actor/d_a_obj_mirror_6pole.cpp +++ b/src/d/actor/d_a_obj_mirror_6pole.cpp @@ -3,7 +3,7 @@ * Mirror Chamber Sage Poles */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_6pole.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_mirror_chain.cpp b/src/d/actor/d_a_obj_mirror_chain.cpp index c60c6e2539..a1e4dc3b05 100644 --- a/src/d/actor/d_a_obj_mirror_chain.cpp +++ b/src/d/actor/d_a_obj_mirror_chain.cpp @@ -3,99 +3,12 @@ * Mirror Chamber Chains */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_chain.h" #include "d/d_com_inf_game.h" #include "dol2asm.h" -// -// Forward References: -// - -extern "C" void draw__22dScissorBegin_packet_cFv(); -extern "C" void __dt__4cXyzFv(); -extern "C" void draw__20dScissorEnd_packet_cFv(); -extern "C" static void createSolidHeap__FP10fopAc_ac_c(); -extern "C" void createHeap__18daObjMirrorChain_cFv(); -extern "C" void __dt__12J3DFrameCtrlFv(); -extern "C" void initBaseMtx__18daObjMirrorChain_cFv(); -extern "C" void setBaseMtx__18daObjMirrorChain_cFv(); -extern "C" static void daObjMirrorChain_Draw__FP18daObjMirrorChain_c(); -extern "C" void draw__18daObjMirrorChain_cFv(); -extern "C" static void daObjMirrorChain_Execute__FP18daObjMirrorChain_c(); -extern "C" void execute__18daObjMirrorChain_cFv(); -extern "C" static bool daObjMirrorChain_IsDelete__FP18daObjMirrorChain_c(); -extern "C" static void daObjMirrorChain_Delete__FP18daObjMirrorChain_c(); -extern "C" void __dt__4dBgWFv(); -extern "C" static void daObjMirrorChain_Create__FP10fopAc_ac_c(); -extern "C" void __dt__20dScissorEnd_packet_cFv(); -extern "C" void __dt__22dScissorBegin_packet_cFv(); -extern "C" void __ct__4cXyzFv(); -extern "C" extern char const* const d_a_obj_mirror_chain__stringBase0; - -// -// External References: -// - -extern "C" void transS__14mDoMtx_stack_cFRC4cXyz(); -extern "C" void ZXYrotM__14mDoMtx_stack_cFRC5csXyz(); -extern "C" void play__14mDoExt_baseAnmFv(); -extern "C" void init__13mDoExt_brkAnmFP16J3DMaterialTableP15J3DAnmTevRegKeyiifss(); -extern "C" void entry__13mDoExt_brkAnmFP16J3DMaterialTablef(); -extern "C" void init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb(); -extern "C" void entry__13mDoExt_bckAnmFP12J3DModelDataf(); -extern "C" void mDoExt_modelUpdateDL__FP8J3DModel(); -extern "C" void mDoExt_J3DModel__create__FP12J3DModelDataUlUl(); -extern "C" void __ct__10fopAc_ac_cFv(); -extern "C" void __dt__10fopAc_ac_cFv(); -extern "C" void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(); -extern "C" void dComIfG_resLoad__FP30request_of_phase_process_classPCc(); -extern "C" void dComIfG_resDelete__FP30request_of_phase_process_classPCc(); -extern "C" void isEventBit__11dSv_event_cCFUs(); -extern "C" void isSwitch__10dSv_info_cCFii(); -extern "C" void getRes__14dRes_control_cFPCclP11dRes_info_ci(); -extern "C" void -set__13dPa_control_cFUcUsPC4cXyzPC12dKy_tevstr_cPC5csXyzPC4cXyzUcP18dPa_levelEcallBackScPC8_GXColorPC8_GXColorPC4cXyzf(); -extern "C" void Release__4cBgSFP9dBgW_Base(); -extern "C" void Regist__4dBgSFP9dBgW_BaseP10fopAc_ac_c(); -extern "C" void __dt__4cBgWFv(); -extern "C" void Set__4cBgWFP6cBgD_tUlPA3_A4_f(); -extern "C" void __ct__4dBgWFv(); -extern "C" void Move__4dBgWFv(); -extern "C" void settingTevStruct__18dScnKy_env_light_cFiP4cXyzP12dKy_tevstr_c(); -extern "C" void setLightTevColorType_MAJI__18dScnKy_env_light_cFP12J3DModelDataP12dKy_tevstr_c(); -extern "C" void __pl__4cXyzCFRC3Vec(); -extern "C" void __mi__4cXyzCFRC3Vec(); -extern "C" void outprod__4cXyzCFRC3Vec(); -extern "C" void isZero__4cXyzCFv(); -extern "C" void ChkUsed__9cBgW_BgIdCFv(); -extern "C" void seStart__7Z2SeMgrF10JAISoundIDPC3VecUlScffffUc(); -extern "C" void* __nw__FUl(); -extern "C" void __dl__FPv(); -extern "C" bool entry__9J3DPacketFP13J3DDrawBuffer(); -extern "C" void entryImm__13J3DDrawBufferFP9J3DPacketUs(); -extern "C" void init__12J3DFrameCtrlFs(); -extern "C" void removeTevRegAnimator__16J3DMaterialTableFP15J3DAnmTevRegKey(); -extern "C" void __destroy_arr(); -extern "C" void __construct_array(); -extern "C" void __cvt_fp2unsigned(); -extern "C" void _savegpr_22(); -extern "C" void _savegpr_26(); -extern "C" void _savegpr_29(); -extern "C" void _restgpr_22(); -extern "C" void _restgpr_26(); -extern "C" void _restgpr_29(); -extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */]; -extern "C" extern void* __vt__4dBgW[65]; -extern "C" extern void* __vt__9J3DPacket[5]; -extern "C" u8 now__14mDoMtx_stack_c[48]; -extern "C" u8 mAudioMgrPtr__10Z2AudioMgr[4 + 4 /* padding */]; - -// -// Declarations: -// - /* 80C98080-80C98084 -00001 0004+00 3/3 0/0 0/0 .data l_arcName */ static char const* l_arcName = "MR-Chain"; @@ -111,15 +24,6 @@ SECTION_RODATA static f32 const lit_3916 = 0.5f; COMPILER_STRIP_GATE(0x80C9802C, &lit_3916); #pragma pop -/* 80C98030-80C98034 000008 0004+00 2/4 0/0 0/0 .rodata @3917 */ -SECTION_RODATA static u8 const lit_3917[4] = { - 0x00, - 0x00, - 0x00, - 0x00, -}; -COMPILER_STRIP_GATE(0x80C98030, &lit_3917); - /* 80C98034-80C98038 00000C 0004+00 0/1 0/0 0/0 .rodata @3918 */ #pragma push #pragma force_active on @@ -537,7 +441,7 @@ void daObjMirrorChain_c::create_init() { if (mpBckAnm != NULL /* dSv_event_flag_c::F_0354 - Cutscene - [cutscene] Mirror complete */ && !dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[354])) { - mpBckAnm->setPlaySpeed(FLOAT_LABEL(lit_3917)); + mpBckAnm->setPlaySpeed(0.0f); } mpEmitter = NULL; mBgW[0].SetCrrFunc(NULL); diff --git a/src/d/actor/d_a_obj_mirror_sand.cpp b/src/d/actor/d_a_obj_mirror_sand.cpp index 5417e275a1..464700ad94 100644 --- a/src/d/actor/d_a_obj_mirror_sand.cpp +++ b/src/d/actor/d_a_obj_mirror_sand.cpp @@ -3,7 +3,7 @@ * Mirror Chamber Sand Floor */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_sand.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_mirror_screw.cpp b/src/d/actor/d_a_obj_mirror_screw.cpp index a949237277..1ee9dc6c00 100644 --- a/src/d/actor/d_a_obj_mirror_screw.cpp +++ b/src/d/actor/d_a_obj_mirror_screw.cpp @@ -3,7 +3,7 @@ * Mirror Chamber Statue */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_screw.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_mirror_table.cpp b/src/d/actor/d_a_obj_mirror_table.cpp index d45d66b9b5..db1f7f6dba 100644 --- a/src/d/actor/d_a_obj_mirror_table.cpp +++ b/src/d/actor/d_a_obj_mirror_table.cpp @@ -3,7 +3,7 @@ * Mirror Chamber Pedestal & Mirror */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mirror_table.h" #include "d/actor/d_a_mirror.h" diff --git a/src/d/actor/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp index b928c1eefb..c6c4d016b9 100644 --- a/src/d/actor/d_a_obj_movebox.cpp +++ b/src/d/actor/d_a_obj_movebox.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_movebox.h" #include "SSystem/SComponent/c_math.h" @@ -56,7 +56,7 @@ void daObjMovebox::Bgc_c::gnd_pos(const daObjMovebox::Act_c* i_actor, f32 param_3) { cXyz sp50; cXyz sp5C; - f32 var_f31 = -1000000000.0f; + f32 var_f31 = -G_CM3D_F_INF; mDoMtx_stack_c::transS(i_actor->current.pos); mDoMtx_stack_c::YrotM(i_actor->home.angle.y); @@ -536,7 +536,7 @@ int daObjMovebox::Act_c::CreateHeap() { if (i_attr().field_0x58 >= 0) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(M_arcname[mType], i_attr().field_0x58); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); var_r29 = mpModel != NULL; @@ -1130,7 +1130,7 @@ int daObjMovebox::Act_c::Execute(Mtx** param_0) { cXyz sp48(current.pos); J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); - JUT_ASSERT(0, kibako_bmd != 0); + JUT_ASSERT(0, kibako_bmd != NULL); JPABaseEmitter* emitter = dComIfGp_particle_set( 0x82AF, &sp48, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), @@ -1229,7 +1229,7 @@ int daObjMovebox::Act_c::Draw() { cM3dGPla sp40; if (dComIfG_Bgsp().GetTriPla(mBgc.M_gnd_work[mBgc.field_0x5c], &sp40) && - var_f31 != -1000000000.0f) + var_f31 != -G_CM3D_F_INF) { dComIfGd_setSimpleShadow(¤t.pos, var_f31, i_attr().mShadowSize, &sp40.mNormal, shape_angle.y, -0.4f, NULL); diff --git a/src/d/actor/d_a_obj_msima.cpp b/src/d/actor/d_a_obj_msima.cpp index f3d62b0c53..556c2d9330 100644 --- a/src/d/actor/d_a_obj_msima.cpp +++ b/src/d/actor/d_a_obj_msima.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_msima.h" #include "Z2AudioLib/Z2Instances.h" @@ -400,7 +400,7 @@ static int daObj_Msima_Delete(obj_msima_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { obj_msima_class* i_this = (obj_msima_class*)a_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("MAGNESIMA", obj_msima_class::BMDR_S_MAGNE_SIMA); - JUT_ASSERT(847, modelData != 0); + JUT_ASSERT(847, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (i_this->mpModel == NULL) { return 0; @@ -441,7 +441,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { for (int i = 0; i < 4; i++) { for (int j = 0; j < 35; j++) { modelData = (J3DModelData*)dComIfG_getObjectRes("MAGNESIMA", obj_msima_class::BMDR_KUSARI); - JUT_ASSERT(898, modelData != 0); + JUT_ASSERT(898, modelData != NULL); i_this->mChains[i].model[j] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mChains[i].model[j] == NULL) { diff --git a/src/d/actor/d_a_obj_mvstair.cpp b/src/d/actor/d_a_obj_mvstair.cpp index f18f750106..e40cc5fa70 100644 --- a/src/d/actor/d_a_obj_mvstair.cpp +++ b/src/d/actor/d_a_obj_mvstair.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_mvstair.h" #include "d/d_com_inf_game.h" @@ -88,7 +88,7 @@ static char* l_arcName[2] = { /* 80C9D2B8-80C9D338 000298 0080+00 1/0 0/0 0/0 .text CreateHeap__12daObjStair_cFv */ int daObjStair_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mResType], l_bmdName[mResType]); - JUT_ASSERT(250, modelData != 0); + JUT_ASSERT(250, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_myogan.cpp b/src/d/actor/d_a_obj_myogan.cpp index 8b3eb2c946..db24a17d7f 100644 --- a/src/d/actor/d_a_obj_myogan.cpp +++ b/src/d/actor/d_a_obj_myogan.cpp @@ -3,7 +3,7 @@ * Dangoro Arena Lava */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_myogan.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_nagaisu.cpp b/src/d/actor/d_a_obj_nagaisu.cpp index cc152a6943..aa42459273 100644 --- a/src/d/actor/d_a_obj_nagaisu.cpp +++ b/src/d/actor/d_a_obj_nagaisu.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_nagaisu.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_nameplate.cpp b/src/d/actor/d_a_obj_nameplate.cpp index fc72af31ef..82c46d17ee 100644 --- a/src/d/actor/d_a_obj_nameplate.cpp +++ b/src/d/actor/d_a_obj_nameplate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_nameplate.h" #include "d/actor/d_a_alink.h" diff --git a/src/d/actor/d_a_obj_nan.cpp b/src/d/actor/d_a_obj_nan.cpp index 7211fe6c7a..a2167e1dcf 100644 --- a/src/d/actor/d_a_obj_nan.cpp +++ b/src/d/actor/d_a_obj_nan.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_nan.h" #include "SSystem/SComponent/c_xyz.h" @@ -67,7 +67,7 @@ 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 != 0); + JUT_ASSERT(254, modelData != NULL); mMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("I_Nan", 6), 2, 1.0f, 0, -1, &mCreatureSound, 0, 0x11000284); @@ -643,7 +643,7 @@ inline int daObjNAN_c::draw() { cStack_88.y += 20.0f; gndChk.SetPos(&cStack_88); f32 groundCross = dComIfG_Bgsp().GroundCross(&gndChk); - if (groundCross != 1000000000.0f) { + if (groundCross != G_CM3D_F_INF) { dComIfGd_setSimpleShadow(¤t.pos, groundCross, 15.0f, gndChk, 0, -0.6f, dDlst_shadowControl_c::getSimpleTex()); } diff --git a/src/d/actor/d_a_obj_ndoor.cpp b/src/d/actor/d_a_obj_ndoor.cpp index bd48eb2300..a28818b3bc 100644 --- a/src/d/actor/d_a_obj_ndoor.cpp +++ b/src/d/actor/d_a_obj_ndoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ndoor.h" #include "d/actor/d_a_player.h" @@ -87,7 +87,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_ndoor", 3); if (modelData == NULL) { - JUT_ASSERT(305, modelData != 0); + JUT_ASSERT(305, modelData != NULL); } a_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_nougu.cpp b/src/d/actor/d_a_obj_nougu.cpp index 0cf716d8aa..fd7211a03c 100644 --- a/src/d/actor/d_a_obj_nougu.cpp +++ b/src/d/actor/d_a_obj_nougu.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_nougu.h" #include "dol2asm.h" @@ -269,7 +269,7 @@ COMPILER_STRIP_GATE(0x80CA49DC, &lit_3921); /* 80CA49E0-80CA49E4 000028 0004+00 0/3 0/0 0/0 .rodata @3922 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_3922 = -1000000000.0f; +SECTION_RODATA static f32 const lit_3922 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80CA49E0, &lit_3922); #pragma pop diff --git a/src/d/actor/d_a_obj_octhashi.cpp b/src/d/actor/d_a_obj_octhashi.cpp index a3bf99af5b..b5e34df4f1 100644 --- a/src/d/actor/d_a_obj_octhashi.cpp +++ b/src/d/actor/d_a_obj_octhashi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_octhashi.h" #include "d/d_cc_d.h" @@ -304,7 +304,7 @@ static int daObjOCTHASHI_Execute(daObjOCTHASHI_c* i_this) { /* 80CA5AE0-80CA5B98 000FA0 00B8+00 1/0 0/0 0/0 .text CreateHeap__15daObjOCTHASHI_cFv */ int daObjOCTHASHI_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[0], "S_octhashi00.bmd"); - JUT_ASSERT(84, modelData != 0); + JUT_ASSERT(84, modelData != NULL); int idx = 0; while (idx < mPieceNum) { diff --git a/src/d/actor/d_a_obj_oiltubo.cpp b/src/d/actor/d_a_obj_oiltubo.cpp index 7ea9b19d94..7ad77e8f38 100644 --- a/src/d/actor/d_a_obj_oiltubo.cpp +++ b/src/d/actor/d_a_obj_oiltubo.cpp @@ -3,7 +3,7 @@ * Lantern Oil Pot */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_oiltubo.h" @@ -56,7 +56,7 @@ const dCcD_SrcGObjInf daObj_Oiltubo_c::mCcDObjInfo = { /* 80CA6B28-80CA6C5C 000488 0134+00 1/1 0/0 0/0 .text CreateHeap__15daObj_Oiltubo_cFv */ int daObj_Oiltubo_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileName); - JUT_ASSERT(0, mdlData_p != 0); + JUT_ASSERT(0, mdlData_p != NULL); mpModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -64,7 +64,7 @@ int daObj_Oiltubo_c::CreateHeap() { } J3DModelData* mdlBData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bbmdFileName); - JUT_ASSERT(0, mdlBData_p != 0); + JUT_ASSERT(0, mdlBData_p != NULL); mpBModel = mDoExt_J3DModel__create(mdlBData_p, 0x80000, 0x19000284); if (mpBModel == NULL) { @@ -95,7 +95,7 @@ int daObj_Oiltubo_c::Execute() { mGroundChk = mAcch.m_gnd; mGroundHeight = mAcch.GetGroundH(); - if (mGroundHeight != -1000000000.0f) { + if (mGroundHeight != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } diff --git a/src/d/actor/d_a_obj_onsen.cpp b/src/d/actor/d_a_obj_onsen.cpp index abe3053e2b..8809d6e5fe 100644 --- a/src/d/actor/d_a_obj_onsen.cpp +++ b/src/d/actor/d_a_obj_onsen.cpp @@ -3,7 +3,7 @@ * Object - Hot Spring */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_onsen.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_onsenFire.cpp b/src/d/actor/d_a_obj_onsenFire.cpp index 8d68454703..567fb46aaf 100644 --- a/src/d/actor/d_a_obj_onsenFire.cpp +++ b/src/d/actor/d_a_obj_onsenFire.cpp @@ -3,7 +3,7 @@ * Object - Hotspring Fire */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_onsenFire.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_onsenTaru.cpp b/src/d/actor/d_a_obj_onsenTaru.cpp index 7f8ff0499a..04e8c21b2d 100644 --- a/src/d/actor/d_a_obj_onsenTaru.cpp +++ b/src/d/actor/d_a_obj_onsenTaru.cpp @@ -3,7 +3,7 @@ * Object - Hotspring Water Barrel */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_onsenTaru.h" #include "d/actor/d_a_player.h" @@ -51,7 +51,7 @@ void daOnsTaru_c::setBaseMtx() { /* 80CA8748-80CA87B4 000268 006C+00 1/0 0/0 0/0 .text CreateHeap__11daOnsTaru_cFv */ int daOnsTaru_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("maroTaru", 3); - JUT_ASSERT(231, modelData != 0); + JUT_ASSERT(231, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { @@ -361,7 +361,7 @@ void daOnsTaru_c::breakEffSet() { cXyz scale(0.75f, 0.75f, 0.75f); J3DModelData* kibako_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", "BreakWoodBox.bmd"); - JUT_ASSERT(0x310, kibako_bmd != 0); + JUT_ASSERT(784, kibako_bmd != NULL); JPABaseEmitter* emitter = dComIfGp_particle_set(0x8A99, &pos, NULL, NULL, 0xFF, &dPa_modelEcallBack::getEcallback(), diff --git a/src/d/actor/d_a_obj_ornament_cloth.cpp b/src/d/actor/d_a_obj_ornament_cloth.cpp index 875bc13305..c15402f96c 100644 --- a/src/d/actor/d_a_obj_ornament_cloth.cpp +++ b/src/d/actor/d_a_obj_ornament_cloth.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ornament_cloth.h" #include "d/d_a_obj.h" @@ -232,13 +232,13 @@ static char* l_arcName = "J_Necktie"; int daObjOnCloth_c::createHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcName, "J_Necktie.bmd")); - JUT_ASSERT(413, modelData != 0); + JUT_ASSERT(413, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, "J_Necktie.btk"); - JUT_ASSERT(420, pbtk != 0); + JUT_ASSERT(420, pbtk != NULL); mBtkAnm = new mDoExt_btkAnm(); diff --git a/src/d/actor/d_a_obj_pdoor.cpp b/src/d/actor/d_a_obj_pdoor.cpp index ce3991bfb6..f7dbea3ed9 100644 --- a/src/d/actor/d_a_obj_pdoor.cpp +++ b/src/d/actor/d_a_obj_pdoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pdoor.h" #include "d/actor/d_a_player.h" @@ -92,7 +92,7 @@ int daObjPDoor_c::Create() { /* 80CAA14C-80CAA1BC 00032C 0070+00 1/0 0/0 0/0 .text CreateHeap__12daObjPDoor_cFv */ int daObjPDoor_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(270, modelData != 0); + JUT_ASSERT(270, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != NULL ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_pdtile.cpp b/src/d/actor/d_a_obj_pdtile.cpp index 354b3d1161..1adf4a66d5 100644 --- a/src/d/actor/d_a_obj_pdtile.cpp +++ b/src/d/actor/d_a_obj_pdtile.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pdtile.h" #include "SSystem/SComponent/c_math.h" @@ -199,7 +199,7 @@ void daObjPDtile_c::rideActor(fopAc_ac_c* param_1) { /* 80CAB1F0-80CAB258 0005B0 0068+00 1/0 0/0 0/0 .text CreateHeap__13daObjPDtile_cFv */ int daObjPDtile_c::CreateHeap() { J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(mArcName, mBmdId); - JUT_ASSERT(557, model_data != 0); + JUT_ASSERT(557, model_data != NULL); mModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); return mModel != 0 ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_pdwall.cpp b/src/d/actor/d_a_obj_pdwall.cpp index 4ec82de694..f512fdf21e 100644 --- a/src/d/actor/d_a_obj_pdwall.cpp +++ b/src/d/actor/d_a_obj_pdwall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pdwall.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_picture.cpp b/src/d/actor/d_a_obj_picture.cpp index cff54cc827..33a7a4fda9 100644 --- a/src/d/actor/d_a_obj_picture.cpp +++ b/src/d/actor/d_a_obj_picture.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_picture.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_pillar.cpp b/src/d/actor/d_a_obj_pillar.cpp index fe72aa3e40..e9d9855d1e 100644 --- a/src/d/actor/d_a_obj_pillar.cpp +++ b/src/d/actor/d_a_obj_pillar.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pillar.h" #include "d/actor/d_a_player.h" @@ -177,7 +177,7 @@ int daPillar_c::Create() { /* 80CAF7A8-80CAF8A4 000568 00FC+00 1/0 0/0 0/0 .text CreateHeap__10daPillar_cFv */ int daPillar_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_bmd[mMdlType]); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; @@ -185,7 +185,7 @@ int daPillar_c::CreateHeap() { if (checkShadow() == 0xFF) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mMdlType], l_shadowBmd[mMdlType]); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpShadowModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpShadowModel == NULL) { return 0; @@ -448,7 +448,7 @@ int daPillar_c::Execute(Mtx** param_0) { } break; default: - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); } if (shape_angle.x != 0) { diff --git a/src/d/actor/d_a_obj_pleaf.cpp b/src/d/actor/d_a_obj_pleaf.cpp index 0b868571fd..5224065076 100644 --- a/src/d/actor/d_a_obj_pleaf.cpp +++ b/src/d/actor/d_a_obj_pleaf.cpp @@ -3,7 +3,7 @@ * Object - Pumpkin Leaf */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pleaf.h" #include "dol2asm.h" @@ -41,7 +41,7 @@ int daObj_Pleaf_c::create() { new_pos.y += 50.0f; mGndChk.SetPos(&new_pos); mGroundDist = dComIfG_Bgsp().GroundCross(&mGndChk); - if (mGroundDist != -1000000000.0f) { + if (mGroundDist != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -75,7 +75,7 @@ int daObj_Pleaf_c::Execute() { new_pos.y += 50.0f; mGndChk.SetPos(&new_pos); mGroundDist = dComIfG_Bgsp().GroundCross(&mGndChk); - if (mGroundDist != -1000000000.0f) { + if (mGroundDist != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -91,7 +91,7 @@ int daObj_Pleaf_c::Draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); - if (mGroundDist != -1000000000.0f) { + if (mGroundDist != -G_CM3D_F_INF) { mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, ¤t.pos, daObj_Pleaf_Param_c::m.field_0xc, 20.0f, current.pos.y, mGroundDist, diff --git a/src/d/actor/d_a_obj_poCandle.cpp b/src/d/actor/d_a_obj_poCandle.cpp index 56c8c530de..4850a1dfb1 100644 --- a/src/d/actor/d_a_obj_poCandle.cpp +++ b/src/d/actor/d_a_obj_poCandle.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_poCandle.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_poFire.cpp b/src/d/actor/d_a_obj_poFire.cpp index 7ced7e3748..ebcf2533b0 100644 --- a/src/d/actor/d_a_obj_poFire.cpp +++ b/src/d/actor/d_a_obj_poFire.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_poFire.h" diff --git a/src/d/actor/d_a_obj_poTbox.cpp b/src/d/actor/d_a_obj_poTbox.cpp index c9fd51ac94..8117d4ed37 100644 --- a/src/d/actor/d_a_obj_poTbox.cpp +++ b/src/d/actor/d_a_obj_poTbox.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_poTbox.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_prop.cpp b/src/d/actor/d_a_obj_prop.cpp index 6f3945b53b..ed7a7f4807 100644 --- a/src/d/actor/d_a_obj_prop.cpp +++ b/src/d/actor/d_a_obj_prop.cpp @@ -3,7 +3,7 @@ * Object - Propeller */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_prop.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index a384853fc9..6272653a81 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_pumpkin.h" #include "d/d_cc_d.h" @@ -438,7 +438,7 @@ COMPILER_STRIP_GATE(0x80CB83F0, &lit_4865); /* 80CB83F4-80CB83F8 000084 0004+00 0/2 0/0 0/0 .rodata @4866 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_4866 = -1000000000.0f; +SECTION_RODATA static f32 const lit_4866 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80CB83F4, &lit_4866); #pragma pop diff --git a/src/d/actor/d_a_obj_rcircle.cpp b/src/d/actor/d_a_obj_rcircle.cpp index fd37b44e33..c5bdfc3eb0 100644 --- a/src/d/actor/d_a_obj_rcircle.cpp +++ b/src/d/actor/d_a_obj_rcircle.cpp @@ -3,7 +3,7 @@ * Object - River Circle */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rcircle.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_rfHole.cpp b/src/d/actor/d_a_obj_rfHole.cpp index 12777cdc72..eb9a047626 100644 --- a/src/d/actor/d_a_obj_rfHole.cpp +++ b/src/d/actor/d_a_obj_rfHole.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rfHole.h" #include "d/d_com_inf_game.h" @@ -30,7 +30,7 @@ void daRfHole_c::setBaseMtx() { /* 80CB8F8C-80CB8FF8 00020C 006C+00 1/0 0/0 0/0 .text CreateHeap__10daRfHole_cFv */ int daRfHole_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Otosiana", 4); - JUT_ASSERT(167, modelData!=0); + JUT_ASSERT(167, modelData!=NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != NULL ? 1 : 0; } diff --git a/src/d/actor/d_a_obj_rgate.cpp b/src/d/actor/d_a_obj_rgate.cpp index edc8bd20ac..60167aa3e0 100644 --- a/src/d/actor/d_a_obj_rgate.cpp +++ b/src/d/actor/d_a_obj_rgate.cpp @@ -3,7 +3,7 @@ * Bulblin Gate */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rgate.h" #include "SSystem/SComponent/c_math.h" @@ -256,7 +256,7 @@ int daObjRgate_c::Create() { for (u16 i = 0; i < mpGateModel->getModelData()->getJointNum(); i++) { if ((int)i == 1 || (int)i == 2) { J3DJoint* jnt = mpGateModel->getModelData()->getJointNodePointer(i); - JUT_ASSERT(448, jnt != 0); + JUT_ASSERT(448, jnt != NULL); jnt->setCallBack(nodeCallBack); mpGateModel->setUserArea((uintptr_t)this); @@ -270,7 +270,7 @@ int daObjRgate_c::Create() { /* 80CBA654-80CBA828 000A34 01D4+00 1/0 0/0 0/0 .text CreateHeap__12daObjRgate_cFv */ int daObjRgate_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(472, modelData != 0); + JUT_ASSERT(472, modelData != NULL); mpGateModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpGateModel == NULL) { @@ -279,10 +279,10 @@ int daObjRgate_c::CreateHeap() { if (getSwNo() != 0xFF) { modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); - JUT_ASSERT(485, modelData != 0); + JUT_ASSERT(485, modelData != NULL); J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(495, modelData2 != 0); + JUT_ASSERT(495, modelData2 != NULL); mDoExt_setupShareTexture(modelData, modelData2); mpKeyModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); @@ -291,7 +291,7 @@ int daObjRgate_c::CreateHeap() { } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); - JUT_ASSERT(511, modelData != 0); + JUT_ASSERT(511, modelData != NULL); mDoExt_setupShareTexture(modelData, modelData2); mpHookModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_riverrock.cpp b/src/d/actor/d_a_obj_riverrock.cpp index b775415834..3eab65db95 100644 --- a/src/d/actor/d_a_obj_riverrock.cpp +++ b/src/d/actor/d_a_obj_riverrock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_riverrock.h" #include "SSystem/SComponent/c_math.h" @@ -242,7 +242,7 @@ static int daObjRIVERROCK_Execute(daObjRIVERROCK_c* i_this) { /* 80CBD348-80CBD3C0 000D68 0078+00 1/0 0/0 0/0 .text CreateHeap__16daObjRIVERROCK_cFv */ int daObjRIVERROCK_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "M_RiverRock.bmd"); - JUT_ASSERT(242, modelData != 0); + JUT_ASSERT(242, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != NULL ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_rock.cpp b/src/d/actor/d_a_obj_rock.cpp index 1b54e45d78..1fac1fe906 100644 --- a/src/d/actor/d_a_obj_rock.cpp +++ b/src/d/actor/d_a_obj_rock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rock.h" diff --git a/src/d/actor/d_a_obj_rope_bridge.cpp b/src/d/actor/d_a_obj_rope_bridge.cpp index 7c460d5902..f486de2e0d 100644 --- a/src/d/actor/d_a_obj_rope_bridge.cpp +++ b/src/d/actor/d_a_obj_rope_bridge.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rope_bridge.h" #include "d/d_com_inf_game.h" @@ -374,7 +374,7 @@ int daObjRBridge_c::Create() { /* 80596B88-80596DE8 000DC8 0260+00 1/0 0/0 0/0 .text CreateHeap__14daObjRBridge_cFv */ int daObjRBridge_c::CreateHeap() { void* modelData = dComIfG_getObjectRes(l_arcName[mType], l_brgBmdIdx[mType]); - JUT_ASSERT(837, modelData != 0); + JUT_ASSERT(837, modelData != NULL); mpBrgModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); if (mpBrgModel == NULL) { return 0; @@ -382,7 +382,7 @@ int daObjRBridge_c::CreateHeap() { if (!fopAcM_isSwitch(this, getSwbit2())) { modelData = dComIfG_getObjectRes(l_ropeArcName, 4); - JUT_ASSERT(853, modelData != 0); + JUT_ASSERT(853, modelData != NULL); mpStopModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084); if (mpStopModel == NULL) { return 0; @@ -427,7 +427,7 @@ int daObjRBridge_c::create1st() { if (mType != 0 && mType != 1) { // "Rope Stop Bridge: Invalid type\n" OS_REPORT_ERROR("止め具ロープ付き橋：タイプが不正です\n"); - JUT_ASSERT(923, 0); + JUT_ASSERT(923, FALSE); } int rope_phase_state = dComIfG_resLoad(&mRopePhase, l_ropeArcName); diff --git a/src/d/actor/d_a_obj_rotBridge.cpp b/src/d/actor/d_a_obj_rotBridge.cpp index 2dd0ce6245..a73bcb6693 100644 --- a/src/d/actor/d_a_obj_rotBridge.cpp +++ b/src/d/actor/d_a_obj_rotBridge.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rotBridge.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_rotTrap.cpp b/src/d/actor/d_a_obj_rotTrap.cpp index 1b7bbad0f0..bf9a8045cc 100644 --- a/src/d/actor/d_a_obj_rotTrap.cpp +++ b/src/d/actor/d_a_obj_rotTrap.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rotTrap.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp index c8a2ffec96..49c78e9dcb 100644 --- a/src/d/actor/d_a_obj_roten.cpp +++ b/src/d/actor/d_a_obj_roten.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_roten.h" #include "SSystem/SComponent/c_math.h" @@ -80,7 +80,7 @@ static u32 l_bmdFileIdx = 4; /* 80CC0EC4-80CC0F40 0003E4 007C+00 1/0 0/0 0/0 .text CreateHeap__13daObj_Roten_cFv */ int daObj_Roten_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdFileIdx); - JUT_ASSERT(156, mdlData_p != 0); + JUT_ASSERT(156, mdlData_p != NULL); mModel = mDoExt_J3DModel__create(mdlData_p, 0x80000, 0x11000084); return mModel != NULL; } diff --git a/src/d/actor/d_a_obj_rstair.cpp b/src/d/actor/d_a_obj_rstair.cpp index 1c85f49610..2e7b790d6e 100644 --- a/src/d/actor/d_a_obj_rstair.cpp +++ b/src/d/actor/d_a_obj_rstair.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rstair.h" #include "d/d_bg_w.h" @@ -87,20 +87,20 @@ static Vec l_water_check_offset = { /* 80CC17F0-80CC19E0 000310 01F0+00 1/0 0/0 0/0 .text CreateHeap__15daObjRotStair_cFv */ int daObjRotStair_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(215, modelData != 0); + JUT_ASSERT(215, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mModel == NULL) { return 0; } for (int i = 0; i < 2; i++) { modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_wtr_bmd[i]); - JUT_ASSERT(232, modelData != 0); + JUT_ASSERT(232, modelData != NULL); mWaterModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x19000284); if (mWaterModels[i] == NULL) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, l_wtr_btk[i]); - JUT_ASSERT(245, pbtk != 0); + JUT_ASSERT(245, pbtk != NULL); mBtks[i] = new mDoExt_btkAnm(); if (mBtks[i] == NULL || mBtks[i]->init(modelData, pbtk, 1, 2, 1.0f, 0, -1) == 0) { return 0; diff --git a/src/d/actor/d_a_obj_rw.cpp b/src/d/actor/d_a_obj_rw.cpp index dee64a0343..cd16190ffb 100644 --- a/src/d/actor/d_a_obj_rw.cpp +++ b/src/d/actor/d_a_obj_rw.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_rw.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_sWallShutter.cpp b/src/d/actor/d_a_obj_sWallShutter.cpp index 8d8692ba9a..0e58fc7d1c 100644 --- a/src/d/actor/d_a_obj_sWallShutter.cpp +++ b/src/d/actor/d_a_obj_sWallShutter.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_sWallShutter.h" #include "SSystem/SComponent/c_math.h" @@ -46,7 +46,7 @@ static const int l_bmdIdx[2] = {4, 4}; int daSwShutter_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mModelType], l_bmdIdx[mModelType]); - JUT_ASSERT(199, modelData != 0); + JUT_ASSERT(199, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_saidan.cpp b/src/d/actor/d_a_obj_saidan.cpp index e77797216f..0957b13c4a 100644 --- a/src/d/actor/d_a_obj_saidan.cpp +++ b/src/d/actor/d_a_obj_saidan.cpp @@ -3,7 +3,7 @@ // Object - Altar // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_saidan.h" diff --git a/src/d/actor/d_a_obj_sakuita.cpp b/src/d/actor/d_a_obj_sakuita.cpp index 248584bfbc..3de02773c8 100644 --- a/src/d/actor/d_a_obj_sakuita.cpp +++ b/src/d/actor/d_a_obj_sakuita.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_sakuita.h" #include "d/d_a_obj.h" @@ -76,7 +76,7 @@ void daObjSakuita_c::create_init() { field_0x728 = field_0x71c; initBaseMtx(); J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd"); - JUT_ASSERT(210, modelData != 0); + JUT_ASSERT(210, modelData != NULL); if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(this), 0) == -1) { OS_REPORT("\x1B[43;30mカラカラ板：シンプルモデル登録失敗しました。\n\x1B[m"); } @@ -145,7 +145,7 @@ void daObjSakuita_c::calcAngle() { inline int daObjSakuita_c::createHeap() { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd"); - JUT_ASSERT(567, modelData != 0); + JUT_ASSERT(567, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x20000, 0x11000084); return mModel != NULL ? 1 : 0; } @@ -201,7 +201,7 @@ daObjSakuita_c::~daObjSakuita_c() { if (field_0x74c != 0) { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd"); - JUT_ASSERT(160, modelData != 0); + JUT_ASSERT(160, modelData != NULL); dComIfGp_removeSimpleModel(modelData, fopAcM_GetRoomNo(this)); } dComIfG_resDelete(&mPhase, l_arcName); diff --git a/src/d/actor/d_a_obj_sakuita_rope.cpp b/src/d/actor/d_a_obj_sakuita_rope.cpp index 3754674003..433a48f328 100644 --- a/src/d/actor/d_a_obj_sakuita_rope.cpp +++ b/src/d/actor/d_a_obj_sakuita_rope.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_sakuita_rope.h" #include "d/d_com_inf_game.h" @@ -61,7 +61,7 @@ void daObjItaRope_Hio_c::genMessage(JORMContext* ctx) { /* 80CC5238-80CC527C 000078 0044+00 1/1 0/0 0/0 .text setModelData__9Sakuita_cFP12J3DModelData */ int Sakuita_c::setModelData(J3DModelData* i_modelData) { mModel = mDoExt_J3DModel__create(i_modelData, 0x20000, 0x11000084); - JUT_ASSERT(140, mModel != 0); + JUT_ASSERT(140, mModel != NULL); return 1; } @@ -162,7 +162,7 @@ inline daObjItaRope_c::~daObjItaRope_c() { if (field_0x636 != 0) { J3DModelData* modelData = (J3DModelData*) dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd"); - JUT_ASSERT(320, modelData != 0); + JUT_ASSERT(320, modelData != NULL); dComIfGp_removeSimpleModel(modelData, fopAcM_GetRoomNo(this)); } dComIfG_resDelete(&mPhase, l_arcName); @@ -173,7 +173,7 @@ void daObjItaRope_c::create_init() { gravity = attr().mGravity; JUT_ASSERT(359, getPathID() != 0xff); dPath* path = dPath_GetRoomPath(getPathID(), fopAcM_GetRoomNo(this)); - JUT_ASSERT(361, path != 0 && (path->m_num == 2)); + JUT_ASSERT(361, path != NULL && (path->m_num == 2)); cXyz cStack_60(path->m_points[0].m_position); cXyz cStack_6c(path->m_points[1].m_position); current.pos = (cStack_60 + cStack_6c) * 0.5f; @@ -206,7 +206,7 @@ void daObjItaRope_c::create_init() { setNormalRopePos(); initBaseMtx(); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd"); - JUT_ASSERT(420, modelData != 0); + JUT_ASSERT(420, modelData != NULL); if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(this), 0) == -1) { OS_REPORT("\x1b[43;30mカラカラ板：シンプルモデル登録失敗しました。\n\x1b[m"); } @@ -305,7 +305,7 @@ inline int daObjItaRope_c::createHeap() { } J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, "A_Sakuita.bmd"); - JUT_ASSERT(585, modelData != 0); + JUT_ASSERT(585, modelData != NULL); Sakuita_c* pSakuita = mSakuitas; for (int i = 0; i < field_0x635 - 2; i++, pSakuita++) { diff --git a/src/d/actor/d_a_obj_scannon.cpp b/src/d/actor/d_a_obj_scannon.cpp index 9bd5e01163..debc9089e0 100644 --- a/src/d/actor/d_a_obj_scannon.cpp +++ b/src/d/actor/d_a_obj_scannon.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "f_op/f_op_camera_mng.h" #include "d/actor/d_a_obj_scannon.h" @@ -292,7 +292,7 @@ int daSCannon_c::createHeap() { } J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(arcname, bmd_index); - JUT_ASSERT(541, a_model_data_p != 0); + JUT_ASSERT(541, a_model_data_p != NULL); mpModels[0] = mDoExt_J3DModel__create(a_model_data_p, J3DMdlFlag_DifferedDLBuffer, mdl_diff_flags); if (mpModels[0] == NULL) { @@ -301,7 +301,7 @@ int daSCannon_c::createHeap() { if (layer_no == 3 || layer_no == 10) { J3DAnmTransform* a_bck_p = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName_Comp, 5); - JUT_ASSERT(562, a_bck_p != 0); + JUT_ASSERT(562, a_bck_p != NULL); int rt = mBck.init(a_bck_p, 1, 0, 0.0f, 0, -1, 0); if (!rt) { @@ -309,7 +309,7 @@ int daSCannon_c::createHeap() { } } else if (layer_no == 1) { J3DModelData* a_repair_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName_Crash, 6); - JUT_ASSERT(583, a_repair_model_data_p != 0); + JUT_ASSERT(583, a_repair_model_data_p != NULL); mpModels[1] = mDoExt_J3DModel__create(a_repair_model_data_p, J3DMdlFlag_DifferedDLBuffer, J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 0, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE)); if (mpModels[1] == NULL) { @@ -318,21 +318,21 @@ int daSCannon_c::createHeap() { if (mIsPortal != 0) { J3DAnmTextureSRTKey* a_btk_p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName_Crash, 9); - JUT_ASSERT(606, a_btk_p != 0); + JUT_ASSERT(606, a_btk_p != NULL); mpCrashBtk = new mDoExt_btkAnm(); if (mpCrashBtk == NULL || !mpCrashBtk->init(a_model_data_p, a_btk_p, 1, 0, 0.0f, 0, -1)) { return 0; } J3DModelData* a_ptl_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName_Ptl, 5); - JUT_ASSERT(623, a_ptl_model_data_p != 0); + JUT_ASSERT(623, a_ptl_model_data_p != NULL); mpPtlModel = mDoExt_J3DModel__create(a_ptl_model_data_p, J3DMdlFlag_DifferedDLBuffer, J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE)); if (mpPtlModel == NULL) { return 0; } a_btk_p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName_Ptl, 0xC); - JUT_ASSERT(642, a_btk_p != 0); + JUT_ASSERT(642, a_btk_p != NULL); mpPtlBtk = new mDoExt_btkAnm(); if (mpPtlBtk == NULL || !mpPtlBtk->init(a_ptl_model_data_p, a_btk_p, 1, 2, 0.0f, 0, -1)) { return 0; @@ -657,7 +657,7 @@ void daSCannon_c::demoInitFinish() { if (joint_p == NULL) { // "××××××Sky Cannon—The head joint is missing!!!! ××××××" OS_REPORT("______________________××××××天空砲台　頭部分のジョイントがありません！！！！ ××××××____________\n"); - JUT_ASSERT(1351, 0); + JUT_ASSERT(1351, FALSE); } } #endif diff --git a/src/d/actor/d_a_obj_scannon_crs.cpp b/src/d/actor/d_a_obj_scannon_crs.cpp index c679b41bdd..87be04bd98 100644 --- a/src/d/actor/d_a_obj_scannon_crs.cpp +++ b/src/d/actor/d_a_obj_scannon_crs.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_scannon_crs.h" #include "d/actor/d_a_player.h" @@ -418,7 +418,7 @@ void daSCannonCrs_c::setModelMtx() { /* 80CCA8CC-80CCAAC4 0012CC 01F8+00 1/1 0/0 0/0 .text createHeap__14daSCannonCrs_cFv */ int daSCannonCrs_c::createHeap() { J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 10); - JUT_ASSERT(967, a_model_data_p != 0); + JUT_ASSERT(967, a_model_data_p != NULL); mpModel = mDoExt_J3DModel__create(a_model_data_p, J3DMdlFlag_DifferedDLBuffer, J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 2, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE)); if (mpModel == NULL) { @@ -426,14 +426,14 @@ int daSCannonCrs_c::createHeap() { } J3DAnmTransform* a_bck_p = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 7); - JUT_ASSERT(981, a_bck_p != 0); + JUT_ASSERT(981, a_bck_p != NULL); int rt = mBck.init(a_bck_p, 1, 0, 0.0f, 0, -1, 0); if (!rt) { return 0; } J3DAnmTextureSRTKey* a_btk_p = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 13); - JUT_ASSERT(1000, a_btk_p != 0); + JUT_ASSERT(1000, a_btk_p != NULL); rt = mBtk.init(a_model_data_p, a_btk_p, 1, 0, 0.0f, 0, -1); if (!rt) { 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 3bff6a5e37..ee9f98d571 100644 --- a/src/d/actor/d_a_obj_scannon_ten.cpp +++ b/src/d/actor/d_a_obj_scannon_ten.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_scannon_ten.h" #include "d/actor/d_a_player.h" @@ -50,7 +50,7 @@ daObjSCannonTen_c::~daObjSCannonTen_c() { */ int daObjSCannonTen_c::createHeap() { J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 9); - JUT_ASSERT(116, a_model_data_p != 0); + JUT_ASSERT(116, a_model_data_p != NULL); mpModel = mDoExt_J3DModel__create(a_model_data_p, J3DMdlFlag_DifferedDLBuffer, J3D_DIFF_FLAG(FALSE, FALSE, TRUE, 8, 0, FALSE, 0, 0, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE)); if (mpModel == NULL) { @@ -58,7 +58,7 @@ int daObjSCannonTen_c::createHeap() { } J3DAnmTransform* a_bck_p = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 6); - JUT_ASSERT(133, a_bck_p != 0); + JUT_ASSERT(133, a_bck_p != NULL); int rt = mBck.init(a_bck_p, 1, 0, 0.0f, 0, -1, 0); if (!rt) { return 0; @@ -365,7 +365,7 @@ void daObjSCannonTen_c::demoInitFinish() { if (joint_p == NULL) { // "××××××Sky Cannon—The head joint is missing!!!! ××××××" OS_REPORT("______________________××××××天空砲台　頭部分のジョイントがありません！！！！ ××××××____________\n"); - JUT_ASSERT(1351, 0); + JUT_ASSERT(1351, FALSE); } #endif diff --git a/src/d/actor/d_a_obj_sekidoor.cpp b/src/d/actor/d_a_obj_sekidoor.cpp index c8205961a4..73d968588d 100644 --- a/src/d/actor/d_a_obj_sekidoor.cpp +++ b/src/d/actor/d_a_obj_sekidoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_sekidoor.h" diff --git a/src/d/actor/d_a_obj_sekizo.cpp b/src/d/actor/d_a_obj_sekizo.cpp index 59be425885..129c324448 100644 --- a/src/d/actor/d_a_obj_sekizo.cpp +++ b/src/d/actor/d_a_obj_sekizo.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_sekizo.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_sekizoa.cpp b/src/d/actor/d_a_obj_sekizoa.cpp index 912e481437..fd3cf06dbd 100644 --- a/src/d/actor/d_a_obj_sekizoa.cpp +++ b/src/d/actor/d_a_obj_sekizoa.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_obj_sekizoa // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_sekizoa.h" #include "Z2AudioLib/Z2Instances.h" diff --git a/src/d/actor/d_a_obj_shield.cpp b/src/d/actor/d_a_obj_shield.cpp index df9db5ba63..9e4f0d5787 100644 --- a/src/d/actor/d_a_obj_shield.cpp +++ b/src/d/actor/d_a_obj_shield.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_shield.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_sm_door.cpp b/src/d/actor/d_a_obj_sm_door.cpp index 837b770254..408e89f081 100644 --- a/src/d/actor/d_a_obj_sm_door.cpp +++ b/src/d/actor/d_a_obj_sm_door.cpp @@ -3,7 +3,7 @@ * Object - Sacred Meadow Door */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_sm_door.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_obj_smallkey.cpp b/src/d/actor/d_a_obj_smallkey.cpp index 9d7ea2d90f..a4fbc3ce22 100644 --- a/src/d/actor/d_a_obj_smallkey.cpp +++ b/src/d/actor/d_a_obj_smallkey.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smallkey.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_smgdoor.cpp b/src/d/actor/d_a_obj_smgdoor.cpp index f6c697e570..ed8a2b9735 100644 --- a/src/d/actor/d_a_obj_smgdoor.cpp +++ b/src/d/actor/d_a_obj_smgdoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smgdoor.h" #include "d/actor/d_a_player.h" @@ -119,7 +119,7 @@ int daObjSmgDoor_c::Create() { /* 80CDBE1C-80CDBED4 00035C 00B8+00 1/0 0/0 0/0 .text CreateHeap__14daObjSmgDoor_cFv */ int daObjSmgDoor_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]); - JUT_ASSERT(252, modelData != 0); + JUT_ASSERT(252, modelData != NULL); for (int i = 0; i < 2; i++) { mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_smoke.cpp b/src/d/actor/d_a_obj_smoke.cpp index 433b90ffea..3407d92be8 100644 --- a/src/d/actor/d_a_obj_smoke.cpp +++ b/src/d/actor/d_a_obj_smoke.cpp @@ -3,7 +3,7 @@ * Object - Smoke */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smoke.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_smtile.cpp b/src/d/actor/d_a_obj_smtile.cpp index 49b464ee22..86b390776b 100644 --- a/src/d/actor/d_a_obj_smtile.cpp +++ b/src/d/actor/d_a_obj_smtile.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smtile.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_smw_stone.cpp b/src/d/actor/d_a_obj_smw_stone.cpp index 5daad4524f..ddec633cbf 100644 --- a/src/d/actor/d_a_obj_smw_stone.cpp +++ b/src/d/actor/d_a_obj_smw_stone.cpp @@ -3,7 +3,7 @@ * Object - Sacred Meadow Howling Stone */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_smw_stone.h" #include "d/actor/d_a_alink.h" diff --git a/src/d/actor/d_a_obj_snowEffTag.cpp b/src/d/actor/d_a_obj_snowEffTag.cpp index 08ec343d02..9ee153d849 100644 --- a/src/d/actor/d_a_obj_snowEffTag.cpp +++ b/src/d/actor/d_a_obj_snowEffTag.cpp @@ -3,7 +3,7 @@ * Snow Effect Generator Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_snowEffTag.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_snow_soup.cpp b/src/d/actor/d_a_obj_snow_soup.cpp index 683a3ccb71..47f8fef614 100644 --- a/src/d/actor/d_a_obj_snow_soup.cpp +++ b/src/d/actor/d_a_obj_snow_soup.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_snow_soup.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_so.cpp b/src/d/actor/d_a_obj_so.cpp index 7127124824..f0c4eb1d7e 100644 --- a/src/d/actor/d_a_obj_so.cpp +++ b/src/d/actor/d_a_obj_so.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_so.h" #include "d/d_cc_d.h" @@ -948,7 +948,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { obj_so_class* i_this = (obj_so_class*)a_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_so", 7); - JUT_ASSERT(1784, modelData != 0); + JUT_ASSERT(1784, modelData != NULL); i_this->field_0x574 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->field_0x574 == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_spinLift.cpp b/src/d/actor/d_a_obj_spinLift.cpp index 1cd2c81f6a..2bb5695dc9 100644 --- a/src/d/actor/d_a_obj_spinLift.cpp +++ b/src/d/actor/d_a_obj_spinLift.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_spinLift.h" #include "dol2asm.h" @@ -71,7 +71,7 @@ int daSpinLift_c::CreateHeap() { static u32 const l_bmdIdx[] = {4, 4, 4, 4, 4, 4, 4, 4, 4}; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mModelType], l_bmdIdx[mModelType]); - JUT_ASSERT(222, modelData != 0); + JUT_ASSERT(222, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mpModel == NULL ? 0 : 1; } diff --git a/src/d/actor/d_a_obj_ss_base.cpp b/src/d/actor/d_a_obj_ss_base.cpp index 42853e86c4..113cfc709a 100644 --- a/src/d/actor/d_a_obj_ss_base.cpp +++ b/src/d/actor/d_a_obj_ss_base.cpp @@ -3,7 +3,7 @@ // Translation Unit: a/obj/d_a_obj_ss_base // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ss_base.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_obj_ss_drink.cpp b/src/d/actor/d_a_obj_ss_drink.cpp index f2beb00527..089a1454e5 100644 --- a/src/d/actor/d_a_obj_ss_drink.cpp +++ b/src/d/actor/d_a_obj_ss_drink.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_myna.h" #include "d/actor/d_a_obj_ss_drink.h" @@ -64,7 +64,7 @@ int daObj_SSDrink_c::CreateHeap() { int unused = 0; mdlData_p = (J3DModelData*)dComIfG_getObjectRes(getResName(), l_bmdName); - JUT_ASSERT(216, mdlData_p != 0); + JUT_ASSERT(216, mdlData_p != NULL); mpModel = mDoExt_J3DModel__create(mdlData_p, 0, 0x11020084); if (mpModel == NULL) { @@ -72,14 +72,14 @@ int daObj_SSDrink_c::CreateHeap() { } pbtp = (J3DAnmTexPattern*)dComIfG_getObjectRes(l_resFileName, "al_bottle.btp"); - JUT_ASSERT(230, pbtp != 0); + JUT_ASSERT(230, pbtp != NULL); mpBtpAnm = 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 != 0); + JUT_ASSERT(242, pbrk != NULL); mpBrkAnm = 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_ss_item.cpp b/src/d/actor/d_a_obj_ss_item.cpp index 06b0c8573c..a3d15b8b6c 100644 --- a/src/d/actor/d_a_obj_ss_item.cpp +++ b/src/d/actor/d_a_obj_ss_item.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ss_item.h" #include "d/d_com_inf_game.h" @@ -114,7 +114,7 @@ int daObj_SSItem_c::Execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; field_0xB00 = mAcch.GetGroundH(); - if (field_0xB00 != -1000000000.0f) { + if (field_0xB00 != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -152,7 +152,7 @@ int daObj_SSItem_c::Draw() { g_env_light.settingTevStruct(0, ¤t.pos, &tevStr); g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); - if (field_0xB00 != -1000000000.0f) { + if (field_0xB00 != -G_CM3D_F_INF) { cM3dGPla plane; bool tri_pla = dComIfG_Bgsp().GetTriPla(mGndChk, &plane); if (tri_pla) { diff --git a/src/d/actor/d_a_obj_stairBlock.cpp b/src/d/actor/d_a_obj_stairBlock.cpp index 225d0efbda..15dae22070 100644 --- a/src/d/actor/d_a_obj_stairBlock.cpp +++ b/src/d/actor/d_a_obj_stairBlock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_stairBlock.h" @@ -55,7 +55,7 @@ static const Vec centerPos[10] = { int daStairBlock_c::CreateHeap() { for (int i = 0; i < 10; i++) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("StaBlock", l_bmdIdx[i]); - JUT_ASSERT(276, modelData != 0); + JUT_ASSERT(276, modelData != NULL); mpModel[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel[i] == NULL) { diff --git a/src/d/actor/d_a_obj_stick.cpp b/src/d/actor/d_a_obj_stick.cpp index c1bac1d17b..50ad8e1fde 100644 --- a/src/d/actor/d_a_obj_stick.cpp +++ b/src/d/actor/d_a_obj_stick.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_stick.h" #include "d/d_com_inf_game.h" @@ -68,7 +68,7 @@ int daObj_Stick_c::create() { mGndChk = mAcch.m_gnd; mGroundHeight = mAcch.m_ground_h; - if(mGroundHeight != -1000000000.0f) { + if(mGroundHeight != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -106,7 +106,7 @@ int daObj_Stick_c::Execute() { mGndChk = mAcch.m_gnd; mGroundHeight = mAcch.m_ground_h; - if (mGroundHeight != -1000000000.0f) { + if (mGroundHeight != -G_CM3D_F_INF) { setEnvTevColor(); setRoomNo(); } @@ -127,7 +127,7 @@ int daObj_Stick_c::Draw() { g_env_light.setLightTevColorType_MAJI(mpModel, &tevStr); mDoExt_modelUpdateDL(mpModel); - if(mGroundHeight != -1000000000.0f) { + if(mGroundHeight != -G_CM3D_F_INF) { mShadowKey = dComIfGd_setShadow(mShadowKey, 1, mpModel, diff --git a/src/d/actor/d_a_obj_stone.cpp b/src/d/actor/d_a_obj_stone.cpp index 0291b8c222..899867f805 100644 --- a/src/d/actor/d_a_obj_stone.cpp +++ b/src/d/actor/d_a_obj_stone.cpp @@ -6,7 +6,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_stone.h" #include "d/actor/d_a_player.h" @@ -411,7 +411,7 @@ void daObjStone_c::mode_proc_call() { dBgS_ObjGndChk adStack_c8; adStack_c8.SetPos(&cStack_d4); f32 dVar17 = dComIfG_Bgsp().GroundCross(&adStack_c8); - if (dVar17 == -1000000000.0f) { + if (dVar17 == -G_CM3D_F_INF) { dVar17 = -100000.0f; } dVar17 = fabs(waterHeight - dVar17); @@ -736,7 +736,7 @@ void daObjStone_c::modeWalk() { bool iVar7 = fopAcM_gc_c::gndCheck(&cStack_c8); bool isTriPla = fopAcM_gc_c::getTriPla(&acStack_a4); f32 dVar12 = fopAcM_gc_c::getGroundY(); - if (iVar7 && dVar12 != -1000000000.0f && isTriPla) { + if (iVar7 && dVar12 != -G_CM3D_F_INF && isTriPla) { f32 dVar12 = cM_scos(cM_deg2s(dVar15 - 0.5f)); cXyz cStack_d4(acStack_a4.mNormal); if (cStack_d4.y < dVar12) { @@ -853,7 +853,7 @@ void daObjStone_c::init_modeBreak() { acStack_40.setall(0.5f); } J3DModelData* stone_bmd = (J3DModelData*)dComIfG_getObjectRes("Always", 27); - JUT_ASSERT(1687, stone_bmd != 0); + JUT_ASSERT(1687, stone_bmd != NULL); JPABaseEmitter* emitter = dComIfGp_particle_set( 0x15c, ¤t.pos, 0, &acStack_40, 0xff, &dPa_modelEcallBack::getEcallback(), fopAcM_GetRoomNo(this), 0, 0, 0); dPa_modelEcallBack::setModel(emitter, stone_bmd, tevStr, @@ -977,7 +977,7 @@ int daObjStone_c::checkRollAngle() { bool triPla = dComIfG_Bgsp().GetTriPla(fopAcM_gc_c::mGndCheck, &plane); f32 ground_y = fopAcM_gc_c::getGroundY(); - if (gnd_chk && -1000000000.0f != ground_y && triPla) { + if (gnd_chk && -G_CM3D_F_INF != ground_y && triPla) { f32 tmp2 = cM_scos(cM_deg2s(dVar11 - 0.5f)); cXyz pos2 = plane.mNormal; diff --git a/src/d/actor/d_a_obj_stoneMark.cpp b/src/d/actor/d_a_obj_stoneMark.cpp index 21fdfe5b7e..296ff6cd83 100644 --- a/src/d/actor/d_a_obj_stoneMark.cpp +++ b/src/d/actor/d_a_obj_stoneMark.cpp @@ -6,7 +6,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_stoneMark.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_stopper.cpp b/src/d/actor/d_a_obj_stopper.cpp index 75c77696f4..7dda75f42e 100644 --- a/src/d/actor/d_a_obj_stopper.cpp +++ b/src/d/actor/d_a_obj_stopper.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_stopper.h" #include "Z2AudioLib/Z2Instances.h" diff --git a/src/d/actor/d_a_obj_stopper2.cpp b/src/d/actor/d_a_obj_stopper2.cpp index a1cda649ed..68dca5a302 100644 --- a/src/d/actor/d_a_obj_stopper2.cpp +++ b/src/d/actor/d_a_obj_stopper2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_stopper2.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_suisya.cpp b/src/d/actor/d_a_obj_suisya.cpp index 57ae5bca4f..cd667409aa 100644 --- a/src/d/actor/d_a_obj_suisya.cpp +++ b/src/d/actor/d_a_obj_suisya.cpp @@ -3,7 +3,7 @@ * Ordon Village Water Wheel */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_suisya.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_sw.cpp b/src/d/actor/d_a_obj_sw.cpp index 4f7359549c..bc8d936283 100644 --- a/src/d/actor/d_a_obj_sw.cpp +++ b/src/d/actor/d_a_obj_sw.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep // #define VIRTUAL_3DLINEMAT #include "d/actor/d_a_obj_sw.h" @@ -695,7 +695,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { if (i == 2) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Npc_ksw", 18); - JUT_ASSERT(1220, modelData != 0); + JUT_ASSERT(1220, modelData != NULL); i_this->field_0x8c8 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->field_0x8c8 == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_swBallA.cpp b/src/d/actor/d_a_obj_swBallA.cpp index aeacd201c5..00f0f8040b 100644 --- a/src/d/actor/d_a_obj_swBallA.cpp +++ b/src/d/actor/d_a_obj_swBallA.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swBallA.h" #include "d/actor/d_a_player.h" @@ -148,13 +148,13 @@ static char* l_arcName = "P_LBswA"; /* 80CF37FC-80CF3928 00057C 012C+00 1/1 0/0 0/0 .text CreateHeap__14daObjSwBallA_cFv */ int daObjSwBallA_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(381, modelData != 0); + JUT_ASSERT(381, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mModel == 0) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 7); - JUT_ASSERT(381, pbtk != 0); + JUT_ASSERT(381, pbtk != NULL); field_0x588 = 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 02c1295c7f..8180fd56ac 100644 --- a/src/d/actor/d_a_obj_swBallB.cpp +++ b/src/d/actor/d_a_obj_swBallB.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swBallB.h" #include "d/actor/d_a_player.h" @@ -177,13 +177,13 @@ static char* l_arcName = "P_LBswBC"; /* 80CF4B74-80CF4CA0 000634 012C+00 1/1 0/0 0/0 .text CreateHeap__14daObjSwBallB_cFv */ int daObjSwBallB_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(427, modelData != 0); + JUT_ASSERT(427, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mModel == 0) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 9); - JUT_ASSERT(441, pbtk != 0); + JUT_ASSERT(441, pbtk != NULL); field_0x588 = 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 a2bf175923..cb8357f967 100644 --- a/src/d/actor/d_a_obj_swBallC.cpp +++ b/src/d/actor/d_a_obj_swBallC.cpp @@ -2,7 +2,7 @@ // d_a_obj_swBallC // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swBallC.h" #include "d/actor/d_a_obj_swBallB.h" @@ -110,13 +110,13 @@ static char* l_staffName = "lbsw"; /* 80CF5EF8-80CF6024 0003D8 012C+00 1/1 0/0 0/0 .text CreateHeap__14daObjSwBallC_cFv */ int daObjSwBallC_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); - JUT_ASSERT(427, modelData != 0); + JUT_ASSERT(427, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mModel == 0) { return 0; } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 10); - JUT_ASSERT(441, pbtk != 0); + JUT_ASSERT(441, pbtk != NULL); field_0x574 = 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_swLight.cpp b/src/d/actor/d_a_obj_swLight.cpp index 619ec4c768..d51394cb57 100644 --- a/src/d/actor/d_a_obj_swLight.cpp +++ b/src/d/actor/d_a_obj_swLight.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swLight.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_swchain.cpp b/src/d/actor/d_a_obj_swchain.cpp index 6d11425ff5..e2a9db6968 100644 --- a/src/d/actor/d_a_obj_swchain.cpp +++ b/src/d/actor/d_a_obj_swchain.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swchain.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_swhang.cpp b/src/d/actor/d_a_obj_swhang.cpp index 239085a971..1f3a597be5 100644 --- a/src/d/actor/d_a_obj_swhang.cpp +++ b/src/d/actor/d_a_obj_swhang.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swhang.h" #include "SSystem/SComponent/c_math.h" @@ -171,7 +171,7 @@ int daObjSwHang_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes( l_arcName[mType], l_bmdIdx[mType]); - JUT_ASSERT(445, modelData != 0); + JUT_ASSERT(445, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_sword.cpp b/src/d/actor/d_a_obj_sword.cpp index e53caa9e14..9b784d0056 100644 --- a/src/d/actor/d_a_obj_sword.cpp +++ b/src/d/actor/d_a_obj_sword.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_sword.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_swpropeller.cpp b/src/d/actor/d_a_obj_swpropeller.cpp index 49f2aa4dfd..44455308ac 100644 --- a/src/d/actor/d_a_obj_swpropeller.cpp +++ b/src/d/actor/d_a_obj_swpropeller.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swpropeller.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp index 47323a13cc..04a129ad0d 100644 --- a/src/d/actor/d_a_obj_swpush.cpp +++ b/src/d/actor/d_a_obj_swpush.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swpush.h" #include "d/actor/d_a_player.h" @@ -74,7 +74,7 @@ bool daObjSwpush::Act_c::create_heap() { bool rv = false; J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes(M_arcname[mMdl], M_bmd[mMdl]); - JUT_ASSERT(518, model_data != 0); + JUT_ASSERT(518, model_data != NULL); mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (mpModel != NULL) { @@ -95,7 +95,7 @@ bool daObjSwpush::Act_c::create_heap() { cBgD_t* bg_data = (cBgD_t*)dComIfG_getObjectRes(M_arcname[mMdl], M_dzb[mMdl]); - JUT_ASSERT(569, bg_data != 0); + JUT_ASSERT(569, bg_data != NULL); bool bVar2 = false; mpBgW = new dBgWSv(); diff --git a/src/d/actor/d_a_obj_swpush2.cpp b/src/d/actor/d_a_obj_swpush2.cpp index f5692e4bda..7917ae1a9a 100644 --- a/src/d/actor/d_a_obj_swpush2.cpp +++ b/src/d/actor/d_a_obj_swpush2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swpush2.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_swpush5.cpp b/src/d/actor/d_a_obj_swpush5.cpp index 393a257893..bcc77a4101 100644 --- a/src/d/actor/d_a_obj_swpush5.cpp +++ b/src/d/actor/d_a_obj_swpush5.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swpush5.h" #include "d/actor/d_a_player.h" @@ -104,7 +104,7 @@ int daObjSw5_c::Create() { mpBgW->SetRideCallback(rideCallBack); J3DJoint* sw_jnt = mpModel->getModelData()->getJointNodePointer(1); - JUT_ASSERT(276, sw_jnt != 0); + JUT_ASSERT(276, sw_jnt != NULL); sw_jnt->setCallBack(nodeCallBack); mpModel->setUserArea((uintptr_t)this); @@ -125,7 +125,7 @@ static char* l_arcName = "D_Hfsw00"; /* 8059BA1C-8059BB1C 00061C 0100+00 1/0 0/0 0/0 .text CreateHeap__10daObjSw5_cFv */ int daObjSw5_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(308, modelData != 0); + JUT_ASSERT(308, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, BMD_DEFAULT_DIFF_FLAGS); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_swspinner.cpp b/src/d/actor/d_a_obj_swspinner.cpp index 5fd1edbbcf..916ff3ee9e 100644 --- a/src/d/actor/d_a_obj_swspinner.cpp +++ b/src/d/actor/d_a_obj_swspinner.cpp @@ -3,7 +3,7 @@ * Object - Spinner Switch */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swspinner.h" #include "d/d_procname.h" @@ -81,14 +81,14 @@ static char* l_arcName = "P_Sswitch"; /* 80D0035C-80D00498 00045C 013C+00 1/0 0/0 0/0 .text CreateHeap__16daObjSwSpinner_cFv */ int daObjSwSpinner_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(0xED, modelData != 0); + JUT_ASSERT(0xED, modelData != NULL); mpModelA = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModelA == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(0xF8, modelData != 0); + JUT_ASSERT(0xF8, modelData != NULL); mpModelB = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModelB == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_swturn.cpp b/src/d/actor/d_a_obj_swturn.cpp index 00e142d553..2f8640ba25 100644 --- a/src/d/actor/d_a_obj_swturn.cpp +++ b/src/d/actor/d_a_obj_swturn.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_swturn.h" #include "SSystem/SComponent/c_math.h" @@ -133,7 +133,7 @@ static char* l_arcName[2] = { /* 80D00EE4-80D00F64 000384 0080+00 1/0 0/0 0/0 .text CreateHeap__13daObjSwTurn_cFv */ int daObjSwTurn_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mModelType], l_bmd[mModelType]); - JUT_ASSERT(347, modelData != 0); + JUT_ASSERT(347, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != 0 ? TRUE : FALSE; } diff --git a/src/d/actor/d_a_obj_syRock.cpp b/src/d/actor/d_a_obj_syRock.cpp index 3672b30e5e..be52f38c9b 100644 --- a/src/d/actor/d_a_obj_syRock.cpp +++ b/src/d/actor/d_a_obj_syRock.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_syRock.h" #include "d/actor/d_a_obj_eff.h" @@ -84,14 +84,14 @@ void daSyRock_c::setBaseMtx() { /* 80D02454-80D02584 000294 0130+00 1/0 0/0 0/0 .text CreateHeap__10daSyRock_cFv */ int daSyRock_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes("syourock", 4)); - JUT_ASSERT(271, modelData != 0); + JUT_ASSERT(271, modelData != NULL); mpModels[0] = mDoExt_J3DModel__create(modelData, 1 << 19, 0x11000084); if(!mpModels[0]) return 0; modelData = static_cast(dComIfG_getObjectRes("syourock", 5)); - JUT_ASSERT(282, modelData != 0); + JUT_ASSERT(282, modelData != NULL); mpModels[1] = mDoExt_J3DModel__create(modelData, 1 << 19, 0x11000084); if(!mpModels[1]) diff --git a/src/d/actor/d_a_obj_szbridge.cpp b/src/d/actor/d_a_obj_szbridge.cpp index 2db487b7d0..f5bc8b298b 100644 --- a/src/d/actor/d_a_obj_szbridge.cpp +++ b/src/d/actor/d_a_obj_szbridge.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_szbridge.h" #include "dol2asm.h" @@ -173,7 +173,7 @@ COMPILER_STRIP_GATE(0x80D04C64, &lit_3715); /* 80D04C68-80D04C6C 000030 0004+00 0/1 0/0 0/0 .rodata @3716 */ #pragma push #pragma force_active on -SECTION_RODATA static f32 const lit_3716 = -1000000000.0f; +SECTION_RODATA static f32 const lit_3716 = -G_CM3D_F_INF; COMPILER_STRIP_GATE(0x80D04C68, &lit_3716); #pragma pop diff --git a/src/d/actor/d_a_obj_taFence.cpp b/src/d/actor/d_a_obj_taFence.cpp index 14b353ab59..077596f2c5 100644 --- a/src/d/actor/d_a_obj_taFence.cpp +++ b/src/d/actor/d_a_obj_taFence.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_taFence.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp index 1e5da74807..880f228c6f 100644 --- a/src/d/actor/d_a_obj_table.cpp +++ b/src/d/actor/d_a_obj_table.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_table.h" diff --git a/src/d/actor/d_a_obj_takaraDai.cpp b/src/d/actor/d_a_obj_takaraDai.cpp index 1a70811a57..cb7eeebb63 100644 --- a/src/d/actor/d_a_obj_takaraDai.cpp +++ b/src/d/actor/d_a_obj_takaraDai.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_takaraDai.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_tatigi.cpp b/src/d/actor/d_a_obj_tatigi.cpp index cffc6526af..7aed9577ca 100644 --- a/src/d/actor/d_a_obj_tatigi.cpp +++ b/src/d/actor/d_a_obj_tatigi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tatigi.h" #include "d/d_cc_d.h" @@ -95,7 +95,7 @@ static int daObj_Tatigi_Delete(obj_tatigi_class* i_this) { static int useHeapInit(fopAc_ac_c* a_this) { obj_tatigi_class* i_this = (obj_tatigi_class*)a_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_tg", 3); - JUT_ASSERT(279, modelData != 0); + JUT_ASSERT(279, modelData != NULL); for (int i = 0; i < i_this->mTgNum; i++) { i_this->mTgs[i].mModel = mDoExt_J3DModel__create(modelData, 0x20000, 0x11000084); if (i_this->mTgs[i].mModel == NULL) { @@ -205,7 +205,7 @@ static int daObj_Tatigi_Create(fopAc_ac_c* a_this) { } daObj_Tatigi_Execute(i_this); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_tg", 3); - JUT_ASSERT(476, modelData != 0); + JUT_ASSERT(476, modelData != NULL); if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 0) == -1) { // Standing tree: simple model registration failed. OS_REPORT("\x1B" "[43;30m立ち木：シンプルモデル登録失敗しました。\n" "\x1B" "[m"); diff --git a/src/d/actor/d_a_obj_ten.cpp b/src/d/actor/d_a_obj_ten.cpp index aac5051ad6..a9ec82e5e6 100644 --- a/src/d/actor/d_a_obj_ten.cpp +++ b/src/d/actor/d_a_obj_ten.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ten.h" #include "d/actor/d_a_player.h" @@ -63,7 +63,7 @@ void daObjTEN_c::SetCcSph() { 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 != 0); + JUT_ASSERT(246, modelData != NULL); i_this->mMorf = 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) { diff --git a/src/d/actor/d_a_obj_testcube.cpp b/src/d/actor/d_a_obj_testcube.cpp index 8c38440714..174eeaeec7 100644 --- a/src/d/actor/d_a_obj_testcube.cpp +++ b/src/d/actor/d_a_obj_testcube.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_testcube.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_tgake.cpp b/src/d/actor/d_a_obj_tgake.cpp index 5ead5fa1be..4d70b8e024 100644 --- a/src/d/actor/d_a_obj_tgake.cpp +++ b/src/d/actor/d_a_obj_tgake.cpp @@ -3,7 +3,7 @@ * Howling Cliff */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tgake.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_thashi.cpp b/src/d/actor/d_a_obj_thashi.cpp index e80624d516..d66ed77836 100644 --- a/src/d/actor/d_a_obj_thashi.cpp +++ b/src/d/actor/d_a_obj_thashi.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_thashi.h" #include "d/d_cc_d.h" diff --git a/src/d/actor/d_a_obj_thdoor.cpp b/src/d/actor/d_a_obj_thdoor.cpp index 55f888c941..985c250d5e 100644 --- a/src/d/actor/d_a_obj_thdoor.cpp +++ b/src/d/actor/d_a_obj_thdoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_thdoor.h" #include "d/d_bg_w.h" @@ -126,7 +126,7 @@ int daObjThDoor_c::Create() { /* 80D0D7F8-80D0D868 000378 0070+00 1/0 0/0 0/0 .text CreateHeap__13daObjThDoor_cFv */ int daObjThDoor_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(319, modelData != 0); + JUT_ASSERT(319, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != NULL ? 1 : 0; } diff --git a/src/d/actor/d_a_obj_timeFire.cpp b/src/d/actor/d_a_obj_timeFire.cpp index 4b8120b87c..6c18082dd7 100644 --- a/src/d/actor/d_a_obj_timeFire.cpp +++ b/src/d/actor/d_a_obj_timeFire.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_timeFire.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp index 7df30b0194..926e841451 100644 --- a/src/d/actor/d_a_obj_timer.cpp +++ b/src/d/actor/d_a_obj_timer.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_timer.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_tks.cpp b/src/d/actor/d_a_obj_tks.cpp index 4a06b84a62..a9e26d0a2a 100644 --- a/src/d/actor/d_a_obj_tks.cpp +++ b/src/d/actor/d_a_obj_tks.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tks.h" #include "d/d_camera.h" @@ -158,7 +158,7 @@ int daObjTks_c::Create() { /* 80D0F904-80D0FB78 000764 0274+00 1/1 0/0 0/0 .text CreateHeap__10daObjTks_cFv */ int daObjTks_c::CreateHeap() { J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 0xE); - JUT_ASSERT(314, 0 != mdlData_p); + JUT_ASSERT(314, NULL != mdlData_p); mpMorf = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf != NULL && mpMorf->getModel() == NULL) { @@ -445,7 +445,7 @@ void daObjTks_c::wait() { case 3: break; default: - JUT_ASSERT(1183, 0); + JUT_ASSERT(1183, FALSE); break; } } @@ -595,7 +595,7 @@ void daObjTks_c::talk() { } case 3: default: - JUT_ASSERT(1243, 0); + JUT_ASSERT(1243, FALSE); return; } } @@ -705,7 +705,7 @@ void daObjTks_c::demo() { mEventIdx = -1; return; default: - JUT_ASSERT(1374, 0); + JUT_ASSERT(1374, FALSE); break; } } @@ -760,7 +760,7 @@ void daObjTks_c::warp() { gravity = daObjTks_Param_c::m.common.gravity; break; case '0001': - JUT_ASSERT(1419, 0); + JUT_ASSERT(1419, FALSE); } } @@ -775,7 +775,7 @@ void daObjTks_c::warp() { eventMgr.cutEnd(staff_id); break; default: - JUT_ASSERT(1431, 0); + JUT_ASSERT(1431, FALSE); } if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && eventMgr.endCheck(mEventIdx)) { @@ -794,7 +794,7 @@ void daObjTks_c::warp() { mEventIdx = -1; return; default: - JUT_ASSERT(1452, 0); + JUT_ASSERT(1452, FALSE); break; } } diff --git a/src/d/actor/d_a_obj_tmoon.cpp b/src/d/actor/d_a_obj_tmoon.cpp index ac754c8f3c..2157557c3b 100644 --- a/src/d/actor/d_a_obj_tmoon.cpp +++ b/src/d/actor/d_a_obj_tmoon.cpp @@ -3,7 +3,7 @@ * Moon in Hidden Skill Scene */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tmoon.h" #include "f_op/f_op_draw_tag.h" diff --git a/src/d/actor/d_a_obj_toaru_maki.cpp b/src/d/actor/d_a_obj_toaru_maki.cpp index 95f020bcf0..1623f868dc 100644 --- a/src/d/actor/d_a_obj_toaru_maki.cpp +++ b/src/d/actor/d_a_obj_toaru_maki.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_toaru_maki.h" #include "d/d_bg_w.h" @@ -36,7 +36,7 @@ int daObjToaruMaki_c::createHeap() { u32 nameArg = getNameArg_0(); J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName[nameArg], l_bmdIdx[nameArg]); - JUT_ASSERT(101, a_model_data_p != 0); + JUT_ASSERT(101, a_model_data_p != NULL); mpModel = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_toby.cpp b/src/d/actor/d_a_obj_toby.cpp index 863ed4bef1..e7d2a98190 100644 --- a/src/d/actor/d_a_obj_toby.cpp +++ b/src/d/actor/d_a_obj_toby.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_toby.h" #include "d/actor/d_a_e_hz.h" @@ -452,10 +452,10 @@ static int useHeapInit(fopAc_ac_c* a_this) { if (i_this->field_0x577 == 0) { modelData = dComIfG_getObjectRes(i_this->mArcName, 4); - JUT_ASSERT(868, modelData != 0); + JUT_ASSERT(868, modelData != NULL); modelData2 = dComIfG_getObjectRes(i_this->mArcName, 5); // !@bug assert on wrong variable. not really meaningful. - JUT_ASSERT(872, modelData != 0); + JUT_ASSERT(872, modelData != NULL); pYuka = i_this->mYukas; for (int i = 0; i < i_this->mYukaNum; i++, pYuka++) { i_this->mYukas[i].mModel1 = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x20000, 0x11000084); @@ -479,7 +479,7 @@ static int useHeapInit(fopAc_ac_c* a_this) { } else if (i_this->field_0x577 == 1) { a_this->field_0x567 = 1; modelData = dComIfG_getObjectRes(i_this->mArcName, 6); - JUT_ASSERT(907, modelData != 0); + JUT_ASSERT(907, modelData != NULL); for (int i = 0; i < i_this->mYukaNum; i++) { i_this->mYukas[i].mModel1 = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x20000, 0x11000084); @@ -701,7 +701,7 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) { if (i_this->field_0x577 == 0) { for (u32 i = 0; i < 2; i++) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mArcName, l_bmdidx[i]); - JUT_ASSERT(1341, modelData != 0); + JUT_ASSERT(1341, modelData != NULL); if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 1) == -1) { // Skipping floor: simple model registration failed OS_REPORT("\x1B" "[43;30m飛び床：シンプルモデル登録失敗しました。\n" "\x1B" "[m"); @@ -710,7 +710,7 @@ static int daObj_Toby_Create(fopAc_ac_c* a_this) { } } else if (i_this->field_0x577 == 1) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(i_this->mArcName, 6); - JUT_ASSERT(1351, modelData != 0); + JUT_ASSERT(1351, modelData != NULL); if (dComIfGp_addSimpleModel(modelData, fopAcM_GetRoomNo(a_this), 1) == -1) { //Skipping leaves: simple model registration failed. OS_REPORT("\x1B" "[43;30m飛び葉：シンプルモデル登録失敗しました。\n" "\x1B" "[m"); diff --git a/src/d/actor/d_a_obj_tobyhouse.cpp b/src/d/actor/d_a_obj_tobyhouse.cpp index d66b9f2693..56b1bde209 100644 --- a/src/d/actor/d_a_obj_tobyhouse.cpp +++ b/src/d/actor/d_a_obj_tobyhouse.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tobyhouse.h" #include "d/actor/d_a_obj_carry.h" @@ -187,12 +187,12 @@ int daObjTobyHouse_c::Create() { } } J3DJoint* jnt = mModel->getModelData()->getJointNodePointer(mBirlPJnt); - JUT_ASSERT(398, jnt != 0); + JUT_ASSERT(398, jnt != NULL); jnt->setCallBack(nodeCallBack); mModel->setUserArea((uintptr_t)this); jnt = mModel->getModelData()->getJointNodePointer(mBirlCannonJnt); - JUT_ASSERT(406, jnt != 0); + JUT_ASSERT(406, jnt != NULL); } initBaseMtx(); return 1; @@ -201,7 +201,7 @@ int daObjTobyHouse_c::Create() { /* 80D161A4-80D163A8 0007E4 0204+00 1/0 0/0 0/0 .text CreateHeap__16daObjTobyHouse_cFv */ int daObjTobyHouse_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]); - JUT_ASSERT(430, modelData != 0); + JUT_ASSERT(430, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mModel == NULL) { return 0; @@ -210,7 +210,7 @@ int daObjTobyHouse_c::CreateHeap() { for (int i = 0; i < 3; i++) { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[mType], l_bck[i]); - JUT_ASSERT(447, pbck != 0); + JUT_ASSERT(447, pbck != NULL); mBcks[i] = new mDoExt_bckAnm(); if (mBcks[i] == NULL || !mBcks[i]->init(pbck, 1, 0, 1.0, 0, -1, false)) { return 0; @@ -219,9 +219,9 @@ int daObjTobyHouse_c::CreateHeap() { } } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_LodBmd[mType]); - JUT_ASSERT(462, modelData != 0); + JUT_ASSERT(462, modelData != NULL); J3DModelData* shareModelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[mType], l_bmd[mType]); - JUT_ASSERT(469, shareModelData != 0); + JUT_ASSERT(469, shareModelData != NULL); mDoExt_setupShareTexture(modelData, shareModelData); mLODModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mLODModel == NULL) { diff --git a/src/d/actor/d_a_obj_togeTrap.cpp b/src/d/actor/d_a_obj_togeTrap.cpp index e0d9abc8f6..4f542638e9 100644 --- a/src/d/actor/d_a_obj_togeTrap.cpp +++ b/src/d/actor/d_a_obj_togeTrap.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_togeTrap.h" #include "d/actor/d_a_player.h" @@ -57,13 +57,13 @@ void daTogeTrap_c::setBaseMtx() { /* 80D17D5C-80D17E14 0002DC 00B8+00 1/0 0/0 0/0 .text CreateHeap__12daTogeTrap_cFv */ int daTogeTrap_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("P_Toge", 4); - JUT_ASSERT(251, modelData != 0); + JUT_ASSERT(251, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mModel == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes("P_Toge", 5); - JUT_ASSERT(262, modelData != 0); + JUT_ASSERT(262, modelData != NULL); mWolfEyeModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mWolfEyeModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_tombo.cpp b/src/d/actor/d_a_obj_tombo.cpp index af7e401f0a..7256e31b53 100644 --- a/src/d/actor/d_a_obj_tombo.cpp +++ b/src/d/actor/d_a_obj_tombo.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tombo.h" #include "d/actor/d_a_player.h" @@ -91,7 +91,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { /* 80D192E4-80D195CC 000204 02E8+00 1/1 0/0 0/0 .text CreateHeap__12daObjTOMBO_cFv */ int daObjTOMBO_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Tombo", 9); - JUT_ASSERT(259, modelData != 0); + JUT_ASSERT(259, modelData != NULL); mpMorf = new mDoExt_McaMorfSO(modelData, NULL, NULL, (J3DAnmTransform*)dComIfG_getObjectRes("Tombo", 6), 2, 1.0, 0, -1, &mCreature, 0, 0x11000284); @@ -189,7 +189,7 @@ bool daObjTOMBO_c::CheckWater() { cXyz gndPos(current.pos.x, current.pos.y + 100.0f, current.pos.z); adStack_6c.SetPos(&gndPos); gndPos.y = dComIfG_Bgsp().GroundCross(&adStack_6c); - if (gndPos.y != -1e9f) { + if (gndPos.y != -G_CM3D_F_INF) { if (dComIfG_Bgsp().GetPolyAtt0(adStack_6c) == 7 && current.pos.y - gndPos.y < 50.0f) { return TRUE; } @@ -203,7 +203,7 @@ void daObjTOMBO_c::CheckGround() { cXyz gndPos(current.pos.x, current.pos.y + 100.0f, current.pos.z); adStack_6c.SetPos(&gndPos); gndPos.y = dComIfG_Bgsp().GroundCross(&adStack_6c); - if (gndPos.y != -1e9f) { + if (gndPos.y != -G_CM3D_F_INF) { if (current.pos.y - gndPos.y < 100.0f) { field_0x720 = 3.0f; } else if (current.pos.y - gndPos.y > 300.0f) { diff --git a/src/d/actor/d_a_obj_tornado.cpp b/src/d/actor/d_a_obj_tornado.cpp index 331ca91970..a94ae0b18d 100644 --- a/src/d/actor/d_a_obj_tornado.cpp +++ b/src/d/actor/d_a_obj_tornado.cpp @@ -3,7 +3,7 @@ * Wind Column */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tornado.h" #include "d/d_kankyo_rain.h" diff --git a/src/d/actor/d_a_obj_tornado2.cpp b/src/d/actor/d_a_obj_tornado2.cpp index c2a44e19da..f7f0f663c1 100644 --- a/src/d/actor/d_a_obj_tornado2.cpp +++ b/src/d/actor/d_a_obj_tornado2.cpp @@ -3,7 +3,7 @@ * Strong Wind Column */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tornado2.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_tp.cpp b/src/d/actor/d_a_obj_tp.cpp index 156b63405d..8bdff05aac 100644 --- a/src/d/actor/d_a_obj_tp.cpp +++ b/src/d/actor/d_a_obj_tp.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_tp.h" #include "JSystem/J3DGraphAnimator/J3DAnimation.h" @@ -362,7 +362,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { if (tp->field_0x5a0 != 0xf) { for (int i = 0; i < 2; i++) { J3DModelData* modelData = ( J3DModelData*)dComIfG_getObjectRes("Obj_tp", eff_bmd[i]); - JUT_ASSERT(809, modelData != 0); + JUT_ASSERT(809, modelData != NULL); tp->mModels[i] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (tp->mModels[i] == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_treesh.cpp b/src/d/actor/d_a_obj_treesh.cpp index eeb6801809..e1c689aa1a 100644 --- a/src/d/actor/d_a_obj_treesh.cpp +++ b/src/d/actor/d_a_obj_treesh.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_treesh.h" #include "d/d_com_inf_game.h" @@ -59,7 +59,7 @@ void daTreeSh_c::setBaseMtx() { /* 80D1F2E8-80D1F358 000308 0070+00 1/0 0/0 0/0 .text CreateHeap__10daTreeSh_cFv */ int daTreeSh_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(211, modelData != 0); + JUT_ASSERT(211, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_twGate.cpp b/src/d/actor/d_a_obj_twGate.cpp index d9425e5175..9b0db907dd 100644 --- a/src/d/actor/d_a_obj_twGate.cpp +++ b/src/d/actor/d_a_obj_twGate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_twGate.h" #include "d/d_com_inf_game.h" @@ -109,7 +109,7 @@ static Vec const l_cheeckPos1[13] = { int daTwGate_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_resNameIdx[mGateType], l_bmdIdx[mGateType]); - JUT_ASSERT(292, modelData != 0); + JUT_ASSERT(292, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mModel == NULL) { return 0; diff --git a/src/d/actor/d_a_obj_udoor.cpp b/src/d/actor/d_a_obj_udoor.cpp index 451d1f2940..31b30a6b24 100644 --- a/src/d/actor/d_a_obj_udoor.cpp +++ b/src/d/actor/d_a_obj_udoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_udoor.h" #include "d/d_cc_d.h" @@ -94,7 +94,7 @@ static int useHeapInit(fopAc_ac_c* i_this) { obj_udoor_class* a_this = static_cast(i_this); J3DModelData* model_data = (J3DModelData*)dComIfG_getObjectRes("Obj_udoor", bmdd[a_this->field_0x570]); - JUT_ASSERT(301, model_data != 0); + JUT_ASSERT(301, model_data != NULL); a_this->mpModel = mDoExt_J3DModel__create(model_data, 0x80000, 0x11000084); if (a_this->mpModel == NULL) { diff --git a/src/d/actor/d_a_obj_usaku.cpp b/src/d/actor/d_a_obj_usaku.cpp index a45c2651c6..7fdf1b156a 100644 --- a/src/d/actor/d_a_obj_usaku.cpp +++ b/src/d/actor/d_a_obj_usaku.cpp @@ -3,7 +3,7 @@ * Horse Fence */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_usaku.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_vground.cpp b/src/d/actor/d_a_obj_vground.cpp index 13d524a3f5..cd537fbe7b 100644 --- a/src/d/actor/d_a_obj_vground.cpp +++ b/src/d/actor/d_a_obj_vground.cpp @@ -3,7 +3,7 @@ * Object - Volcano Ground */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_vground.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_obj_volcball.cpp b/src/d/actor/d_a_obj_volcball.cpp index 7b8d9b374b..6e779abb50 100644 --- a/src/d/actor/d_a_obj_volcball.cpp +++ b/src/d/actor/d_a_obj_volcball.cpp @@ -3,7 +3,7 @@ * Volcano Eruption Falling Rocks */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_volcball.h" #include "d/actor/d_a_obj_volcbom.h" @@ -551,7 +551,7 @@ int daObjVolcBall_c::executeBall() { ball->mAcch.CrrPos(dComIfG_Bgsp()); - if (ball->mAcch.ChkGroundHit() || ball->mAcch.GetGroundH() == -1000000000.0f) { + if (ball->mAcch.ChkGroundHit() || ball->mAcch.GetGroundH() == -G_CM3D_F_INF) { mDoAud_seStart(Z2SE_OBJ_BREAK_ROCK, &mBall[i].field_0x4, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(this))); endFallEffect(i); diff --git a/src/d/actor/d_a_obj_volcbom.cpp b/src/d/actor/d_a_obj_volcbom.cpp index 78a0c96d9f..c9039259a8 100644 --- a/src/d/actor/d_a_obj_volcbom.cpp +++ b/src/d/actor/d_a_obj_volcbom.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_volcbom.h" #include "d/actor/d_a_midna.h" @@ -151,28 +151,28 @@ int daObjVolcBom_c::Create() { /* 80D244E0-80D248AC 0003C0 03CC+00 1/0 0/0 0/0 .text CreateHeap__14daObjVolcBom_cFv */ int daObjVolcBom_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 12); - JUT_ASSERT(389, modelData != 0); + JUT_ASSERT(389, modelData != NULL); mModel1 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mModel1 == NULL) { return 0; } J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 16); - JUT_ASSERT(403, pbrk != 0); + JUT_ASSERT(403, pbrk != NULL); mBrk1 = 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 != 0); + JUT_ASSERT(416, pbtk != NULL); mBtk1 = 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 != 0); + JUT_ASSERT(428, pbck != NULL); mBck1 = new mDoExt_bckAnm(); if (mBck1 == NULL || !mBck1->init(pbck, 1, 0, 1.0f, 0, -1, false)) { return 0; @@ -180,14 +180,14 @@ int daObjVolcBom_c::CreateHeap() { field_0x5cb = false; modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 11); - JUT_ASSERT(443, modelData != 0); + JUT_ASSERT(443, modelData != NULL); mModel2 = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mModel2 == NULL) { return 0; } pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName, 15); - JUT_ASSERT(457, pbrk != 0); + JUT_ASSERT(457, pbrk != NULL); mBrk2 = new mDoExt_brkAnm(); if (mBrk2 == NULL || !mBrk2->init(modelData, pbrk, 1, 0, 1.0f, 0, -1)) { return 0; @@ -195,7 +195,7 @@ int daObjVolcBom_c::CreateHeap() { mBrk2->setPlaySpeed(0.0f); pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, 19); - JUT_ASSERT(471, pbtk != 0); + JUT_ASSERT(471, pbtk != NULL); mBtk2 = new mDoExt_btkAnm(); if (mBtk2 == NULL || !mBtk2->init(modelData, pbtk, 1, 2, 1.0f, 0, -1)) { return 0; @@ -309,7 +309,7 @@ void daObjVolcBom_c::init_modeWaitAppear() { void daObjVolcBom_c::modeWaitAppear() { daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0); J3DJoint* root_jnt = mModel1->getModelData()->getJointNodePointer(0); - JUT_ASSERT(623, root_jnt != 0); + JUT_ASSERT(623, root_jnt != NULL); switch (mWaitAppearState) { case 0: @@ -833,7 +833,7 @@ void daObjVolcBom_c::demoProc() { /* 80D26468-80D264E8 002348 0080+00 1/1 0/0 0/0 .text calcObjPos__14daObjVolcBom_cFv */ void daObjVolcBom_c::calcObjPos() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(1459, pbck != 0); + JUT_ASSERT(1459, pbck != NULL); J3DTransformInfo info; pbck->getTransform(0, &info); mWarpSEPos.x = info.mTranslate.x; diff --git a/src/d/actor/d_a_obj_warp_kbrg.cpp b/src/d/actor/d_a_obj_warp_kbrg.cpp index 3e7d7564fd..e0bdce73c1 100644 --- a/src/d/actor/d_a_obj_warp_kbrg.cpp +++ b/src/d/actor/d_a_obj_warp_kbrg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_warp_kbrg.h" #include "d/d_com_inf_game.h" @@ -176,7 +176,7 @@ int daObjWarpKBrg_c::Create() { /* 80D27300-80D2766C 000440 036C+00 1/0 0/0 0/0 .text CreateHeap__15daObjWarpKBrg_cFv */ int daObjWarpKBrg_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[getNameArg()], l_bmd_idx[getNameArg()]); - JUT_ASSERT(380, modelData != 0); + JUT_ASSERT(380, modelData != NULL); u32 sp2C = 0x11000284; mpBridgeModel = mDoExt_J3DModel__create(modelData, 0x80000, sp2C); @@ -185,7 +185,7 @@ int daObjWarpKBrg_c::CreateHeap() { } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], l_btk_idx[getNameArg()]); - JUT_ASSERT(394, pbtk != 0); + JUT_ASSERT(394, pbtk != NULL); mpBridgeBtk = new mDoExt_btkAnm(); if (mpBridgeBtk == NULL || !mpBridgeBtk->init(modelData, pbtk, TRUE, 0, 1.0f, 0, -1)) { return 0; @@ -193,7 +193,7 @@ int daObjWarpKBrg_c::CreateHeap() { mpBridgeBtk->setFrame(0.0f); J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[getNameArg()], l_bck_idx[getNameArg()]); - JUT_ASSERT(407, pbck != 0); + JUT_ASSERT(407, pbck != NULL); mpBridgeBck = new mDoExt_bckAnm(); if (mpBridgeBck == NULL || !mpBridgeBck->init(pbck, TRUE, 0, 1.0f, 0, -1, false)) { return 0; @@ -201,14 +201,14 @@ int daObjWarpKBrg_c::CreateHeap() { if (getNameArg() == 1) { modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[getNameArg()], 10); - JUT_ASSERT(424, modelData != 0); + JUT_ASSERT(424, modelData != NULL); mpPortalModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mpPortalModel == NULL) { return 0; } pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], 18); - JUT_ASSERT(438, pbtk != 0); + JUT_ASSERT(438, pbtk != NULL); mpPortalBtk = new mDoExt_btkAnm(); if (mpPortalBtk == NULL || !mpPortalBtk->init(modelData, pbtk, TRUE, 2, 1.0f, 0, -1)) { return 0; @@ -216,7 +216,7 @@ int daObjWarpKBrg_c::CreateHeap() { mpPortalBtk->setFrame(0.0f); J3DAnmTevRegKey* pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], 14); - JUT_ASSERT(451, pbrk != 0); + JUT_ASSERT(451, pbrk != NULL); mpPortalBrk = new mDoExt_brkAnm(); if (mpPortalBrk == NULL || !mpPortalBrk->init(modelData, pbrk, TRUE, 0, 1.0f, 0, -1)) { return 0; @@ -224,7 +224,7 @@ int daObjWarpKBrg_c::CreateHeap() { #if VERSION == VERSION_SHIELD_DEBUG pbrk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(l_arcName[getNameArg()], 15); - JUT_ASSERT(463, pbrk != 0); + JUT_ASSERT(463, pbrk != NULL); #endif } @@ -648,7 +648,7 @@ void daObjWarpKBrg_c::demoProc() { /* 80D28A50-80D28AE0 001B90 0090+00 1/1 0/0 0/0 .text calcObjPos__15daObjWarpKBrg_cFv */ void daObjWarpKBrg_c::calcObjPos() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName[getNameArg()], l_bck_idx[getNameArg()]); - JUT_ASSERT(1191, pbck != 0); + JUT_ASSERT(1191, pbck != NULL); J3DTransformInfo transinfo; pbck->getTransform(0, &transinfo); diff --git a/src/d/actor/d_a_obj_warp_obrg.cpp b/src/d/actor/d_a_obj_warp_obrg.cpp index 18c2caab50..f917b15990 100644 --- a/src/d/actor/d_a_obj_warp_obrg.cpp +++ b/src/d/actor/d_a_obj_warp_obrg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_warp_obrg.h" #include "d/d_com_inf_game.h" @@ -66,7 +66,7 @@ void daObjWarpOBrg_c::setBaseMtx() { if (getNameArg() == 0) { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_bck_idx[getNameArg()]); - JUT_ASSERT(189, pbck != 0); + JUT_ASSERT(189, pbck != NULL); J3DTransformInfo transinfo; pbck->getTransform(0, &transinfo); @@ -105,7 +105,7 @@ int daObjWarpOBrg_c::Create() { /* 80D29BB4-80D29E34 000274 0280+00 1/0 0/0 0/0 .text CreateHeap__15daObjWarpOBrg_cFv */ int daObjWarpOBrg_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_bmd_idx[getNameArg()]); - JUT_ASSERT(254, modelData != 0); + JUT_ASSERT(254, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000284); if (mpModel == NULL) { @@ -113,7 +113,7 @@ int daObjWarpOBrg_c::CreateHeap() { } J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_bck_idx[getNameArg()]); - JUT_ASSERT(263, pbck != 0); + JUT_ASSERT(263, pbck != NULL); mpBck = new mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(pbck, TRUE, 0, 0.0f, 0, -1, false)) { return 0; @@ -125,7 +125,7 @@ int daObjWarpOBrg_c::CreateHeap() { } J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getObjectRes(l_arcName, l_btk_idx[getNameArg()]); - JUT_ASSERT(271, pbtk != 0); + JUT_ASSERT(271, pbtk != NULL); mpBtk = new mDoExt_btkAnm(); if (mpBtk == NULL || !mpBtk->init(modelData, pbtk, TRUE, 0, 0.0f, 0, -1)) { return 0; @@ -515,7 +515,7 @@ void daObjWarpOBrg_c::demoProc() { } J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_bck_idx[getNameArg()]); - JUT_ASSERT(740, pbck != 0); + JUT_ASSERT(740, pbck != NULL); J3DTransformInfo transinfo; pbck->getTransform(0, &transinfo); diff --git a/src/d/actor/d_a_obj_waterGate.cpp b/src/d/actor/d_a_obj_waterGate.cpp index 748a3819b2..24ca50fa5a 100644 --- a/src/d/actor/d_a_obj_waterGate.cpp +++ b/src/d/actor/d_a_obj_waterGate.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_waterGate.h" #include "d/d_com_inf_game.h" @@ -43,7 +43,7 @@ void daWtGate_c::setBaseMtx() { /* 80D2BC94-80D2BD00 0001F4 006C+00 1/0 0/0 0/0 .text CreateHeap__10daWtGate_cFv */ int daWtGate_c::CreateHeap() { J3DModelData* const modelData = static_cast(dComIfG_getObjectRes("S_Zsuimon", 4)); - JUT_ASSERT(159, modelData != 0); + JUT_ASSERT(159, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_waterPillar.cpp b/src/d/actor/d_a_obj_waterPillar.cpp index e9953b7902..7d35bcb6ee 100644 --- a/src/d/actor/d_a_obj_waterPillar.cpp +++ b/src/d/actor/d_a_obj_waterPillar.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_waterPillar.h" #include "d/d_com_inf_game.h" @@ -80,7 +80,7 @@ int daWtPillar_c::createHeapCallBack(fopAc_ac_c* i_this) { /* 80D2C858-80D2C960 000278 0108+00 1/1 0/0 0/0 .text CreateHeap__12daWtPillar_cFv */ int daWtPillar_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes("efWater", 8)); - JUT_ASSERT(369, modelData != 0); + JUT_ASSERT(369, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, J3DMdlFlag_DifferedDLBuffer, 0x11000284); if(!mpModel) diff --git a/src/d/actor/d_a_obj_waterfall.cpp b/src/d/actor/d_a_obj_waterfall.cpp index 6e8e7192d2..7c0ca6b5fe 100644 --- a/src/d/actor/d_a_obj_waterfall.cpp +++ b/src/d/actor/d_a_obj_waterfall.cpp @@ -2,7 +2,7 @@ * @file d_a_obj_waterfall.cpp */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_waterfall.h" #include "d/actor/d_a_arrow.h" diff --git a/src/d/actor/d_a_obj_wchain.cpp b/src/d/actor/d_a_obj_wchain.cpp index 720ff26db0..3fe20606f4 100644 --- a/src/d/actor/d_a_obj_wchain.cpp +++ b/src/d/actor/d_a_obj_wchain.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_wchain.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_wdStick.cpp b/src/d/actor/d_a_obj_wdStick.cpp index 76b2998eb2..1c7d8e4974 100644 --- a/src/d/actor/d_a_obj_wdStick.cpp +++ b/src/d/actor/d_a_obj_wdStick.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_wdStick.h" #include "SSystem/SComponent/c_math.h" @@ -37,7 +37,7 @@ void daWdStick_c::setBaseMtx() { /* 80D31C58-80D31CC4 0001F8 006C+00 1/0 0/0 0/0 .text CreateHeap__11daWdStick_cFv */ int daWdStick_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("H_Kinobou", 4); - JUT_ASSERT(245, modelData != 0); + JUT_ASSERT(245, modelData != NULL); mModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mModel != 0 ? 1 : 0; } @@ -425,7 +425,7 @@ void daWdStick_c::mode_proc_roll() { cM3dGPla cStack_ec; fopAcM_gc_c::gndCheck(&cStack_f8); bool iVar7 = fopAcM_gc_c::getTriPla(&cStack_ec); - if ((groundCross != -1000000000.0f) && iVar7 != 0) { + if ((groundCross != -G_CM3D_F_INF) && iVar7 != 0) { f32 dVar11 = cM_scos(cM_deg2s(dVar14 - 0.5f)); cStack_104 = cStack_ec.mNormal; if (cStack_104.y < dVar11) { diff --git a/src/d/actor/d_a_obj_web0.cpp b/src/d/actor/d_a_obj_web0.cpp index aa973d86ce..e87e582ee6 100644 --- a/src/d/actor/d_a_obj_web0.cpp +++ b/src/d/actor/d_a_obj_web0.cpp @@ -3,7 +3,7 @@ * Spider Web (Wall) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_web0.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_web1.cpp b/src/d/actor/d_a_obj_web1.cpp index 873eb02d14..16bf822705 100644 --- a/src/d/actor/d_a_obj_web1.cpp +++ b/src/d/actor/d_a_obj_web1.cpp @@ -3,7 +3,7 @@ * Spider Web (Floor) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_web1.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_well_cover.cpp b/src/d/actor/d_a_obj_well_cover.cpp index d2a6c0c77d..ba108079d9 100644 --- a/src/d/actor/d_a_obj_well_cover.cpp +++ b/src/d/actor/d_a_obj_well_cover.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_well_cover.h" #include "d/d_procname.h" @@ -37,7 +37,7 @@ static char* l_arcName = "H_Idohuta"; /* 80D36394-80D36404 000174 0070+00 1/0 0/0 0/0 .text CreateHeap__13daObjWCover_cFv */ int daObjWCover_c::CreateHeap() { J3DModelData* modelData = static_cast(dComIfG_getObjectRes(l_arcName, 4)); - JUT_ASSERT(194, modelData != 0) + JUT_ASSERT(194, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); return mpModel != NULL ? 1 : 0; } diff --git a/src/d/actor/d_a_obj_wflag.cpp b/src/d/actor/d_a_obj_wflag.cpp index ed0dfad87c..202ed8b4ae 100644 --- a/src/d/actor/d_a_obj_wflag.cpp +++ b/src/d/actor/d_a_obj_wflag.cpp @@ -2,7 +2,7 @@ // Object wflag // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_wflag.h" #include "d/d_com_inf_game.h" @@ -155,7 +155,7 @@ static int daObj_Wflag_Delete(obj_wflag_class* i_this) { static int useHeapInit(fopAc_ac_c* i_actor) { obj_wflag_class* i_this = (obj_wflag_class*)i_actor; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Obj_wflag", 10); - JUT_ASSERT(409, modelData != 0); + JUT_ASSERT(409, modelData != NULL); i_this->mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (i_this->mpModel == NULL) { return 0; @@ -183,7 +183,7 @@ static int useHeapInit(fopAc_ac_c* i_actor) { } modelData = static_cast(dComIfG_getObjectRes("Obj_wflag", 9)); - JUT_ASSERT(479, modelData != 0); + JUT_ASSERT(479, modelData != NULL); for (int i = 0; i < 1; i++) { for (int j = 0; j < 19; j++) { i_this->mTails[i].mModels[j] = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); diff --git a/src/d/actor/d_a_obj_wind_stone.cpp b/src/d/actor/d_a_obj_wind_stone.cpp index cae8712edb..a60b7f170d 100644 --- a/src/d/actor/d_a_obj_wind_stone.cpp +++ b/src/d/actor/d_a_obj_wind_stone.cpp @@ -3,7 +3,7 @@ * Object - Wind Stone */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_wind_stone.h" #include "d/actor/d_a_alink.h" diff --git a/src/d/actor/d_a_obj_window.cpp b/src/d/actor/d_a_obj_window.cpp index f303a1ac78..0b35bdcb6f 100644 --- a/src/d/actor/d_a_obj_window.cpp +++ b/src/d/actor/d_a_obj_window.cpp @@ -3,7 +3,7 @@ * Object - Twilight Hyrule Castle Window Shutter */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_window.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_wood_pendulum.cpp b/src/d/actor/d_a_obj_wood_pendulum.cpp index 13a37b1f16..6e44c9a7d9 100644 --- a/src/d/actor/d_a_obj_wood_pendulum.cpp +++ b/src/d/actor/d_a_obj_wood_pendulum.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_wood_pendulum.h" diff --git a/src/d/actor/d_a_obj_wood_statue.cpp b/src/d/actor/d_a_obj_wood_statue.cpp index 9a5b9fd9e0..6fd70be8f3 100644 --- a/src/d/actor/d_a_obj_wood_statue.cpp +++ b/src/d/actor/d_a_obj_wood_statue.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_wood_statue.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_obj_wsword.cpp b/src/d/actor/d_a_obj_wsword.cpp index 419b2bc57f..494e38472d 100644 --- a/src/d/actor/d_a_obj_wsword.cpp +++ b/src/d/actor/d_a_obj_wsword.cpp @@ -3,7 +3,7 @@ * Object - Wooden Sword */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_wsword.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_yel_bag.cpp b/src/d/actor/d_a_obj_yel_bag.cpp index d290006785..14c4cb1c5e 100644 --- a/src/d/actor/d_a_obj_yel_bag.cpp +++ b/src/d/actor/d_a_obj_yel_bag.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_yel_bag.h" #include "d/actor/d_a_npc.h" @@ -166,7 +166,7 @@ int daObj_YBag_c::Execute() { field_0xa33 = 1; } else { fopAcM_getWaterY(¤t.pos, &field_0x9f4); - if (field_0x9f4 != -1e9f && daObj_YBag_Param_c::m[10] < field_0x9f4 - field_0x9f0 && + if (field_0x9f4 != -G_CM3D_F_INF && daObj_YBag_Param_c::m[10] < field_0x9f4 - field_0x9f0 && current.pos.y <= field_0x9f4 && field_0xa32 == 0) { if (field_0xa33 != 0) { @@ -248,7 +248,7 @@ int daObj_YBag_c::Execute() { } if (mAcch.ChkGroundLanding()) { if (field_0x9c4.y < -30.0f) { - if (field_0x9f4 != -1e9f && current.pos.y <= field_0x9f4) { + if (field_0x9f4 != -G_CM3D_F_INF && current.pos.y <= field_0x9f4) { setWaterPrtcl(); } else { setSmokePrtcl(); @@ -318,7 +318,7 @@ int daObj_YBag_c::Execute() { mAcch.CrrPos(dComIfG_Bgsp()); mGndChk = mAcch.m_gnd; field_0x9f0 = mAcch.GetGroundH(); - if (field_0x9f0 != -1e9f) { + if (field_0x9f0 != -G_CM3D_F_INF) { field_0xa02 = daNpcF_getGroundAngle(&mGndChk, shape_angle.y); setEnvTevColor(); setRoomNo(); @@ -347,7 +347,7 @@ int daObj_YBag_c::Draw() { mModel, &tevStr); mDoExt_modelUpdateDL(mModel); - if (field_0x9f0 != -1e9f) { + if (field_0x9f0 != -G_CM3D_F_INF) { fopAc_ac_c* grabActor = NULL; s32 grabActorId = daPy_getPlayerActorClass()->getGrabActorID(); fopAcM_SearchByID(grabActorId, &grabActor); diff --git a/src/d/actor/d_a_obj_yobikusa.cpp b/src/d/actor/d_a_obj_yobikusa.cpp index 6252c504d5..c8bd430be6 100644 --- a/src/d/actor/d_a_obj_yobikusa.cpp +++ b/src/d/actor/d_a_obj_yobikusa.cpp @@ -3,7 +3,7 @@ // Obj - Call grass // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_yobikusa.h" diff --git a/src/d/actor/d_a_obj_yousei.cpp b/src/d/actor/d_a_obj_yousei.cpp index 397732b2cb..5c00794af6 100644 --- a/src/d/actor/d_a_obj_yousei.cpp +++ b/src/d/actor/d_a_obj_yousei.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_yousei.h" #include "d/d_com_inf_game.h" @@ -41,7 +41,7 @@ void daObjYOUSEI_c::SetCcSph() { int daObjYOUSEI_c::CreateHeap() { void* modelData = dComIfG_getObjectRes("Always", 0x21); - JUT_ASSERT(177, modelData != 0); + 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); if (mpModelMorf == NULL) { @@ -626,7 +626,7 @@ void daObjYOUSEI_c::CheckGround() { gnd_chk.SetPos(&pos); pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (pos.y != -1000000000.0f) { + if (pos.y != -G_CM3D_F_INF) { home.pos.y = pos.y; } } @@ -638,7 +638,7 @@ bool daObjYOUSEI_c::CheckWater() { gnd_chk.SetPos(&pos); pos.y = dComIfG_Bgsp().GroundCross(&gnd_chk); - if (-1000000000.0f != pos.y && dComIfG_Bgsp().GetPolyAtt0(gnd_chk) == 7 && current.pos.y - pos.y < 50.0f+ yREG_F(0)) { + if (-G_CM3D_F_INF != pos.y && dComIfG_Bgsp().GetPolyAtt0(gnd_chk) == 7 && current.pos.y - pos.y < 50.0f+ yREG_F(0)) { return true; } diff --git a/src/d/actor/d_a_obj_ystone.cpp b/src/d/actor/d_a_obj_ystone.cpp index b9211d8c3d..a6d4f9338c 100644 --- a/src/d/actor/d_a_obj_ystone.cpp +++ b/src/d/actor/d_a_obj_ystone.cpp @@ -3,7 +3,7 @@ * Object - Dungeon Prize */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_ystone.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_zcloth.cpp b/src/d/actor/d_a_obj_zcloth.cpp index 275b0982df..5645d30d1d 100644 --- a/src/d/actor/d_a_obj_zcloth.cpp +++ b/src/d/actor/d_a_obj_zcloth.cpp @@ -3,7 +3,7 @@ * Object - Zora Armor */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zcloth.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_obj_zdoor.cpp b/src/d/actor/d_a_obj_zdoor.cpp index 247df2b663..4729f901c8 100644 --- a/src/d/actor/d_a_obj_zdoor.cpp +++ b/src/d/actor/d_a_obj_zdoor.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zdoor.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_obj_zrTurara.cpp b/src/d/actor/d_a_obj_zrTurara.cpp index 474b0bdde1..bca609b134 100644 --- a/src/d/actor/d_a_obj_zrTurara.cpp +++ b/src/d/actor/d_a_obj_zrTurara.cpp @@ -3,7 +3,7 @@ * Object - Zora River Stalactite */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zrTurara.h" #include "d/d_bg_w.h" diff --git a/src/d/actor/d_a_obj_zrTuraraRock.cpp b/src/d/actor/d_a_obj_zrTuraraRock.cpp index b75b73da95..19ff5e5d10 100644 --- a/src/d/actor/d_a_obj_zrTuraraRock.cpp +++ b/src/d/actor/d_a_obj_zrTuraraRock.cpp @@ -3,7 +3,7 @@ * Object - Zora River Stalactite Debris */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zrTuraraRock.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_zraMark.cpp b/src/d/actor/d_a_obj_zraMark.cpp index 4827f00154..46e45a33cb 100644 --- a/src/d/actor/d_a_obj_zraMark.cpp +++ b/src/d/actor/d_a_obj_zraMark.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zraMark.h" #include "SSystem/SComponent/c_lib.h" @@ -84,7 +84,7 @@ int daObjZraMark_c::Create() { /* 80D4287C-80D42A7C 00029C 0200+00 1/1 0/0 0/0 .text CreateHeap__14daObjZraMark_cFv */ int daObjZraMark_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[0], l_arcIdx[mType]); - JUT_ASSERT(0x176, modelData != 0); + JUT_ASSERT(0x176, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return 0; @@ -389,7 +389,7 @@ BOOL _ZraMark_Hahen_c::loadModel() { static const int sHahenBmdType[] = {7, 8}; J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName[0], sHahenBmdType[getColor()]); - JUT_ASSERT(0x428, modelData != 0); + JUT_ASSERT(0x428, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { // "--------------Can't load Fragment Model\n" diff --git a/src/d/actor/d_a_obj_zra_freeze.cpp b/src/d/actor/d_a_obj_zra_freeze.cpp index 61deed1396..daa81bc4a5 100644 --- a/src/d/actor/d_a_obj_zra_freeze.cpp +++ b/src/d/actor/d_a_obj_zra_freeze.cpp @@ -3,7 +3,7 @@ * Object - Frozen Zora */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zra_freeze.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_obj_zra_rock.cpp b/src/d/actor/d_a_obj_zra_rock.cpp index 44ab719bff..683e1bb39e 100644 --- a/src/d/actor/d_a_obj_zra_rock.cpp +++ b/src/d/actor/d_a_obj_zra_rock.cpp @@ -3,7 +3,7 @@ * Zora Rock (Graveyard) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_obj_zra_rock.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_passer_mng.cpp b/src/d/actor/d_a_passer_mng.cpp index afa1db6ed2..b852b1d993 100644 --- a/src/d/actor/d_a_passer_mng.cpp +++ b/src/d/actor/d_a_passer_mng.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_passer_mng.h" #include "d/d_com_inf_game.h" @@ -537,7 +537,7 @@ int daPasserMng_c::create() { void daPasserMng_c::create_init() { npcId = getDetailLevel() == 0 ? PROC_NPC_PASSER : PROC_NPC_PASSER2; mPath = dPath_GetRoomPath(getPathID(), fopAcM_GetHomeRoomNo(this)); - JUT_ASSERT(542, mPath != 0); + JUT_ASSERT(542, mPath != NULL); dPnt* pnt0 = dPath_GetPnt(mPath, 0); dPnt* pnt1 = dPath_GetPnt(mPath, 1); current.pos.set(pnt0->m_position); diff --git a/src/d/actor/d_a_path_line.cpp b/src/d/actor/d_a_path_line.cpp index 665ff34aa3..d05e3f357d 100644 --- a/src/d/actor/d_a_path_line.cpp +++ b/src/d/actor/d_a_path_line.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_path_line.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_peru.cpp b/src/d/actor/d_a_peru.cpp index d2ae78a962..c3dcf6e64e 100644 --- a/src/d/actor/d_a_peru.cpp +++ b/src/d/actor/d_a_peru.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_peru.h" #include "Z2AudioLib/Z2Instances.h" @@ -227,7 +227,7 @@ int daPeru_c::CreateHeap() { } J3DModelData* mdlData_p = (J3DModelData*)dComIfG_getObjectRes(l_resNameList[l_bmdData[idx][1]], l_bmdData[idx][0]); - JUT_ASSERT(660, 0 != mdlData_p); + JUT_ASSERT(660, NULL != mdlData_p); mpMorf[0] = new mDoExt_McaMorfSO(mdlData_p, NULL, NULL, NULL, -1, 1.0f, 0, -1, &mSound, 0x80000, 0x11020284); if (mpMorf[0] != NULL && mpMorf[0]->getModel() == NULL) { diff --git a/src/d/actor/d_a_player.cpp b/src/d/actor/d_a_player.cpp index 3a085b8fe5..d8829057eb 100644 --- a/src/d/actor/d_a_player.cpp +++ b/src/d/actor/d_a_player.cpp @@ -3,7 +3,7 @@ * Base Player Actor functionality */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player.h" #include "JSystem/J3DGraphLoader/J3DAnmLoader.h" diff --git a/src/d/actor/d_a_ppolamp.cpp b/src/d/actor/d_a_ppolamp.cpp index ea14258e8f..03c2b73146 100644 --- a/src/d/actor/d_a_ppolamp.cpp +++ b/src/d/actor/d_a_ppolamp.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ppolamp.h" #include "Z2AudioLib/Z2Instances.h" @@ -113,21 +113,21 @@ void daPPolamp_c::setPclModelMtx() { /* 80D4CE9C-80D4CFB0 0005DC 0114+00 1/1 0/0 0/0 .text createHeap__11daPPolamp_cFv */ int daPPolamp_c::createHeap() { J3DModelData* a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(347, a_model_data_p != 0); + JUT_ASSERT(347, a_model_data_p != NULL); mModel1 = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084); if (mModel1 == NULL) { return 0; } a_model_data_p = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 7); - JUT_ASSERT(360, a_model_data_p != 0); + JUT_ASSERT(360, a_model_data_p != NULL); mModel2 = mDoExt_J3DModel__create(a_model_data_p, 0x80000, 0x11000084); if (mModel2 == NULL) { return 0; } J3DAnmTransform* a_bck_p = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, 4); - JUT_ASSERT(372, a_bck_p != 0); + JUT_ASSERT(372, a_bck_p != NULL); if (mBck.init(a_bck_p, 1, 2, 1.0f, 0, -1, false) == 0) { return 0; } diff --git a/src/d/actor/d_a_scene_exit.cpp b/src/d/actor/d_a_scene_exit.cpp index a82b751f86..b2b8998dd6 100644 --- a/src/d/actor/d_a_scene_exit.cpp +++ b/src/d/actor/d_a_scene_exit.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_scene_exit.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_scene_exit2.cpp b/src/d/actor/d_a_scene_exit2.cpp index db23b170b4..d4edd5899f 100644 --- a/src/d/actor/d_a_scene_exit2.cpp +++ b/src/d/actor/d_a_scene_exit2.cpp @@ -3,7 +3,7 @@ * Grotto Scene Exit trigger */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_scene_exit2.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_set_bgobj.cpp b/src/d/actor/d_a_set_bgobj.cpp index 7ffb36efb1..c6de6c748b 100644 --- a/src/d/actor/d_a_set_bgobj.cpp +++ b/src/d/actor/d_a_set_bgobj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_set_bgobj.h" #include "stdio.h" diff --git a/src/d/actor/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp index 987dd2a55a..fea0ed3593 100644 --- a/src/d/actor/d_a_shop_item.cpp +++ b/src/d/actor/d_a_shop_item.cpp @@ -3,7 +3,7 @@ * Shop Item Actor */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_shop_item.h" #include "JSystem/JKernel/JKRSolidHeap.h" diff --git a/src/d/actor/d_a_skip_2D.cpp b/src/d/actor/d_a_skip_2D.cpp index 9d94c36c0d..dfb7a0bbe7 100644 --- a/src/d/actor/d_a_skip_2D.cpp +++ b/src/d/actor/d_a_skip_2D.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_skip_2D.h" #include "d/d_meter_button.h" diff --git a/src/d/actor/d_a_spinner.cpp b/src/d/actor/d_a_spinner.cpp index b64fafd04b..2f69b5a26b 100644 --- a/src/d/actor/d_a_spinner.cpp +++ b/src/d/actor/d_a_spinner.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_spinner.h" #include "d/actor/d_a_tag_sppath.h" @@ -125,7 +125,7 @@ static int daSpinner_Delete(daSpinner_c* i_this) { /* 804D21E0-804D2278 000940 0098+00 2/2 0/0 0/0 .text setRoomInfo__11daSpinner_cFv */ void daSpinner_c::setRoomInfo() { int roomNo; - if (mAcch.GetGroundH() != -1000000000.0f) { + if (mAcch.GetGroundH() != -G_CM3D_F_INF) { roomNo = dComIfG_Bgsp().GetRoomId(mAcch.m_gnd); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mAcch.m_gnd); } else { diff --git a/src/d/actor/d_a_sq.cpp b/src/d/actor/d_a_sq.cpp index c1212afd45..3f2e8483ba 100644 --- a/src/d/actor/d_a_sq.cpp +++ b/src/d/actor/d_a_sq.cpp @@ -3,7 +3,7 @@ * Squirrel */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_sq.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_startAndGoal.cpp b/src/d/actor/d_a_startAndGoal.cpp index 3d7cbf1beb..4af0a34339 100644 --- a/src/d/actor/d_a_startAndGoal.cpp +++ b/src/d/actor/d_a_startAndGoal.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_startAndGoal.h" #include "d/actor/d_a_npc.h" @@ -100,7 +100,7 @@ void daStartAndGoal_c::init() { mPath.initialize(); mPath.setPathInfo(fopAcM_GetParam(this) >> 8, fopAcM_GetRoomNo(this), 0); - JUT_ASSERT(0, 0 != mPath.getPathInfo()); + JUT_ASSERT(0, NULL != mPath.getPathInfo()); if (dComIfG_getTimerPtr() == NULL) { dTimer_createTimer(l_timerType[mType].mode, 9999000, l_timerType[mType].type, 0, 210.0f, diff --git a/src/d/actor/d_a_suspend.cpp b/src/d/actor/d_a_suspend.cpp index 2a179c6892..cc35caa597 100644 --- a/src/d/actor/d_a_suspend.cpp +++ b/src/d/actor/d_a_suspend.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_suspend.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_swBall.cpp b/src/d/actor/d_a_swBall.cpp index 629b101561..ac954a13c9 100644 --- a/src/d/actor/d_a_swBall.cpp +++ b/src/d/actor/d_a_swBall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swBall.h" #include "d/actor/d_a_obj_carry.h" diff --git a/src/d/actor/d_a_swLBall.cpp b/src/d/actor/d_a_swLBall.cpp index caf5e6027e..dc6ad78be9 100644 --- a/src/d/actor/d_a_swLBall.cpp +++ b/src/d/actor/d_a_swLBall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swLBall.h" #include "SSystem/SComponent/c_phase.h" diff --git a/src/d/actor/d_a_swTime.cpp b/src/d/actor/d_a_swTime.cpp index f50719da02..3bf92988d9 100644 --- a/src/d/actor/d_a_swTime.cpp +++ b/src/d/actor/d_a_swTime.cpp @@ -3,7 +3,7 @@ * Switch Time */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swTime.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp index 4718455646..126a6441e3 100644 --- a/src/d/actor/d_a_swc00.cpp +++ b/src/d/actor/d_a_swc00.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swc00.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp index b22b9e6609..89ad9cddd1 100644 --- a/src/d/actor/d_a_swhit0.cpp +++ b/src/d/actor/d_a_swhit0.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_swhit0.h" #include "d/d_com_inf_game.h" @@ -69,7 +69,7 @@ void daSwhit0_c::makeEventId() { /* 804860EC-80486214 00016C 0128+00 1/1 0/0 0/0 .text CreateHeap__10daSwhit0_cFv */ int daSwhit0_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 8); - JUT_ASSERT(193, modelData != 0); + JUT_ASSERT(193, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000202); if (mpModel == NULL) { diff --git a/src/d/actor/d_a_tag_CstaSw.cpp b/src/d/actor/d_a_tag_CstaSw.cpp index c46676d22f..893ff1253b 100644 --- a/src/d/actor/d_a_tag_CstaSw.cpp +++ b/src/d/actor/d_a_tag_CstaSw.cpp @@ -3,7 +3,7 @@ * Overworld Statue switch trigger */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_CstaSw.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_Lv6Gate.cpp b/src/d/actor/d_a_tag_Lv6Gate.cpp index b5230d35a1..a77f134168 100644 --- a/src/d/actor/d_a_tag_Lv6Gate.cpp +++ b/src/d/actor/d_a_tag_Lv6Gate.cpp @@ -3,7 +3,7 @@ // Temple of Time Gate // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_Lv6Gate.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_tag_Lv7Gate.cpp b/src/d/actor/d_a_tag_Lv7Gate.cpp index 3e9019f025..8e380ec461 100644 --- a/src/d/actor/d_a_tag_Lv7Gate.cpp +++ b/src/d/actor/d_a_tag_Lv7Gate.cpp @@ -3,7 +3,7 @@ // City in the Sky Gate // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_Lv7Gate.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_Lv8Gate.cpp b/src/d/actor/d_a_tag_Lv8Gate.cpp index 9570535d20..57c978c092 100644 --- a/src/d/actor/d_a_tag_Lv8Gate.cpp +++ b/src/d/actor/d_a_tag_Lv8Gate.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_Lv8Gate // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_Lv8Gate.h" diff --git a/src/d/actor/d_a_tag_TWgate.cpp b/src/d/actor/d_a_tag_TWgate.cpp index 62bb8c092b..25297601e5 100644 --- a/src/d/actor/d_a_tag_TWgate.cpp +++ b/src/d/actor/d_a_tag_TWgate.cpp @@ -2,7 +2,7 @@ // d_a_tag_TWgate // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_TWgate.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_ajnot.cpp b/src/d/actor/d_a_tag_ajnot.cpp index 8714ac934d..abe8a037e0 100644 --- a/src/d/actor/d_a_tag_ajnot.cpp +++ b/src/d/actor/d_a_tag_ajnot.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_ajnot.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_allmato.cpp b/src/d/actor/d_a_tag_allmato.cpp index cfc26225a2..194c45b4cf 100644 --- a/src/d/actor/d_a_tag_allmato.cpp +++ b/src/d/actor/d_a_tag_allmato.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_allmato.h" #include "d/actor/d_a_obj_itamato.h" @@ -94,7 +94,7 @@ int daTag_AllMato_c::Execute() { case 1: case 2: actor_p = mBrkMatoActorMngr.getActorP(); - JUT_ASSERT(164, 0 != actor_p); + JUT_ASSERT(164, NULL != actor_p); if (((daObj_BouMato_c*)actor_p)->getTgHitAcId() != fpcM_ERROR_PROCESS_ID_e) { if (daNpcT_chkEvtBit(76)) { @@ -148,7 +148,7 @@ int daTag_AllMato_c::Execute() { if (dComIfGp_getEventManager().getIsAddvance(staff_id)) { actor_p = mBrkMatoActorMngr.getActorP(); - JUT_ASSERT(218, 0 != actor_p); + JUT_ASSERT(218, NULL != actor_p); dComIfGp_getEvent().setPt2(mBrkMatoActorMngr.getActorP()); @@ -158,7 +158,7 @@ int daTag_AllMato_c::Execute() { case 2: camera_id = dComIfGp_getPlayerCameraID(0); camera_p = dComIfGp_getCamera(camera_id); - JUT_ASSERT(228, 0 != camera_p); + JUT_ASSERT(228, NULL != camera_p); dComIfGp_saveCameraPosition(0, fopCamM_GetCenter_p(camera_p), @@ -207,7 +207,7 @@ int daTag_AllMato_c::Execute() { break; case 3: actor_p = mBrkMatoActorMngr.getActorP(); - JUT_ASSERT(292, 0 != actor_p); + JUT_ASSERT(292, NULL != actor_p); if (field_0x1d10 == 0) { switch (((daObj_ItaMato_c*)actor_p)->getNo()) { @@ -229,7 +229,7 @@ int daTag_AllMato_c::Execute() { switch (field_0x1d08) { case 4: actor_p = mBrkMatoActorMngr.getActorP(); - JUT_ASSERT(320, 0 != actor_p) + JUT_ASSERT(320, NULL != actor_p) switch (((daObj_ItaMato_c*)actor_p)->getNo()) { case 1: diff --git a/src/d/actor/d_a_tag_arena.cpp b/src/d/actor/d_a_tag_arena.cpp index 8bad46b6d2..257d43b351 100644 --- a/src/d/actor/d_a_tag_arena.cpp +++ b/src/d/actor/d_a_tag_arena.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_arena.h" diff --git a/src/d/actor/d_a_tag_assistance.cpp b/src/d/actor/d_a_tag_assistance.cpp index dc91e53fbf..f347a04bf6 100644 --- a/src/d/actor/d_a_tag_assistance.cpp +++ b/src/d/actor/d_a_tag_assistance.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_assistance.h" diff --git a/src/d/actor/d_a_tag_attack_item.cpp b/src/d/actor/d_a_tag_attack_item.cpp index ca2f515c16..5a7f51b3c0 100644 --- a/src/d/actor/d_a_tag_attack_item.cpp +++ b/src/d/actor/d_a_tag_attack_item.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_attack_item // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_attack_item.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp index 6e8c964de7..db5ad5bbdc 100644 --- a/src/d/actor/d_a_tag_attention.cpp +++ b/src/d/actor/d_a_tag_attention.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_attention.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_bottle_item.cpp b/src/d/actor/d_a_tag_bottle_item.cpp index 5600a025b8..3047f24300 100644 --- a/src/d/actor/d_a_tag_bottle_item.cpp +++ b/src/d/actor/d_a_tag_bottle_item.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_bottle_item.h" #include "d/d_item.h" diff --git a/src/d/actor/d_a_tag_camera.cpp b/src/d/actor/d_a_tag_camera.cpp index 84ba237b34..71990aa08b 100644 --- a/src/d/actor/d_a_tag_camera.cpp +++ b/src/d/actor/d_a_tag_camera.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_camera // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_camera.h" #include "cmath.h" diff --git a/src/d/actor/d_a_tag_chgrestart.cpp b/src/d/actor/d_a_tag_chgrestart.cpp index d1c9bb435b..64c6f74fa4 100644 --- a/src/d/actor/d_a_tag_chgrestart.cpp +++ b/src/d/actor/d_a_tag_chgrestart.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_chgrestart.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_chkpoint.cpp b/src/d/actor/d_a_tag_chkpoint.cpp index c4eced456e..524171d11c 100644 --- a/src/d/actor/d_a_tag_chkpoint.cpp +++ b/src/d/actor/d_a_tag_chkpoint.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_chkpoint.h" #include diff --git a/src/d/actor/d_a_tag_csw.cpp b/src/d/actor/d_a_tag_csw.cpp index 477086f97d..c98296617c 100644 --- a/src/d/actor/d_a_tag_csw.cpp +++ b/src/d/actor/d_a_tag_csw.cpp @@ -2,7 +2,7 @@ // d_a_tag_csw // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_csw.h" #include "d/actor/d_a_cstatue.h" @@ -93,13 +93,13 @@ void daTagCsw_c::setMtx() { /* 80D56EF8-80D572B8 000398 03C0+00 1/1 0/0 0/0 .text createHeap__10daTagCsw_cFv */ int daTagCsw_c::createHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 5); - JUT_ASSERT(303, modelData != 0); + JUT_ASSERT(303, modelData != NULL); field_0x574 = mDoExt_J3DModel__create(modelData, 0, 0x11000084); if (field_0x574 == NULL) { return 0; } modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, 6); - JUT_ASSERT(314, modelData != 0); + JUT_ASSERT(314, modelData != NULL); if (field_0x570 == 0 && getSw() == 6) { field_0x578 = NULL; } else { diff --git a/src/d/actor/d_a_tag_escape.cpp b/src/d/actor/d_a_tag_escape.cpp index b8a4c79387..8645f03dbe 100644 --- a/src/d/actor/d_a_tag_escape.cpp +++ b/src/d/actor/d_a_tag_escape.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_escape.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp index 866c5c8fdd..17213fb649 100644 --- a/src/d/actor/d_a_tag_event.cpp +++ b/src/d/actor/d_a_tag_event.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_event // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_event.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_evt.cpp b/src/d/actor/d_a_tag_evt.cpp index 05fefcb44f..88d62d0d63 100644 --- a/src/d/actor/d_a_tag_evt.cpp +++ b/src/d/actor/d_a_tag_evt.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_evt // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_evt.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_evtarea.cpp b/src/d/actor/d_a_tag_evtarea.cpp index f4358c1764..1d3eb42b57 100644 --- a/src/d/actor/d_a_tag_evtarea.cpp +++ b/src/d/actor/d_a_tag_evtarea.cpp @@ -2,7 +2,7 @@ // Tag: Event Area // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_evtarea.h" #include "d/actor/d_a_npc.h" diff --git a/src/d/actor/d_a_tag_evtmsg.cpp b/src/d/actor/d_a_tag_evtmsg.cpp index 3777793ba6..b4c35a5bf3 100644 --- a/src/d/actor/d_a_tag_evtmsg.cpp +++ b/src/d/actor/d_a_tag_evtmsg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_evtmsg.h" #include "d/actor/d_a_npc.h" diff --git a/src/d/actor/d_a_tag_firewall.cpp b/src/d/actor/d_a_tag_firewall.cpp index f26e5116a0..0662f8ae05 100644 --- a/src/d/actor/d_a_tag_firewall.cpp +++ b/src/d/actor/d_a_tag_firewall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_firewall.h" #include "cmath.h" diff --git a/src/d/actor/d_a_tag_gra.cpp b/src/d/actor/d_a_tag_gra.cpp index 26caf4dfb4..e2bb35b93a 100644 --- a/src/d/actor/d_a_tag_gra.cpp +++ b/src/d/actor/d_a_tag_gra.cpp @@ -3,7 +3,7 @@ * Tag - Goron A */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_gra.h" diff --git a/src/d/actor/d_a_tag_gstart.cpp b/src/d/actor/d_a_tag_gstart.cpp index 0272b512ec..e1f7320264 100644 --- a/src/d/actor/d_a_tag_gstart.cpp +++ b/src/d/actor/d_a_tag_gstart.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_gstart.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_guard.cpp b/src/d/actor/d_a_tag_guard.cpp index 5ca0f5df42..a98f4e6666 100644 --- a/src/d/actor/d_a_tag_guard.cpp +++ b/src/d/actor/d_a_tag_guard.cpp @@ -3,7 +3,7 @@ * Tag - Guard */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_guard.h" #include "d/d_stage.h" diff --git a/src/d/actor/d_a_tag_hinit.cpp b/src/d/actor/d_a_tag_hinit.cpp index 14436a133a..dad91fee6f 100644 --- a/src/d/actor/d_a_tag_hinit.cpp +++ b/src/d/actor/d_a_tag_hinit.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_hinit.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_tag_hjump.cpp b/src/d/actor/d_a_tag_hjump.cpp index ecd7c5cf19..550eacbc2d 100644 --- a/src/d/actor/d_a_tag_hjump.cpp +++ b/src/d/actor/d_a_tag_hjump.cpp @@ -3,7 +3,7 @@ * Epona fence jump trigger / object */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_hjump.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_tag_howl.cpp b/src/d/actor/d_a_tag_howl.cpp index b7dd65d708..38fc0685fa 100644 --- a/src/d/actor/d_a_tag_howl.cpp +++ b/src/d/actor/d_a_tag_howl.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_howl.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_hstop.cpp b/src/d/actor/d_a_tag_hstop.cpp index e0b82f828a..a6ed4c10d1 100644 --- a/src/d/actor/d_a_tag_hstop.cpp +++ b/src/d/actor/d_a_tag_hstop.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_hstop.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_instruction.cpp b/src/d/actor/d_a_tag_instruction.cpp index 6be81633a1..ee6df800c9 100644 --- a/src/d/actor/d_a_tag_instruction.cpp +++ b/src/d/actor/d_a_tag_instruction.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_instruction.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_kago_fall.cpp b/src/d/actor/d_a_tag_kago_fall.cpp index 6331c14015..3f904887a3 100644 --- a/src/d/actor/d_a_tag_kago_fall.cpp +++ b/src/d/actor/d_a_tag_kago_fall.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_kago_fall // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_kago_fall.h" diff --git a/src/d/actor/d_a_tag_kmsg.cpp b/src/d/actor/d_a_tag_kmsg.cpp index d28d6297a8..4e80722d56 100644 --- a/src/d/actor/d_a_tag_kmsg.cpp +++ b/src/d/actor/d_a_tag_kmsg.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_kmsg // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_kmsg.h" #include "d/actor/d_a_npc.h" @@ -86,7 +86,7 @@ int daTag_KMsg_c::Execute() { attention_info.distances[fopAc_attn_TALK_e] = daNpcT_getDistTableIdx(getTalkAngle(), getTalkDis()); #endif attention_info.distances[fopAc_attn_SPEAK_e] = attention_info.distances[fopAc_attn_TALK_e]; - if (getAttnPosOffset() != 1000000000.0f) { + if (getAttnPosOffset() != G_CM3D_F_INF) { attention_info.flags = fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e; } else { attention_info.flags = fopAc_AttnFlag_SPEAK_e; @@ -165,7 +165,7 @@ int daTag_KMsg_c::Execute() { } if (getType() == KMSG_TYPE_3) { attention_info.position = current.pos; - if (getAttnPosOffset() != 1000000000.0f) { + if (getAttnPosOffset() != G_CM3D_F_INF) { attention_info.position.y += getAttnPosOffset(); } eyePos = current.pos; @@ -175,7 +175,7 @@ int daTag_KMsg_c::Execute() { attention_info.position.y += scale.y; } eyePos = attention_info.position; - if (getAttnPosOffset() != 1000000000.0f) { + if (getAttnPosOffset() != G_CM3D_F_INF) { attention_info.position.y += getAttnPosOffset(); } eyePos.y += getEyePosOffset(); @@ -184,7 +184,7 @@ int daTag_KMsg_c::Execute() { #if VERSION != VERSION_SHIELD_DEBUG if (var_r28) { f32 f31; - if (getAttnPosOffset() != 1000000000.0f) { + if (getAttnPosOffset() != G_CM3D_F_INF) { f31 = -0.5f * getAttnPosOffset(); } else { f31 = -20.0f; diff --git a/src/d/actor/d_a_tag_lantern.cpp b/src/d/actor/d_a_tag_lantern.cpp index 9754370c0b..3263404d6e 100644 --- a/src/d/actor/d_a_tag_lantern.cpp +++ b/src/d/actor/d_a_tag_lantern.cpp @@ -3,7 +3,7 @@ * Tag - Lantern */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_lantern.h" #include "d/d_procname.h" @@ -48,7 +48,7 @@ int daTag_Lantern_c::Execute() { mGroundCross = dComIfG_Bgsp().GroundCross(&mGndChk); s32 room_no; - if (mGroundCross != -1000000000.0f) { + if (mGroundCross != -G_CM3D_F_INF) { room_no = dComIfG_Bgsp().GetRoomId(mGndChk); tevStr.YukaCol = dComIfG_Bgsp().GetPolyColor(mGndChk); } else { diff --git a/src/d/actor/d_a_tag_lightball.cpp b/src/d/actor/d_a_tag_lightball.cpp index baffd339ef..55d694fd5b 100644 --- a/src/d/actor/d_a_tag_lightball.cpp +++ b/src/d/actor/d_a_tag_lightball.cpp @@ -1,6 +1,6 @@ // Translation Unit: d_a_tag_lightball -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_lightball.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_lv2prchk.cpp b/src/d/actor/d_a_tag_lv2prchk.cpp index 8c5a9e6f72..8226eac54f 100644 --- a/src/d/actor/d_a_tag_lv2prchk.cpp +++ b/src/d/actor/d_a_tag_lv2prchk.cpp @@ -3,7 +3,7 @@ * Boomerang Switch Puzzle Tag */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_lv2prchk.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_lv5soup.cpp b/src/d/actor/d_a_tag_lv5soup.cpp index 59bb67fe90..6d61f06bed 100644 --- a/src/d/actor/d_a_tag_lv5soup.cpp +++ b/src/d/actor/d_a_tag_lv5soup.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_lv5soup.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_lv6CstaSw.cpp b/src/d/actor/d_a_tag_lv6CstaSw.cpp index bbed14c993..6f77b88f84 100644 --- a/src/d/actor/d_a_tag_lv6CstaSw.cpp +++ b/src/d/actor/d_a_tag_lv6CstaSw.cpp @@ -3,7 +3,7 @@ * Temple of Time Statue switch trigger */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_lv6CstaSw.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_magne.cpp b/src/d/actor/d_a_tag_magne.cpp index 18adc3c556..31230dee09 100644 --- a/src/d/actor/d_a_tag_magne.cpp +++ b/src/d/actor/d_a_tag_magne.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_magne.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_mhint.cpp b/src/d/actor/d_a_tag_mhint.cpp index e17545bbac..5405a0640d 100644 --- a/src/d/actor/d_a_tag_mhint.cpp +++ b/src/d/actor/d_a_tag_mhint.cpp @@ -3,7 +3,7 @@ * Tag - Midna Hint */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_mhint.h" #include "d/actor/d_a_midna.h" diff --git a/src/d/actor/d_a_tag_mist.cpp b/src/d/actor/d_a_tag_mist.cpp index f453771b26..9c3e75a46f 100644 --- a/src/d/actor/d_a_tag_mist.cpp +++ b/src/d/actor/d_a_tag_mist.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_mist.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_mmsg.cpp b/src/d/actor/d_a_tag_mmsg.cpp index 38db26b385..64eec5271f 100644 --- a/src/d/actor/d_a_tag_mmsg.cpp +++ b/src/d/actor/d_a_tag_mmsg.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_mmsg // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_mmsg.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp index 4ec5eabdf1..c957f7bef2 100644 --- a/src/d/actor/d_a_tag_msg.cpp +++ b/src/d/actor/d_a_tag_msg.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_msg.h" #include "d/actor/d_a_player.h" @@ -125,7 +125,7 @@ int daTag_Msg_c::execute() { if (set_event && rangeCheck() && otherCheck()) { if (field_0x5dd) { mOrderEvtNum = 1; - JUT_ASSERT(0, 0 != l_evtNameTBL[mOrderEvtNum]); + JUT_ASSERT(0, NULL != l_evtNameTBL[mOrderEvtNum]); mEventIdx = dComIfGp_getEventManager().getEventIdx(this, l_evtNameTBL[mOrderEvtNum], 0xFF); diff --git a/src/d/actor/d_a_tag_mstop.cpp b/src/d/actor/d_a_tag_mstop.cpp index 9f8dfad528..df6104a610 100644 --- a/src/d/actor/d_a_tag_mstop.cpp +++ b/src/d/actor/d_a_tag_mstop.cpp @@ -3,7 +3,7 @@ * Tag - Midna Stop */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_mstop.h" #include "d/actor/d_a_midna.h" diff --git a/src/d/actor/d_a_tag_mwait.cpp b/src/d/actor/d_a_tag_mwait.cpp index ec424a10d9..8e20a9c444 100644 --- a/src/d/actor/d_a_tag_mwait.cpp +++ b/src/d/actor/d_a_tag_mwait.cpp @@ -3,7 +3,7 @@ * Midna Wait Trigger */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_mwait.h" #include "d/actor/d_a_midna.h" diff --git a/src/d/actor/d_a_tag_myna2.cpp b/src/d/actor/d_a_tag_myna2.cpp index 4adf8e616e..76fbc6d601 100644 --- a/src/d/actor/d_a_tag_myna2.cpp +++ b/src/d/actor/d_a_tag_myna2.cpp @@ -3,7 +3,7 @@ * @brief Tag - Creates Plumm's actor. */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_myna2.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_myna_light.cpp b/src/d/actor/d_a_tag_myna_light.cpp index fcffb4ca5f..8c3bd58207 100644 --- a/src/d/actor/d_a_tag_myna_light.cpp +++ b/src/d/actor/d_a_tag_myna_light.cpp @@ -1,6 +1,6 @@ // Translation Unit: d_a_tag_myna_light -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_myna_light.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_pachi.cpp b/src/d/actor/d_a_tag_pachi.cpp index e664896c79..0c6dd1eab0 100644 --- a/src/d/actor/d_a_tag_pachi.cpp +++ b/src/d/actor/d_a_tag_pachi.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_pachi // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_pachi.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_poFire.cpp b/src/d/actor/d_a_tag_poFire.cpp index 51c334f799..77fbcdb2b3 100644 --- a/src/d/actor/d_a_tag_poFire.cpp +++ b/src/d/actor/d_a_tag_poFire.cpp @@ -3,7 +3,7 @@ * Tag - Poe Fire */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_poFire.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_push.cpp b/src/d/actor/d_a_tag_push.cpp index 85de77fa82..e5f9deba0c 100644 --- a/src/d/actor/d_a_tag_push.cpp +++ b/src/d/actor/d_a_tag_push.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tag_push // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_push.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_qs.cpp b/src/d/actor/d_a_tag_qs.cpp index 5d48e6beff..c4a15f24f5 100644 --- a/src/d/actor/d_a_tag_qs.cpp +++ b/src/d/actor/d_a_tag_qs.cpp @@ -2,7 +2,7 @@ // d_a_tag_qs // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_qs.h" #include "d/actor/d_a_obj_carry.h" diff --git a/src/d/actor/d_a_tag_ret_room.cpp b/src/d/actor/d_a_tag_ret_room.cpp index 0c5cc284e8..bf1d0e5373 100644 --- a/src/d/actor/d_a_tag_ret_room.cpp +++ b/src/d/actor/d_a_tag_ret_room.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_ret_room.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_river_back.cpp b/src/d/actor/d_a_tag_river_back.cpp index 5955a338aa..145fb44f4e 100644 --- a/src/d/actor/d_a_tag_river_back.cpp +++ b/src/d/actor/d_a_tag_river_back.cpp @@ -3,7 +3,7 @@ * Tag - River Back */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_river_back.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_rmbit_sw.cpp b/src/d/actor/d_a_tag_rmbit_sw.cpp index 4ae87dba40..86b1db96a6 100644 --- a/src/d/actor/d_a_tag_rmbit_sw.cpp +++ b/src/d/actor/d_a_tag_rmbit_sw.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_rmbit_sw.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_schedule.cpp b/src/d/actor/d_a_tag_schedule.cpp index 89e4077857..fa58d27626 100644 --- a/src/d/actor/d_a_tag_schedule.cpp +++ b/src/d/actor/d_a_tag_schedule.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_schedule.h" diff --git a/src/d/actor/d_a_tag_setBall.cpp b/src/d/actor/d_a_tag_setBall.cpp index a087409b17..5fcd7f37ef 100644 --- a/src/d/actor/d_a_tag_setBall.cpp +++ b/src/d/actor/d_a_tag_setBall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_setBall.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_setrestart.cpp b/src/d/actor/d_a_tag_setrestart.cpp index b9c8b52f64..bf94e70436 100644 --- a/src/d/actor/d_a_tag_setrestart.cpp +++ b/src/d/actor/d_a_tag_setrestart.cpp @@ -4,7 +4,7 @@ * Sets player room restart info */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_setrestart.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_shop_camera.cpp b/src/d/actor/d_a_tag_shop_camera.cpp index 3a7d974444..579f628510 100644 --- a/src/d/actor/d_a_tag_shop_camera.cpp +++ b/src/d/actor/d_a_tag_shop_camera.cpp @@ -3,7 +3,7 @@ * Tag - Shop Camera */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_shop_camera.h" #include "dol2asm.h" diff --git a/src/d/actor/d_a_tag_shop_item.cpp b/src/d/actor/d_a_tag_shop_item.cpp index 69ed81ad30..1351e1cb29 100644 --- a/src/d/actor/d_a_tag_shop_item.cpp +++ b/src/d/actor/d_a_tag_shop_item.cpp @@ -3,7 +3,7 @@ * Tag - Shop Item */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_shop_item.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_smk_emt.cpp b/src/d/actor/d_a_tag_smk_emt.cpp index b444b0f6c9..77a827557c 100644 --- a/src/d/actor/d_a_tag_smk_emt.cpp +++ b/src/d/actor/d_a_tag_smk_emt.cpp @@ -3,7 +3,7 @@ * Tag - Smoke Emit */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_smk_emt.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_spinner.cpp b/src/d/actor/d_a_tag_spinner.cpp index d005b39fc1..070e17ae98 100644 --- a/src/d/actor/d_a_tag_spinner.cpp +++ b/src/d/actor/d_a_tag_spinner.cpp @@ -3,7 +3,7 @@ * Tag - Spinner */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_spinner.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_sppath.cpp b/src/d/actor/d_a_tag_sppath.cpp index f0613450cd..351185f925 100644 --- a/src/d/actor/d_a_tag_sppath.cpp +++ b/src/d/actor/d_a_tag_sppath.cpp @@ -3,7 +3,7 @@ * Tag - Spinner Path */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_sppath.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_spring.cpp b/src/d/actor/d_a_tag_spring.cpp index f2b13a5108..2f4ebb0287 100644 --- a/src/d/actor/d_a_tag_spring.cpp +++ b/src/d/actor/d_a_tag_spring.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_spring.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_ss_drink.cpp b/src/d/actor/d_a_tag_ss_drink.cpp index 7d5abf8ff2..75f42d66e1 100644 --- a/src/d/actor/d_a_tag_ss_drink.cpp +++ b/src/d/actor/d_a_tag_ss_drink.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_ss_drink.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_statue_evt.cpp b/src/d/actor/d_a_tag_statue_evt.cpp index b57e38f4ad..d5078e6875 100644 --- a/src/d/actor/d_a_tag_statue_evt.cpp +++ b/src/d/actor/d_a_tag_statue_evt.cpp @@ -3,7 +3,7 @@ /* Owl Statue Event Tag -- Awarding Sky Characters */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_statue_evt.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_stream.cpp b/src/d/actor/d_a_tag_stream.cpp index 75d92a460b..edd2edd5b9 100644 --- a/src/d/actor/d_a_tag_stream.cpp +++ b/src/d/actor/d_a_tag_stream.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_stream.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/actor/d_a_tag_telop.cpp b/src/d/actor/d_a_tag_telop.cpp index 0249ed25fc..0e2e00259c 100644 --- a/src/d/actor/d_a_tag_telop.cpp +++ b/src/d/actor/d_a_tag_telop.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_telop.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/actor/d_a_tag_theB_hint.cpp b/src/d/actor/d_a_tag_theB_hint.cpp index e84b930858..0cd1b38910 100644 --- a/src/d/actor/d_a_tag_theB_hint.cpp +++ b/src/d/actor/d_a_tag_theB_hint.cpp @@ -3,7 +3,7 @@ * Tag - Telma B Hint */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_theB_hint.h" diff --git a/src/d/actor/d_a_tag_wara_howl.cpp b/src/d/actor/d_a_tag_wara_howl.cpp index 38c7f7feed..00615d642f 100644 --- a/src/d/actor/d_a_tag_wara_howl.cpp +++ b/src/d/actor/d_a_tag_wara_howl.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_wara_howl.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_tag_watchge.cpp b/src/d/actor/d_a_tag_watchge.cpp index 4779788e8a..9e423b6e86 100644 --- a/src/d/actor/d_a_tag_watchge.cpp +++ b/src/d/actor/d_a_tag_watchge.cpp @@ -3,7 +3,7 @@ * Tag - Guay */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_watchge.h" #include "d/d_procname.h" diff --git a/src/d/actor/d_a_tag_waterfall.cpp b/src/d/actor/d_a_tag_waterfall.cpp index c3e8121cc0..7adb958f6e 100644 --- a/src/d/actor/d_a_tag_waterfall.cpp +++ b/src/d/actor/d_a_tag_waterfall.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_waterfall.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_tag_wljump.cpp b/src/d/actor/d_a_tag_wljump.cpp index b91e7d6214..9a464c7783 100644 --- a/src/d/actor/d_a_tag_wljump.cpp +++ b/src/d/actor/d_a_tag_wljump.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_wljump.h" #include "d/d_path.h" diff --git a/src/d/actor/d_a_tag_yami.cpp b/src/d/actor/d_a_tag_yami.cpp index f5f88d4994..c780c90e96 100644 --- a/src/d/actor/d_a_tag_yami.cpp +++ b/src/d/actor/d_a_tag_yami.cpp @@ -3,7 +3,7 @@ * Tag - Yami (Twili) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tag_yami.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_talk.cpp b/src/d/actor/d_a_talk.cpp index 8e4d66bbe4..bbd59c3ea2 100644 --- a/src/d/actor/d_a_talk.cpp +++ b/src/d/actor/d_a_talk.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_talk.h" #include "d/d_msg_object.h" diff --git a/src/d/actor/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp index 483359809c..8cce789e6d 100644 --- a/src/d/actor/d_a_tbox.cpp +++ b/src/d/actor/d_a_tbox.cpp @@ -3,7 +3,7 @@ // Translation Unit: d_a_tbox // -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tbox.h" #include "d/d_tresure.h" @@ -89,7 +89,7 @@ cPhs__Step daTbox_c::commonShapeSet() { daTbox_ModelInfo* model_info = getModelInfo(); J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mModelResNo); - JUT_ASSERT(0x191, modelData != 0); + JUT_ASSERT(0x191, modelData != NULL); mpAnm = new mDoExt_bckAnm(); if (mpAnm == NULL) { @@ -114,7 +114,7 @@ cPhs__Step daTbox_c::commonShapeSet() { if (!strcmp(dComIfGp_getStartStageName(), "D_MN01B")) { // Deku Toad chest J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Dalways", 15); - JUT_ASSERT(0x1BD, modelData != 0); + JUT_ASSERT(0x1BD, modelData != NULL); mpSlimeModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpSlimeModel == NULL) { return cPhs_ERROR_e; @@ -123,7 +123,7 @@ cPhs__Step daTbox_c::commonShapeSet() { if (checkAppear()) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(model_info->mArcName, model_info->mEffectResNo); - JUT_ASSERT(0x1CE, modelData != 0); + JUT_ASSERT(0x1CE, modelData != NULL); mpEffectModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpEffectModel == NULL) { return cPhs_ERROR_e; @@ -135,7 +135,7 @@ cPhs__Step daTbox_c::commonShapeSet() { } J3DAnmTevRegKey* brk = (J3DAnmTevRegKey*)dComIfG_getObjectRes(model_info->mArcName, model_info->mBrkResNo); - JUT_ASSERT(0x1E1, brk != 0); + JUT_ASSERT(0x1E1, brk != NULL); if (!mpEffectAnm->init(modelData, brk, TRUE, J3DFrameCtrl::EMode_NONE, 0.0f, 0, -1)) { return cPhs_ERROR_e; } @@ -169,7 +169,7 @@ cPhs__Step daTbox_c::bgCheckSet() { daTbox_ModelInfo* model_info = getModelInfo(); cBgD_t* bgd = (cBgD_t*)dComIfG_getObjectRes(model_info->mArcName, model_info->mOpenDzbResNo); - JUT_ASSERT(0x210, bgd != 0); + JUT_ASSERT(528, bgd != NULL); mpOpenBgW = new dBgW(); if (mpOpenBgW == NULL) { return cPhs_ERROR_e; @@ -416,7 +416,7 @@ void daTbox_c::initPos() { int func_type = getFuncType(); if ((func_type == 6 && getSwType() == 15) || func_type == 7) { dPath* path_p = dPath_GetRoomPath(getPathId(), -1); - JUT_ASSERT(0x3B7, path_p != 0); + JUT_ASSERT(0x3B7, path_p != NULL); if (func_type == 6 && path_p->m_num != 2 && path_p->m_num != 3) { fopAcM_setWarningMessage(this, __FILE__, 0x3BD, "Num of Jump TBox's path point must be 2 or 3!"); @@ -649,7 +649,7 @@ void daTbox_c::dropProcInitCall() { /* 80492450-804928DC 001810 048C+00 1/1 0/0 0/0 .text dropProcInit__8daTbox_cFv */ void daTbox_c::dropProcInit() { dPath* path_p = dPath_GetRoomPath(getPathId(), -1); - JUT_ASSERT(0x56A, path_p != 0); + JUT_ASSERT(0x56A, path_p != NULL); cXyz pos = current.pos; cXyz pnt1 = path_p->m_points[1].m_position; @@ -668,7 +668,7 @@ void daTbox_c::dropProcInit() { cXyz pnt2(path_p->m_points[2].m_position); if (pos.y < pnt2.y) { OS_REPORT_ERROR("落下開始点より落下点の方が上にあります！！！\n"); - JUT_ASSERT(0x58F, 0); + JUT_ASSERT(1423, FALSE); } f32 delta_y1 = pos.y - pnt2.y; @@ -773,7 +773,7 @@ void daTbox_c::dropProcInit2() { } else { // "Falling Memory Treasure Chest: There's not 2 points!\n" OS_REPORT_ERROR("落下方向記憶宝箱：ポイントが２点ではありません！\n"); - JUT_ASSERT(0x641, 0); + JUT_ASSERT(1601, FALSE); } field_0x9c8 = temp / 19.0f; @@ -1410,7 +1410,7 @@ u8 daTbox_c::getBombItemNoMain(u8 i_itemNo) { default: // "Get Item: Wrong number of bomb bags!<%d>\n" OS_REPORT("\x1b[41;37mゲットアイテム：バクダン袋の数がおかしい！<%d>\n\x1b[m", bag_count); - JUT_ASSERT(0xABD, 0); + JUT_ASSERT(2749, FALSE); break; } @@ -1516,12 +1516,12 @@ void daTbox_c::settingDropDemoCamera() { player_camera->mCamera.Stop(); dStage_MapEvent_dt_c* maptooldata = dEvt_control_c::searchMapEventData(getEvent(), fopAcM_GetRoomNo(this)); - JUT_ASSERT(0xB89, maptooldata != 0); + JUT_ASSERT(0xB89, maptooldata != NULL); player_camera->mCamera.SetTrimSize(maptooldata->field_0x1); dStage_roomDt_c* roomdt = dComIfGp_roomControl_getStatusRoomDt(fopAcM_GetRoomNo(this)); - JUT_ASSERT(0xB8E, roomdt != 0); + JUT_ASSERT(0xB8E, roomdt != NULL); stage_camera_class* stage_camera = roomdt->getCamera(); stage_camera2_data_class* stage_camera_data = stage_camera->m_entries; @@ -1842,7 +1842,7 @@ cPhs__Step daTbox_c::create1st() { if (getShapeType() > 2) { OS_REPORT("\x1b[43;30mTbox Type Error!!!<%d>\n\x1b[m", getShapeType()); - JUT_ASSERT(0xDD8, 0); + JUT_ASSERT(3544, FALSE); } daTbox_ModelInfo* model_info = getModelInfo(); diff --git a/src/d/actor/d_a_tbox2.cpp b/src/d/actor/d_a_tbox2.cpp index 6668011a77..7c8d5cb9e7 100644 --- a/src/d/actor/d_a_tbox2.cpp +++ b/src/d/actor/d_a_tbox2.cpp @@ -3,7 +3,7 @@ * Treasure Chest (Opened state not saved) */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tbox2.h" #include "d/d_bg_w.h" @@ -112,7 +112,7 @@ int daTbox2_c::Create() { int daTbox2_c::CreateHeap() { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bmd_no); - JUT_ASSERT(0, modelData != 0); + JUT_ASSERT(0, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); if (mpModel == NULL) { return false; @@ -120,7 +120,7 @@ int daTbox2_c::CreateHeap() { J3DAnmTransform* pbck = (J3DAnmTransform*)dComIfG_getObjectRes(l_arcName, l_resInfo[mModelType].bck_no); - JUT_ASSERT(0, pbck != 0); + JUT_ASSERT(0, pbck != NULL); mpBck = new mDoExt_bckAnm(); if (mpBck == NULL || !mpBck->init(pbck, TRUE, J3DFrameCtrl::EMode_NONE, 1.0f, 0, -1, false)) { return false; diff --git a/src/d/actor/d_a_tboxSw.cpp b/src/d/actor/d_a_tboxSw.cpp index d7d8961277..f3a1642ce8 100644 --- a/src/d/actor/d_a_tboxSw.cpp +++ b/src/d/actor/d_a_tboxSw.cpp @@ -3,7 +3,7 @@ * Turns on a switch when a treasure chest is opened */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_tboxSw.h" #include "d/d_com_inf_game.h" diff --git a/src/d/actor/d_a_title.cpp b/src/d/actor/d_a_title.cpp index df42d70e34..84e53429e9 100644 --- a/src/d/actor/d_a_title.cpp +++ b/src/d/actor/d_a_title.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_title.h" #include "d/d_demo.h" @@ -279,7 +279,7 @@ void daTitle_c::nextScene_init() { void daTitle_c::nextScene_proc() { if (!fopOvlpM_IsPeek() && !mDoRst::isReset()) { scene_class* playScene = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); - JUT_ASSERT(706, playScene != 0); + JUT_ASSERT(706, playScene != NULL); fopScnM_ChangeReq(playScene, 13, 0, 5); #if VERSION != VERSION_SHIELD_DEBUG mDoGph_gInf_c::setFadeColor(*(JUtility::TColor*)&g_blackColor); diff --git a/src/d/actor/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp index af44150ce5..960d1445e6 100644 --- a/src/d/actor/d_a_vrbox.cpp +++ b/src/d/actor/d_a_vrbox.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_vrbox.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" diff --git a/src/d/actor/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp index 648ce483df..98762efa86 100644 --- a/src/d/actor/d_a_vrbox2.cpp +++ b/src/d/actor/d_a_vrbox2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_vrbox2.h" #include "d/d_com_inf_game.h" @@ -403,7 +403,7 @@ static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) { vrbox2_class* a_this = (vrbox2_class*)i_this; J3DModelData* modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_kumo.bmd"); - JUT_ASSERT(785, modelData != 0); + JUT_ASSERT(785, modelData != NULL); a_this->mpKumoModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11020202); @@ -412,12 +412,12 @@ static int daVrbox2_solidHeapCB(fopAc_ac_c* i_this) { sun_modelData = (J3DModelData*)dComIfG_getStageRes("vrbox_sun.bmd"); if (sun_modelData != NULL) { a_this->model2 = mDoExt_J3DModel__create(sun_modelData, 0x80000, 0x11020202); - JUT_ASSERT(809, a_this->model2 != 0); + JUT_ASSERT(809, a_this->model2 != NULL); a_this->model2_und = mDoExt_J3DModel__create(sun_modelData, 0x80000, 0x11020202); - JUT_ASSERT(820, a_this->model2_und != 0); + JUT_ASSERT(820, a_this->model2_und != NULL); J3DAnmTextureSRTKey* pbtk = (J3DAnmTextureSRTKey*)dComIfG_getStageRes("vrbox_sun.btk"); - JUT_ASSERT(825, pbtk != 0); + JUT_ASSERT(825, pbtk != NULL); if (!a_this->mSunBtk.init(sun_modelData, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { return 0; } diff --git a/src/d/actor/d_a_warp_bug.cpp b/src/d/actor/d_a_warp_bug.cpp index f691a603c5..91900370c1 100644 --- a/src/d/actor/d_a_warp_bug.cpp +++ b/src/d/actor/d_a_warp_bug.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_warp_bug.h" #include "d/actor/d_a_player.h" diff --git a/src/d/actor/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp index bdb88264ba..687205199b 100644 --- a/src/d/actor/d_a_ykgr.cpp +++ b/src/d/actor/d_a_ykgr.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel_rel.h" +#include "d/dolzel_rel.h" // IWYU pragma: keep #include "d/actor/d_a_ykgr.h" #include "f_op/f_op_actor.h" diff --git a/src/d/actor/d_flower.inc b/src/d/actor/d_flower.inc index f08767a1f7..f2bd9aae78 100644 --- a/src/d/actor/d_flower.inc +++ b/src/d/actor/d_flower.inc @@ -865,7 +865,7 @@ static f32 flowerCheckGroundY(cXyz& param_0) { f32 temp_f31 = dComIfG_Bgsp().GroundCross(&sp8); param_0.y -= 50.0f; - if (temp_f31 <= -1000000000.0f) { + if (temp_f31 <= -G_CM3D_F_INF) { return param_0.y; } else { return temp_f31; diff --git a/src/d/d_a_horse_static.cpp b/src/d/d_a_horse_static.cpp index d4e2e7a3f4..890a801669 100644 --- a/src/d/d_a_horse_static.cpp +++ b/src/d/d_a_horse_static.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/actor/d_a_horse_static // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_a_horse_static.h" #include "d/actor/d_a_e_wb.h" diff --git a/src/d/d_a_item_static.cpp b/src/d/d_a_item_static.cpp index 1c70be4703..d338e126cb 100644 --- a/src/d/d_a_item_static.cpp +++ b/src/d/d_a_item_static.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_a_item_static.h" diff --git a/src/d/d_a_itembase_static.cpp b/src/d/d_a_itembase_static.cpp index fba2bab746..876460634b 100644 --- a/src/d/d_a_itembase_static.cpp +++ b/src/d/d_a_itembase_static.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_a_itembase_static.h" #include "SSystem/SComponent/c_lib.h" diff --git a/src/d/d_a_obj.cpp b/src/d/d_a_obj.cpp index 7261a98064..2f661e697f 100644 --- a/src/d/d_a_obj.cpp +++ b/src/d/d_a_obj.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_a_obj.h" #include "SSystem/SComponent/c_math.h" @@ -121,7 +121,7 @@ void posMoveF_grade_acc(cXyz* pos, const fopAc_ac_c* i_actor, cXyz const* param_ void posMoveF_grade(fopAc_ac_c* i_actor, cXyz const* param_1, cXyz const* stream_spd, f32 param_3, f32 param_4, cXyz const* param_5, f32 friction, f32 no_grade_cos, cXyz const* param_8) { - JUT_ASSERT(0, stream_spd != 0); + JUT_ASSERT(0, stream_spd != NULL); cXyz spAC; posMoveF_resist_acc(&spAC, i_actor, stream_spd, param_3, param_4); diff --git a/src/d/d_a_shop_item_static.cpp b/src/d/d_a_shop_item_static.cpp index 3bdbcadf95..b09660a5d0 100644 --- a/src/d/d_a_shop_item_static.cpp +++ b/src/d/d_a_shop_item_static.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_a_shop_item_static.h" diff --git a/src/d/d_att_dist.cpp b/src/d/d_att_dist.cpp index 218a68a4a4..4116135965 100644 --- a/src/d/d_att_dist.cpp +++ b/src/d/d_att_dist.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_att_dist.h" #include "d/d_attention.h" diff --git a/src/d/d_attention.cpp b/src/d/d_attention.cpp index 8d8a652ebd..95fffaf762 100644 --- a/src/d/d_attention.cpp +++ b/src/d/d_attention.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_attention.h" #include "JSystem/JKernel/JKRSolidHeap.h" @@ -184,7 +184,7 @@ dAttention_c::dAttention_c(fopAc_ac_c* i_player, u32 i_padNo) { mAttnBlockTimer = 0; heap = mDoExt_createSolidHeapFromGameToCurrent(0x9000, 0); - JUT_ASSERT(0x198, heap != 0); + JUT_ASSERT(0x198, heap != NULL); J3DModelData* modelDataR = (J3DModelData*)dComIfG_getObjectRes("Always", 0x25); JUT_ASSERT(0x1BB, modelDataR); @@ -194,10 +194,10 @@ dAttention_c::dAttention_c(fopAc_ac_c* i_player, u32 i_padNo) { for (int i = 0; i < 2; i++) { draw[i].mModel[DRAW_TYPE_YELLOW] = mDoExt_J3DModel__create(modelDataY, 0x80000, 0x11000285); - JUT_ASSERT(0x1CA, draw[i].mModel[0] != 0); + JUT_ASSERT(0x1CA, draw[i].mModel[0] != NULL); draw[i].mModel[DRAW_TYPE_RED] = mDoExt_J3DModel__create(modelDataR, 0x80000, 0x11000285); - JUT_ASSERT(0x1D4, draw[i].mModel[1] != 0); + JUT_ASSERT(0x1D4, draw[i].mModel[1] != NULL); int res; res = draw[i].mNoticeCursorBck[DRAW_TYPE_YELLOW].init((J3DAnmTransform*)dComIfG_getObjectRes("Always", 0x11), TRUE, 2, 1.0f, 0, -1, false); diff --git a/src/d/d_bg_parts.cpp b/src/d/d_bg_parts.cpp index 43a5c1b285..a68c6a9643 100644 --- a/src/d/d_bg_parts.cpp +++ b/src/d/d_bg_parts.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J3DGraphAnimator/J3DAnimation.h" diff --git a/src/d/d_bg_pc.cpp b/src/d/d_bg_pc.cpp index 215779a1c4..071abd911e 100644 --- a/src/d/d_bg_pc.cpp +++ b/src/d/d_bg_pc.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_pc.h" diff --git a/src/d/d_bg_plc.cpp b/src/d/d_bg_plc.cpp index 3ac719fe61..c7ee8061f5 100644 --- a/src/d/d_bg_plc.cpp +++ b/src/d/d_bg_plc.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_plc.h" #include "JSystem/JUtility/JUTAssert.h" @@ -18,7 +18,7 @@ void dBgPlc::setBase(void* pbase) { /* 800740C4-800740DC 06EA04 0018+00 0/0 1/1 0/0 .text getCode__6dBgPlcCFiPP5sBgPc */ sBgPc* dBgPlc::getCode(int index, sBgPc** ppcode) const { - JUT_ASSERT(45, m_base != 0); + JUT_ASSERT(45, m_base != NULL); JUT_ASSERT(46, m_base->m_code_size == ZELDA_CODE_SIZE); JUT_ASSERT(47, index >= 0 && index< m_base->m_num); sBgPc* code = m_base->m_code; @@ -30,7 +30,7 @@ sBgPc* dBgPlc::getCode(int index, sBgPc** ppcode) const { /* 800740DC-800740F4 06EA1C 0018+00 0/0 1/1 0/0 .text getGrpCode__6dBgPlcCFi */ u32 dBgPlc::getGrpCode(int index) const { - JUT_ASSERT(62, m_base != 0); + JUT_ASSERT(62, m_base != NULL); JUT_ASSERT(63, m_base->m_code_size == ZELDA_CODE_SIZE); JUT_ASSERT(64, 0 <= index && index < m_base->m_num); sBgPc* code = m_base->m_code; diff --git a/src/d/d_bg_s.cpp b/src/d/d_bg_s.cpp index 99bff775de..bfd2f7f952 100644 --- a/src/d/d_bg_s.cpp +++ b/src/d/d_bg_s.cpp @@ -3,7 +3,7 @@ * Background (Map) Collision main handler */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s.h" #include "d/d_bg_s_sph_chk.h" @@ -131,7 +131,7 @@ bool cBgS::LineCross(cBgS_LinChk* p_line) { /* 800744A0-80074578 06EDE0 00D8+00 0/0 51/51 231/231 .text GroundCross__4cBgSFP11cBgS_GndChk */ f32 cBgS::GroundCross(cBgS_GndChk* p_gnd) { - p_gnd->SetNowY(-1000000000.0f); + p_gnd->SetNowY(-G_CM3D_F_INF); p_gnd->ClearPi(); p_gnd->PreCheck(); diff --git a/src/d/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp index 17faae6d6d..e071ae90bd 100644 --- a/src/d/d_bg_s_acch.cpp +++ b/src/d/d_bg_s_acch.cpp @@ -3,7 +3,7 @@ * BG collision Actor Check */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_player.h" #include "d/d_bg_s.h" @@ -64,7 +64,7 @@ dBgS_Acch::dBgS_Acch() { pm_pos = NULL; pm_old_pos = NULL; pm_speed = NULL; - m_ground_h = -1000000000.0f; + m_ground_h = -G_CM3D_F_INF; field_0x90 = 0.0f; m_gnd_chk_offset = 60.0f; field_0x94 = 0.0f; @@ -75,7 +75,7 @@ dBgS_Acch::dBgS_Acch() { m_tbl_size = 0; pm_acch_cir = NULL; - m_roof_height = 1000000000.0f; + m_roof_height = G_CM3D_F_INF; m_roof_crr_height = 0.0f; field_0xcc = 0.0f; @@ -86,7 +86,7 @@ dBgS_Acch::dBgS_Acch() { pm_shape_angle = NULL; m_my_ac = NULL; pm_out_poly_info = NULL; - field_0xd8 = -1000000000.0f; + field_0xd8 = -G_CM3D_F_INF; } /* 800761CC-80076248 070B0C 007C+00 1/1 0/0 0/0 .text Init__9dBgS_AcchFv */ @@ -105,8 +105,8 @@ void dBgS_Acch::Set(cXyz* i_pos, cXyz* i_old_pos, fopAc_ac_c* i_actor, int i_tbl pm_pos = i_pos; pm_old_pos = i_old_pos; - JUT_ASSERT(246, pm_pos != 0); - JUT_ASSERT(247, pm_old_pos != 0); + JUT_ASSERT(246, pm_pos != NULL); + JUT_ASSERT(247, pm_old_pos != NULL); m_my_ac = i_actor; fpc_ProcID id = fopAcM_GetID(i_actor); @@ -139,7 +139,7 @@ void dBgS_Acch::GroundCheckInit(dBgS& i_bgs) { if (!(m_flags & 2)) { i_bgs; // necessary to match - m_ground_h = -1000000000.0f; + m_ground_h = -G_CM3D_F_INF; m_gnd.SetExtChk(*this); field_0xb4 = ChkGroundHit(); ClrGroundHit(); @@ -170,7 +170,7 @@ void dBgS_Acch::GroundCheck(dBgS& i_bgs) { m_gnd.SetPos(&grnd_pos); m_ground_h = i_bgs.GroundCross(&m_gnd); - if (m_ground_h != -1000000000.0f) { + if (m_ground_h != -G_CM3D_F_INF) { field_0xbc = m_ground_h + field_0x90; if (field_0xbc > field_0xb8) { pm_pos->y = field_0xbc; @@ -203,7 +203,7 @@ void dBgS_Acch::GroundCheck(dBgS& i_bgs) { /* 8007654C-80076624 070E8C 00D8+00 1/1 0/0 0/0 .text GroundRoofProc__9dBgS_AcchFR4dBgS */ void dBgS_Acch::GroundRoofProc(dBgS& i_bgs) { - if (m_ground_h != -1000000000.0f) { + if (m_ground_h != -G_CM3D_F_INF) { if (field_0xbc < field_0xcc && field_0xcc < pm_pos->y) { pm_pos->y = field_0xcc; } @@ -226,7 +226,7 @@ void dBgS_Acch::LineCheck(dBgS& i_bgs) { f32 temp_f31 = dComIfG_Bgsp().RoofChk(&roof_chk); - f32 var_f30 = 1000000000.0f; + f32 var_f30 = G_CM3D_F_INF; bool var_r30 = false; bool var_r29 = false; @@ -294,7 +294,7 @@ void dBgS_Acch::LineCheck(dBgS& i_bgs) { if (ChkLineDown()) { f32 temp_f1 = GetOldPos()->y - GetPos()->y; - if (var_f30 != 1000000000.0f && !var_r30 && !cM3d_IsZero(temp_f1)) { + if (var_f30 != G_CM3D_F_INF && !var_r30 && !cM3d_IsZero(temp_f1)) { cBgS_LinChk lin_chk; cXyz old_pos; cXyz pos; @@ -325,8 +325,8 @@ void dBgS_Acch::LineCheck(dBgS& i_bgs) { void dBgS_Acch::CrrPos(dBgS& i_bgs) { bool bvar9; if (!(m_flags & 1)) { - JUT_ASSERT(792, pm_pos != 0); - JUT_ASSERT(793, pm_old_pos != 0); + JUT_ASSERT(792, pm_pos != NULL); + JUT_ASSERT(793, pm_old_pos != NULL); JUT_ASSERT(833, fpclassify(pm_pos->x) == 1); JUT_ASSERT(834, fpclassify(pm_pos->y) == 1); @@ -391,7 +391,7 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) { if (ChkWallHit() && bvar2) { LineCheck(i_bgs); } - field_0xcc = 1000000000.0f; + field_0xcc = G_CM3D_F_INF; if (!(m_flags & ROOF_NONE)) { m_roof.SetExtChk(*this); @@ -404,7 +404,7 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) { m_roof.SetPos(roof_pos); m_roof_height = i_bgs.RoofChk(&m_roof); - if (m_roof_height != 1000000000.0f) { + if (m_roof_height != G_CM3D_F_INF) { f32 y = GetPos()->y; if (y + m_roof_crr_height > m_roof_height) { @@ -427,13 +427,13 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) { if (!(m_flags & 0x400)) { ClrWaterHit(); ClrWaterIn(); - m_wtr.SetHeight(-1000000000.0f); + m_wtr.SetHeight(-G_CM3D_F_INF); f32 var_f29; f32 var_f30; f32 temp_f1_5 = m_ground_h; - if (temp_f1_5 == -1000000000.0f) { + if (temp_f1_5 == -G_CM3D_F_INF) { var_f29 = GetPos()->y - 50.0f; } else { var_f29 = temp_f1_5; @@ -447,7 +447,7 @@ void dBgS_Acch::CrrPos(dBgS& i_bgs) { roof_chk.SetPos(*pm_pos); var_f30 = i_bgs.RoofChk(&roof_chk); - if (var_f30 == 1000000000.0f) { + if (var_f30 == G_CM3D_F_INF) { var_f30 = GetPos()->y + 1000000.0f; } } diff --git a/src/d/d_bg_s_chk.cpp b/src/d/d_bg_s_chk.cpp index f953aa7f9e..0abf4b4e5b 100644 --- a/src/d/d_bg_s_chk.cpp +++ b/src/d/d_bg_s_chk.cpp @@ -3,7 +3,7 @@ * BG Collision Check Base */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_chk.h" diff --git a/src/d/d_bg_s_gnd_chk.cpp b/src/d/d_bg_s_gnd_chk.cpp index ad4456ad65..a3a246dc32 100644 --- a/src/d/d_bg_s_gnd_chk.cpp +++ b/src/d/d_bg_s_gnd_chk.cpp @@ -3,7 +3,7 @@ * BG Collision Ground Check */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_gnd_chk.h" diff --git a/src/d/d_bg_s_lin_chk.cpp b/src/d/d_bg_s_lin_chk.cpp index a86e80cec8..bb5e75b74a 100644 --- a/src/d/d_bg_s_lin_chk.cpp +++ b/src/d/d_bg_s_lin_chk.cpp @@ -3,11 +3,15 @@ * BG Collision Line Check */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_lin_chk.h" #include "f_op/f_op_actor_mng.h" +#define CHECK_FLOAT_RANGE(line, x) JUT_ASSERT(line, -1.0e32f < x && x < 1.0e32f); + +static const f32 INF = 2000000000.0f; + /* 80077C68-80077CDC 0725A8 0074+00 8/8 3/3 388/388 .text __ct__11dBgS_LinChkFv */ dBgS_LinChk::dBgS_LinChk() { SetPolyPassChk(GetPolyPassChkInfo()); @@ -20,8 +24,27 @@ dBgS_LinChk::~dBgS_LinChk() {} /* 80077D64-80077DA4 0726A4 0040+00 0/0 15/15 307/307 .text * Set__11dBgS_LinChkFPC4cXyzPC4cXyzPC10fopAc_ac_c */ void dBgS_LinChk::Set(cXyz const* pi_start, cXyz const* pi_end, fopAc_ac_c const* p_actor) { - u32 id; + JUT_ASSERT(45, !isnan(pi_start->x)); + JUT_ASSERT(46, !isnan(pi_start->y)); + JUT_ASSERT(47, !isnan(pi_start->z)); + JUT_ASSERT(48, !isnan(pi_end->x)); + JUT_ASSERT(49, !isnan(pi_end->y)); + //! @bug Two asserts on pi_end->y instead of one on py_end->z + JUT_ASSERT(50, !isnan(pi_end->y)); + JUT_ASSERT(54, -INF < pi_start->x && pi_start->x < INF); + JUT_ASSERT(55, -INF < pi_start->y && pi_start->y < INF); + JUT_ASSERT(56, -INF < pi_start->z && pi_start->z < INF); + JUT_ASSERT(57, -INF < pi_end->x && pi_end->x < INF); + JUT_ASSERT(58, -INF < pi_end->y && pi_end->y < INF); + JUT_ASSERT(59, -INF < pi_end->z && pi_end->z < INF); + + JUT_ASSERT(61, pi_start->y != G_CM3D_F_INF); + JUT_ASSERT(62, pi_start->y != -G_CM3D_F_INF); + JUT_ASSERT(63, pi_end->y != G_CM3D_F_INF); + JUT_ASSERT(64, pi_end->y != -G_CM3D_F_INF); + + u32 id; if (p_actor != NULL) { id = fopAcM_GetID(p_actor); } else { diff --git a/src/d/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp index 1f28f60ee9..77790534d2 100644 --- a/src/d/d_bg_s_movebg_actor.cpp +++ b/src/d/d_bg_s_movebg_actor.cpp @@ -3,7 +3,7 @@ * Non-static BG actor base */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_movebg_actor.h" #include "d/d_bg_w.h" diff --git a/src/d/d_bg_s_roof_chk.cpp b/src/d/d_bg_s_roof_chk.cpp index f5e483e547..5dd9822e61 100644 --- a/src/d/d_bg_s_roof_chk.cpp +++ b/src/d/d_bg_s_roof_chk.cpp @@ -3,7 +3,7 @@ * BG Collision Roof Check */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_roof_chk.h" @@ -23,6 +23,6 @@ dBgS_RoofChk::~dBgS_RoofChk() {} /* 80079124-8007914C 073A64 0028+00 0/0 1/1 0/0 .text Init__12dBgS_RoofChkFv */ void dBgS_RoofChk::Init() { - SetNowY(1000000000.0f); + SetNowY(G_CM3D_F_INF); ClearPi(); } diff --git a/src/d/d_bg_s_sph_chk.cpp b/src/d/d_bg_s_sph_chk.cpp index aa747ba855..e57c0ecdd2 100644 --- a/src/d/d_bg_s_sph_chk.cpp +++ b/src/d/d_bg_s_sph_chk.cpp @@ -3,7 +3,7 @@ * BG Collision Sphere Check */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_sph_chk.h" diff --git a/src/d/d_bg_s_spl_grp_chk.cpp b/src/d/d_bg_s_spl_grp_chk.cpp index dab7a33508..f67e11b17a 100644 --- a/src/d/d_bg_s_spl_grp_chk.cpp +++ b/src/d/d_bg_s_spl_grp_chk.cpp @@ -3,7 +3,7 @@ * BG Collision Special Group Check */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_spl_grp_chk.h" @@ -22,7 +22,7 @@ dBgS_SplGrpChk::dBgS_SplGrpChk() { m_ground.x = 0.0f; m_ground.y = 0.0f; m_ground.z = 0.0f; - m_roof = 1000000000.0f; + m_roof = G_CM3D_F_INF; m_height = 0.0f; OffMoveBGOnly(); diff --git a/src/d/d_bg_s_wtr_chk.cpp b/src/d/d_bg_s_wtr_chk.cpp index 09c8d779f1..c5a744da4f 100644 --- a/src/d/d_bg_s_wtr_chk.cpp +++ b/src/d/d_bg_s_wtr_chk.cpp @@ -3,7 +3,7 @@ * BG Collision Water Check */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_s_wtr_chk.h" diff --git a/src/d/d_bg_w.cpp b/src/d/d_bg_w.cpp index bbcdff8e06..216c42c63a 100644 --- a/src/d/d_bg_w.cpp +++ b/src/d/d_bg_w.cpp @@ -3,7 +3,7 @@ * DZB Collision handling */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_w.h" #include "SSystem/SComponent/c_bg_s_shdw_draw.h" @@ -249,12 +249,12 @@ void cBgW::MakeBlckBnd(int i_blk_idx, cXyz* i_min, cXyz* i_max) { if (mNeedsFullTransform == 0) { MakeBlckTransMinMax(i_min, i_max); } else { - i_min->z = 1000000000.0f; - i_min->y = 1000000000.0f; - i_min->x = 1000000000.0f; - i_max->z = -1000000000.0f; - i_max->y = -1000000000.0f; - i_max->x = -1000000000.0f; + i_min->z = G_CM3D_F_INF; + i_min->y = G_CM3D_F_INF; + i_min->x = G_CM3D_F_INF; + i_max->z = -G_CM3D_F_INF; + i_max->y = -G_CM3D_F_INF; + i_max->x = -G_CM3D_F_INF; for (int i = start; i <= max; i++) { MakeBlckMinMax(pm_bgd->m_t_tbl[i].m_vtx_idx0, i_min, i_max); diff --git a/src/d/d_bg_w_base.cpp b/src/d/d_bg_w_base.cpp index edc54ab7d9..8835d0d9a7 100644 --- a/src/d/d_bg_w_base.cpp +++ b/src/d/d_bg_w_base.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_w_base.h" diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp index 1aaf2031b9..208eb36eaf 100644 --- a/src/d/d_bg_w_kcol.cpp +++ b/src/d/d_bg_w_kcol.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_w_kcol.h" #include "d/d_com_inf_game.h" @@ -34,8 +34,8 @@ void* dBgWKCol::initKCollision(void* i_kclData) { /* 8007E804-8007E850 079144 004C+00 0/0 0/0 1/1 .text create__8dBgWKColFPvPv */ void dBgWKCol::create(void* pprism, void* plc) { - JUT_ASSERT(0x43, pprism != 0); - JUT_ASSERT(0x44, plc != 0); + JUT_ASSERT(0x43, pprism != NULL); + JUT_ASSERT(0x44, plc != NULL); ClrDBgWBase(); m_pkc_head = (KC_Header*)pprism; @@ -177,7 +177,7 @@ void dBgWKCol::getPolyCode(int poly_index, dBgPc* ppoly) const { * chkPolyThrough__8dBgWKColCFP5dBgPcP16cBgS_PolyPassChkP15cBgS_GrpPassChkR4cXyz */ bool dBgWKCol::chkPolyThrough(dBgPc* ppoly, cBgS_PolyPassChk* ppolypasschk, cBgS_GrpPassChk* pgrppasschk, cXyz& param_4) const { - JUT_ASSERT(279, ppoly != 0); + JUT_ASSERT(279, ppoly != NULL); if (pgrppasschk != NULL) { dBgS_GrpPassChk* var_r28 = (dBgS_GrpPassChk*)pgrppasschk; diff --git a/src/d/d_bg_w_sv.cpp b/src/d/d_bg_w_sv.cpp index 514dc6dbaf..70312ce6d7 100644 --- a/src/d/d_bg_w_sv.cpp +++ b/src/d/d_bg_w_sv.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bg_w_sv.h" #include "SSystem/SComponent/c_bg_s_chk.h" diff --git a/src/d/d_bomb.cpp b/src/d/d_bomb.cpp index 1d6e4c997a..09d05aaf0f 100644 --- a/src/d/d_bomb.cpp +++ b/src/d/d_bomb.cpp @@ -3,7 +3,7 @@ * dolzel2 - Bomb */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bomb.h" #include "d/actor/d_a_nbomb.h" diff --git a/src/d/d_bright_check.cpp b/src/d/d_bright_check.cpp index 7f65b3d7ef..6a3a35bee2 100644 --- a/src/d/d_bright_check.cpp +++ b/src/d/d_bright_check.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_bright_check.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -15,7 +15,7 @@ dBrightCheck_c::dBrightCheck_c(JKRArchive* i_archive) { mArchive = i_archive; mBrightCheck.mMsgString = new dMsgString_c(); - JUT_ASSERT(0, mBrightCheck.mMsgString != 0); + JUT_ASSERT(0, mBrightCheck.mMsgString != NULL); screenSet(); mCompleteCheck = false; @@ -61,7 +61,7 @@ void dBrightCheck_c::screenSet() { #endif mBrightCheck.Scr = new J2DScreen(); - JUT_ASSERT(0, mBrightCheck.Scr != 0); + JUT_ASSERT(0, mBrightCheck.Scr != NULL); mBrightCheck.Scr->setPriority("zelda_option_check.blo", 0x1100000, mArchive); mBrightCheck.Scr->search('g_abtn_n')->hide(); diff --git a/src/d/d_cam_param.cpp b/src/d/d_cam_param.cpp index 2111aa6478..2ab36b4aca 100644 --- a/src/d/d_cam_param.cpp +++ b/src/d/d_cam_param.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cam_param.h" diff --git a/src/d/d_camera.cpp b/src/d/d_camera.cpp index d391798469..232eb6a3cf 100644 --- a/src/d/d_camera.cpp +++ b/src/d/d_camera.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_camera // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_camera.h" #include "SSystem/SComponent/c_counter.h" @@ -459,8 +459,8 @@ void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_c mBG.field_0x5c.field_0x0 = 0; mBG.field_0x0.field_0x0 = 0; mBG.field_0xc0.field_0x3c = 0xFF; - mBG.field_0x5c.field_0x58 = -1000000000.0f; - mBG.field_0x0.field_0x58 = -1000000000.0f; + mBG.field_0x5c.field_0x58 = -G_CM3D_F_INF; + mBG.field_0x0.field_0x58 = -G_CM3D_F_INF; mBG.field_0x0.field_0x4.OffNormalGrp(); mBG.field_0x0.field_0x4.OnWaterGrp(); mBG.field_0xc0.field_0x1 = 0; @@ -473,7 +473,7 @@ void dCamera_c::initialize(camera_class* i_camera, fopAc_ac_c* i_player, u32 i_c mBG.field_0xc0.field_0x34 = 0; mBG.field_0x108.field_0x0 = 0; mBG.field_0x108.field_0x4 = 0.0f; - mBG.field_0xc0.field_0x38 = -1000000000.0f; + mBG.field_0xc0.field_0x38 = -G_CM3D_F_INF; mBG.field_0xc0.field_0x40 = 0xFF; mWallUpDist = mCamSetup.mBGChk.WallUpDistance(); @@ -2238,7 +2238,7 @@ f32 dCamera_c::groundHeight(cXyz* param_0) { } f32 height_correct; - if (height == -1000000000.0f) { + if (height == -G_CM3D_F_INF) { height_correct = param_0->y; } else { height_correct = height; @@ -2942,7 +2942,7 @@ void dCamera_c::tooNearEscape(cXyz* param_0) { /* 80167EF4-80167FEC 162834 00F8+00 2/2 0/0 0/0 .text getWaterSurfaceHeight__9dCamera_cFP4cXyz */ f32 dCamera_c::getWaterSurfaceHeight(cXyz* param_0) { - f32 var_f31 = -1000000000.0f; + f32 var_f31 = -G_CM3D_F_INF; cXyz spF8(*param_0); dBgS_RoofChk roofchk; @@ -10056,7 +10056,7 @@ static int camera_draw(camera_process_class* i_this) { gndchk.SetPos(&i_this->lookat.eye); f32 cross = dComIfG_Bgsp().GroundCross(&gndchk); - if (cross != -1000000000.0f) { + if (cross != -G_CM3D_F_INF) { if (dComIfG_Bgsp().ChkGrpInf(gndchk, 0x100)) { mDoAud_getCameraMapInfo(6); } else { @@ -10117,7 +10117,7 @@ static int init_phase2(camera_class* i_this) { spA4.y += 50.0f; gndchk.SetPos(&spA4); - if (dComIfG_Bgsp().GroundCross(&gndchk) == -1000000000.0f) { + if (dComIfG_Bgsp().GroundCross(&gndchk) == -G_CM3D_F_INF) { #if DEBUG if (i_this->field_0x238 < 100) { if (i_this->field_0x238 % 100 == 0 && i_this->field_0x238 != 0) { diff --git a/src/d/d_cc_d.cpp b/src/d/d_cc_d.cpp index e566dd56ee..7bc1ab527a 100644 --- a/src/d/d_cc_d.cpp +++ b/src/d/d_cc_d.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_cc_d // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cc_d.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/d_cc_mass_s.cpp b/src/d/d_cc_mass_s.cpp index 20243ababc..a9453fbb4a 100644 --- a/src/d/d_cc_mass_s.cpp +++ b/src/d/d_cc_mass_s.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cc_mass_s.h" #include "SSystem/SComponent/c_math.h" @@ -48,11 +48,11 @@ void dCcMassS_Mng::Ct() { field_0x202 = 0; mResultCam = 0; mCamTopPos.x = 0.0f; - mCamTopPos.y = -1000000000.0f; + mCamTopPos.y = -G_CM3D_F_INF; mCamTopPos.z = 0.0f; mCamBottomPos.x = 0.0f; - mCamBottomPos.y = -1000000000.0f; + mCamBottomPos.y = -G_CM3D_F_INF; mCamBottomPos.z = 0.0f; Clear(); @@ -106,14 +106,14 @@ void dCcMassS_Mng::Prepare() { } mCamTopPos.x = 0.0f; - mCamTopPos.y = -1000000000.0f; + mCamTopPos.y = -G_CM3D_F_INF; mCamTopPos.z = 0.0f; - mCamTopDist = 1000000000.0f; + mCamTopDist = G_CM3D_F_INF; mCamBottomPos.x = 0.0f; - mCamBottomPos.y = -1000000000.0f; + mCamBottomPos.y = -G_CM3D_F_INF; mCamBottomPos.z = 0.0f; - mCamBottomDist = 1000000000.0f; + mCamBottomDist = G_CM3D_F_INF; } /* 800858AC-80085CF0 0801EC 0444+00 0/0 0/0 2/2 .text diff --git a/src/d/d_cc_s.cpp b/src/d/d_cc_s.cpp index 8ef12c1539..12fd2697e9 100644 --- a/src/d/d_cc_s.cpp +++ b/src/d/d_cc_s.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cc_s.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_cc_uty.cpp b/src/d/d_cc_uty.cpp index 7b95f07e35..823ed6a3f6 100644 --- a/src/d/d_cc_uty.cpp +++ b/src/d/d_cc_uty.cpp @@ -3,7 +3,7 @@ * Collider Utilties */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_cc_uty.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_com_inf_actor.cpp b/src/d/d_com_inf_actor.cpp index 96056b36bd..cbfca57a8b 100644 --- a/src/d/d_com_inf_actor.cpp +++ b/src/d/d_com_inf_actor.cpp @@ -3,7 +3,7 @@ * dolzel2 - Common Information For Actor */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_com_inf_actor.h" #include "dolphin/types.h" diff --git a/src/d/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp index 26ca573212..75fc3ee91e 100644 --- a/src/d/d_com_inf_game.cpp +++ b/src/d/d_com_inf_game.cpp @@ -3,7 +3,7 @@ * Game Information */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -1140,7 +1140,7 @@ s8 dComIfGp_getReverb(int i_roomNo) { * dComIfGd_setSimpleShadow__FP4cXyzffR13cBgS_PolyInfosfP9_GXTexObj */ int dComIfGd_setSimpleShadow(cXyz* i_pos, f32 param_1, f32 param_2, cBgS_PolyInfo& param_3, s16 i_angle, f32 param_5, GXTexObj* i_tex) { - if (param_3.ChkSetInfo() && -1000000000.0f != param_1) { + if (param_3.ChkSetInfo() && -G_CM3D_F_INF != param_1) { cM3dGPla plane; dComIfG_Bgsp().GetTriPla(param_3, &plane); @@ -1823,7 +1823,7 @@ void dComIfGp_addSelectItemNum(int i_selItemIdx, s16 i_num) { int dComIfGd_setShadow(u32 param_0, s8 param_1, J3DModel* param_2, cXyz* param_3, f32 param_4, f32 param_5, f32 param_6, f32 param_7, cBgS_PolyInfo& param_8, dKy_tevstr_c* param_9, s16 param_10, f32 param_11, _GXTexObj* param_12) { - if (param_7 <= -1000000000.0f) { + if (param_7 <= -G_CM3D_F_INF) { return 0; } else { return dComIfGd_setRealShadow(param_0, param_1, param_2, param_3, param_4, diff --git a/src/d/d_debug_viewer.cpp b/src/d/d_debug_viewer.cpp index e269bd3b3f..d9646c2798 100644 --- a/src/d/d_debug_viewer.cpp +++ b/src/d/d_debug_viewer.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_debug_viewer.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_demo.cpp b/src/d/d_demo.cpp index a139556483..60d5cb5606 100644 --- a/src/d/d_demo.cpp +++ b/src/d/d_demo.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_demo.h" #include "d/d_msg_class.h" @@ -24,7 +24,7 @@ void jstudio_tAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData const void* pContent, u32 uSize) { switch (iType) { case JStudio::data::UNK_0x19: - JUT_ASSERT(107, pContent!=0); + JUT_ASSERT(107, pContent!=NULL); JUT_ASSERT(108, uSize==4); u32 content = *(u32*)pContent; dMsgObject_setDemoMessage(content); @@ -50,7 +50,7 @@ jstudio_tCreateObject_message::~jstudio_tCreateObject_message() {} bool jstudio_tCreateObject_message::create(JStudio::TObject** ppObject, const JStudio::stb::data::TParse_TBlock_object& iBlock) { - JUT_ASSERT(168, ppObject!=0); + JUT_ASSERT(168, ppObject!=NULL); u32 type = iBlock.get_type(); switch (type) { @@ -329,7 +329,7 @@ int dDemo_setDemoData(fopAc_ac_c* i_actor, u8 i_flags, mDoExt_McaMorf* i_morf, c demo_actor->setOldAnmId(anmID); J3DAnmTransform* i_key = (J3DAnmTransform*)dComIfG_getObjectIDRes(a_name, anmID & 0xffff); - JUT_ASSERT(272, i_key != 0); + JUT_ASSERT(272, i_key != NULL); ptr = dDemo_getJaiPointer(a_name, anmID & 0xffff, param_4, param_5); @@ -359,7 +359,7 @@ int dDemo_setDemoData(fopAc_ac_c* i_actor, u8 i_flags, mDoExt_McaMorf* i_morf, c /* 800387A8-800387EC 0330E8 0044+00 1/1 0/0 0/0 .text branchFile__FPCc */ static void branchFile(char const* resName) { u8* branchData = (u8*)dComIfG_getObjectRes(dStage_roomControl_c::getDemoArcName(), resName); - JUT_ASSERT(712, branchData != 0); + JUT_ASSERT(712, branchData != NULL); dDemo_c::setBranchData(branchData); } @@ -429,7 +429,7 @@ void dDemo_actor_c::JSGSetTranslation(Vec const& i_trans) { } else { // "\n\n!!JSGSetTranslation outside of range. x[%f]y[%f]z[%f]\n" OS_REPORT("\n\n!!JSGSetTranslationで範囲外の指定がされました。x[%f]y[%f]z[%f]\n", i_trans.x, i_trans.y, i_trans.z); - JUT_ASSERT(789, 0); + JUT_ASSERT(789, FALSE); } } @@ -930,7 +930,7 @@ int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNam } else { // "Strange Demo Object type!! Type<%d>\n" OS_REPORT("へんなデモオブジェクトタイプです！！ タイプ<%d>\n"); - JUT_ASSERT(1755, 0); + JUT_ASSERT(1755, FALSE); } return *p_TObj == NULL ? TRUE : FALSE; @@ -939,32 +939,32 @@ int dDemo_system_c::JSGFindObject(JStage::TObject** p_TObj, char const* actorNam /* 80039678-80039910 033FB8 0298+00 0/0 1/1 0/0 .text create__7dDemo_cFv */ void dDemo_c::create() { m_system = new dDemo_system_c(); - JUT_ASSERT(0, m_system != 0); + JUT_ASSERT(0, m_system != NULL); m_control = new JStudio::TControl(); - JUT_ASSERT(0, m_control != 0); + JUT_ASSERT(0, m_control != NULL); m_mesgControl = new jmessage_tControl(); - JUT_ASSERT(0, m_mesgControl != 0); + JUT_ASSERT(0, m_mesgControl != NULL); m_stage = new JStudio_JStage::TCreateObject(m_system); - JUT_ASSERT(0, m_stage != 0); + JUT_ASSERT(0, m_stage != NULL); m_audio = new JStudio_JAudio2::TCreateObject(Z2GetSoundStarter(), m_system); - JUT_ASSERT(0, m_audio != 0); + JUT_ASSERT(0, m_audio != NULL); m_audio->mPermit_onExit_notEnd = true; m_particle = new dDemo_particle_c(dPa_control_c::getEmitterManager(), m_system); - JUT_ASSERT(0, m_particle != 0); + JUT_ASSERT(0, m_particle != NULL); m_message = new jstudio_tCreateObject_message(); - JUT_ASSERT(0, m_message != 0); + JUT_ASSERT(0, m_message != NULL); m_factory = new JStudio::TFactory(); - JUT_ASSERT(0, m_factory != 0); + JUT_ASSERT(0, m_factory != NULL); m_object = new dDemo_object_c(); - JUT_ASSERT(0, m_object != 0); + JUT_ASSERT(0, m_object != NULL); m_control->setSecondPerFrame(1.0f / 30.0f); m_control->setFactory(m_factory); @@ -1037,7 +1037,7 @@ jmessage_tControl::~jmessage_tControl() {} /* 80039B6C-80039CF8 0344AC 018C+00 1/1 1/1 0/0 .text start__7dDemo_cFPCUcP4cXyzf */ int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) { - JUT_ASSERT(0, m_system != 0); + JUT_ASSERT(0, m_system != NULL); m_control->reset(); JStudio::TParse parser(m_control); @@ -1075,7 +1075,7 @@ int dDemo_c::start(u8 const* p_data, cXyz* p_translation, f32 rotationY) { /* 80039CF8-80039D4C 034638 0054+00 1/1 2/2 0/0 .text end__7dDemo_cFv */ void dDemo_c::end() { - JUT_ASSERT(0, m_system != 0); + JUT_ASSERT(0, m_system != NULL); m_control->destroyObject_all(); m_object->remove(); @@ -1085,7 +1085,7 @@ void dDemo_c::end() { /* 80039D4C-80039DA4 03468C 0058+00 1/1 0/0 0/0 .text branch__7dDemo_cFv */ void dDemo_c::branch() { - JUT_ASSERT(0, m_system != 0); + JUT_ASSERT(0, m_system != NULL); m_control->destroyObject_all(); const u8* branchData = m_branchData; @@ -1097,7 +1097,7 @@ void dDemo_c::branch() { /* 80039DA4-80039EDC 0346E4 0138+00 0/0 1/1 0/0 .text update__7dDemo_cFv */ int dDemo_c::update() { - JUT_ASSERT(0, m_system != 0); + JUT_ASSERT(0, m_system != NULL); if (m_data == NULL) { if (m_branchData == NULL) { diff --git a/src/d/d_door_param2.cpp b/src/d/d_door_param2.cpp index 9d0735d279..da58107bdb 100644 --- a/src/d/d_door_param2.cpp +++ b/src/d/d_door_param2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_door_param2.h" #include "f_op/f_op_actor_mng.h" diff --git a/src/d/d_drawlist.cpp b/src/d/d_drawlist.cpp index 25ef94fe33..1934a687f1 100644 --- a/src/d/d_drawlist.cpp +++ b/src/d/d_drawlist.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_drawlist // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DAnimation.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -32,7 +32,7 @@ public: J2DPicture* getPicture(u64 i_tag) { J2DPane* pane = getPane(i_tag); - JUT_ASSERT(1553, pane != 0); + JUT_ASSERT(1553, pane != NULL); if (pane->getTypeID() != 0x12) { return NULL; } diff --git a/src/d/d_envse.cpp b/src/d/d_envse.cpp index b4dfd2ff88..b6f455ec3d 100644 --- a/src/d/d_envse.cpp +++ b/src/d/d_envse.cpp @@ -3,7 +3,7 @@ * Environment Sound Effects handler */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_envse.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_error_msg.cpp b/src/d/d_error_msg.cpp index 6416755509..a179e1856c 100644 --- a/src/d/d_error_msg.cpp +++ b/src/d/d_error_msg.cpp @@ -3,7 +3,7 @@ * Disk Error Message screen handler */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include #include "JSystem/J2DGraph/J2DOrthoGraph.h" diff --git a/src/d/d_ev_camera.cpp b/src/d/d_ev_camera.cpp index 416dee084d..eecbadc672 100644 --- a/src/d/d_ev_camera.cpp +++ b/src/d/d_ev_camera.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_ev_camera // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ev_camera.h" #include "d/d_debug_viewer.h" diff --git a/src/d/d_event.cpp b/src/d/d_event.cpp index ffce9bcd7a..f103b04166 100644 --- a/src/d/d_event.cpp +++ b/src/d/d_event.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event.h" #include "d/actor/d_a_alink.h" @@ -277,7 +277,7 @@ int dEvt_control_c::talkCheck(dEvt_order_c* order) { if (!dComIfGp_getEventManager().order(mEventId)) { // "specified event %d not ordered!!" OS_REPORT("指定イベント %d が無い!!\n", mEventId); - JUT_ASSERT(429, 0); + JUT_ASSERT(429, FALSE); } return 1; @@ -343,7 +343,7 @@ int dEvt_control_c::talkXyCheck(dEvt_order_c* order) { if (!dComIfGp_getEventManager().order(mEventId)) { // "specified event %d not ordered!!" OS_REPORT("指定イベント %d が無い!!\n", mEventId); - JUT_ASSERT(512, 0); + JUT_ASSERT(512, FALSE); } return 1; } @@ -374,7 +374,7 @@ int dEvt_control_c::catchCheck(dEvt_order_c* order) { if (!dComIfGp_getEventManager().order(mEventId)) { // "specified event %d not ordered!!" OS_REPORT("指定イベント %d が無い!!\n", mEventId); - JUT_ASSERT(551, 0); + JUT_ASSERT(551, FALSE); } } @@ -414,7 +414,7 @@ int dEvt_control_c::demoCheck(dEvt_order_c* order) { int eventId = order->mEventId; if (actor2 == NULL) { - JUT_ASSERT(608, 0); + JUT_ASSERT(608, FALSE); return 0; } @@ -481,7 +481,7 @@ int dEvt_control_c::potentialCheck(dEvt_order_c* order) { #if DEBUG if (actor1 == NULL || actor2 == NULL) { - JUT_ASSERT(704, 0); + JUT_ASSERT(704, FALSE); } #endif @@ -536,7 +536,7 @@ int dEvt_control_c::doorCheck(dEvt_order_c* order) { if (mEventId != -1 && dComIfGp_getEventManager().getEventData(mEventId) != NULL) { if (!dComIfGp_getEventManager().order(mEventId)) { - JUT_ASSERT(773, 0); + JUT_ASSERT(773, FALSE); } } else { mEventId = -1; @@ -572,7 +572,7 @@ int dEvt_control_c::itemCheck(dEvt_order_c* order) { if (!dComIfGp_getEventManager().order(mEventId)) { // "specified event %d not ordered!!" OS_REPORT("指定イベント %s が無い!!\n", eventname); - JUT_ASSERT(817, 0); + JUT_ASSERT(817, FALSE); } return 1; } @@ -596,7 +596,7 @@ int dEvt_control_c::endProc() { demoEnd(); break; case dEvt_mode_COMPULSORY_e: - JUT_ASSERT(858, 0); + JUT_ASSERT(858, FALSE); } mMode = dEvt_mode_WAIT_e; @@ -699,7 +699,7 @@ int dEvt_control_c::entry() { } break; case 12: - JUT_ASSERT(980, 0); + JUT_ASSERT(980, FALSE); break; case 13: break; diff --git a/src/d/d_event_data.cpp b/src/d/d_event_data.cpp index 2ce9ea3a4e..365fdc7ae4 100644 --- a/src/d/d_event_data.cpp +++ b/src/d/d_event_data.cpp @@ -3,7 +3,7 @@ * Event Data Processor */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_data.h" #include "d/actor/d_a_player.h" @@ -317,7 +317,7 @@ static int dEvDt_Next_Stage(int i_staffId, int i_wipe) { } else { // "Scene transition data is not complete!!" OS_REPORT_ERROR("シーン切り替えのデータ指定が足りない!!\n"); - JUT_ASSERT(379, 0); + JUT_ASSERT(379, FALSE); } return 1; @@ -499,7 +499,7 @@ void dEvDtStaff_c::specialProcLight() { int staffId = dComIfGp_evmng_getMyStaffId("LIGHT", NULL, 0); if (staffId == -1) { - JUT_ASSERT(663, 0); + JUT_ASSERT(663, FALSE); return; } @@ -550,7 +550,7 @@ void dEvDtStaff_c::specialProcMessage() { int staffId = dComIfGp_evmng_getMyStaffId("MESSAGE", NULL, 0); if (staffId == -1) { - JUT_ASSERT(741, 0); + JUT_ASSERT(741, FALSE); return; } @@ -752,7 +752,7 @@ void dEvDtStaff_c::specialProcSound() { int staffId = dComIfGp_evmng_getMyStaffId("SOUND", NULL, 0); if (staffId == -1) { - JUT_ASSERT(960, 0); + JUT_ASSERT(960, FALSE); return; } @@ -833,7 +833,7 @@ void dEvDtStaff_c::specialProcCreate() { int staffId = dComIfGp_evmng_getMyStaffId("CREATER", NULL, 0); if (staffId == -1) { - JUT_ASSERT(1055, 0); + JUT_ASSERT(1055, FALSE); return; } @@ -900,7 +900,7 @@ void dEvDtStaff_c::specialProcDirector() { int staffId = dComIfGp_evmng_getMyStaffId("DIRECTOR", NULL, 0); if (staffId == -1) { - JUT_ASSERT(1146, 0); + JUT_ASSERT(1146, FALSE); return; } @@ -1052,14 +1052,14 @@ void dEvDtStaff_c::specialProcDirector() { case 'VIBR': specialProc_WaitStart(staffId); if (data->unk2 == 0) { - JUT_ASSERT(1291, 0); + JUT_ASSERT(1291, FALSE); } idata = dComIfGp_evmng_getMyIntegerP(staffId, "Pattern"); idata2 = dComIfGp_evmng_getMyIntegerP(staffId, "Type"); if (idata == NULL || idata2 == NULL) { - JUT_ASSERT(1295, 0); + JUT_ASSERT(1295, FALSE); } dComIfGp_getVibration().StartQuake((u8*)idata, 0, *idata2, cXyz(0.0f, 1.0f, 0.0f)); @@ -1260,7 +1260,7 @@ void dEvDtStaff_c::specialProcPackage() { int staffId = dComIfGp_evmng_getMyStaffId("PACKAGE", NULL, 0); if (staffId == -1) { - JUT_ASSERT(1528, 0); + JUT_ASSERT(1528, FALSE); return; } @@ -1342,7 +1342,7 @@ void dEvDtStaff_c::specialProcTimekeeper() { int staffId = dComIfGp_evmng_getMyStaffId("TIMEKEEPER", NULL, 0); if (staffId == -1) { - JUT_ASSERT(1650, 0); + JUT_ASSERT(1650, FALSE); return; } @@ -1397,7 +1397,7 @@ void dEvDtStaff_c::specialProcEffect() { int staffId = dComIfGp_evmng_getMyStaffId("EFFECT", NULL, 0); if (staffId == -1) { - JUT_ASSERT(1720, 0); + JUT_ASSERT(1720, FALSE); return; } diff --git a/src/d/d_event_debug.cpp b/src/d/d_event_debug.cpp index d48e381739..10fecd3cf4 100644 --- a/src/d/d_event_debug.cpp +++ b/src/d/d_event_debug.cpp @@ -1,5 +1,5 @@ #ifdef DEBUG -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_debug.h" #include "JSystem/JHostIO/JORFile.h" diff --git a/src/d/d_event_lib.cpp b/src/d/d_event_lib.cpp index 19fbd67bd1..c0518992a3 100644 --- a/src/d/d_event_lib.cpp +++ b/src/d/d_event_lib.cpp @@ -3,7 +3,7 @@ * Event Callback Library */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_lib.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_event_manager.cpp b/src/d/d_event_manager.cpp index a4f6f0f2e4..46715d3c46 100644 --- a/src/d/d_event_manager.cpp +++ b/src/d/d_event_manager.cpp @@ -3,7 +3,7 @@ * Event System Manager */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_event_manager.h" #include "SSystem/SComponent/c_math.h" @@ -212,12 +212,12 @@ static void dummyStrings() { * getSubstance__16dEvent_manager_cFP11dEvDtData_ci */ void* dEvent_manager_c::getSubstance(dEvDtData_c* evData, int type) { if (evData->getIndex() < 0 || evData->getNumber() <= 0) { - JUT_ASSERT(378, 0); + JUT_ASSERT(378, FALSE); return NULL; } if (type != -1 && type != evData->getType()) { - JUT_ASSERT(383, 0); + JUT_ASSERT(383, FALSE); } switch (evData->getType()) { @@ -232,7 +232,7 @@ void* dEvent_manager_c::getSubstance(dEvDtData_c* evData, int type) { default: // "dEvent_manager_c::getSubstance unsupported type %d" OS_REPORT("dEvent_manager_c::getSubstance 未対応タイプ %d\n", evData->getType()); - JUT_ASSERT(403, 0); + JUT_ASSERT(403, FALSE); } return NULL; @@ -868,7 +868,7 @@ s16 dEvent_manager_c::getEventIdx(const char* eventName, u8 mapToolID, s32 roomN sprintf(map_tool_name, "MapToolCamera%d", mapToolID); return getEventIdx(map_tool_name, 0xFF, roomNo); default: - JUT_ASSERT(1278, 0); + JUT_ASSERT(1278, FALSE); } } } @@ -910,7 +910,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* actor, u8 mapToolID) { sprintf(map_tool_name, "MapToolCamera%d", mapToolID); return getEventIdx(actor, map_tool_name, 0xFF); default: - JUT_ASSERT(1341, 0); + JUT_ASSERT(1341, FALSE); } } @@ -937,7 +937,7 @@ s16 dEvent_manager_c::getEventIdx(fopAc_ac_c* actor, const char* eventName, u8 m sprintf(map_tool_name, "MapToolCamera%d", mapToolID); return getEventIdx(actor, map_tool_name, 0xFF); default: - JUT_ASSERT(1376, 0); + JUT_ASSERT(1376, FALSE); } } } @@ -1441,7 +1441,7 @@ fopAc_ac_c* dEvent_manager_c::specialCast_Shutter(s16 actorName, BOOL param_1) { prms.actor = dComIfGp_getPlayer(0); if (prms.actor == NULL) { - JUT_ASSERT(2238, 0); + JUT_ASSERT(2238, FALSE); } shutterActor = fopAcM_Search((fopAcIt_JudgeFunc)findShutterCallBack, &prms); diff --git a/src/d/d_eye_hl.cpp b/src/d/d_eye_hl.cpp index e1da08769b..a2512a41b7 100644 --- a/src/d/d_eye_hl.cpp +++ b/src/d/d_eye_hl.cpp @@ -3,7 +3,7 @@ * dolzel2 - Eye Highlight Management */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_eye_hl.h" #include "JSystem/J3DGraphBase/J3DTexture.h" diff --git a/src/d/d_file_sel_info.cpp b/src/d/d_file_sel_info.cpp index f217de49e4..d51d63d446 100644 --- a/src/d/d_file_sel_info.cpp +++ b/src/d/d_file_sel_info.cpp @@ -3,7 +3,7 @@ * File Select Screen File Info */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_file_sel_info.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -34,7 +34,7 @@ dFile_info_c::~dFile_info_c() { /* 80192570-80192954 18CEB0 03E4+00 1/1 0/0 0/0 .text screenSet__12dFile_info_cFv */ void dFile_info_c::screenSet() { mFileInfo.Scr = new J2DScreen(); - JUT_ASSERT(0, mFileInfo.Scr != 0); + JUT_ASSERT(0, mFileInfo.Scr != NULL); mFileInfo.Scr->setPriority("zelda_file_select_info_text.blo", 0x1100000, mArchive); mFileInfo.mFont = mDoExt_getMesgFont(); diff --git a/src/d/d_file_sel_warning.cpp b/src/d/d_file_sel_warning.cpp index 078646002a..bf3825aab7 100644 --- a/src/d/d_file_sel_warning.cpp +++ b/src/d/d_file_sel_warning.cpp @@ -7,7 +7,7 @@ // Translation Unit: d/file/d_file_sel_warning // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_file_sel_warning.h" #include "d/d_msg_string.h" @@ -55,10 +55,10 @@ void dFile_warning_c::screenSet() { }; mFileWarn.Scr = new J2DScreen(); - JUT_ASSERT(0, mFileWarn.Scr != 0); + JUT_ASSERT(0, mFileWarn.Scr != NULL); mFileWarn.mMsgString = new dMsgString_c(); - JUT_ASSERT(0, mFileWarn.mMsgString != 0); + JUT_ASSERT(0, mFileWarn.mMsgString != NULL); mFileWarn.Scr->setPriority(blo_name[field_0x3e], 0x100000, mpArchive); @@ -70,7 +70,7 @@ void dFile_warning_c::screenSet() { mFileWarn.mFont = mDoExt_getMesgFont(); mpRootPane = new CPaneMgr(mFileWarn.Scr, 'Nm_02', 0, NULL); - JUT_ASSERT(0, mpRootPane != 0); + JUT_ASSERT(0, mpRootPane != NULL); field_0x34 = mpRootPane->getTranslateY(); mFileWarn.Scr->search('w_msg_jp')->hide(); diff --git a/src/d/d_file_select.cpp b/src/d/d_file_select.cpp index 363ca34c51..38f92626bd 100644 --- a/src/d/d_file_select.cpp +++ b/src/d/d_file_select.cpp @@ -3,7 +3,7 @@ * dolzel2 - Quest Log Management (File Select Menu) */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DAnmLoader.h" #include "JSystem/J2DGraph/J2DTextBox.h" @@ -2372,7 +2372,7 @@ void dFile_select_c::screenSet() { static u64 l_tagName131[3] = {'N_sel_00', 'N_sel_01', 'N_sel_02'}; fileSel.Scr = new J2DScreen(); - JUT_ASSERT(4917, fileSel.Scr != 0); + JUT_ASSERT(4917, fileSel.Scr != NULL); fileSel.Scr->setPriority("zelda_file_select.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(fileSel.Scr); void* uVar14 = JKRGetNameResource("zelda_file_select.bck", mpArchive); @@ -2417,12 +2417,12 @@ void dFile_select_c::screenSet() { fopMsgM_messageGet(acStack_38, 0x55); ((J2DTextBox*)field_0x0244->getPanePtr())->setString(acStack_38); void* bpk = JKRGetNameResource("zelda_file_select.bpk", mpArchive); - JUT_ASSERT(4994, bpk != 0); + JUT_ASSERT(4994, bpk != NULL); field_0x01c8 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); field_0x01c8->searchUpdateMaterialID(fileSel.Scr); field_0x01cc = 0; void* btk = JKRGetNameResource("zelda_file_select_05.btk", mpArchive); - JUT_ASSERT(5004, btk != 0); + JUT_ASSERT(5004, btk != NULL); field_0x01d0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); field_0x01d0->searchUpdateMaterialID(fileSel.Scr); field_0x01d4 = 0; @@ -2439,11 +2439,11 @@ void dFile_select_c::screenSet() { field_0x01d8 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); field_0x01d8->searchUpdateMaterialID(fileSel.Scr); btk = JKRGetNameResource("zelda_file_select.btk", mpArchive); - JUT_ASSERT(5039, btk != 0); + JUT_ASSERT(5039, btk != NULL); field_0x01e0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); field_0x01e0->searchUpdateMaterialID(fileSel.Scr); void* brk = JKRGetNameResource("zelda_file_select.brk", mpArchive); - JUT_ASSERT(5048, brk != 0); + JUT_ASSERT(5048, brk != NULL); field_0x01e8 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(brk); field_0x0200 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(brk); field_0x01e8->searchUpdateMaterialID(fileSel.Scr); @@ -2490,11 +2490,11 @@ void dFile_select_c::screenSet() { field_0x020c[1]->setAlpha(0); field_0x021c = 0; bpk = JKRGetNameResource("zelda_file_select_02.btk", mpArchive); - JUT_ASSERT(5124, bpk != 0); + JUT_ASSERT(5124, bpk != NULL); field_0x01f8 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(bpk); field_0x01f8->searchUpdateMaterialID(fileSel.Scr); bpk = JKRGetNameResource("zelda_file_select_03.btk", mpArchive); - JUT_ASSERT(5133, bpk != 0); + JUT_ASSERT(5133, bpk != NULL); field_0x01f0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(bpk); field_0x01f0->searchUpdateMaterialID(fileSel.Scr); field_0x01f4 = 0; @@ -2547,7 +2547,7 @@ void dFile_select_c::screenSet() { field_0x0138[field_0x0148]->setAlpha(0xff); field_0x0138[field_0x0148 ^ 1]->setAlpha(0); mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); - JUT_ASSERT(5209, mSelIcon != 0); + JUT_ASSERT(5209, mSelIcon != NULL); mSelIcon->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); Vec vtxCenter; vtxCenter = field_0x00bc[mSelectNum]->getGlobalVtxCenter(false, 0); @@ -2600,7 +2600,7 @@ void dFile_select_c::screenSetCopySel() { static u64 l_tagName005[2] = {'w_cp_ef1', 'w_cp_ef2'}; mCpSel.Scr = new J2DScreen(); - JUT_ASSERT(5286, mCpSel.Scr != 0); + JUT_ASSERT(5286, mCpSel.Scr != NULL); mCpSel.Scr->setPriority("zelda_file_select_copy_select.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(mCpSel.Scr); mCpSel.mpPane2 = mCpSel.Scr->search('name_n'); @@ -2612,23 +2612,23 @@ void dFile_select_c::screenSetCopySel() { field_0x029c->searchUpdateMaterialID(mCpSel.Scr); field_0x02a0->searchUpdateMaterialID(mCpSel.Scr); void* bpk = JKRGetNameResource("zelda_file_select_copy_select.bpk", mpArchive); - JUT_ASSERT(5315, bpk != 0); + JUT_ASSERT(5315, bpk != NULL); field_0x02e8 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); field_0x02e8->searchUpdateMaterialID(mCpSel.Scr); field_0x02ec = 0; void* btk = JKRGetNameResource("zelda_file_select_copy_select_03.btk", mpArchive); - JUT_ASSERT(5325, btk != 0); + JUT_ASSERT(5325, btk != NULL); field_0x02f0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); field_0x02f0->searchUpdateMaterialID(mCpSel.Scr); field_0x02f4 = 0; field_0x02f8 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); field_0x02f8->searchUpdateMaterialID(mCpSel.Scr); btk = JKRGetNameResource("zelda_file_select_copy_select.btk", mpArchive); - JUT_ASSERT(5343, btk != 0); + JUT_ASSERT(5343, btk != NULL); field_0x0300 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); field_0x0300->searchUpdateMaterialID(mCpSel.Scr); void* brk = JKRGetNameResource("zelda_file_select_copy_select.brk", mpArchive); - JUT_ASSERT(5352, brk != 0); + JUT_ASSERT(5352, brk != NULL); field_0x0308 = (J2DAnmTevRegKey*)J2DAnmLoaderDataBase::load(brk); field_0x0308->searchUpdateMaterialID(mCpSel.Scr); field_0x02fc = 0; @@ -2658,7 +2658,7 @@ void dFile_select_c::screenSetCopySel() { namePane->animationTransform(); namePane->setAnimation((J2DAnmTransform*)NULL); mSelIcon2 = new dSelect_cursor_c(0, 1.0f, NULL); - JUT_ASSERT(5406, mSelIcon2 != 0); + JUT_ASSERT(5406, mSelIcon2 != NULL); mSelIcon2->setParam(0.96f, 0.94f, 0.03f, 0.7f, 0.7f); Vec local_24 = field_0x02a4[0]->getGlobalVtxCenter(false, 0); mSelIcon2->setPos(local_24.x, local_24.y, field_0x02a4[0]->getPanePtr(), true); @@ -2682,7 +2682,7 @@ void dFile_select_c::screenSetYesNo() { static u8 l_msgNum2[2] = {0x08, 0x07}; mYnSel.ScrYn = new J2DScreen(); - JUT_ASSERT(5435, mYnSel.ScrYn != 0); + JUT_ASSERT(5435, mYnSel.ScrYn != NULL); mYnSel.ScrYn->setPriority("zelda_file_select_yes_no_window.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(mYnSel.ScrYn); void* bck = JKRGetNameResource("zelda_file_select_yes_no_window.bck", mpArchive); @@ -2707,12 +2707,12 @@ void dFile_select_c::screenSetYesNo() { ((J2DTextBox*)field_0x01c0[i]->getPanePtr())->setString(acStack_30); } void* bpk = JKRGetNameResource("zelda_file_select_yes_no_window.bpk", mpArchive); - JUT_ASSERT(5483, bpk != 0); + JUT_ASSERT(5483, bpk != NULL); field_0x0318 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); field_0x0318->searchUpdateMaterialID(mYnSel.ScrYn); field_0x031c = 0; void* btk = JKRGetNameResource("zelda_file_select_yes_no_window.btk", mpArchive); - JUT_ASSERT(5493, btk != 0); + JUT_ASSERT(5493, btk != NULL); field_0x0320 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); field_0x0320->searchUpdateMaterialID(mYnSel.ScrYn); field_0x0324 = 0; @@ -2741,7 +2741,7 @@ void dFile_select_c::screenSet3Menu() { static u8 l_msgNum[3] = {0x57, 0x58, 0x56}; m3mSel.Scr3m = new J2DScreen(); - JUT_ASSERT(5530, m3mSel.Scr3m != 0); + JUT_ASSERT(5530, m3mSel.Scr3m != NULL); m3mSel.Scr3m->setPriority("zelda_file_select_3menu_window.blo", 0x1100000, mpArchive); dPaneClass_showNullPane(m3mSel.Scr3m); void* bck = JKRGetNameResource("zelda_file_select_3menu_window.bck", mpArchive); @@ -2750,12 +2750,12 @@ void dFile_select_c::screenSet3Menu() { field_0x0328->searchUpdateMaterialID(m3mSel.Scr3m); field_0x032c->searchUpdateMaterialID(m3mSel.Scr3m); void* bpk = JKRGetNameResource("zelda_file_select_3menu_window.bpk", mpArchive); - JUT_ASSERT(5552, bpk != 0); + JUT_ASSERT(5552, bpk != NULL); field_0x0330 = (J2DAnmColor*)J2DAnmLoaderDataBase::load(bpk); field_0x0330->searchUpdateMaterialID(m3mSel.Scr3m); field_0x0334 = 0; void* btk = JKRGetNameResource("zelda_file_select_3menu_window.btk", mpArchive); - JUT_ASSERT(5562, btk != 0); + JUT_ASSERT(5562, btk != NULL); field_0x0338 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); field_0x0338->searchUpdateMaterialID(m3mSel.Scr3m); field_0x033c = 0; @@ -2794,10 +2794,10 @@ void dFile_select_c::screenSet3Menu() { */ void dFile_select_c::screenSetDetail() { mSelDt.ScrDt = new J2DScreen(); - JUT_ASSERT(5622, mSelDt.ScrDt != 0); + JUT_ASSERT(5622, mSelDt.ScrDt != NULL); mSelDt.ScrDt->setPriority("zelda_file_select_details.blo", 0x1100000, mpArchive); void* btk = JKRGetNameResource("zelda_file_select_details.btk", mpArchive); - JUT_ASSERT(5628, btk != 0); + JUT_ASSERT(5628, btk != NULL); field_0x03a0 = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); mSelDt.ScrDt->setAnimation(field_0x03a0); field_0x03a4 = 0; @@ -4164,7 +4164,7 @@ void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char con bmdRes = archive->getResource('BMD ', param_0); modelData = J3DModelLoaderDataBase::load(bmdRes, 0x51020010); - JUT_ASSERT(8823, modelData != 0); + JUT_ASSERT(8823, modelData != NULL); for (u16 i = 0; i < modelData->getMaterialNum(); i++) { material = new J3DMaterialAnm(); @@ -4173,12 +4173,12 @@ void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char con } mpModel = new J3DModel(modelData, 0, 1); - JUT_ASSERT(8836, mpModel != 0); + JUT_ASSERT(8836, mpModel != NULL); if (param_1) { bckRes = archive->getResource('BCK ', param_1); anmBase = (J3DAnmTransform*)J3DAnmLoaderDataBase::load(bckRes); - JUT_ASSERT(8846, anmBase != 0); + JUT_ASSERT(8846, anmBase != NULL); mBckAnm = new mDoExt_bckAnm(); if (mBckAnm == NULL || !mBckAnm->init((J3DAnmTransform*)anmBase, 1, 2, 1.0f, 0, -1, false)) { @@ -4189,7 +4189,7 @@ void dFile_select3D_c::setJ3D(char const* param_0, char const* param_1, char con if (param_2) { brkRes = archive->getResource('BRK ', param_2); anmBase = (J3DAnmTevRegKey*)J3DAnmLoaderDataBase::load(brkRes); - JUT_ASSERT(8859, anmBase != 0); + JUT_ASSERT(8859, anmBase != NULL); ((J3DAnmTevRegKey*)anmBase)->searchUpdateMaterialID(modelData); mBrkAnm = new mDoExt_brkAnm(); diff --git a/src/d/d_gameover.cpp b/src/d/d_gameover.cpp index 947c8a74df..eefe7bfd6d 100644 --- a/src/d/d_gameover.cpp +++ b/src/d/d_gameover.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_gameover // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_gameover.h" #include "JSystem/J2DGraph/J2DScreen.h" @@ -146,7 +146,7 @@ int dGameover_c::_create() { } dRes_info_c* resInfo = dComIfG_getObjectResInfo("Gover"); - JUT_ASSERT(0, resInfo != 0); + JUT_ASSERT(0, resInfo != NULL); mpHeap = (JKRHeap*)dComIfGp_getExpHeap2D(); dComIfGp_setHeapLockFlag(6); @@ -155,7 +155,7 @@ int dGameover_c::_create() { dgo_screen_c = new dDlst_GameOverScrnDraw_c(resInfo->getArchive()); dMs_c = new dMenu_save_c(); - JUT_ASSERT(0, dMs_c != 0); + JUT_ASSERT(0, dMs_c != NULL); if (dMeter2Info_getGameOverType() == 1) { if (!strcmp(dComIfGp_getLastPlayStageName(), "D_MN10A")) { @@ -174,7 +174,7 @@ int dGameover_c::_create() { dMs_c->_create(); dgo_capture_c = new dDlst_Gameover_CAPTURE_c(); - JUT_ASSERT(0, dgo_capture_c != 0); + JUT_ASSERT(0, dgo_capture_c != NULL); OS_REPORT("game over create size ===> %d\n", temp - mpHeap->getTotalFreeSize()); diff --git a/src/d/d_home_button.cpp b/src/d/d_home_button.cpp index 821afe9798..782b021696 100644 --- a/src/d/d_home_button.cpp +++ b/src/d/d_home_button.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_home_button.h" #include "JSystem/JFramework/JFWDisplay.h" diff --git a/src/d/d_insect.cpp b/src/d/d_insect.cpp index fdb15164a6..6bbaf990e3 100644 --- a/src/d/d_insect.cpp +++ b/src/d/d_insect.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_insect.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp index 4a2338e94b..5904db9892 100644 --- a/src/d/d_item.cpp +++ b/src/d/d_item.cpp @@ -3,7 +3,7 @@ * Item Get Handling */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_item.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp index 0508d7714b..c347e59ce1 100644 --- a/src/d/d_item_data.cpp +++ b/src/d/d_item_data.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_item_data.h" diff --git a/src/d/d_jnt_col.cpp b/src/d/d_jnt_col.cpp index 98493bd74b..26ba4d763e 100644 --- a/src/d/d_jnt_col.cpp +++ b/src/d/d_jnt_col.cpp @@ -2,7 +2,7 @@ // d_jnt_col // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_jnt_col.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp index 432795e5ba..45913a8cf5 100644 --- a/src/d/d_k_wmark.cpp +++ b/src/d/d_k_wmark.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_k_wmark.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -37,7 +37,7 @@ int dkWmark_c::create() { mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x880, 0x20); if (mpHeap != NULL) { J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x23); - JUT_ASSERT(60, modelData != 0); + JUT_ASSERT(60, modelData != NULL); mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000084); mDoExt_restoreCurrentHeap(); diff --git a/src/d/d_k_wpillar.cpp b/src/d/d_k_wpillar.cpp index 5f84129c46..a29045a718 100644 --- a/src/d/d_k_wpillar.cpp +++ b/src/d/d_k_wpillar.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_k_wpillar // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_k_wpillar.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp index c71ab89fa7..79a144153f 100644 --- a/src/d/d_kankyo.cpp +++ b/src/d/d_kankyo.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo.h" #include @@ -34,7 +34,7 @@ inline float cosf(float x) { /* 8019C388-8019C3A4 196CC8 001C+00 2/2 0/0 0/0 .text dKy_WolfPowerup_AmbCol__FP11_GXColorS10 */ void dKy_WolfPowerup_AmbCol(GXColorS10* in_col_p) { - JUT_ASSERT(185, in_col_p != 0); + JUT_ASSERT(185, in_col_p != NULL); in_col_p->r = 40; in_col_p->g = 52; @@ -292,7 +292,7 @@ static u16 lightMaskData[8] = { /* 8019CB0C-8019CCDC 19744C 01D0+00 3/2 0/0 0/0 .text dKy_WolfPowerup_BgAmbCol__FP11_GXColorS10 */ void dKy_WolfPowerup_BgAmbCol(GXColorS10* in_col_p) { - JUT_ASSERT(374, in_col_p != 0); + JUT_ASSERT(374, in_col_p != NULL); switch (dKy_sense_pat_get()) { case 1: @@ -372,8 +372,8 @@ void dKy_WolfPowerup_BgAmbCol(GXColorS10* in_col_p) { /* 8019CCDC-8019CE5C 19761C 0180+00 4/3 0/0 0/0 .text dKy_WolfPowerup_FogNearFar__FPfPf */ void dKy_WolfPowerup_FogNearFar(f32* near_p, f32* far_p) { - JUT_ASSERT(499, near_p != 0); - JUT_ASSERT(500, far_p != 0); + JUT_ASSERT(499, near_p != NULL); + JUT_ASSERT(500, far_p != NULL); switch (dKy_sense_pat_get()) { case 1: @@ -1105,7 +1105,7 @@ static void dungeonlight_init() { /* 8019EAA0-8019EBD0 1993E0 0130+00 1/1 0/0 0/0 .text undwater_init__Fv */ static void undwater_init() { J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Always", 0x1D); - JUT_ASSERT(1867, modelData2 != 0); + JUT_ASSERT(1867, modelData2 != NULL); g_env_light.undwater_ef_heap = mDoExt_createSolidHeapFromGameToCurrent(0x600, 0x20); @@ -1120,16 +1120,16 @@ static void undwater_init() { if (!g_env_light.undwater_btk->init(modelData2, pbtk, TRUE, J3DFrameCtrl::EMode_LOOP, 1.0f, 0, -1)) { - JUT_ASSERT(1898, 0); + JUT_ASSERT(1898, FALSE); } } else { - JUT_ASSERT(1902, 0); + JUT_ASSERT(1902, FALSE); } } mDoExt_restoreCurrentHeap(); mDoExt_adjustSolidHeap(g_env_light.undwater_ef_heap); } else { - JUT_ASSERT(1917, 0); + JUT_ASSERT(1917, FALSE); } } @@ -4419,7 +4419,7 @@ void dKy_setLight_nowroom_common(char room_no, f32 light_ratio) { if (lightMask & lightMaskData[i + 2]) { if (room_tevstr == NULL) { - JUT_ASSERT(12633, 0); + JUT_ASSERT(12633, FALSE); } J3DLightInfo* room_light = &room_tevstr->mLights[i].getLightInfo(); @@ -6803,7 +6803,7 @@ void dKy_murky_set(J3DMaterial* material_p) { J3DGXColorS10 tev_col; J3DGXColor tev_kcol; - JUT_ASSERT(0x43DB, material_p != 0); + JUT_ASSERT(0x43DB, material_p != NULL); tev_col.r = g_env_light.bg_amb_col[1].r; tev_col.g = g_env_light.bg_amb_col[1].g; diff --git a/src/d/d_kankyo_data.cpp b/src/d/d_kankyo_data.cpp index 0c18732fd9..26782d30e9 100644 --- a/src/d/d_kankyo_data.cpp +++ b/src/d/d_kankyo_data.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/kankyo/d_kankyo_data // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo_data.h" #include "d/d_stage.h" diff --git a/src/d/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp index eafc35da51..502f15a8e7 100644 --- a/src/d/d_kankyo_rain.cpp +++ b/src/d/d_kankyo_rain.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTTexture.h" #include "SSystem/SComponent/c_counter.h" @@ -267,7 +267,7 @@ void dKyr_sun_move() { lenz_packet->field_0x84 = lenz_packet->field_0x8c; lenz_packet->field_0x88 = lenz_packet->field_0x90; - lenz_packet->field_0x8c = 1000000000.0f; + lenz_packet->field_0x8c = 1000000000.0f; // This is not G_CM3D_F_INF lenz_packet->field_0x90 = 0.0f; cXyz center; @@ -508,7 +508,7 @@ static BOOL forward_overhead_bg_chk(cXyz* ppos, f32 dist) { *ppos = chk_pos; roofchk.SetPos(chk_pos); - if (1000000000.0f != dComIfG_Bgsp().RoofChk(&roofchk)) { + if (G_CM3D_F_INF != dComIfG_Bgsp().RoofChk(&roofchk)) { chk = TRUE; if (strcmp(dComIfGp_getStartStageName(), "F_SP122") == 0) { if (dStage_roomControl_c::getStayNo() == 17) { diff --git a/src/d/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp index c1b1b87385..dae51872bb 100644 --- a/src/d/d_kankyo_wether.cpp +++ b/src/d/d_kankyo_wether.cpp @@ -3,7 +3,7 @@ * Weather Effects */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kankyo_wether.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" @@ -563,7 +563,7 @@ static void wether_move_sun() { (u8*)dComIfG_getObjectRes("Always", 0x57); g_env_light.mpSunLenzPacket->mpResLenz = (u8*)dComIfG_getObjectRes("Always", 0x5C); - g_env_light.mpSunLenzPacket->field_0x8c = 1e9f; + g_env_light.mpSunLenzPacket->field_0x8c = 1000000000.0f; // This is not G_CM3D_F_INF g_env_light.mpSunLenzPacket->field_0x90 = 0.0f; g_env_light.mpSunLenzPacket->mDistFalloff = 0.0f; g_env_light.mpSunLenzPacket->mDrawLenzInSky = false; diff --git a/src/d/d_kantera_icon_meter.cpp b/src/d/d_kantera_icon_meter.cpp index c2d072feb5..3c62e4dd82 100644 --- a/src/d/d_kantera_icon_meter.cpp +++ b/src/d/d_kantera_icon_meter.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_kantera_icon_meter // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kantera_icon_meter.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_ky_thunder.cpp b/src/d/d_ky_thunder.cpp index ee6142f8e2..f99c1d9514 100644 --- a/src/d/d_ky_thunder.cpp +++ b/src/d/d_ky_thunder.cpp @@ -3,7 +3,7 @@ * Environment - Thunder */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ky_thunder.h" #include "JSystem/JKernel/JKRSolidHeap.h" diff --git a/src/d/d_kyeff.cpp b/src/d/d_kyeff.cpp index 7d64b730a9..7e1db4ed0c 100644 --- a/src/d/d_kyeff.cpp +++ b/src/d/d_kyeff.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_kyeff.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_kyeff2.cpp b/src/d/d_kyeff2.cpp index 317993e81e..bb3cf57b76 100644 --- a/src/d/d_kyeff2.cpp +++ b/src/d/d_kyeff2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "SSystem/SComponent/c_phase.h" #include "d/d_kyeff2.h" diff --git a/src/d/d_lib.cpp b/src/d/d_lib.cpp index a88d3f67a4..74d9181b05 100644 --- a/src/d/d_lib.cpp +++ b/src/d/d_lib.cpp @@ -3,7 +3,7 @@ * Utility Functions */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_lib.h" #include "d/d_event.h" @@ -255,7 +255,7 @@ BOOL dLib_checkActorInRectangle(fopAc_ac_c* param_0, fopAc_ac_c* param_1, cXyz c * dLib_getExpandSizeFromAramArchive__FP14JKRAramArchivePCc */ u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* i_aramArchive, char const* param_2) { u8 header[32] __attribute__((aligned(32))); - JUT_ASSERT(1252, i_aramArchive != 0); + JUT_ASSERT(1252, i_aramArchive != NULL); u32 address = i_aramArchive->getAramAddress(param_2); if (address == 0) { return 0; @@ -264,7 +264,7 @@ u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* i_aramArchive, char const* 0, 0, 0xffffffff, 0); JUT_ASSERT(1260, readAddress == header); JKRArchive::SDIFileEntry* entry = i_aramArchive->findFsResource(param_2, 0); - JUT_ASSERT(1263, entry != 0); + JUT_ASSERT(1263, entry != NULL); u32 uVar1 = ALIGN_NEXT(JKRDecompExpandSize(header), 32); u32 uVar5 = ALIGN_NEXT(entry->data_size, 32); if (uVar1 > uVar5) { diff --git a/src/d/d_map.cpp b/src/d/d_map.cpp index 3b5b96fcda..7fde89416c 100644 --- a/src/d/d_map.cpp +++ b/src/d/d_map.cpp @@ -101,7 +101,7 @@ int renderingAmap_c::getDispType() const { disp_type = 5; break; default: - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; } @@ -339,7 +339,7 @@ GXColor* renderingAmap_c::getLineColor(int param_0, int param_1) { *color = borderColor1; break; default: - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; } } else { @@ -360,7 +360,7 @@ const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) { const GXColor* color; if (isDrawOutSideTrim() && field_0x38 != 2) { - JUT_ASSERT(0, m_outSideBlackLineCnt < (sizeof(colorTable) / sizeof(colorTable[0]))); + JUT_ASSERT(0, m_outSideBlackLineCnt < ARRAY_SIZEU(colorTable)); color = &colorTable[m_outSideBlackLineCnt]; } else { color = getLineColor(param_0, param_1); @@ -430,7 +430,7 @@ int renderingAmap_c::getStayType() const { * isDrawIconSingle2__15renderingAmap_cCFPCQ27dTres_c6data_sbbi */ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1, bool param_2, int param_3) const { - JUT_ASSERT(0, i_data != 0); + JUT_ASSERT(0, i_data != NULL); bool var_r31 = false; int disp_type = getDispType(); @@ -596,7 +596,7 @@ bool renderingAmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para } break; default: - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; } @@ -625,7 +625,7 @@ bool dMap_c::isSpecialOutline() { /* 8002974C-800297A8 02408C 005C+00 1/1 0/0 0/0 .text copyPalette__6dMap_cFv */ void dMap_c::copyPalette() { - JUT_ASSERT(0, m_res != 0); + JUT_ASSERT(0, m_res != NULL); cLib_memCpy(m_res, m_res_src, sizeof(dMap_HIO_prm_res_dst_s::m_res->palette_data)); if (getStayType() == 0) { @@ -684,7 +684,7 @@ dMap_c::dMap_c(int param_0, int param_1, int param_2, int param_3) { field_0x90 = 0; m_res = new (0x20) dMap_prm_res_s; - JUT_ASSERT(0, m_res != 0); + JUT_ASSERT(0, m_res != NULL); dMap_HIO_prm_res_dst_s::m_res = m_res; @@ -700,12 +700,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]; - JUT_ASSERT(0, mImage_p != 0); + JUT_ASSERT(0, mImage_p != NULL); renderingDAmap_c::init(mImage_p, mTexSizeX, mTexSizeY, mTexSizeX, mTexSizeY); mResTIMG = new (0x20) ResTIMG; - JUT_ASSERT(0, mResTIMG != 0); + JUT_ASSERT(0, mResTIMG != NULL); makeResTIMG(mResTIMG, mTexSizeX, mTexSizeY, mImage_p, (u8*)m_res, 0x33); } @@ -750,7 +750,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param f32 sp8 = 0.0f; dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i_roomNo); - JUT_ASSERT(0, fileList2_p != 0); + JUT_ASSERT(0, fileList2_p != NULL); if (fileList2_p != NULL) { dMapInfo_n::getRoomMinMaxXZ(i_roomNo, &sp14, &sp10, &spC, &sp8); @@ -758,7 +758,7 @@ void dMap_c::getMapMinMaxXZ(int i_roomNo, f32* param_1, f32* param_2, f32* param switch (getDispType()) { default: - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); case 4: case 0: var_f0 = temp_f31; @@ -870,7 +870,7 @@ void dMap_c::calcMapCenterXZ(int i_roomNo, f32* param_1, f32* param_2) { /* 80029E1C-80029F84 02475C 0168+00 1/1 0/0 0/0 .text calcMapCmPerTexel__6dMap_cFiPf */ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) { JUT_ASSERT(0, i_roomNo >= 0); - JUT_ASSERT(0, ip_cmPerTexel != 0); + JUT_ASSERT(0, ip_cmPerTexel != NULL); f32 cmPerTexel = 0.0f; JUT_ASSERT(0, mTexSizeY != 0); @@ -897,7 +897,7 @@ void dMap_c::calcMapCmPerTexel(int i_roomNo, f32* ip_cmPerTexel) { f32 var_f31 = 0.0f; stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); - JUT_ASSERT(0, pstag != 0); + JUT_ASSERT(0, pstag != NULL); if (pstag != NULL) { var_f31 = pstag->field_0x20; @@ -1106,7 +1106,7 @@ void dMap_c::_move(f32 i_centerX, f32 i_centerZ, int i_roomNo, f32 param_3) { switch (getDispType()) { default: case 0: - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; case 5: field_0x8e = 2; diff --git a/src/d/d_map_path.cpp b/src/d/d_map_path.cpp index 0492125a7e..e4de4822e1 100644 --- a/src/d/d_map_path.cpp +++ b/src/d/d_map_path.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DGrafContext.h" #include "JSystem/JUtility/JUTTexture.h" diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp index cda14658c8..469c9acfbc 100644 --- a/src/d/d_map_path_dmap.cpp +++ b/src/d/d_map_path_dmap.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_map_path_dmap.h" #include "d/actor/d_a_player.h" @@ -435,7 +435,7 @@ int dMpath_c::getTopBottomFloorNo(s8* i_topFloorNo, s8* i_bottomFloorNo) { /* 8003F7E8-8003F810 03A128 0028+00 0/0 1/1 0/0 .text createWork__8dMpath_cFv */ void dMpath_c::createWork() { mLayerList = new dDrawPath_c::layer_data; - JUT_ASSERT(1416, mLayerList!=0); + JUT_ASSERT(1416, mLayerList!=NULL); } /* 8003F810-8003FA40 03A150 0230+00 1/1 1/1 0/0 .text @@ -1114,7 +1114,7 @@ void renderingPlusDoorAndCursor_c::drawTreasure() { int group_num = getIconGroupNumber(tmp); if (group_num != 0) { - JUT_ASSERT(0xaf9, typeGroupData_p != 0); + JUT_ASSERT(0xaf9, typeGroupData_p != NULL); f32 icon_size = getIconSize(tmp) * mCmPerTexel; f32 icon_size_2 = icon_size; @@ -1190,7 +1190,7 @@ void renderingPlusDoorAndCursor_c::drawTreasureAfterPlayer() { int group_num = getIconGroupNumber(tmp); if (group_num != 0) { - JUT_ASSERT(0xb7e, typeGroupData_p != 0); + JUT_ASSERT(0xb7e, typeGroupData_p != NULL); f32 icon_size = getIconSize(tmp) * mCmPerTexel; f32 icon_size_2 = icon_size; diff --git a/src/d/d_map_path_fmap.cpp b/src/d/d_map_path_fmap.cpp index a3135e90a4..e7138f009b 100644 --- a/src/d/d_map_path_fmap.cpp +++ b/src/d/d_map_path_fmap.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_map_path_fmap // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_com_inf_game.h" #include "d/d_map_path_fmap.h" diff --git a/src/d/d_menu_calibration.cpp b/src/d/d_menu_calibration.cpp index 39a3b904b4..bf342bb5eb 100644 --- a/src/d/d_menu_calibration.cpp +++ b/src/d/d_menu_calibration.cpp @@ -3,7 +3,7 @@ * Wii Remote Calibration Option Menu */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_calibration.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_menu_collect.cpp b/src/d/d_menu_collect.cpp index f73b4e7fed..4a3b004950 100644 --- a/src/d/d_menu_collect.cpp +++ b/src/d/d_menu_collect.cpp @@ -3,7 +3,7 @@ * Collection Menu */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_collect.h" #include "JSystem/J3DGraphLoader/J3DModelLoader.h" diff --git a/src/d/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp index 32613cf645..8637c14c3a 100644 --- a/src/d/d_menu_dmap.cpp +++ b/src/d/d_menu_dmap.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_dmap.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -97,15 +97,15 @@ dMenu_DmapBg_c::dMenu_DmapBg_c(JKRExpHeap* i_heap, STControl* i_stick) { field_0xdd8 = 1; mString = new dMsgString_c(); - JUT_ASSERT(621, mString != 0); + JUT_ASSERT(621, mString != NULL); mpTalkHeap = JKRCreateExpHeap(0x32000, mpHeap, false); - JUT_ASSERT(624, mpTalkHeap != 0); + JUT_ASSERT(624, mpTalkHeap != NULL); mpItemExplain = NULL; mpMeterHaihai = new dMeterHaihai_c(2); - JUT_ASSERT(630, mpMeterHaihai != 0); + JUT_ASSERT(630, mpMeterHaihai != NULL); field_0xdda = 0; @@ -141,7 +141,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(); - JUT_ASSERT(689, mMapScreen[i] != 0); + JUT_ASSERT(689, mMapScreen[i] != NULL); bool fg = mMapScreen[i]->setPriority("zelda_dungeon_map_map.blo", 0x20000, dComIfGp_getDmapResArchive()); JUT_ASSERT(693, fg != false); @@ -151,7 +151,7 @@ void dMenu_DmapBg_c::mapScreenInit() { #if (PLATFORM_WII || PLATFORM_SHIELD) mpBlack = new CPaneMgrAlpha(mMapScreen[0], 'm_black', 2, NULL); - JUT_ASSERT(699, mpBlack != 0); + JUT_ASSERT(699, mpBlack != NULL); mpBlack->setAlphaRate(0.0f); #else mpBlack = NULL; @@ -182,11 +182,11 @@ void dMenu_DmapBg_c::mapScreenInit() { for (int i = 0; i < 2; i++) { mpMapRoot[i] = new CPaneMgrAlphaMorf(mMapScreen[i], 'ROOT', 2, NULL); - JUT_ASSERT(751, mpMapRoot[i] != 0); + JUT_ASSERT(751, mpMapRoot[i] != NULL); } void* btk0 = JKRGetNameResource("zelda_dungeon_map_map.btk", dComIfGp_getDmapResArchive()); - JUT_ASSERT(766, btk0 != 0); + JUT_ASSERT(766, btk0 != NULL); field_0xd28[0] = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk0); field_0xd28[0]->searchUpdateMaterialID(mMapScreen[0]); @@ -216,7 +216,7 @@ void dMenu_DmapBg_c::mapScreenInit() { for (int i = 0; i < 2; i++) { mpMapSpace[i] = new CPaneMgr(mMapScreen[i], 'mapspace', 0, NULL); - JUT_ASSERT(817, mpMapSpace[i] != 0); + JUT_ASSERT(817, mpMapSpace[i] != NULL); mpMapSpace[i]->paneTrans(0.0f, -15.0f); } @@ -298,7 +298,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { static u64 const c_tag[2] = {'f_text_s', 'f_text'}; mButtonScreen = new J2DScreen(); - JUT_ASSERT(916, mButtonScreen != 0); + JUT_ASSERT(916, mButtonScreen != NULL); bool fg = mButtonScreen->setPriority("zelda_dungeon_map_spot_button.blo", 0x20000, dComIfGp_getDmapResArchive()); JUT_ASSERT(922, fg != false); @@ -306,14 +306,14 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { #if (PLATFORM_WII || PLATFORM_SHIELD) mDecorateScreen = new J2DScreen(); - JUT_ASSERT(926, mDecorateScreen != 0); + 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); - JUT_ASSERT(934, mpDecorateRoot != 0); + JUT_ASSERT(934, mpDecorateRoot != NULL); #else mDecorateScreen = NULL; mpDecorateRoot = NULL; @@ -323,7 +323,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { #endif mpButtonRoot = new CPaneMgrAlphaMorf(mButtonScreen, 'ROOT', 2, NULL); - JUT_ASSERT(952, mpButtonRoot != 0); + JUT_ASSERT(952, mpButtonRoot != NULL); for (int i = 0; i < 2; i++) { mpButtonAB[i] = NULL; @@ -331,7 +331,7 @@ void dMenu_DmapBg_c::buttonIconScreenInit() { } mpCButton = new CPaneMgrAlpha(mButtonScreen, 'c_btn', 2, NULL); - JUT_ASSERT(978, mpCButton != 0); + JUT_ASSERT(978, mpCButton != NULL); mpJButton = NULL; for (int i = 0; i < 5; i++) { @@ -433,7 +433,7 @@ void dMenu_DmapBg_c::createExplain() { if (mpItemExplain == NULL) { JKRHeap* prevHeap = mDoExt_setCurrentHeap(mpTalkHeap); mpItemExplain = new dMenu_ItemExplain_c(mpTalkHeap, dComIfGp_getDmapResArchive(), mpStick, true); - JUT_ASSERT(1308, mpItemExplain != 0); + JUT_ASSERT(1308, mpItemExplain != NULL); mDoExt_setCurrentHeap(prevHeap); } @@ -454,14 +454,14 @@ void dMenu_DmapBg_c::deleteExplain() { */ void dMenu_DmapBg_c::baseScreenInit() { mBaseScreen = new J2DScreen(); - JUT_ASSERT(1336, mBaseScreen != 0); + 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(); - JUT_ASSERT(1351, mFloorScreen != 0); + JUT_ASSERT(1351, mFloorScreen != NULL); fg = mFloorScreen->setPriority("zelda_dungeon_map_floor_parts.blo", 0x20000, dComIfGp_getDmapResArchive()); @@ -471,13 +471,13 @@ void dMenu_DmapBg_c::baseScreenInit() { mBaseScreen->search('w_btn_n')->hide(); mpBaseRoot = new CPaneMgrAlphaMorf(mBaseScreen, 'ROOT', 2, NULL); - JUT_ASSERT(1396, mpBaseRoot != 0); + JUT_ASSERT(1396, mpBaseRoot != NULL); mpFloorRoot = new CPaneMgrAlphaMorf(mFloorScreen, 'ROOT', 2, NULL); - JUT_ASSERT(1399, mpFloorRoot != 0); + JUT_ASSERT(1399, mpFloorRoot != NULL); mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); - JUT_ASSERT(1403, mpDrawCursor != 0); + JUT_ASSERT(1403, mpDrawCursor != NULL); mpDrawCursor->setAlphaRate(1.0f); mpDrawCursor->setParam(0.95f, 0.9f, 0.1f, 0.6f, 0.5f); @@ -950,10 +950,10 @@ void dMenu_DmapBg_c::update() { mpArchiveMount = NULL; ResTIMG* mp_image = (ResTIMG*)mpArchive->getResource("tex/bg.bti"); - JUT_ASSERT(2321, mp_image != 0); + JUT_ASSERT(2321, mp_image != NULL); mpBackTexture = new J2DPicture(mp_image); - JUT_ASSERT(2323, mpBackTexture != 0); + JUT_ASSERT(2323, mpBackTexture != NULL); void* spec = mpArchive->getResource("spec/spec.dat"); memcpy(&field_0xd80, spec, 20); @@ -1069,16 +1069,16 @@ void dMenu_Dmap_c::screenInit() { for (int i = 0; i < 8; i++) { field_0x114[i] = 0.0f; mSelFloor[i] = new CPaneMgr(mpDrawBg->mFloorScreen, floor_tag[i], 3, NULL); - JUT_ASSERT(2654, mSelFloor[i] != 0); + JUT_ASSERT(2654, mSelFloor[i] != NULL); mIconLinkPos[i] = new CPaneMgr(mpDrawBg->mFloorScreen, icon_tag[i], 0, NULL); - JUT_ASSERT(2657, mIconLinkPos[i] != 0); + JUT_ASSERT(2657, mIconLinkPos[i] != NULL); mIconBossPos[i] = new CPaneMgr(mpDrawBg->mFloorScreen, boss_tag[i], 0, NULL); - JUT_ASSERT(2660, mIconBossPos[i] != 0); + JUT_ASSERT(2660, mIconBossPos[i] != NULL); } for (int i = 0; i < 2; i++) { mStayIcon[i] = new CPaneMgr(mpDrawBg->mFloorScreen, stay_tag[i], 0, NULL); - JUT_ASSERT(2665, mStayIcon[i] != 0); + JUT_ASSERT(2665, mStayIcon[i] != NULL); mStayIcon[i]->hide(); field_0x14c[i] = mStayIcon[i]->getGlobalVtxCenter(false, 0); @@ -1635,12 +1635,12 @@ void dMenu_Dmap_c::_create() { OS_REPORT("MenuDmap create前================> %d bytes remain\n", sp30); mDmapHeap = JKRCreateExpHeap(field_0xe8->getFreeSize() - 0x10, field_0xe8, false); - JUT_ASSERT(3732, mDmapHeap != 0); + JUT_ASSERT(3732, mDmapHeap != NULL); JKRHeap* heap = mDoExt_setCurrentHeap(mDmapHeap); u32 sp28 = mDmapHeap->getTotalFreeSize(); mMapCtrl = new dMenu_DmapMapCtrl_c(); - JUT_ASSERT(3739, mMapCtrl != 0); + JUT_ASSERT(3739, mMapCtrl != NULL); mCMessageNum = 0; mJMessageNum = 0; @@ -1651,15 +1651,15 @@ void dMenu_Dmap_c::_create() { } mSelStick = new STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800); - JUT_ASSERT(3753, mSelStick != 0); + JUT_ASSERT(3753, mSelStick != NULL); mSelStick->setFirstWaitTime(8); u32 sp24 = field_0xe8->getTotalFreeSize(); mpDrawBg = new dMenu_DmapBg_c(mDmapHeap, mpStick); - JUT_ASSERT(3763, mpDrawBg != 0); + JUT_ASSERT(3763, mpDrawBg != NULL); mItemTexBuf = (u8*)mDmapHeap->alloc(0xC00, 0x20); - JUT_ASSERT(3766, mItemTexBuf != 0); + JUT_ASSERT(3766, mItemTexBuf != NULL); if (mZoomState) { if (POINTER_OPT == 0) { @@ -1905,7 +1905,7 @@ bool dMenu_Dmap_c::isOpen() { mpDresArchiveMount = NULL; mpBinData = mpDresArchive->getResource("dat/data.dat"); - JUT_ASSERT(4377, mpBinData != 0); + JUT_ASSERT(4377, mpBinData != NULL); _create(); } else { diff --git a/src/d/d_menu_dmap_map.cpp b/src/d/d_menu_dmap_map.cpp index e04e1acff8..a042c45dd5 100644 --- a/src/d/d_menu_dmap_map.cpp +++ b/src/d/d_menu_dmap_map.cpp @@ -2,7 +2,7 @@ // Translation Unit: d/d_menu_dmap_map // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include #include "d/d_com_inf_game.h" @@ -25,7 +25,7 @@ bool renderingDmap_c::hasMap() const { * isDrawIconSingle2__15renderingDmap_cCFPCQ27dTres_c6data_sbbi */ bool renderingDmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool param_1, bool param_2, int param_3) const { - JUT_ASSERT(995, i_data != 0); + JUT_ASSERT(995, i_data != NULL); bool rt = false; int var_r27 = dTres_c::getTypeToTypeGroupNo(i_data->mType); @@ -47,7 +47,7 @@ bool renderingDmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para switch (var_r27) { default: - JUT_ASSERT(1015, 0); + JUT_ASSERT(1015, FALSE); break; case 0: if (var_r29 && i_data->mNo != 0xFF && !dComIfGs_isTbox(i_data->mNo)) { @@ -66,7 +66,7 @@ bool renderingDmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para } break; case 4: - JUT_ASSERT(1044, 0); + JUT_ASSERT(1044, FALSE); break; case 5: if ((i_data->mNo == 0xFF || (i_data->mNo != 0xFF && !dComIfGs_isTbox(i_data->mNo))) && (i_data->mSwBit == 0xFF || (i_data->mSwBit != 0xFF && dComIfGs_isSwitch(i_data->mSwBit, i_data->mRoomNo))) && param_1) { @@ -74,7 +74,7 @@ bool renderingDmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para } break; case 6: - JUT_ASSERT(1070, 0); + JUT_ASSERT(1070, FALSE); break; case 3: if (var_r29 && (i_data->mSwBit == 0xFF || (i_data->mSwBit != 0xFF && dComIfGs_isSwitch(i_data->mSwBit, i_data->mRoomNo))) && !dComIfGs_isStageBossEnemy()) { @@ -87,7 +87,7 @@ bool renderingDmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para } break; case 10: - JUT_ASSERT(1100, 0); + JUT_ASSERT(1100, FALSE); break; case 11: if (var_r29) { @@ -101,7 +101,7 @@ bool renderingDmap_c::isDrawIconSingle2(dTres_c::data_s const* i_data, bool para break; case 13: case 14: - JUT_ASSERT(1123, 0); + JUT_ASSERT(1123, FALSE); break; case 15: if (var_r29 && (i_data->mNo == 0xFF || (i_data->mNo != 0xFF && dComIfGs_isTbox(i_data->mNo)))) { @@ -297,7 +297,7 @@ void* dMdm_HIO_prm_res_dst_s::m_res; /* 801C0CD8-801C0D04 1BB618 002C+00 1/1 0/0 0/0 .text _create__15dMenu_DmapMap_cFUsUsUsUsPv */ void dMenu_DmapMap_c::_create(u16 param_0, u16 param_1, u16 param_2, u16 param_3, void* res) { - JUT_ASSERT(1569, res != 0); + JUT_ASSERT(1569, res != NULL); dMdm_HIO_prm_res_dst_s::m_res = res; field_0x84 = 120; setTexture(param_0, param_1, param_2, param_3); @@ -321,11 +321,11 @@ void dMenu_DmapMap_c::setTexture(u16 param_0, u16 param_1, u16 param_2, u16 para 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]; - JUT_ASSERT(1672, mMapImage_p[lp1] != 0); + 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; - JUT_ASSERT(1687, mResTIMG[lp1] != 0); + 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); } } @@ -446,9 +446,9 @@ void dMenu_StageMapCtrl_c::cnvPosTo2Dpos(f32 param_0, f32 param_1, f32* param_2, /* 801C1194-801C1218 1BBAD4 0084+00 0/0 1/1 0/0 .text * getPlayerDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs */ void dMenu_StageMapCtrl_c::getPlayerDrawInfo(f32* i_dispX, f32* i_dispY, s16* i_rotY) const { - JUT_ASSERT(2030, i_dispX != 0); - JUT_ASSERT(2031, i_dispX != 0); - JUT_ASSERT(2032, i_rotY != 0); + JUT_ASSERT(2030, i_dispX != NULL); + JUT_ASSERT(2031, i_dispX != NULL); + JUT_ASSERT(2032, i_rotY != NULL); Vec sp10 = dMapInfo_n::getMapPlayerPos(); cnvPosTo2Dpos(sp10.x, sp10.z, i_dispX, i_dispY); @@ -461,9 +461,9 @@ void dMenu_StageMapCtrl_c::getPlayerDrawInfo(f32* i_dispX, f32* i_dispY, s16* i_ /* 801C1218-801C12A8 1BBB58 0090+00 0/0 1/1 0/0 .text * getRestartDrawInfo__20dMenu_StageMapCtrl_cCFPfPfPs */ s8 dMenu_StageMapCtrl_c::getRestartDrawInfo(f32* i_dispX, f32* i_dispY, s16* i_rotY) const { - JUT_ASSERT(2057, i_dispX != 0); - JUT_ASSERT(2058, i_dispX != 0); - JUT_ASSERT(2059, i_rotY != 0); + JUT_ASSERT(2057, i_dispX != NULL); + JUT_ASSERT(2058, i_dispX != NULL); + JUT_ASSERT(2059, i_rotY != NULL); Vec sp10 = dMapInfo_n::getMapRestartPos(); cnvPosTo2Dpos(sp10.x, sp10.z, i_dispX, i_dispY); @@ -604,7 +604,7 @@ void dMenu_DmapMapCtrl_c::getZoomMinMaxCheck(f32* param_0, f32* param_1, f32* pa for (int i = 0; i < 64; i++) { if (dMpath_c::getRoomPointer(0, i) || dMpath_c::getRoomPointer(1, i)) { dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(i); - JUT_ASSERT(2360, fileList2_p != 0); + JUT_ASSERT(2360, fileList2_p != NULL); if (fileList2_p != NULL && (dMapInfo_n::chkGetMap() || dMapInfo_n::chkGetCompass() || dMapInfo_n::isVisitedRoom(i) || field_0xe6 == i)) { f32 sp18, sp14, sp10, spC; @@ -676,7 +676,7 @@ void dMenu_DmapMapCtrl_c::calcZoomCenter(f32* param_0, f32* param_1) { f32 sp8 = 0.0f; dStage_FileList2_dt_c* fileList2_p = dStage_roomControl_c::getFileList2(field_0xe6); - JUT_ASSERT(2437, fileList2_p != 0); + JUT_ASSERT(2437, fileList2_p != NULL); if (fileList2_p != NULL) { dMapInfo_n::getRoomCenter(field_0xe6, &spC, &sp8); @@ -697,7 +697,7 @@ f32 dMenu_DmapMapCtrl_c::getZoomCmPerPixel() { f32 var_f30 = field_0x98 < field_0x94 ? field_0x98 : field_0x94; stage_stag_info_class* pstag = dComIfGp_getStage()->getStagInfo(); - JUT_ASSERT(2467, pstag != 0); + JUT_ASSERT(2467, pstag != NULL); f32 var_f29 = 10800.0f / var_f30; f32 var_f31 = 0.0f; diff --git a/src/d/d_menu_fishing.cpp b/src/d/d_menu_fishing.cpp index 37d1c5be50..849f2786c0 100644 --- a/src/d/d_menu_fishing.cpp +++ b/src/d/d_menu_fishing.cpp @@ -3,7 +3,7 @@ * Menu - Fishing Journal */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_fishing.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp index 84b7659ac5..cb719c0bec 100644 --- a/src/d/d_menu_fmap.cpp +++ b/src/d/d_menu_fmap.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_menu_fmap // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_fmap.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_menu_fmap2D.cpp b/src/d/d_menu_fmap2D.cpp index 2a81428eed..d73ea252e0 100644 --- a/src/d/d_menu_fmap2D.cpp +++ b/src/d/d_menu_fmap2D.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_menu_fmap2D // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_fmap2D.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -157,7 +157,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { initiate(dComIfGp_getFmapResArchive()); mpBackScreen = new J2DScreen(); - JUT_ASSERT(238, mpBackScreen != 0); + JUT_ASSERT(238, mpBackScreen != NULL); bool fg = mpBackScreen->setPriority("zelda_map_screen_stone_base.blo", 0x20000, dComIfGp_getFmapResArchive()); @@ -166,7 +166,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dPaneClass_showNullPane(mpBackScreen); mpBaseScreen = new J2DScreen(); - JUT_ASSERT(248, mpBaseScreen != 0) + JUT_ASSERT(248, mpBaseScreen != NULL) fg = mpBaseScreen->setPriority("zelda_map_screen_base.blo", 0x20000, dComIfGp_getFmapResArchive()); @@ -181,27 +181,27 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { mAnmFrame = 0.0; mpBaseRoot = new CPaneMgrAlphaMorf(mpBaseScreen, 'ROOT', 2, NULL); - JUT_ASSERT(264, mpBaseRoot != 0); + JUT_ASSERT(264, mpBaseRoot != NULL); mpMapArea = new CPaneMgr(mpBaseScreen, 'center_n', 0, NULL); - JUT_ASSERT(269, mpMapArea != 0); + JUT_ASSERT(269, mpMapArea != NULL); mpMapBlack = new CPaneMgr(mpBaseScreen, 'map_blak', 0, NULL); - JUT_ASSERT(273, mpMapBlack != 0); + JUT_ASSERT(273, mpMapBlack != NULL); mpMeterHaihai = new dMeterHaihai_c(1); - JUT_ASSERT(277, mpMeterHaihai != 0); + JUT_ASSERT(277, mpMeterHaihai != NULL); ResTIMG* backTexResource = (ResTIMG*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); mpBackTex = new J2DPicture(backTexResource); - JUT_ASSERT(282, mpBackTex != 0); + 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(); - JUT_ASSERT(293, mpPointScreen != 0); + JUT_ASSERT(293, mpPointScreen != NULL); fg = mpPointScreen->setPriority("zelda_field_map_point_cursor.blo", 0x20000, dComIfGp_getFmapResArchive()); @@ -210,7 +210,7 @@ dMenu_Fmap2DBack_c::dMenu_Fmap2DBack_c() { dPaneClass_showNullPane(mpPointScreen); mpPointParent = new CPaneMgr(mpPointScreen, 'f_po_n', 2, NULL); - JUT_ASSERT(301, mpPointParent != 0); + JUT_ASSERT(301, mpPointParent != NULL); mpPointParent->scale(g_fmapHIO.mCursorScale, g_fmapHIO.mCursorScale); @@ -444,7 +444,7 @@ void dMenu_Fmap2DBack_c::setRegionTexData(u8 i_regionNo, ResTIMG* i_timg, f32 i_ } mpAreaTex[i_regionNo] = new J2DPicture(i_timg); - JUT_ASSERT(763, mpAreaTex[i_regionNo] != 0); + JUT_ASSERT(763, mpAreaTex[i_regionNo] != NULL); mRegionOriginX[i_regionNo] = i_originX; mRegionOriginZ[i_regionNo] = i_originZ; @@ -626,7 +626,7 @@ void dMenu_Fmap2DBack_c::calcAllMapPosWorld(f32 param_0, f32 param_1, f32* param void dMenu_Fmap2DBack_c::setSpotPane(ResTIMG* i_timg) { if (mpSpotTexture == NULL) { mpSpotTexture = new J2DPicture(i_timg); - JUT_ASSERT(1169, mpSpotTexture != 0); + JUT_ASSERT(1169, mpSpotTexture != NULL); } } diff --git a/src/d/d_menu_fmap_map.cpp b/src/d/d_menu_fmap_map.cpp index e3951f105e..e49c9b9735 100644 --- a/src/d/d_menu_fmap_map.cpp +++ b/src/d/d_menu_fmap_map.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_menu_fmap_map // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JUtility/JUTTexture.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_menu_insect.cpp b/src/d/d_menu_insect.cpp index 4179721123..2f1d8526d2 100644 --- a/src/d/d_menu_insect.cpp +++ b/src/d/d_menu_insect.cpp @@ -3,7 +3,7 @@ * Menu - Insect List */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_insect.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_menu_item_explain.cpp b/src/d/d_menu_item_explain.cpp index 2f821ee5a4..7dda5b156f 100644 --- a/src/d/d_menu_item_explain.cpp +++ b/src/d/d_menu_item_explain.cpp @@ -3,7 +3,7 @@ * Menu - Item Explain */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_item_explain.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_menu_letter.cpp b/src/d/d_menu_letter.cpp index bf4b35dabc..549107a10d 100644 --- a/src/d/d_menu_letter.cpp +++ b/src/d/d_menu_letter.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_menu_letter // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_letter.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -173,7 +173,7 @@ dMenu_Letter_c::~dMenu_Letter_c() { /* 801DD36C-801DD474 1D7CAC 0108+00 1/1 0/0 0/0 .text _create__14dMenu_Letter_cFv */ void dMenu_Letter_c::_create() { mpDrawCursor = new dSelect_cursor_c(2, 1.0f, NULL); - JUT_ASSERT(231, mpDrawCursor != 0); + JUT_ASSERT(231, mpDrawCursor != NULL); #if VERSION == VERSION_SHIELD_DEBUG mpDrawCursor->setParam(1.01f, 0.85f, 0.02f, 0.5f, 0.5f); #else @@ -184,10 +184,10 @@ void dMenu_Letter_c::_create() { mpDrawCursor->offPlayAnime(0); mpString = new dMsgString_c(); - JUT_ASSERT(245, mpString != 0); + JUT_ASSERT(245, mpString != NULL); mpArrow = new dMsgScrnArrow_c(); - JUT_ASSERT(249, mpArrow != 0); + JUT_ASSERT(249, mpArrow != NULL); screenSetMenu(); screenSetBase(); @@ -796,12 +796,12 @@ void dMenu_Letter_c::screenSetMenu() { }; mpMenuScreen = new J2DScreen(); - JUT_ASSERT(1146, mpMenuScreen != 0); + 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, 'n_all', 2, NULL); - JUT_ASSERT(1161, mpParent[0] != 0); + JUT_ASSERT(1161, mpParent[0] != NULL); mpParent[0]->setAlphaRate(0.0f); for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN @@ -830,7 +830,7 @@ void dMenu_Letter_c::screenSetMenu() { } for (int i = 0; i < 6; i++) { mpLetterParent[i] = new CPaneMgr(mpMenuScreen, tag_letter[i], 0, NULL); - JUT_ASSERT(1212, mpLetterParent[i] != 0); + JUT_ASSERT(1212, mpLetterParent[i] != NULL); } for (int i = 0; i < 6; i++) { field_0x34[i][0] = mpMenuScreen->search(tag_frame[i]); @@ -868,12 +868,12 @@ void dMenu_Letter_c::screenSetMenu() { } } mpMenuDMYScreen = new J2DScreen(); - JUT_ASSERT(1270, mpMenuDMYScreen != 0); + 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, 'n_all', 2, NULL); - JUT_ASSERT(1285, mpDMYParent != 0); + JUT_ASSERT(1285, mpDMYParent != NULL); for (int i = 0; i < 6; i++) { #if VERSION == VERSION_GCN_JPN field_0x184[i][0] = (J2DTextBox*)mpMenuDMYScreen->search(tag_sub0[i]); @@ -924,13 +924,13 @@ void dMenu_Letter_c::screenSetBase() { }; mpBaseScreen = new J2DScreen(); - JUT_ASSERT(1357, mpBaseScreen != 0); + 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('wi_btn_n')->hide(); mpParent[1] = new CPaneMgr(mpBaseScreen, 'n_all', 2, NULL); - JUT_ASSERT(1372, mpParent[1] != 0); + JUT_ASSERT(1372, mpParent[1] != NULL); mpParent[1]->setAlphaRate(0.0f); #if VERSION == VERSION_GCN_JPN J2DTextBox* piVar9 = (J2DTextBox*)mpBaseScreen->search('t_t00'); @@ -1025,7 +1025,7 @@ void dMenu_Letter_c::screenSetShadow() { */ void dMenu_Letter_c::screenSetLetter() { mpLetterScreen[0] = new J2DScreen(); - JUT_ASSERT(1507, mpLetterScreen[0] != 0); + JUT_ASSERT(1507, mpLetterScreen[0] != NULL); bool fg = mpLetterScreen[0]->setPriority("zelda_letter_window_base.blo", 0x20000, mpArchive); JUT_ASSERT(1511, fg != false); dPaneClass_showNullPane(mpLetterScreen[0]); @@ -1041,7 +1041,7 @@ void dMenu_Letter_c::screenSetLetter() { mpLetterScreen[0]->search('t3_s')->hide(); mpLetterScreen[0]->search('mg_3line')->hide(); mpLineParent = new CPaneMgr(mpLetterScreen[0], 'jp_fri_n', 0, NULL); - JUT_ASSERT(1530, mpLineParent != 0); + JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { static u64 const line_tag[12] = { 'line00', 'line01', 'line02', 'line03', 'line04', 'line05', @@ -1072,7 +1072,7 @@ void dMenu_Letter_c::screenSetLetter() { mpLetterScreen[0]->search('mg_3f_s')->hide(); mpLetterScreen[0]->search('mg_3f')->hide(); mpLineParent = new CPaneMgr(mpLetterScreen[0], 'jp_n', 0, NULL); - JUT_ASSERT(1530, mpLineParent != 0); + JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { static u64 const line_tag[12] = { 'line21', 'line22', 'line23', 'line24', 'line25', 'line26', @@ -1107,7 +1107,7 @@ void dMenu_Letter_c::screenSetLetter() { mpLetterScreen[0]->search('t3_s')->hide(); mpLetterScreen[0]->search('mg_3line')->hide(); mpLineParent = new CPaneMgr(mpLetterScreen[0], 'us_n', 0, NULL); - JUT_ASSERT(1530, mpLineParent != 0); + JUT_ASSERT(1530, mpLineParent != NULL); for (int i = 0; i < 12; i++) { if (line_tag[i] != 0) { field_0x25c[i] = (J2DTextBox*)mpLetterScreen[0]->search(line_tag[i]); @@ -1142,19 +1142,19 @@ void dMenu_Letter_c::screenSetLetter() { field_0x1e4[i]->setString(0x10, ""); } mpLetterScreen[1] = new J2DScreen(); - JUT_ASSERT(1627, mpLetterScreen[1] != 0); + 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], 'n_all', 2, NULL); - JUT_ASSERT(1636, mpTextParent[i] != 0); + 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); - JUT_ASSERT(1644, mpBlackTex != 0); + JUT_ASSERT(1644, mpBlackTex != NULL); mpBlackTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); mpBlackTex->setAlpha(0); } diff --git a/src/d/d_menu_map_common.cpp b/src/d/d_menu_map_common.cpp index ac6bea08eb..4cf81a16ac 100644 --- a/src/d/d_menu_map_common.cpp +++ b/src/d/d_menu_map_common.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_map_common.h" #include "d/d_com_inf_game.h" @@ -93,211 +93,211 @@ void dMenuMapCommon_c::initiate(JKRArchive* i_archive) { ResTIMG* mp_image; mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_boss_s_ci8_16_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_BOSS_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_boss_ci8_32_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_BOSS_e]->append(mp_image, 0.0f); mPictures[ICON_BOSS_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_BOSS_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_boss_s_ci8_16_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_BOSS_GANON_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_boss_ci8_32_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_BOSS_GANON_e]->append(mp_image, 0.0f); mPictures[ICON_BOSS_GANON_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_BOSS_GANON_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_enter_ci8_24_02.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_DUNGEON_ENTER_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_enter_ci8_02.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_DUNGEON_ENTER_e]->append(mp_image, 0.0f); mPictures[ICON_DUNGEON_ENTER_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_DUNGEON_ENTER_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_enter_s_ci8_24_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LINK_ENTER_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_enter_ci8_32_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LINK_ENTER_e]->append(mp_image, 0.0f); mPictures[ICON_LINK_ENTER_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_LINK_ENTER_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_warp_24_ci8_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LV8_WARP_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_warp_32_ci8_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LV8_WARP_e]->append(mp_image, 0.0f); mPictures[ICON_LV8_WARP_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_LV8_WARP_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_box_s_ci8_24_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_TREASURE_CHEST_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_box_ci8_32_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_TREASURE_CHEST_e]->append(mp_image, 0.0f); mPictures[ICON_TREASURE_CHEST_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_TREASURE_CHEST_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_gray_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_KEY_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_key_ci8_32_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_KEY_e]->append(mp_image, 0.0f); mPictures[ICON_KEY_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_KEY_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_YETO_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "st_yuki_M.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_YETO_e]->append(mp_image, 0.0f); mPictures[ICON_YETO_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_YETO_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_YETA_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "st_yuki_W.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_YETA_e]->append(mp_image, 0.0f); mPictures[ICON_YETA_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_YETA_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_yellow_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_GOLD_WOLF_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "st_gold_wolf.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_GOLD_WOLF_e]->append(mp_image, 0.0f); mPictures[ICON_GOLD_WOLF_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_GOLD_WOLF_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_MONKEY_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_monkey_ci8_32_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_MONKEY_e]->append(mp_image, 0.0f); mPictures[ICON_MONKEY_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_MONKEY_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_blue_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_OOCCOO_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "ni_obacyan.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_OOCCOO_e]->append(mp_image, 0.0f); mPictures[ICON_OOCCOO_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_OOCCOO_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_blue_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_OOCCOO_JR_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "ni_obacyan.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_OOCCOO_JR_e]->append(mp_image, 0.0f); mPictures[ICON_OOCCOO_JR_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_OOCCOO_JR_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[8] = 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 != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[8]->append(mp_image, 0.0f); mPictures[8]->setBasePosition(J2DBasePosition_4); mPictures[8]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_link_s_ci8_24_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LINK_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_link_ci8_32_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LINK_e]->append(mp_image, 0.0f); mPictures[ICON_LINK_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_LINK_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_penant_s_ci8_24_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_DUNGEON_WARP_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_penant_ci8_32_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_DUNGEON_WARP_e]->append(mp_image, 0.0f); mPictures[ICON_DUNGEON_WARP_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_DUNGEON_WARP_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_black_32.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LIGHT_DROP_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_black_32.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LIGHT_DROP_e]->append(mp_image, 0.0f); mPictures[ICON_LIGHT_DROP_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_LIGHT_DROP_e]->setInfluencedAlpha(false, false); mPictures[ICON_LIGHT_DROP_e]->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(0, 0, 0, 255)); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_hikari_no_shizuku_try_10_00_24x24.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mLightDropPic = 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 != 0); + JUT_ASSERT(0, mp_image != NULL); mLightDropPic->append(mp_image, 0.0f); mLightDropPic->setBasePosition(J2DBasePosition_4); mLightDropPic->setInfluencedAlpha(false, false); mLightDropPic->setBlackWhite(JUtility::TColor(0, 240, 170, 0), JUtility::TColor(255, 255, 230, 255)); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LIGHT_BALL_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_zelda_map_icon_hikari_ball_03.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_LIGHT_BALL_e]->append(mp_image, 0.0f); mPictures[ICON_LIGHT_BALL_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_LIGHT_BALL_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_CANNON_BALL_e] = 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 != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_CANNON_BALL_e]->append(mp_image, 0.0f); mPictures[ICON_CANNON_BALL_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_CANNON_BALL_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "tt_map_icon_s_size_circle_ci4_00.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_COACH_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_map_icon_basha_ci8.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_COACH_e]->append(mp_image, 0.0f); mPictures[ICON_COACH_e]->setBasePosition(J2DBasePosition_4); mPictures[ICON_COACH_e]->setInfluencedAlpha(false, false); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_nijumaru_40x40_ind_01.bti"); - JUT_ASSERT(0, mp_image != 0); + JUT_ASSERT(0, mp_image != NULL); mPictures[ICON_DESTINATION_e] = new J2DPicture(mp_image); mp_image = (ResTIMG*)i_archive->getResource('TIMG', "im_nijumaru_40x40_ind_01.bti"); - JUT_ASSERT(0, mp_image != 0); + 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); - JUT_ASSERT(0, mpDrawCursor != 0); + JUT_ASSERT(0, mpDrawCursor != NULL); if (i_archive == dComIfGp_getFmapResArchive()) { mpPortalIcon = new dSelect_cursor_c(5, 1.0f, i_archive); - JUT_ASSERT(0, mpPortalIcon != 0); + JUT_ASSERT(0, mpPortalIcon != NULL); } } diff --git a/src/d/d_menu_option.cpp b/src/d/d_menu_option.cpp index a20b1bc958..7d2ec85441 100644 --- a/src/d/d_menu_option.cpp +++ b/src/d/d_menu_option.cpp @@ -2,7 +2,7 @@ // Option Menu // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include #include "JSystem/J2DGraph/J2DAnmLoader.h" diff --git a/src/d/d_menu_ring.cpp b/src/d/d_menu_ring.cpp index e5860cc7ef..bb57b2116e 100644 --- a/src/d/d_menu_ring.cpp +++ b/src/d/d_menu_ring.cpp @@ -4,7 +4,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_ring.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp index b4662add8a..5b57b6cebd 100644 --- a/src/d/d_menu_save.cpp +++ b/src/d/d_menu_save.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_menu_save // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_save.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_menu_skill.cpp b/src/d/d_menu_skill.cpp index 21431e909a..07f725ac91 100644 --- a/src/d/d_menu_skill.cpp +++ b/src/d/d_menu_skill.cpp @@ -3,7 +3,7 @@ * Menu - Hidden Skills */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_skill.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_menu_window.cpp b/src/d/d_menu_window.cpp index d78f0a2038..b95d54042e 100644 --- a/src/d/d_menu_window.cpp +++ b/src/d/d_menu_window.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRExpHeap.h" #include "d/actor/d_a_player.h" @@ -1124,7 +1124,7 @@ void dMw_c::insect_close_proc() { void dMw_c::dMw_capture_create() { if (!dComIfGp_isPauseFlag() && mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(1996, mpCapture != 0); + JUT_ASSERT(1996, mpCapture != NULL); mpCapture->setCaptureFlag(); } } @@ -1147,12 +1147,12 @@ void dMw_c::dMw_ring_create(u8 i_origin) { dComIfGp_setHeapLockFlag(1); mpMenuRing = new dMenu_Ring_c(mpHeap, mpStick, mpCStick, i_origin); - JUT_ASSERT(2038, mpMenuRing != 0); + JUT_ASSERT(2038, mpMenuRing != NULL); mpMenuRing->_create(); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2043, mpCapture != 0); + JUT_ASSERT(2043, mpCapture != NULL); } mpCapture->setCaptureFlag(); @@ -1180,7 +1180,7 @@ void dMw_c::dMw_collect_create() { markMemSize(); mpMenuCollect = new dMenu_Collect_c(mpHeap, mpStick, mpCStick); - JUT_ASSERT(2093, mpMenuCollect != 0); + JUT_ASSERT(2093, mpMenuCollect != NULL); mpMenuCollect->_create(); if (mDoCPd_c::getHoldLockL(PAD_1)) { @@ -1223,11 +1223,11 @@ void dMw_c::dMw_fmap_create() { mpMenuFmap = new dMenu_Fmap_c(mpHeap, mpStick, mpCStick, mFmapProcess, mFmapRegionCursor, mFmapStageCursor, mFmapStageTransX, mFmapStageTransZ, tmp); - JUT_ASSERT(2194, mpMenuFmap != 0); + JUT_ASSERT(2194, mpMenuFmap != NULL); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2200, mpCapture != 0); + JUT_ASSERT(2200, mpCapture != NULL); } mpCapture->setCaptureFlag(); @@ -1268,7 +1268,7 @@ void dMw_c::dMw_dmap_create() { if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2294, mpCapture != 0); + JUT_ASSERT(2294, mpCapture != NULL); } mpCapture->setCaptureFlag(); @@ -1285,7 +1285,7 @@ void dMw_c::dMw_dmap_create() { } mpMenuDmap = new dMenu_Dmap_c(mpHeap, mpStick, mpCStick, field_0x14C, tmp); - JUT_ASSERT(2314, mpMenuDmap != 0); + JUT_ASSERT(2314, mpMenuDmap != NULL); dMeter2Info_resetWarpStatus(); } @@ -1317,7 +1317,7 @@ void dMw_c::dMw_save_create() { markMemSize(); mpMenuSave = new dMenu_save_c(); - JUT_ASSERT(2365, mpMenuSave != 0); + JUT_ASSERT(2365, mpMenuSave != NULL); mpMenuSave->setUseType(1); mpMenuSave->_create(); @@ -1325,7 +1325,7 @@ void dMw_c::dMw_save_create() { if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2373, mpCapture != 0); + JUT_ASSERT(2373, mpCapture != NULL); } } @@ -1351,11 +1351,11 @@ void dMw_c::dMw_option_create() { markMemSize(); mpMenuOption = new dMenu_Option_c(dComIfGp_getCollectResArchive(), mpStick); - JUT_ASSERT(2415, mpMenuOption != 0); + JUT_ASSERT(2415, mpMenuOption != NULL); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2420, mpCapture != 0); + JUT_ASSERT(2420, mpCapture != NULL); } } @@ -1384,11 +1384,11 @@ void dMw_c::dMw_letter_create() { markMemSize(); mpMenuLetter = new dMenu_Letter_c(mpHeap, mpStick, mpCStick); - JUT_ASSERT(2463, mpMenuLetter != 0); + JUT_ASSERT(2463, mpMenuLetter != NULL); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2467, mpCapture != 0); + JUT_ASSERT(2467, mpCapture != NULL); } } @@ -1416,11 +1416,11 @@ void dMw_c::dMw_fishing_create() { markMemSize(); mpMenuFishing = new dMenu_Fishing_c(mpHeap, mpStick, mpCStick); - JUT_ASSERT(2509, mpMenuFishing != 0); + JUT_ASSERT(2509, mpMenuFishing != NULL); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2513, mpCapture != 0); + JUT_ASSERT(2513, mpCapture != NULL); } } @@ -1448,11 +1448,11 @@ void dMw_c::dMw_skill_create() { markMemSize(); mpMenuSkill = new dMenu_Skill_c(mpHeap, mpStick, mpCStick); - JUT_ASSERT(2555, mpMenuSkill != 0); + JUT_ASSERT(2555, mpMenuSkill != NULL); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2559, mpCapture != 0); + JUT_ASSERT(2559, mpCapture != NULL); } } @@ -1480,11 +1480,11 @@ void dMw_c::dMw_insect_create(u8 param_0) { markMemSize(); mpMenuInsect = new dMenu_Insect_c(mpHeap, mpStick, mpCStick, param_0); - JUT_ASSERT(2601, mpMenuInsect != 0); + JUT_ASSERT(2601, mpMenuInsect != NULL); if (mpCapture == NULL) { mpCapture = new dDlst_MENU_CAPTURE_c(); - JUT_ASSERT(2605, mpCapture != 0); + JUT_ASSERT(2605, mpCapture != NULL); } } @@ -1633,11 +1633,11 @@ int dMw_c::_create() { mpHeap = dComIfGp_getExpHeap2D(); mpStick = new STControl(5, 2, 1, 1, 0.9f, 0.5f, 0, 0x800); - JUT_ASSERT(2967, mpStick != 0); + JUT_ASSERT(2967, mpStick != NULL); mpStick->setFirstWaitTime(8); mpCStick = new CSTControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); - JUT_ASSERT(2976, mpCStick != 0); + JUT_ASSERT(2976, mpCStick != NULL); mpCStick->setWaitParm(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); mButtonBits = 0; diff --git a/src/d/d_menu_window_HIO.cpp b/src/d/d_menu_window_HIO.cpp index d2185a2203..05541a5488 100644 --- a/src/d/d_menu_window_HIO.cpp +++ b/src/d/d_menu_window_HIO.cpp @@ -3,7 +3,7 @@ * Menu HostIO functionality */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_menu_window_HIO.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_meter2.cpp b/src/d/d_meter2.cpp index 4da393758c..d9898f1348 100644 --- a/src/d/d_meter2.cpp +++ b/src/d/d_meter2.cpp @@ -3,7 +3,7 @@ * Main UI handler */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter2.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_meter2_draw.cpp b/src/d/d_meter2_draw.cpp index 3fd3bcf6ac..27b196d95a 100644 --- a/src/d/d_meter2_draw.cpp +++ b/src/d/d_meter2_draw.cpp @@ -3,7 +3,7 @@ * Main HUD drawing */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter2_draw.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -47,7 +47,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { mDoExt_setCurrentHeap(heap); mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image.blo", 0x20000, dComIfGp_getMain2DArchive()); JUT_ASSERT(0, fg != false); dPaneClass_showNullPane(mpScreen); @@ -57,24 +57,24 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { for (int i = 0; i < 2; i++) { mpKanteraMeter[i] = new dKantera_icon_c(); - JUT_ASSERT(0, mpKanteraMeter[i] != 0); + JUT_ASSERT(0, mpKanteraMeter[i] != NULL); } mpKanteraScreen = new J2DScreen(); - JUT_ASSERT(0, mpKanteraScreen != 0); + 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(); - JUT_ASSERT(0, mpPikariScreen != 0); + 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, 'pika_n', 0, NULL); - JUT_ASSERT(0, mpPikariParent != 0); + JUT_ASSERT(0, mpPikariParent != NULL); mPikariBlack = static_cast(mpPikariScreen->search('pika00'))->getBlack(); mPikariWhite = static_cast(mpPikariScreen->search('pika00'))->getWhite(); @@ -89,7 +89,7 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { playPikariBpkAnimation(1.0f); mpParent = new CPaneMgr(mpScreen, 'n_all', 2, NULL); - JUT_ASSERT(0, mpParent != 0); + JUT_ASSERT(0, mpParent != NULL); static u64 const a_tag[] = {'cont_at1', 'cont_at2', 'cont_at3', 'cont_at4', 'cont_at'}; static u64 const b_tag[] = {'cont_bt1', 'cont_bt2', 'cont_bt3', 'cont_bt4', 'cont_bt'}; @@ -99,29 +99,29 @@ dMeter2Draw_c::dMeter2Draw_c(JKRExpHeap* mp_heap) { for (int i = 0; i < 5; i++) { mpAText[i] = new CPaneMgr(mpScreen, a_tag[i], 0, NULL); - JUT_ASSERT(0, mpAText[i] != 0); + 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); - JUT_ASSERT(0, mpBText[i] != 0); + 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); - JUT_ASSERT(0, mpXYText[i][2] != 0); + 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); - JUT_ASSERT(0, mpXYText[i][0] != 0); + 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); - JUT_ASSERT(0, mpXYText[i][1] != 0); + JUT_ASSERT(0, mpXYText[i][1] != NULL); static_cast(mpXYText[i][1]->getPanePtr())->setString(64, ""); static_cast(mpXYText[i][1]->getPanePtr())->setFont(mDoExt_getMesgFont()); } @@ -758,27 +758,27 @@ void dMeter2Draw_c::initLife() { }; mpLifeParent = new CPaneMgr(mpScreen, 'heart_n', 2, NULL); - JUT_ASSERT(0, mpLifeParent != 0); + JUT_ASSERT(0, mpLifeParent != NULL); for (int i = 0; i < 20; i++) { mpLifeParts[i] = new CPaneMgr(mpScreen, life_tag[i], 0, NULL); - JUT_ASSERT(0, mpLifeParts[i] != 0); + JUT_ASSERT(0, mpLifeParts[i] != NULL); mpHeartMark[i] = new CPaneMgr(mpScreen, mark_tag[i], 2, NULL); - JUT_ASSERT(0, mpHeartMark[i] != 0); + JUT_ASSERT(0, mpHeartMark[i] != NULL); mpHeartBase[i] = new CPaneMgrAlpha(mpScreen, base_tag[i], 2, NULL); - JUT_ASSERT(0, mpHeartBase[i] != 0); + JUT_ASSERT(0, mpHeartBase[i] != NULL); mpLifeTexture[i][0] = new CPaneMgrAlpha(mpScreen, lifet1_tag[i], 0, NULL); - JUT_ASSERT(0, mpLifeTexture[i][0] != 0); + JUT_ASSERT(0, mpLifeTexture[i][0] != NULL); mpLifeTexture[i][1] = new CPaneMgrAlpha(mpScreen, lifet2_tag[i], 0, NULL); - JUT_ASSERT(0, mpLifeTexture[i][1] != 0); + JUT_ASSERT(0, mpLifeTexture[i][1] != NULL); } mpBigHeart = new CPaneMgr(mpScreen, 'bigh_n', 2, NULL); - JUT_ASSERT(0, mpBigHeart != 0); + JUT_ASSERT(0, mpBigHeart != NULL); mpLifeParent->setAlphaRate(0.0f); @@ -800,20 +800,20 @@ void dMeter2Draw_c::initMagic() { field_0x554 = 0.0f; mpMagicParent = new CPaneMgr(mpKanteraScreen, 'magic_n', 2, NULL); - JUT_ASSERT(0, mpMagicParent != 0); + JUT_ASSERT(0, mpMagicParent != NULL); mpMagicBase = new CPaneMgr(mpKanteraScreen, 'mm_base', 0, NULL); - JUT_ASSERT(0, mpMagicBase != 0); + JUT_ASSERT(0, mpMagicBase != NULL); mpMagicFrameL = new CPaneMgr(mpKanteraScreen, 'm_w_l_n', 2, NULL); - JUT_ASSERT(0, mpMagicFrameL != 0); + JUT_ASSERT(0, mpMagicFrameL != NULL); mpMagicFrameR = new CPaneMgr(mpKanteraScreen, 'm_w_r_n', 2, NULL); - JUT_ASSERT(0, mpMagicFrameR != 0); + JUT_ASSERT(0, mpMagicFrameR != NULL); mpMagicMeter = new CPaneMgr(mpKanteraScreen, 'mm_00', 0, NULL); - JUT_ASSERT(0, mpMagicMeter != 0); + JUT_ASSERT(0, mpMagicMeter != NULL); OSInitFastCast(); @@ -861,7 +861,7 @@ void dMeter2Draw_c::initMagic() { /* 80212190-80212404 20CAD0 0274+00 1/1 0/0 0/0 .text initLightDrop__13dMeter2Draw_cFv */ void dMeter2Draw_c::initLightDrop() { mpLightDropParent = new CPaneMgr(mpScreen, 's_tuta_n', 2, NULL); - JUT_ASSERT(0, mpLightDropParent != 0); + JUT_ASSERT(0, mpLightDropParent != NULL); static u64 const tuta_0[] = { 's_00', 's_01', 's_02', 's_03', 's_04', 's_05', 's_06', 's_07', @@ -880,20 +880,20 @@ void dMeter2Draw_c::initLightDrop() { for (int i = 0; i < 16; i++) { mpSIParts[i][0] = new CPaneMgr(mpScreen, tuta_0[i], 0, NULL); - JUT_ASSERT(0, mpSIParts[i][0] != 0); + JUT_ASSERT(0, mpSIParts[i][0] != NULL); mpSIParts[i][1] = new CPaneMgr(mpScreen, tuta_1[i], 0, NULL); - JUT_ASSERT(0, mpSIParts[i][1] != 0); + JUT_ASSERT(0, mpSIParts[i][1] != NULL); mpSIParts[i][2] = new CPaneMgr(mpScreen, tuta_2[i], 0, NULL); - JUT_ASSERT(0, mpSIParts[i][2] != 0); + JUT_ASSERT(0, mpSIParts[i][2] != NULL); } mpSIParent[0] = new CPaneMgr(mpScreen, 'tuta_n', 2, NULL); - JUT_ASSERT(0, mpSIParent[0] != 0); + JUT_ASSERT(0, mpSIParent[0] != NULL); mpSIParent[1] = new CPaneMgr(mpScreen, 's_null', 2, NULL); - JUT_ASSERT(0, mpSIParent[1] != 0); + JUT_ASSERT(0, mpSIParent[1] != NULL); mpLightDropParent->setAlphaRate(0.0f); field_0x6fc = 0.0f; @@ -918,7 +918,7 @@ void dMeter2Draw_c::initLightDrop() { /* 80212404-802126E4 20CD44 02E0+00 1/1 0/0 0/0 .text initRupeeKey__13dMeter2Draw_cFv */ void dMeter2Draw_c::initRupeeKey() { mpRupeeKeyParent = new CPaneMgr(mpScreen, 'r_k_n', 2, NULL); - JUT_ASSERT(0, mpRupeeKeyParent != 0); + JUT_ASSERT(0, mpRupeeKeyParent != NULL); field_0x718 = 1.0f; static u64 const rupeet1_tag[] = {'r_n_1_s', 'r_n_2_s', 'r_n_3_s', 'r_n_4_s'}; @@ -926,22 +926,22 @@ void dMeter2Draw_c::initRupeeKey() { for (int i = 0; i < 4; i++) { mpRupeeTexture[i][0] = new CPaneMgr(mpScreen, rupeet1_tag[i], 0, NULL); - JUT_ASSERT(0, mpRupeeTexture[i][0] != 0); + 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); - JUT_ASSERT(0, mpRupeeTexture[i][1] != 0); + JUT_ASSERT(0, mpRupeeTexture[i][1] != NULL); mpRupeeTexture[i][1]->getPanePtr()->setBasePosition(J2DBasePosition_4); } mpRupeeParent[0] = new CPaneMgr(mpScreen, 'rupi_n', 2, NULL); - JUT_ASSERT(0, mpRupeeParent[0] != 0); + JUT_ASSERT(0, mpRupeeParent[0] != NULL); mpRupeeParent[1] = new CPaneMgr(mpScreen, 'moyou_rn', 2, NULL); - JUT_ASSERT(0, mpRupeeParent[1] != 0); + JUT_ASSERT(0, mpRupeeParent[1] != NULL); mpRupeeParent[2] = new CPaneMgr(mpScreen, 'moyou_ln', 2, NULL); - JUT_ASSERT(0, mpRupeeParent[2] != 0); + JUT_ASSERT(0, mpRupeeParent[2] != NULL); mpRupeeParent[0]->setAlphaRate(0.0f); mpRupeeParent[1]->setAlphaRate(0.0f); @@ -951,13 +951,13 @@ void dMeter2Draw_c::initRupeeKey() { for (int i = 0; i < 5; i++) { mpKeyTexture[i] = new CPaneMgr(mpScreen, key_tag[i], 0, NULL); - JUT_ASSERT(0, mpKeyTexture[i] != 0); + JUT_ASSERT(0, mpKeyTexture[i] != NULL); mpKeyTexture[i]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpKeyTexture[i]->hide(); } mpKeyParent = new CPaneMgr(mpScreen, 'key_n', 2, NULL); - JUT_ASSERT(0, mpKeyParent != 0); + JUT_ASSERT(0, mpKeyParent != NULL); mpKeyParent->setAlphaRate(0.0f); drawRupee(dComIfGs_getRupee()); @@ -983,7 +983,7 @@ void dMeter2Draw_c::initButton() { for (int i = 0; i < 2; i++) { for (int j = 0; j < 2; j++) { mpItemBTex[i][j] = (ResTIMG*)heap->alloc(0xC00, 0x20); - JUT_ASSERT(0, mpItemBTex[i][j] != 0); + JUT_ASSERT(0, mpItemBTex[i][j] != NULL); } } @@ -994,13 +994,13 @@ void dMeter2Draw_c::initButton() { for (int j = 0; j < 2; j++) { for (int k = 0; k < 2; k++) { mpItemXYTex[i][j][k] = (ResTIMG*)heap->alloc(0xC00, 0x20); - JUT_ASSERT(0, mpItemXYTex[i][j][k] != 0); + JUT_ASSERT(0, mpItemXYTex[i][j][k] != NULL); } } } mpItemB = new CPaneMgr(mpScreen, 'b_itm_p', 0, NULL); - JUT_ASSERT(0, mpItemB != 0); + JUT_ASSERT(0, mpItemB != NULL); mpItemB->getPanePtr()->setBasePosition(J2DBasePosition_4); mpItemB->show(); @@ -1017,17 +1017,17 @@ void dMeter2Draw_c::initButton() { 'b_itm_pp', JGeometry::TBox2(0.0f, 0.0f, mpItemB->getInitSizeX(), mpItemB->getInitSizeY()), static_cast(mpItemB->getPanePtr())->getTexture(0)->getTexInfo(), NULL); - JUT_ASSERT(0, mpItemBPane != 0); + JUT_ASSERT(0, mpItemBPane != NULL); mpItemBPane->setBasePosition(J2DBasePosition_4); mpItemB->getPanePtr()->appendChild(mpItemBPane); mpItemXY[0] = new CPaneMgr(mpScreen, 'x_itm_p', 0, NULL); - JUT_ASSERT(0, mpItemXY[0] != 0); + JUT_ASSERT(0, mpItemXY[0] != NULL); mpItemXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(0, mpItemXY[0]); mpItemXY[1] = new CPaneMgr(mpScreen, 'y_itm_p', 0, NULL); - JUT_ASSERT(0, mpItemXY[1] != 0); + JUT_ASSERT(0, mpItemXY[1] != NULL); mpItemXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(1, mpItemXY[1]); @@ -1038,7 +1038,7 @@ void dMeter2Draw_c::initButton() { 'x_itm_pp', JGeometry::TBox2(0.0f, 0.0f, mpItemXY[0]->getInitSizeX(), mpItemXY[0]->getInitSizeY()), static_cast(mpItemXY[0]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); - JUT_ASSERT(0, mpItemXYPane[0] != 0); + JUT_ASSERT(0, mpItemXYPane[0] != NULL); mpItemXYPane[0]->setBasePosition(J2DBasePosition_4); mpItemXY[0]->getPanePtr()->appendChild(mpItemXYPane[0]); @@ -1046,12 +1046,12 @@ void dMeter2Draw_c::initButton() { 'y_itm_pp', JGeometry::TBox2(0.0f, 0.0f, mpItemXY[1]->getInitSizeX(), mpItemXY[1]->getInitSizeY()), static_cast(mpItemXY[1]->getPanePtr())->getTexture(0)->getTexInfo(), NULL); - JUT_ASSERT(0, mpItemXYPane[1] != 0); + JUT_ASSERT(0, mpItemXYPane[1] != NULL); mpItemXYPane[1]->setBasePosition(J2DBasePosition_4); mpItemXY[1]->getPanePtr()->appendChild(mpItemXYPane[1]); mpItemR = new CPaneMgr(mpScreen, 'r_itm_p', 0, NULL); - JUT_ASSERT(0, mpItemR != 0); + JUT_ASSERT(0, mpItemR != NULL); mpItemR->getPanePtr()->setBasePosition(J2DBasePosition_4); dMeter2Info_setMeterItemPanePtr(2, mpItemR); @@ -1059,65 +1059,65 @@ void dMeter2Draw_c::initButton() { 'r_itm_pp', JGeometry::TBox2(0.0f, 0.0f, mpItemR->getInitSizeX(), mpItemR->getInitSizeY()), static_cast(mpItemR->getPanePtr())->getTexture(0)->getTexInfo(), NULL); - JUT_ASSERT(0, mpItemXYPane[2] != 0); + JUT_ASSERT(0, mpItemXYPane[2] != NULL); mpItemXYPane[2]->setBasePosition(J2DBasePosition_4); mpItemR->getPanePtr()->appendChild(mpItemXYPane[2]); mpLightB = new CPaneMgr(mpScreen, 'b_light', 0, NULL); - JUT_ASSERT(0, mpLightB != 0); + JUT_ASSERT(0, mpLightB != NULL); mpLightB->getPanePtr()->setBasePosition(J2DBasePosition_4); field_0x72c = 1.0f; mpLightB->hide(); mpLightXY[0] = new CPaneMgr(mpScreen, 'x_light', 0, NULL); - JUT_ASSERT(0, mpLightXY[0] != 0); + JUT_ASSERT(0, mpLightXY[0] != NULL); mpLightXY[0]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[0]->hide(); mpLightXY[1] = new CPaneMgr(mpScreen, 'y_light', 0, NULL); - JUT_ASSERT(0, mpLightXY[1] != 0); + JUT_ASSERT(0, mpLightXY[1] != NULL); mpLightXY[1]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[1]->hide(); mpLightXY[2] = new CPaneMgr(mpScreen, 'r_light', 0, NULL); - JUT_ASSERT(0, mpLightXY[2] != 0); + JUT_ASSERT(0, mpLightXY[2] != NULL); mpLightXY[2]->getPanePtr()->setBasePosition(J2DBasePosition_4); mpLightXY[2]->hide(); mpBTextA = new CPaneMgr(mpScreen, 'b_text_a', 0, NULL); - JUT_ASSERT(0, mpBTextA != 0); + JUT_ASSERT(0, mpBTextA != NULL); mpBTextB = new CPaneMgr(mpScreen, 'b_text_b', 0, NULL); - JUT_ASSERT(0, mpBTextB != 0); + JUT_ASSERT(0, mpBTextB != NULL); mpBTextXY[0] = new CPaneMgr(mpScreen, 'b_text_x', 0, NULL); - JUT_ASSERT(0, mpBTextXY[0] != 0); + JUT_ASSERT(0, mpBTextXY[0] != NULL); mpBTextXY[1] = new CPaneMgr(mpScreen, 'b_text_y', 0, NULL); - JUT_ASSERT(0, mpBTextXY[1] != 0); + JUT_ASSERT(0, mpBTextXY[1] != NULL); mpBTextXY[2] = NULL; mpTextA = new CPaneMgr(mpScreen, 'a_text_n', 0, NULL); - JUT_ASSERT(0, mpTextA != 0); + JUT_ASSERT(0, mpTextA != NULL); mpTextB = new CPaneMgr(mpScreen, 'b_text_n', 0, NULL); - JUT_ASSERT(0, mpTextB != 0); + JUT_ASSERT(0, mpTextB != NULL); mpTextXY[2] = new CPaneMgr(mpScreen, 'z_text_n', 0, NULL); - JUT_ASSERT(0, mpTextXY[2] != 0); + JUT_ASSERT(0, mpTextXY[2] != NULL); mpTextXY[0] = new CPaneMgr(mpScreen, 'x_text_n', 0, NULL); - JUT_ASSERT(0, mpTextXY[0] != 0); + JUT_ASSERT(0, mpTextXY[0] != NULL); mpTextXY[1] = new CPaneMgr(mpScreen, 'y_text_n', 0, NULL); - JUT_ASSERT(0, mpTextXY[1] != 0); + JUT_ASSERT(0, mpTextXY[1] != NULL); mpTextI = new CPaneMgr(mpScreen, 'i_text_n', 2, NULL); - JUT_ASSERT(0, mpTextI != 0); + JUT_ASSERT(0, mpTextI != NULL); mpTextM = new CPaneMgr(mpScreen, 'm_text_n', 2, NULL); - JUT_ASSERT(0, mpTextM != 0); + JUT_ASSERT(0, mpTextM != NULL); static u64 const juji_i_tag[] = {'ju_ring4', 'yaji_00', 'yaji_01', 'ju_ring2', 'ju_ring4'}; static u64 const juji_m_tag[] = {'ju_ring3', 'yaji_02', 'yaji_03', 'ju_ring3', 0}; @@ -1125,14 +1125,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); - JUT_ASSERT(0, mpJujiI[i] != 0); + 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); - JUT_ASSERT(0, mpJujiM[i] != 0); + JUT_ASSERT(0, mpJujiM[i] != NULL); } else { mpJujiM[i] = NULL; } @@ -1142,40 +1142,40 @@ void dMeter2Draw_c::initButton() { mpTextXY[1]->hide(); mpButtonParent = new CPaneMgr(mpScreen, 'cont_n', 2, NULL); - JUT_ASSERT(0, mpButtonParent != 0); + JUT_ASSERT(0, mpButtonParent != NULL); mpButtonA = new CPaneMgr(mpScreen, 'abtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonA != 0); + JUT_ASSERT(0, mpButtonA != NULL); mpButtonB = new CPaneMgr(mpScreen, 'bbtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonB != 0); + JUT_ASSERT(0, mpButtonB != NULL); field_0x730 = 1.0f; mpButtonMidona = new CPaneMgr(mpScreen, 'midona_n', 2, NULL); - JUT_ASSERT(0, mpButtonMidona != 0); + JUT_ASSERT(0, mpButtonMidona != NULL); mButtonZAlpha = 0.0f; field_0x724 = 0.0f; field_0x738 = 0.0f; field_0x740 = 0; mpButtonXY[0] = new CPaneMgr(mpScreen, 'xbtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonXY[0] != 0); + JUT_ASSERT(0, mpButtonXY[0] != NULL); mpButtonXY[1] = new CPaneMgr(mpScreen, 'ybtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonXY[1] != 0); + JUT_ASSERT(0, mpButtonXY[1] != NULL); mpButtonXY[2] = new CPaneMgr(mpScreen, 'zbtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonXY[2] != 0); + JUT_ASSERT(0, mpButtonXY[2] != NULL); mpUzu = new CPaneMgrAlpha(mpScreen, 'uzu_n', 2, NULL); - JUT_ASSERT(0, mpUzu != 0); + 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); - JUT_ASSERT(0, mpItemNumTex[i][j] != 0); + JUT_ASSERT(0, mpItemNumTex[i][j] != NULL); } } @@ -1222,7 +1222,7 @@ void dMeter2Draw_c::initButton() { */ void dMeter2Draw_c::initButtonCross() { mpButtonCrossParent = new CPaneMgr(mpScreen, 'juji_n', 2, NULL); - JUT_ASSERT(0, mpButtonCrossParent != 0); + JUT_ASSERT(0, mpButtonCrossParent != NULL); static_cast(mpScreen->search('cont_ju0'))->setFont(mDoExt_getMesgFont()); static_cast(mpScreen->search('cont_ju1'))->setFont(mDoExt_getMesgFont()); diff --git a/src/d/d_meter2_info.cpp b/src/d/d_meter2_info.cpp index e78e0e73a9..324d80aa66 100644 --- a/src/d/d_meter2_info.cpp +++ b/src/d/d_meter2_info.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DTextBox.h" #include "JSystem/JMessage/JMessage.h" @@ -862,7 +862,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p } const ResTIMG* img = i_pic1->changeTexture((ResTIMG*)i_texBuf1, 0); - JUT_ASSERT(1284, img != 0); + JUT_ASSERT(1284, img != NULL); } tex_num++; @@ -876,7 +876,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p if (i_pic2 != NULL) { set3rdColor(itemType, i_pic2); const ResTIMG* img = i_pic2->changeTexture((ResTIMG*)i_texBuf2, 0); - JUT_ASSERT(1333, img != 0); + JUT_ASSERT(1333, img != NULL); } tex_num++; @@ -888,7 +888,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p if (i_pic2 != NULL) { set2ndColor(itemType, i_pic2); const ResTIMG* img = i_pic2->changeTexture((ResTIMG*)i_texBuf2, 0); - JUT_ASSERT(1348, img != 0); + JUT_ASSERT(1348, img != NULL); } tex_num++; @@ -901,7 +901,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p if (i_pic3 != NULL) { set3rdColor(itemType, i_pic3); const ResTIMG* img = i_pic3->changeTexture((ResTIMG*)i_texBuf3, 0); - JUT_ASSERT(1364, img != 0); + JUT_ASSERT(1364, img != NULL); } tex_num++; @@ -914,7 +914,7 @@ int dMeter2Info_c::readItemTexture(u8 i_itemNo, void* i_texBuf1, J2DPicture* i_p if (i_pic4 != NULL) { set4thColor(itemType, i_pic4); const ResTIMG* img = i_pic4->changeTexture((ResTIMG*)i_texBuf4, 0); - JUT_ASSERT(1380, img != 0); + JUT_ASSERT(1380, img != NULL); } tex_num++; @@ -1699,7 +1699,7 @@ int dMeter2Info_recieveLetter() { OS_REPORT("letter info =====> %d, %d\n", j, dComIfGs_getGetNumber(j) - 1); } - JUT_ASSERT(3552, 0); + JUT_ASSERT(3552, FALSE); } letterNum++; diff --git a/src/d/d_meter_HIO.cpp b/src/d/d_meter_HIO.cpp index 4864576949..f83e93c17c 100644 --- a/src/d/d_meter_HIO.cpp +++ b/src/d/d_meter_HIO.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_meter_HIO // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter_HIO.h" #include "d/d_save.h" diff --git a/src/d/d_meter_button.cpp b/src/d/d_meter_button.cpp index de952695cd..f15009ddf4 100644 --- a/src/d/d_meter_button.cpp +++ b/src/d/d_meter_button.cpp @@ -3,7 +3,7 @@ * UI Button handling */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter_button.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -1035,7 +1035,7 @@ void dMeterButton_c::screenInitButton() { OS_REPORT("enter dMeterButton_c::screenInitButton\n"); mpButtonScreen = new J2DScreen(); - JUT_ASSERT(0, mpButtonScreen != 0); + JUT_ASSERT(0, mpButtonScreen != NULL); OS_REPORT("load zelda_game_image_button_info.blo"); @@ -1052,7 +1052,7 @@ void dMeterButton_c::screenInitButton() { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); } - JUT_ASSERT(0, mpParent != 0); + JUT_ASSERT(0, mpParent != NULL); for (int i = 0; i < BUTTON_NUM; i++) { field_0x18c[i] = 0.0f; @@ -1078,7 +1078,7 @@ void dMeterButton_c::screenInitButton() { if (mpButtonA == NULL) { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); } - JUT_ASSERT(0, mpButtonA != 0); + JUT_ASSERT(0, mpButtonA != NULL); mpButtonA->setAlphaRate(0.0f); mpButtonA->show(); @@ -1086,7 +1086,7 @@ void dMeterButton_c::screenInitButton() { if (mpButtonB == NULL) { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); } - JUT_ASSERT(0, mpButtonB != 0); + JUT_ASSERT(0, mpButtonB != NULL); mpButtonB->setAlphaRate(0.0f); mpButtonB->show(); @@ -1094,12 +1094,12 @@ void dMeterButton_c::screenInitButton() { if (mpButtonR == NULL) { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); } - JUT_ASSERT(0, mpButtonR != 0); + JUT_ASSERT(0, mpButtonR != NULL); mpButtonR->setAlphaRate(0.0f); mpButtonR->show(); mpMidona = new CPaneMgr(mpButtonScreen, 'midona', 0, NULL); - JUT_ASSERT(0, mpMidona != 0); + JUT_ASSERT(0, mpMidona != NULL); if (mpMidona == NULL) { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); } @@ -1115,12 +1115,12 @@ void dMeterButton_c::screenInitButton() { if (mpButtonZ == NULL) { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); } - JUT_ASSERT(0, mpButtonZ != 0); + JUT_ASSERT(0, mpButtonZ != NULL); mpButtonZ->setAlphaRate(0.0f); mpButtonZ->show(); mpButton3D = new CPaneMgr(mpButtonScreen, 'asbtn_n', 2, NULL); - JUT_ASSERT(0, mpButton3D != 0); + JUT_ASSERT(0, mpButton3D != NULL); mpButton3D->setAlphaRate(0.0f); mpButton3D->show(); @@ -1130,7 +1130,7 @@ void dMeterButton_c::screenInitButton() { mpButtonScreen->search('yaji_r_n')->hide(); mpButtonC = new CPaneMgr(mpButtonScreen, 'cbtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonC != 0); + JUT_ASSERT(0, mpButtonC != NULL); mpButtonC->setAlphaRate(0.0f); mpButtonC->show(); @@ -1140,15 +1140,15 @@ void dMeterButton_c::screenInitButton() { mpButtonScreen->search('yaji_rn')->hide(); mpButtonS = new CPaneMgr(mpButtonScreen, 'sbtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonS != 0); + JUT_ASSERT(0, mpButtonS != NULL); mpButtonS->setAlphaRate(0.0f); mpButtonX = new CPaneMgr(mpButtonScreen, 'xbtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonX != 0); + JUT_ASSERT(0, mpButtonX != NULL); mpButtonX->setAlphaRate(0.0f); mpButtonY = new CPaneMgr(mpButtonScreen, 'ybtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonY != 0); + JUT_ASSERT(0, mpButtonY != NULL); mpButtonY->setAlphaRate(0.0f); mpButtonNun = NULL; @@ -1157,7 +1157,7 @@ void dMeterButton_c::screenInitButton() { mpButtonAR = NULL; mpButton3DB = new CPaneMgr(mpButtonScreen, 'as_b_n', 2, NULL); - JUT_ASSERT(0, mpButton3DB != 0); + JUT_ASSERT(0, mpButton3DB != NULL); mpButton3DB->setAlphaRate(0.0f); mpButtonNURE = NULL; @@ -1169,24 +1169,24 @@ void dMeterButton_c::screenInitButton() { mpButtonNunC = NULL; mpButtonBin = new CPaneMgr(mpButtonScreen, 'bottl_n', 2, NULL); - JUT_ASSERT(0, mpButtonBin != 0); + JUT_ASSERT(0, mpButtonBin != NULL); mpButtonBin->setAlphaRate(0.0f); mpText[0] = new CPaneMgr(mpButtonScreen, 'text_n', 2, NULL); - JUT_ASSERT(0, mpText[0] != 0); + JUT_ASSERT(0, mpText[0] != NULL); mpText[0]->setAlphaRate(0.0f); mpText[1] = new CPaneMgr(mpButtonScreen, 'text2_n', 2, NULL); - JUT_ASSERT(0, mpText[1] != 0); + JUT_ASSERT(0, mpText[1] != NULL); mpText[1]->setAlphaRate(0.0f); mpItem_c = new CPaneMgr(mpButtonScreen, 'fishing', 0, NULL); - JUT_ASSERT(0, mpItem_c != 0); + JUT_ASSERT(0, mpItem_c != NULL); mpItem_c->setAlphaRate(0.0f); mpHeap = mDoExt_getCurrentHeap(); mpFishingTex = mpHeap->alloc(0xC00, 0x20); - JUT_ASSERT(0, mpFishingTex != 0); + JUT_ASSERT(0, mpFishingTex != NULL); u8 fishing_item = dComIfGs_getItem(SLOT_20, false); if (dMeter2Info_getMeterClass()->getMeterDrawPtr()->getCanoeFishing()) { @@ -1433,7 +1433,7 @@ void dMeterButton_c::screenInitButton() { */ void dMeterButton_c::screenInitText() { mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); OS_REPORT("enter dMeterButton_c::screenInitText(void)\n"); @@ -1445,7 +1445,7 @@ void dMeterButton_c::screenInitText() { mpFkAll_c = new CPaneMgr(mpScreen, 'n_all', 2, NULL); OS_REPORT("[%s] %d\n", __FILE__, __LINE__); - JUT_ASSERT(0, mpFkAll_c != 0); + JUT_ASSERT(0, mpFkAll_c != NULL); mpFkAll_c->setAlphaRate(0.0f); OS_REPORT("[%s] %d\n", __FILE__, __LINE__); @@ -1455,11 +1455,11 @@ void dMeterButton_c::screenInitText() { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); mpFkRoot_c = new CPaneMgr(mpScreen, 'mg_null', 0, NULL); - JUT_ASSERT(0, mpFkRoot_c != 0); + JUT_ASSERT(0, mpFkRoot_c != NULL); OS_REPORT("[%s] %d\n", __FILE__, __LINE__); mpTextScreen = new J2DScreen(); - JUT_ASSERT(0, mpTextScreen != 0); + JUT_ASSERT(0, mpTextScreen != NULL); OS_REPORT("[%s] %d\n", __FILE__, __LINE__); fg = mpTextScreen->setPriority("zelda_message_window_text.blo", 0x20000, @@ -1470,7 +1470,7 @@ void dMeterButton_c::screenInitText() { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); mpTmRoot_c = new CPaneMgr(mpTextScreen, 'mg_null', 0, NULL); - JUT_ASSERT(0, mpTmRoot_c != 0); + JUT_ASSERT(0, mpTmRoot_c != NULL); #if VERSION == VERSION_GCN_JPN if (dComIfGs_getOptUnk0() == 0) { @@ -1500,10 +1500,10 @@ void dMeterButton_c::screenInitText() { } #else mpTm_c[0] = new CPaneMgr(mpTextScreen, 'mg_e4lin', 0, NULL); - JUT_ASSERT(0, mpTm_c[0] != 0); + JUT_ASSERT(0, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTextScreen, 't4_s', 0, NULL); - JUT_ASSERT(0, mpTm_c[1] != 0); + JUT_ASSERT(0, mpTm_c[1] != NULL); field_0x0ec[0] = NULL; field_0x0ec[1] = NULL; @@ -1544,7 +1544,7 @@ void dMeterButton_c::screenInitText() { OS_REPORT("[%s] %d\n", __FILE__, __LINE__); mpOutFont = new COutFont_c(0); - JUT_ASSERT(0, mpOutFont != 0); + JUT_ASSERT(0, mpOutFont != NULL); mpOutFont->createPane(); OS_REPORT("exit dMeterButton_c::screenInitText(void)\n"); diff --git a/src/d/d_meter_haihai.cpp b/src/d/d_meter_haihai.cpp index cf41e8b98c..df8c3323a5 100644 --- a/src/d/d_meter_haihai.cpp +++ b/src/d/d_meter_haihai.cpp @@ -3,7 +3,7 @@ * UI Arrows */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter_haihai.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -26,7 +26,7 @@ dMeterHaihai_c::~dMeterHaihai_c() { /* 8020AF6C-8020B0F4 2058AC 0188+00 1/0 0/0 0/0 .text _create__14dMeterHaihai_cFv */ int dMeterHaihai_c::_create() { mpHaihaiScreen = new J2DScreen(); - JUT_ASSERT(0, mpHaihaiScreen != 0); + JUT_ASSERT(0, mpHaihaiScreen != NULL); bool fg = mpHaihaiScreen->setPriority("zelda_hihi_cursor.blo", 0x20000, dComIfGp_getMain2DArchive()); @@ -34,7 +34,7 @@ int dMeterHaihai_c::_create() { dPaneClass_showNullPane(mpHaihaiScreen); mpParent = new CPaneMgr(mpHaihaiScreen, 'n_all', 2, NULL); - JUT_ASSERT(0, mpParent != 0); + JUT_ASSERT(0, mpParent != NULL); OSInitFastCast(); mpCursorBck = (J2DAnmTransformKey*)J2DAnmLoaderDataBase::load( diff --git a/src/d/d_meter_hakusha.cpp b/src/d/d_meter_hakusha.cpp index eec7942a2b..6415691b28 100644 --- a/src/d/d_meter_hakusha.cpp +++ b/src/d/d_meter_hakusha.cpp @@ -3,7 +3,7 @@ * UI Epona Dash Spurs */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter_hakusha.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -33,14 +33,14 @@ int dMeterHakusha_c::_create() { for (int i = 0; i < 6; i++) { mpHakushaPos[i] = new CPaneMgr(field_0x004, haku_tag[i], 0, NULL); - JUT_ASSERT(0, mpHakushaPos[i] != 0); + JUT_ASSERT(0, mpHakushaPos[i] != NULL); } mpHakushaParent = new CPaneMgr(field_0x004, 'hakunall', 0, NULL); - JUT_ASSERT(0, mpHakushaParent != 0); + JUT_ASSERT(0, mpHakushaParent != NULL); mpHakushaScreen = new J2DScreen(); - JUT_ASSERT(0, mpHakushaScreen != 0); + JUT_ASSERT(0, mpHakushaScreen != NULL); bool fg = mpHakushaScreen->setPriority("zelda_game_image_hakusha_parts.blo", 0x20000, dComIfGp_getMain2DArchive()); @@ -48,10 +48,10 @@ int dMeterHakusha_c::_create() { dPaneClass_showNullPane(mpHakushaScreen); mpHakushaOn = new CPaneMgr(mpHakushaScreen, 'haku_n', 2, NULL); - JUT_ASSERT(0, mpHakushaOn != 0); + JUT_ASSERT(0, mpHakushaOn != NULL); mpHakushaOff = new CPaneMgr(mpHakushaScreen, 'haku_b_n', 2, NULL); - JUT_ASSERT(0, mpHakushaOff != 0); + JUT_ASSERT(0, mpHakushaOff != NULL); mpHakushaOn->setAlphaRate(0.0f); mpHakushaOff->setAlphaRate(0.0f); @@ -69,7 +69,7 @@ int dMeterHakusha_c::_create() { mHakushaNum = dMeter2Info_getHorseLifeCount(); mpButtonScreen = new J2DScreen(); - JUT_ASSERT(0, mpButtonScreen != 0); + JUT_ASSERT(0, mpButtonScreen != NULL); fg = mpButtonScreen->setPriority("zelda_game_image_hakusha_a_btn.blo", 0x20000, dComIfGp_getMain2DArchive()); @@ -77,7 +77,7 @@ int dMeterHakusha_c::_create() { dPaneClass_showNullPane(mpButtonScreen); mpButtonA = new CPaneMgr(mpButtonScreen, 'abtn_n', 2, NULL); - JUT_ASSERT(0, mpButtonA != 0); + JUT_ASSERT(0, mpButtonA != NULL); mpButtonA->show(); mpButtonA->setAlphaRate(0.0f); diff --git a/src/d/d_meter_map.cpp b/src/d/d_meter_map.cpp index 69dc1c7aa0..6c977833ba 100644 --- a/src/d/d_meter_map.cpp +++ b/src/d/d_meter_map.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter_map.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_meter_string.cpp b/src/d/d_meter_string.cpp index 781d77bad8..64db4a53b5 100644 --- a/src/d/d_meter_string.cpp +++ b/src/d/d_meter_string.cpp @@ -3,7 +3,7 @@ * UI Mini-Game Text */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_meter_string.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -50,7 +50,7 @@ int dMeterString_c::_create() { } mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpMapArchive); JUT_ASSERT(0, fg != false); @@ -61,13 +61,13 @@ int dMeterString_c::_create() { JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpMapArchive)); mpParentPane = new CPaneMgr(mpScreen, 'get_in_n', 2, NULL); - JUT_ASSERT(0, mpParentPane != 0); + JUT_ASSERT(0, mpParentPane != NULL); mpRootPane = new CPaneMgr(mpScreen, 'n_all', 0, NULL); - JUT_ASSERT(0, mpRootPane != 0); + JUT_ASSERT(0, mpRootPane != NULL); mpTextPane = new CPaneMgr(mpScreen, 'get_in', 0, NULL); - JUT_ASSERT(0, mpTextPane != 0); + JUT_ASSERT(0, mpTextPane != NULL); static_cast(mpScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); static_cast(mpScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp index 74d1f31d4a..a356b84143 100644 --- a/src/d/d_model.cpp +++ b/src/d/d_model.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_model // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_model.h" #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" diff --git a/src/d/d_msg_class.cpp b/src/d/d_msg_class.cpp index e4b3fa819b..877edc58ef 100644 --- a/src/d/d_msg_class.cpp +++ b/src/d/d_msg_class.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_class.h" #include @@ -306,7 +306,7 @@ static u8 getPohNum() { /* 80228B04-80228CB4 223444 01B0+00 0/0 1/1 0/0 .text __ct__19jmessage_tReferenceFv */ jmessage_tReference::jmessage_tReference() { mpStick = new STControl(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x2000); - JUT_ASSERT(518, mpStick != 0); + JUT_ASSERT(518, mpStick != NULL); mpStick->setWaitParm(5, 2, 3, 2, 0.9f, 0.5f, 0, 0x800); mActorPos.set(0.0f, 0.0f, 0.0f); diff --git a/src/d/d_msg_flow.cpp b/src/d/d_msg_flow.cpp index 9ea166d9d6..0741fde399 100644 --- a/src/d/d_msg_flow.cpp +++ b/src/d/d_msg_flow.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_flow.h" #include "d/actor/d_a_alink.h" @@ -45,10 +45,10 @@ void dMsgFlow_c::init(fopAc_ac_c* i_partner, int i_flowID, int param_2, fopAc_ac setInitValue(1); mFlow_p = getMsgDataBlock("FLW1"); - JUT_ASSERT(121, 0 != mFlow_p); + JUT_ASSERT(121, NULL != mFlow_p); mLabelInfo_p = getMsgDataBlock("FLI1"); - JUT_ASSERT(125, 0 != mLabelInfo_p); + JUT_ASSERT(125, NULL != mLabelInfo_p); labelInfoTBL = mLabelInfo_p + 0x10; mFlowNodeTBL = (mesg_flow*)(mFlow_p + 0x10); @@ -163,7 +163,7 @@ int dMsgFlow_c::checkOpenDoor(fopAc_ac_c* i_speaker_p, int* param_2) { } case 0: default: - JUT_ASSERT(362, 0); + JUT_ASSERT(362, FALSE); break; } } @@ -261,7 +261,7 @@ void dMsgFlow_c::remove() { /* 8024A528-8024A538 244E68 0010+00 0/0 2/2 66/66 .text getEventId__10dMsgFlow_cFPi */ u16 dMsgFlow_c::getEventId(int* oItemId_p) { - JUT_ASSERT(555, 0 != oItemId_p); + JUT_ASSERT(555, NULL != oItemId_p); *oItemId_p = field_0x30; return mEventId; } @@ -330,10 +330,10 @@ void dMsgFlow_c::setInitValueGroupChange(int i_msgNo, fopAc_ac_c** i_talkPartner setInitValue(0); mFlow_p = getMsgDataBlock("FLW1"); - JUT_ASSERT(680, 0 != mFlow_p); + JUT_ASSERT(680, NULL != mFlow_p); mLabelInfo_p = getMsgDataBlock("FLI1"); - JUT_ASSERT(684, 0 != mLabelInfo_p); + JUT_ASSERT(684, NULL != mLabelInfo_p); labelInfoTBL = mLabelInfo_p + 0x10; @@ -353,7 +353,7 @@ u8* dMsgFlow_c::getMsgDataBlock(char const* block_tag) { char tag[5] = {0}; aMsgRes_p = dMsgObject_getMsgDtPtr(); - JUT_ASSERT(742, 0 != aMsgRes_p); + JUT_ASSERT(742, NULL != aMsgRes_p); u32 num = *(u32*)(aMsgRes_p + 0xC); aMsgRes_p += 0x20; @@ -378,7 +378,7 @@ u16 dMsgFlow_c::getInitNodeIndex(u16 param_1) { u8* var_r30 = NULL; u16 var_r27 = -1; - JUT_ASSERT(777, 0 != mLabelInfo_p); + JUT_ASSERT(777, NULL != mLabelInfo_p); var_r30 = mLabelInfo_p + 0x10; for (int i = 0; i < *(u16*)(mLabelInfo_p + 8); i++) { @@ -398,7 +398,7 @@ void dMsgFlow_c::setNodeIndex(u16 i_nodeIdx, fopAc_ac_c** i_talkPartners) { msg_class* aMsg_p = NULL; if (mMsg != fpcM_ERROR_PROCESS_ID_e) { aMsg_p = fopMsgM_SearchByID(mMsg); - JUT_ASSERT(806, 0 != aMsg_p); + JUT_ASSERT(806, NULL != aMsg_p); } if (i_nodeIdx == 0xFFFF) { @@ -494,7 +494,7 @@ int dMsgFlow_c::setSelectMsg(mesg_flow_node* i_flowNode_p, mesg_flow_node* param if (mMsg != fpcM_ERROR_PROCESS_ID_e) { msg_class* aMsg_p = NULL; aMsg_p = fopMsgM_SearchByID(mMsg); - JUT_ASSERT(944, 0 != aMsg_p); + JUT_ASSERT(944, NULL != aMsg_p); aMsg_p->mode = 15; fopMsgM_messageSet(msg_no, temp_r25); @@ -540,7 +540,7 @@ int dMsgFlow_c::setNormalMsg(mesg_flow_node* i_flowNode_p, fopAc_ac_c* i_speaker if (mMsg != fpcM_ERROR_PROCESS_ID_e) { msg_class* aMsg_p = NULL; aMsg_p = fopMsgM_SearchByID(mMsg); - JUT_ASSERT(1007, 0 != aMsg_p); + JUT_ASSERT(1007, NULL != aMsg_p); aMsg_p->mode = 15; fopMsgM_messageSet(msg_no, 1000); @@ -585,7 +585,7 @@ int dMsgFlow_c::messageNodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPart } } else { OS_REPORT("★sel select mesg ===> %d, %d, %d\n", mSelType, aNextNodeIndex, mFlowNodeTBL[aNextNodeIndex].message.type); - JUT_ASSERT(1077, 0); + JUT_ASSERT(1077, FALSE); } } else { if (setNormalMsg(&mFlowNodeTBL[mNodeIdx].message, i_speaker_p)) { @@ -750,7 +750,7 @@ int dMsgFlow_c::nodeProc(fopAc_ac_c* i_speaker_p, fopAc_ac_c** i_talkPartners) { break; case 0: default: - JUT_ASSERT(1323, 0); + JUT_ASSERT(1323, FALSE); break; } } @@ -880,7 +880,7 @@ u16 dMsgFlow_c::query004(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea * query005__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ u16 dMsgFlow_c::query005(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) { msg_class* aMsg_p = fopMsgM_SearchByID(mMsg); - JUT_ASSERT(1668, 0 != aMsg_p); + JUT_ASSERT(1668, NULL != aMsg_p); u16 ret = aMsg_p->select_idx; mChoiceNo = ret; @@ -1457,7 +1457,7 @@ u16 dMsgFlow_c::query035(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea * query036__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ u16 dMsgFlow_c::query036(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) { msg_class* aMsg_p = fopMsgM_SearchByID(mMsg); - JUT_ASSERT(2751, 0 != aMsg_p); + JUT_ASSERT(2751, NULL != aMsg_p); u16 ret = aMsg_p->select_idx; if (dMsgObject_getMsgObjectClass()->getSelectPushFlag() == 2) { @@ -1477,7 +1477,7 @@ u16 dMsgFlow_c::query036(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea * query037__10dMsgFlow_cFP21mesg_flow_node_branchP10fopAc_ac_ci */ u16 dMsgFlow_c::query037(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_speaker_p, int param_2) { msg_class* aMsg_p = fopMsgM_SearchByID(mMsg); - JUT_ASSERT(2789, 0 != aMsg_p); + JUT_ASSERT(2789, NULL != aMsg_p); u16 ret = aMsg_p->select_idx; if (dMsgObject_getMsgObjectClass()->getSelectPushFlag() == 2) { @@ -1740,7 +1740,7 @@ u16 dMsgFlow_c::query047(mesg_flow_node_branch* i_flowNode_p, fopAc_ac_c* i_spea OS_REPORT("flow:%d, ret:%d\n", mFlow, ret); } - JUT_ASSERT(3305, 0); + JUT_ASSERT(3305, FALSE); return ret; } diff --git a/src/d/d_msg_object.cpp b/src/d/d_msg_object.cpp index a8ba59fbbb..301c349154 100644 --- a/src/d/d_msg_object.cpp +++ b/src/d/d_msg_object.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_msg_object // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #define DISABLE_MSG_OBJECT_EXTERN @@ -359,16 +359,16 @@ int dMsgObject_c::_create(msg_class* param_1) { mpOutFont = NULL; mpScrnDraw = NULL; mpResCont = new JMessage::TResourceContainer(); - JUT_ASSERT(1299, mpResCont != 0); + JUT_ASSERT(1299, mpResCont != NULL); mpCtrl = dDemo_c::getMesgControl(); - JUT_ASSERT(1302, mpCtrl != 0); + JUT_ASSERT(1302, mpCtrl != NULL); mpRefer = new jmessage_tReference(); - JUT_ASSERT(1305, mpRefer != 0); + JUT_ASSERT(1305, mpRefer != NULL); mpRefer->setpStatus(¶m_1->mode); mpSeqProc = new jmessage_tSequenceProcessor(mpRefer, mpCtrl); - JUT_ASSERT(1310, mpSeqProc != 0); + JUT_ASSERT(1310, mpSeqProc != NULL); mpRenProc = new jmessage_tRenderingProcessor(mpRefer); - JUT_ASSERT(1313, mpRenProc != 0); + JUT_ASSERT(1313, mpRenProc != NULL); mpRefer->setResourceContainer(mpResCont); mpCtrl->setSequenceProcessor(mpSeqProc); mpCtrl->setRenderingProcessor(mpRenProc); @@ -407,7 +407,7 @@ int dMsgObject_c::_create(msg_class* param_1) { field_0x172 = 0; setStatusLocal(1); mpMsgString = new dMsgString_c(); - JUT_ASSERT(1366, mpMsgString != 0); + JUT_ASSERT(1366, mpMsgString != NULL); return 4; } @@ -1376,7 +1376,7 @@ void dMsgObject_c::talkStartInit() { if (mpOutFont == NULL) { OS_REPORT("free size (0x%x)=====> %d\n", mDoExt_getCurrentHeap(), mDoExt_getCurrentHeap()->getTotalFreeSize()); mpOutFont = new COutFont_c(0); - JUT_ASSERT(3035, mpOutFont != 0); + JUT_ASSERT(3035, mpOutFont != NULL); mpOutFont->createPane(); mpRenProc->setOutFont(mpOutFont); } @@ -1386,7 +1386,7 @@ void dMsgObject_c::talkStartInit() { case 9: pRef = (jmessage_tReference*)mpRenProc->getReference(); pData = new dMsgScrnItem_c(pRef->getFukiPosType(), pRef->getForm(), mpTalkHeap); - JUT_ASSERT(3049, pData != 0); + JUT_ASSERT(3049, pData != NULL); mpScrnDraw = pData; break; case 2: @@ -1394,32 +1394,32 @@ void dMsgObject_c::talkStartInit() { local_30 = mDoExt_getRubyFont(); } pData = new dMsgScrnTree_c(local_30, mpTalkHeap); - JUT_ASSERT(3061, pData != 0); + JUT_ASSERT(3061, pData != NULL); mpScrnDraw = pData; break; case 6: pData = new dMsgScrnKanban_c(mpTalkHeap); - JUT_ASSERT(3069, pData != 0); + JUT_ASSERT(3069, pData != NULL); mpScrnDraw = pData; break; case 7: pData = new dMsgScrnStaff_c(((jmessage_tReference*)mpRenProc->getReference())->getArrange()); - JUT_ASSERT(3083, pData != 0); + JUT_ASSERT(3083, pData != NULL); mpScrnDraw = pData; break; case 12: pData = new dMsgScrnPlace_c(); - JUT_ASSERT(3092, pData != 0); + JUT_ASSERT(3092, pData != NULL); mpScrnDraw = pData; break; case 19: pData = new dMsgScrnBoss_c(); - JUT_ASSERT(3100, pData != 0); + JUT_ASSERT(3100, pData != NULL); mpScrnDraw = pData; break; case 17: pData = new dMsgScrnHowl_c(); - JUT_ASSERT(3108, pData != 0); + JUT_ASSERT(3108, pData != NULL); mpScrnDraw = pData; local_98 = true; break; @@ -1427,7 +1427,7 @@ void dMsgObject_c::talkStartInit() { case 5: pRef = (jmessage_tReference*)mpRenProc->getReference(); pData = new dMsgScrnJimaku_c(pRef->getForm(), mpTalkHeap); - JUT_ASSERT(3119, pData != 0); + JUT_ASSERT(3119, pData != NULL); mpScrnDraw = pData; break; case 10: @@ -1436,11 +1436,11 @@ void dMsgObject_c::talkStartInit() { pRef = (jmessage_tReference*)mpRenProc->getReference(); if (mpRefer->getMsgID() == 0x2a5) { pData = new dMsgScrnItem_c(0, pRef->getForm(), mpTalkHeap); - JUT_ASSERT(3131, pData != 0); + JUT_ASSERT(3131, pData != NULL); mpScrnDraw = pData; } else { pData = new dMsgScrnTalk_c(pRef->getFukiPosType(), pRef->getForm(), mpTalkHeap); - JUT_ASSERT(3138, pData != 0); + JUT_ASSERT(3138, pData != NULL); mpScrnDraw = pData; local_98 = true; } diff --git a/src/d/d_msg_out_font.cpp b/src/d/d_msg_out_font.cpp index eef5d7b7a6..67d84b0260 100644 --- a/src/d/d_msg_out_font.cpp +++ b/src/d/d_msg_out_font.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_out_font.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_msg_scrn_3select.cpp b/src/d/d_msg_scrn_3select.cpp index 12d64987b6..a19c96e4da 100644 --- a/src/d/d_msg_scrn_3select.cpp +++ b/src/d/d_msg_scrn_3select.cpp @@ -3,7 +3,7 @@ * 3-way Select Message Screen */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_3select.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -40,7 +40,7 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { }; mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_window_3menu.blo", 0x20000, dComIfGp_getMsgArchive(0)); JUT_ASSERT(0, fg != false); @@ -65,11 +65,11 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mBtkFrame = 0.0f; mpSelectCursor = new dSelect_cursor_c(0, 1.0f, NULL); - JUT_ASSERT(0, mpSelectCursor != 0); + JUT_ASSERT(0, mpSelectCursor != NULL); mpSelectCursor->setAlphaRate(0.0f); mpParent = new CPaneMgr(mpScreen, 'abc_n', 0, NULL); - JUT_ASSERT(0, mpParent != 0); + JUT_ASSERT(0, mpParent != NULL); for (int i = 0; i < 3; i++) { mCursorPos[i].x = 0.0f; @@ -77,35 +77,35 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { mCursorPos[i].z = 0.0f; mpSel_c[i] = new CPaneMgr(mpScreen, tag_name[i][0], 0, NULL); - JUT_ASSERT(0, mpSel_c[i] != 0); + JUT_ASSERT(0, mpSel_c[i] != NULL); mpSel_c[i]->hide(); mpSelCld_c[i] = new CPaneMgr(mpScreen, tag_name[i][1], 0, NULL); - JUT_ASSERT(0, mpSelCld_c[i] != 0); + 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); - JUT_ASSERT(0, mpSelCldr_c[i] != 0); + 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); - JUT_ASSERT(0, mpSelCldm_c[i] != 0); + 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); - JUT_ASSERT(0, mpSelCldw_c[j][i] != 0); + JUT_ASSERT(0, mpSelCldw_c[j][i] != NULL); } mpSelPo_c[i] = new CPaneMgr(mpScreen, tag_name[i][9], 0, NULL); - JUT_ASSERT(0, mpSelPo_c[i] != 0); + JUT_ASSERT(0, mpSelPo_c[i] != NULL); mpSelPo_c[i]->hide(); mpKahen_c[i] = new CPaneMgr(mpScreen, tag_name[i][10], 0, NULL); - JUT_ASSERT(0, mpKahen_c[i] != 0); + JUT_ASSERT(0, mpKahen_c[i] != NULL); mpCursor_c[i] = new CPaneMgr(mpScreen, tag_name[i][11], 0, NULL); - JUT_ASSERT(0, mpCursor_c[i] != 0); + JUT_ASSERT(0, mpCursor_c[i] != NULL); mCursorPos[i] = mpCursor_c[i]->getGlobalVtxCenter(true, 0); } @@ -171,13 +171,13 @@ dMsgScrn3Select_c::dMsgScrn3Select_c() { } #else mpTmSel_c[0] = new CPaneMgr(mpScreen, 'a_t_e', 0, NULL); - JUT_ASSERT(0, mpTmSel_c[0] != 0); + JUT_ASSERT(0, mpTmSel_c[0] != NULL); mpTmSel_c[1] = new CPaneMgr(mpScreen, 'b_t_e', 0, NULL); - JUT_ASSERT(0, mpTmSel_c[1] != 0); + JUT_ASSERT(0, mpTmSel_c[1] != NULL); mpTmSel_c[2] = new CPaneMgr(mpScreen, 'c_t_e', 0, NULL); - JUT_ASSERT(0, mpTmSel_c[2] != 0); + JUT_ASSERT(0, mpTmSel_c[2] != NULL); for (int i = 0; i < 3; i++) { ((J2DTextBox*)(mpTmSel_c[i]->getPanePtr()))->setString(64, ""); diff --git a/src/d/d_msg_scrn_arrow.cpp b/src/d/d_msg_scrn_arrow.cpp index c6882e8646..e1597d7d9f 100644 --- a/src/d/d_msg_scrn_arrow.cpp +++ b/src/d/d_msg_scrn_arrow.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_arrow.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -9,7 +9,7 @@ /* 8023B9B4-8023BC78 2362F4 02C4+00 0/0 4/4 0/0 .text __ct__15dMsgScrnArrow_cFv */ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_window_yajirushi.blo", 0x20000, dComIfGp_getMsgArchive(0)); JUT_ASSERT(0, fg != false); @@ -27,10 +27,10 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mBpkFrame = 0.0f; mpParent_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); - JUT_ASSERT(0, mpParent_c != 0); + JUT_ASSERT(0, mpParent_c != NULL); mpArw_c = new CPaneMgr(mpScreen, 'ya_next', 0, NULL); - JUT_ASSERT(0, mpArw_c != 0); + JUT_ASSERT(0, mpArw_c != NULL); mpArw_c->hide(); mpArw_c->mPane->setAnimation(mpBck); @@ -38,7 +38,7 @@ dMsgScrnArrow_c::dMsgScrnArrow_c() { mpScreen->search('yajinexl')->setAnimation(mpBpk); mpDot_c = new CPaneMgr(mpScreen, 'ya_end', 0, NULL); - JUT_ASSERT(0, mpDot_c != 0); + JUT_ASSERT(0, mpDot_c != NULL); mpDot_c->hide(); mpScreen->search('yaj_end')->setAnimation(mpBpk); diff --git a/src/d/d_msg_scrn_base.cpp b/src/d/d_msg_scrn_base.cpp index c36327eefd..a59cfa0859 100644 --- a/src/d/d_msg_scrn_base.cpp +++ b/src/d/d_msg_scrn_base.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_base.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_msg_scrn_boss.cpp b/src/d/d_msg_scrn_boss.cpp index 2f7c1e767c..7d8d7d5096 100644 --- a/src/d/d_msg_scrn_boss.cpp +++ b/src/d/d_msg_scrn_boss.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_boss.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_msg_scrn_explain.cpp b/src/d/d_msg_scrn_explain.cpp index ee5a7badc3..7d8da9e364 100644 --- a/src/d/d_msg_scrn_explain.cpp +++ b/src/d/d_msg_scrn_explain.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_explain.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_msg_scrn_howl.cpp b/src/d/d_msg_scrn_howl.cpp index f934cebdbf..7ee409442a 100644 --- a/src/d/d_msg_scrn_howl.cpp +++ b/src/d/d_msg_scrn_howl.cpp @@ -2,7 +2,7 @@ // Howl Screen // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_howl.h" #include "m_Do/m_Do_controller_pad.h" @@ -56,25 +56,25 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { init(); mpScreen = new J2DScreen(); - JUT_ASSERT(61, mpScreen != 0); + 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('line00')->hide(); mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL); - JUT_ASSERT(79, mpPmP_c != 0); + JUT_ASSERT(79, mpPmP_c != NULL); mpScreen->search('ag_n')->hide(); field_0x1994 = 0.0f; field_0x1998 = 0.0f; mpScreen->search('wi_btn_n')->hide(); mpButtonIcon[0] = new CPaneMgr(mpScreen, 'cbtn_n', 2, NULL); - JUT_ASSERT(91, mpButtonIcon[0] != 0); + JUT_ASSERT(91, mpButtonIcon[0] != NULL); mpButtonText[0] = new CPaneMgr(mpScreen, 'g_ltxt_n', 2, NULL); - JUT_ASSERT(93, mpButtonText[0] != 0); + JUT_ASSERT(93, mpButtonText[0] != NULL); mpButtonIcon[1] = new CPaneMgr(mpScreen, 'abt_n', 2, NULL); - JUT_ASSERT(96, mpButtonIcon[1] != 0); + JUT_ASSERT(96, mpButtonIcon[1] != NULL); mpButtonText[1] = new CPaneMgr(mpScreen, 'gr_txt_n', 2, NULL); - JUT_ASSERT(98, mpButtonText[1] != 0); + JUT_ASSERT(98, mpButtonText[1] != NULL); #if VERSION == VERSION_GCN_JPN J2DTextBox* piStack_19c = (J2DTextBox*)mpScreen->search('g_l_info'); J2DTextBox* piStack_1a0 = (J2DTextBox*)mpScreen->search('g_r_info'); @@ -140,9 +140,9 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { field_0x2138 = 0; field_0x1984 = 255.0f / field_0x2136; mpABase = new CPaneMgr(mpScreen, 'a_base', 0, NULL); - JUT_ASSERT(218, mpABase != 0); + JUT_ASSERT(218, mpABase != NULL); mpLineAll = new CPaneMgr(mpScreen, 'line_all', 0, NULL); - JUT_ASSERT(221, mpLineAll != 0); + JUT_ASSERT(221, mpLineAll != NULL); f32 in_f31; for (int i = 0; i < 7; i++) { J2DPane* piStack_1b4 = mpScreen->search(tlinen_tag[i]); @@ -160,11 +160,11 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { } for (int i = 0; i < 3; i++) { mpLineH[i] = new CPaneMgr(mpScreen, ylinen_tag[i], 0, NULL); - JUT_ASSERT(242, mpLineH[i] != 0); + JUT_ASSERT(242, mpLineH[i] != NULL); } for (int i = 0; i < 7; i++) { mpLineV[i] = new CPaneMgr(mpScreen, tlinen_tag[i], 2, NULL); - JUT_ASSERT(247, mpLineV[i] != 0); + JUT_ASSERT(247, mpLineV[i] != NULL); } Mtx mtx2; field_0x128 = mpLineH[0]->getGlobalVtx(&mtx2, 0, true, 0); @@ -180,21 +180,21 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { field_0x27a8 = 0.0f; ResTIMG const* res = (ResTIMG const*) dComIfGp_getMsgArchive(5)->getResource('TIMG', "tt_ginnouroko_s3tc.bti"); mpDot = new J2DPicture(res); - JUT_ASSERT(275, mpDot != 0); + 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); - JUT_ASSERT(280, mpGuideDot != 0); + JUT_ASSERT(280, mpGuideDot != NULL); mpGuideDot->setBlackWhite(((J2DPicture*)mpScreen->search('line00'))->getBlack(), ((J2DPicture*)mpScreen->search('line00'))->getWhite()); res = (ResTIMG const*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_iastarRR.bti"); mpTopBall = new J2DPicture(res); - JUT_ASSERT(287, mpTopBall != 0); + 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); - JUT_ASSERT(292, mpTopBallTail[i] != 0); + JUT_ASSERT(292, mpTopBallTail[i] != NULL); mpTopBallTail[i]->setBlackWhite(g_MsgObject_HIO_c.mHowlHIO.mDotBlack, g_MsgObject_HIO_c.mHowlHIO.mDotWhite); } field_0x2134 = 0; @@ -205,7 +205,7 @@ dMsgScrnHowl_c::dMsgScrnHowl_c() { field_0x2197 = 0; res = (ResTIMG const*)dComIfGp_getMain2DArchive()->getResource('TIMG', "tt_block8x8.bti"); mpWaveTex = new J2DPicture(res); - JUT_ASSERT(307, mpWaveTex != 0); + JUT_ASSERT(307, mpWaveTex != NULL); mpWaveTex->setBlackWhite(JUtility::TColor(0, 0, 0, 0), JUtility::TColor(255, 200, 0, 255)); mpWaveTex->setCornerColor( JUtility::TColor(128, 128, 128, 0), JUtility::TColor(255, 255, 255, 255), diff --git a/src/d/d_msg_scrn_item.cpp b/src/d/d_msg_scrn_item.cpp index 0b0577a4b1..9443a01cde 100644 --- a/src/d/d_msg_scrn_item.cpp +++ b/src/d/d_msg_scrn_item.cpp @@ -2,7 +2,7 @@ // Item Message Screen // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_item.h" #include "d/d_msg_scrn_light.h" @@ -78,7 +78,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { mpItemPane[i] = 0; field_0x0e0[i] = 0; mpItemTex[i] = field_0x138->alloc(0xc00, 0x20); - JUT_ASSERT(100, mpItemTex[i] != 0); + JUT_ASSERT(100, mpItemTex[i] != NULL); } int uStack_60 = 0xffffffff; if (mItemIndex == 0x46 || mItemIndex == 0x4c) { @@ -110,7 +110,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { JKRReadIdxResource(mpItemTex[0], 0xc00, 0x3d, dComIfGp_getItemIconArchive()); field_0x0e0[0] = (ResTIMG*)mpItemTex[0]; mpItemPane[0] = new J2DPicture(field_0x0e0[0]); - JUT_ASSERT(148, mpItemPane[0] != 0); + JUT_ASSERT(148, mpItemPane[0] != NULL); } else { int texNum = dMeter2Info_readItemTexture(mItemIndex, mpItemTex[0], (J2DPicture*)NULL, mpItemTex[1], @@ -118,7 +118,7 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { for (int i = 0; i < texNum; i++) { field_0x0e0[i] = (ResTIMG*)mpItemTex[i]; mpItemPane[i] = new J2DPicture(field_0x0e0[i]); - JUT_ASSERT(165, mpItemPane[i] != 0); + JUT_ASSERT(165, mpItemPane[i] != NULL); } dMeter2Info_setItemColor( mItemIndex, mpItemPane[0], mpItemPane[1], @@ -130,12 +130,12 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { #endif } mpScreen = new J2DScreen(); - JUT_ASSERT(188, mpScreen != 0); + 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(); - JUT_ASSERT(199, mpTxScreen != 0); + JUT_ASSERT(199, mpTxScreen != NULL); fg = mpTxScreen->setPriority("zelda_item_get_window_text.blo", 0x20000, dComIfGp_getMsgArchive(3)); JUT_ASSERT(206, fg != false); dPaneClass_showNullPane(mpTxScreen); @@ -158,13 +158,13 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } } mpArrow_c = new dMsgScrnArrow_c(); - JUT_ASSERT(280, mpArrow_c != 0); + JUT_ASSERT(280, mpArrow_c != NULL); mpSelect_c = new dMsgScrn3Select_c(); - JUT_ASSERT(284, mpSelect_c != 0); + JUT_ASSERT(284, mpSelect_c != NULL); mpLight_c = new dMsgScrnLight_c(3, param_2); - JUT_ASSERT(288, mpLight_c != 0); + JUT_ASSERT(288, mpLight_c != NULL); void* mpBuf = field_0x138->alloc(0x106a, 0x20); - JUT_ASSERT(291, mpBuf != 0); + JUT_ASSERT(291, mpBuf != NULL); memset(mpBuf, 0, 0x106a); mCharInfoPtr = (CharInfo_c*)mpBuf; field_0x160 = mpScreen->search('n_all')->getBounds().i.x; @@ -176,11 +176,11 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } field_0x194 = 0.0f; mpArw_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); - JUT_ASSERT(306, mpArw_c != 0); + JUT_ASSERT(306, mpArw_c != NULL); mpMg_c[0] = new CPaneMgr(mpScreen, 'mg_null', 0, NULL); - JUT_ASSERT(309, mpMg_c[0] != 0); + JUT_ASSERT(309, mpMg_c[0] != NULL); mpMg_c[1] = new CPaneMgr(mpTxScreen, 'mg_null', 0, NULL); - JUT_ASSERT(312, mpMg_c[1] != 0); + JUT_ASSERT(312, mpMg_c[1] != NULL); OSInitFastCast(); fukiPosCalc(param_1); field_0x118[0] = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(JKRGetNameResource("zelda_item_get_window.btk", dComIfGp_getMsgArchive(3))); @@ -194,51 +194,51 @@ dMsgScrnItem_c::dMsgScrnItem_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { field_0x154[1] = 0.0f; field_0x19d = false; mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL); - JUT_ASSERT(389, mpPmP_c != 0); + 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_getOptUnk0() == 0) { mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3flin', 0, NULL); - JUT_ASSERT(407, mpTm_c[0] != 0); + JUT_ASSERT(407, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3f_s', 0, NULL); - JUT_ASSERT(410, mpTm_c[1] != 0); + JUT_ASSERT(410, mpTm_c[1] != NULL); mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3f_w', 0, NULL); - JUT_ASSERT(413, mpTm_c[2] != 0); + JUT_ASSERT(413, mpTm_c[2] != NULL); mpTmr_c[0] = new CPaneMgr(mpTxScreen, 'mg_3f', 0, NULL); - JUT_ASSERT(416, mpTmr_c[0] != 0); + JUT_ASSERT(416, mpTmr_c[0] != NULL); mpTmr_c[1] = new CPaneMgr(mpTxScreen, 'mg_3f_s', 0, NULL); - JUT_ASSERT(419, mpTmr_c[1] != 0); + JUT_ASSERT(419, mpTmr_c[1] != NULL); mpTmr_c[2] = new CPaneMgr(mpTxScreen, 'mg_3f_w', 0, NULL); - JUT_ASSERT(422, mpTmr_c[2] != 0); + JUT_ASSERT(422, mpTmr_c[2] != NULL); mpTxScreen->search('n_3line')->hide(); mpTxScreen->search('n_3fline')->show(); mpTxScreen->search('n_e4line')->hide(); } else { mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_3line', 0, NULL); - JUT_ASSERT(407, mpTm_c[0] != 0); + JUT_ASSERT(407, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't3_s', 0, NULL); - JUT_ASSERT(410, mpTm_c[1] != 0); + JUT_ASSERT(410, mpTm_c[1] != NULL); mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3_w', 0, NULL); - JUT_ASSERT(413, mpTm_c[2] != 0); + JUT_ASSERT(413, mpTm_c[2] != NULL); mpTxScreen->search('n_3line')->show(); mpTxScreen->search('n_3fline')->hide(); mpTxScreen->search('n_e4line')->hide(); } #else mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_e4lin', 0, NULL); - JUT_ASSERT(407, mpTm_c[0] != 0); + JUT_ASSERT(407, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); - JUT_ASSERT(410, mpTm_c[1] != 0); + JUT_ASSERT(410, mpTm_c[1] != NULL); mpTm_c[2] = new CPaneMgr(mpTxScreen, 't4_w', 0, NULL); - JUT_ASSERT(413, mpTm_c[2] != 0); + JUT_ASSERT(413, mpTm_c[2] != NULL); mpTxScreen->search('n_3line')->hide(); mpTxScreen->search('n_3fline')->hide(); mpTxScreen->search('n_e4line')->show(); diff --git a/src/d/d_msg_scrn_jimaku.cpp b/src/d/d_msg_scrn_jimaku.cpp index 0344e05143..5991245e5b 100644 --- a/src/d/d_msg_scrn_jimaku.cpp +++ b/src/d/d_msg_scrn_jimaku.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_jimaku.h" #include "JSystem/J2DGraph/J2DGrafContext.h" @@ -25,7 +25,7 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { init(); mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_jimaku_message_text.blo", 0x20000, dComIfGp_getMsgCommonArchive()); @@ -33,15 +33,15 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { dPaneClass_showNullPane(mpScreen); mpLight_c = new dMsgScrnLight_c(0, param_0); - JUT_ASSERT(0, mpLight_c != 0); + JUT_ASSERT(0, mpLight_c != NULL); void* mpBuf = heap->alloc(0x106A, 0x20); - JUT_ASSERT(0, mpBuf != 0); + JUT_ASSERT(0, mpBuf != NULL); memset(mpBuf, 0, 0x106A); mCharInfoPtr = (CharInfo_c*)mpBuf; mpPmP_c = new CPaneMgr(mpScreen, 'mg_null', 3, NULL); - JUT_ASSERT(0, mpPmP_c != 0); + 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]; mpPmP_c->paneTrans(0.0f, field_0xcc); @@ -67,10 +67,10 @@ dMsgScrnJimaku_c::dMsgScrnJimaku_c(u8 param_0, JKRExpHeap* i_heap) { } #else mpTm_c[0] = new CPaneMgr(mpScreen, 'mg_e4lin', 0, NULL); - JUT_ASSERT(0, mpTm_c[0] != 0); + JUT_ASSERT(0, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpScreen, 't4_s', 0, NULL); - JUT_ASSERT(0, mpTm_c[1] != 0); + JUT_ASSERT(0, mpTm_c[1] != NULL); mpScreen->search('n_3line')->hide(); mpScreen->search('n_3fline')->hide(); diff --git a/src/d/d_msg_scrn_kanban.cpp b/src/d/d_msg_scrn_kanban.cpp index 20b5675b97..5c305efead 100644 --- a/src/d/d_msg_scrn_kanban.cpp +++ b/src/d/d_msg_scrn_kanban.cpp @@ -2,7 +2,7 @@ // d_msg_scrn_kanban // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_kanban.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -25,7 +25,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { init(); mpScreen = new J2DScreen(); - JUT_ASSERT(43, mpScreen != 0); + JUT_ASSERT(43, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_kanban_stone_a.blo", 0x1020000, dComIfGp_getMsgArchive(2)); JUT_ASSERT(45, fg != false); @@ -41,7 +41,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { field_0xd8 = 0.0f; mpPmP_c = new CPaneMgr(mpScreen, 'n_size', 2, NULL); - JUT_ASSERT(60, mpPmP_c != 0); + JUT_ASSERT(60, mpPmP_c != NULL); mpPmP_c->getPanePtr()->setAnimation(field_0xcc); field_0xcc->setFrame(1.0f); @@ -50,10 +50,10 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { mpPmP_c->scale(g_MsgObject_HIO_c.mBoxStoneScaleX, g_MsgObject_HIO_c.mBoxStoneScaleY); mpBack_c = new CPaneMgr(mpScreen, 'back_b', 0, NULL); - JUT_ASSERT(68, mpBack_c != 0); + JUT_ASSERT(68, mpBack_c != NULL); mpSpot_c = new CPaneMgr(mpScreen, 'spot00', 0, NULL); - JUT_ASSERT(72, mpSpot_c != 0); + JUT_ASSERT(72, mpSpot_c != NULL); mpSpot_c->getPanePtr()->setAnimation(field_0xd0); @@ -90,7 +90,7 @@ dMsgScrnKanban_c::dMsgScrnKanban_c(JKRExpHeap* param_0) { for (int i = 0; i < 3; i++) { mpTm_c[i] = new CPaneMgr(mpScreen, t_tag[i], 0, NULL); - JUT_ASSERT(81, mpTm_c[i] != 0); + JUT_ASSERT(81, mpTm_c[i] != NULL); ((J2DTextBox*)mpTm_c[i]->getPanePtr())->setFont(mDoExt_getMesgFont()); } diff --git a/src/d/d_msg_scrn_light.cpp b/src/d/d_msg_scrn_light.cpp index 688f0190a8..4c64f0e123 100644 --- a/src/d/d_msg_scrn_light.cpp +++ b/src/d/d_msg_scrn_light.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_light.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -131,7 +131,7 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { g_MsgScrnLight_HIO_c.updateColor(i_colorType); mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_message_window_text_light.blo", 0x20000, dComIfGp_getMain2DArchive()); JUT_ASSERT(0, fg != false); @@ -148,7 +148,7 @@ dMsgScrnLight_c::dMsgScrnLight_c(u8 i_colorType, u8 param_1) { mBpkFrame = 0.0f; mpParent_c = new CPaneMgr(mpScreen, 'moya00', 0, NULL); - JUT_ASSERT(0, mpParent_c != 0); + JUT_ASSERT(0, mpParent_c != NULL); mpParent_c->getPanePtr()->setAnimation(mpBck); mpParent_c->getPanePtr()->setAnimation(mpBpk); diff --git a/src/d/d_msg_scrn_place.cpp b/src/d/d_msg_scrn_place.cpp index 166ee93f88..f8adc8e044 100644 --- a/src/d/d_msg_scrn_place.cpp +++ b/src/d/d_msg_scrn_place.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_place.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_msg_scrn_staff.cpp b/src/d/d_msg_scrn_staff.cpp index e5c1c8aab3..9ea453adda 100644 --- a/src/d/d_msg_scrn_staff.cpp +++ b/src/d/d_msg_scrn_staff.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_staff.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_msg_scrn_talk.cpp b/src/d/d_msg_scrn_talk.cpp index 3832bd1fa4..a693e07bf5 100644 --- a/src/d/d_msg_scrn_talk.cpp +++ b/src/d/d_msg_scrn_talk.cpp @@ -2,7 +2,7 @@ // Translation Unit: msg/scrn/d_msg_scrn_talk // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_talk.h" #include "d/d_msg_scrn_light.h" @@ -28,13 +28,13 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } init(); mpScreen = new J2DScreen(); - JUT_ASSERT(70, mpScreen != 0); + 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(); - JUT_ASSERT(81, mpTxScreen != 0); + JUT_ASSERT(81, mpTxScreen != NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { fg = mpTxScreen->setPriority("zelda_message_window_text_seirei.blo", 0x20000, dComIfGp_getMsgCommonArchive()); @@ -45,10 +45,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(); - JUT_ASSERT(95, mpArrow_c != 0); + JUT_ASSERT(95, mpArrow_c != NULL); if (dComIfGp_isHeapLockFlag() != 3) { mpSelect_c = new dMsgScrn3Select_c(); - JUT_ASSERT(100, mpSelect_c != 0); + JUT_ASSERT(100, mpSelect_c != NULL); } else { mpSelect_c = NULL; } @@ -69,9 +69,9 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } mpLight_c = new dMsgScrnLight_c(uVar22, param_2); - JUT_ASSERT(123, mpLight_c != 0); + JUT_ASSERT(123, mpLight_c != NULL); void* mpBuf = field_0xe4->alloc(0x106a, 0x20); - JUT_ASSERT(126, mpBuf != 0); + JUT_ASSERT(126, mpBuf != NULL); memset(mpBuf, 0, 0x106a); mCharInfoPtr = (CharInfo_c*)mpBuf; for (int i = 0; i < 150; i++) { @@ -89,11 +89,11 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { mpScreen->search('mg_null')->getBounds().i.x + g_MsgObject_HIO_c.mTextPosX, mpScreen->search('mg_null')->getBounds().i.y + g_MsgObject_HIO_c.mTextPosY); mpArw_c = new CPaneMgr(mpScreen, 'set_ya_n', 0, NULL); - JUT_ASSERT(147, mpArw_c != 0); + JUT_ASSERT(147, mpArw_c != NULL); mpMg_c[0] = new CPaneMgr(mpScreen, 'mg_null', 0, NULL); - JUT_ASSERT(150, mpMg_c[0] != 0); + JUT_ASSERT(150, mpMg_c[0] != NULL); mpMg_c[1] = new CPaneMgr(mpTxScreen, 'mg_null', 0, NULL); - JUT_ASSERT(153, mpMg_c[1] != 0); + JUT_ASSERT(153, mpMg_c[1] != NULL); OSInitFastCast(); #if VERSION == VERSION_GCN_JPN @@ -103,7 +103,7 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { #endif fukiPosCalc(param_1); mpPmP_c = new CPaneMgr(mpScreen, 'n_all', 3, NULL); - JUT_ASSERT(176, mpPmP_c != 0); + JUT_ASSERT(176, mpPmP_c != NULL); mpPmP_c->scale(g_MsgObject_HIO_c.mBoxTalkScaleX, g_MsgObject_HIO_c.mBoxTalkScaleY); #if VERSION == VERSION_GCN_JPN @@ -132,13 +132,13 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { mpTm_c[2] = new CPaneMgr(mpTxScreen, 't3_s1', 0, NULL); - JUT_ASSERT(189, mpTm_c[2] != 0); + JUT_ASSERT(189, mpTm_c[2] != NULL); mpTm_c[3] = new CPaneMgr(mpTxScreen, 't3_s2', 0, NULL); - JUT_ASSERT(191, mpTm_c[3] != 0); + JUT_ASSERT(191, mpTm_c[3] != NULL); mpTm_c[4] = new CPaneMgr(mpTxScreen, 't3_s3', 0, NULL); - JUT_ASSERT(193, mpTm_c[4] != 0); + JUT_ASSERT(193, mpTm_c[4] != NULL); mpTm_c[5] = new CPaneMgr(mpTxScreen, 't3_s4', 0, NULL); - JUT_ASSERT(193, mpTm_c[5] != 0); + JUT_ASSERT(193, mpTm_c[5] != NULL); } mpTxScreen->search('n_3line')->show(); @@ -147,19 +147,19 @@ dMsgScrnTalk_c::dMsgScrnTalk_c(u8 param_1, u8 param_2, JKRExpHeap* param_3) { } #else mpTm_c[0] = new CPaneMgr(mpTxScreen, 'mg_e4lin', 0, NULL); - JUT_ASSERT(182, mpTm_c[0] != 0); + JUT_ASSERT(182, mpTm_c[0] != NULL); mpTm_c[1] = new CPaneMgr(mpTxScreen, 't4_s', 0, NULL); - JUT_ASSERT(185, mpTm_c[1] != 0); + JUT_ASSERT(185, mpTm_c[1] != NULL); if (dMsgObject_getMsgObjectClass()->getFukiKind() == 8) { mpTm_c[2] = new CPaneMgr(mpTxScreen, 't4_s1', 0, NULL); - JUT_ASSERT(189, mpTm_c[2] != 0); + JUT_ASSERT(189, mpTm_c[2] != NULL); mpTm_c[3] = new CPaneMgr(mpTxScreen, 't4_s2', 0, NULL); - JUT_ASSERT(191, mpTm_c[3] != 0); + JUT_ASSERT(191, mpTm_c[3] != NULL); mpTm_c[4] = new CPaneMgr(mpTxScreen, 't4_s3', 0, NULL); - JUT_ASSERT(193, mpTm_c[4] != 0); + JUT_ASSERT(193, mpTm_c[4] != NULL); mpTm_c[5] = new CPaneMgr(mpTxScreen, 't4_s4', 0, NULL); - JUT_ASSERT(193, mpTm_c[5] != 0); + JUT_ASSERT(193, mpTm_c[5] != NULL); } mpTxScreen->search('n_3line')->hide(); diff --git a/src/d/d_msg_scrn_tree.cpp b/src/d/d_msg_scrn_tree.cpp index e342488816..d0f56782a2 100644 --- a/src/d/d_msg_scrn_tree.cpp +++ b/src/d/d_msg_scrn_tree.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_scrn_tree.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" diff --git a/src/d/d_msg_string.cpp b/src/d/d_msg_string.cpp index 5c3724290a..e9182b8195 100644 --- a/src/d/d_msg_string.cpp +++ b/src/d/d_msg_string.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_msg_string // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_string.h" #include "JSystem/J2DGraph/J2DTextBox.h" diff --git a/src/d/d_msg_string_base.cpp b/src/d/d_msg_string_base.cpp index 8b9c1a62b2..253a87e781 100644 --- a/src/d/d_msg_string_base.cpp +++ b/src/d/d_msg_string_base.cpp @@ -2,7 +2,7 @@ // d_msg_string_base // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_string_base.h" #include "d/d_msg_class.h" @@ -16,17 +16,17 @@ dMsgStringBase_c::dMsgStringBase_c() { field_0x20 = 0; getResource(); mpResCont = new JMessage::TResourceContainer(); - JUT_ASSERT(33, mpResCont != 0); + JUT_ASSERT(33, mpResCont != NULL); mpCtrl = new jmessage_string_tControl(); - JUT_ASSERT(36, mpCtrl != 0); + JUT_ASSERT(36, mpCtrl != NULL); mpRefer = new jmessage_string_tReference(); - JUT_ASSERT(39, mpRefer != 0); + JUT_ASSERT(39, mpRefer != NULL); mpSeqProc = new jmessage_string_tSequenceProcessor(mpRefer, mpCtrl); - JUT_ASSERT(42, mpSeqProc != 0); + JUT_ASSERT(42, mpSeqProc != NULL); mpRenProc = new jmessage_string_tRenderingProcessor(mpRefer); - JUT_ASSERT(45, mpRenProc != 0); + JUT_ASSERT(45, mpRenProc != NULL); mpParse = new JMessage::TParse(mpResCont); - JUT_ASSERT(48, mpParse != 0); + JUT_ASSERT(48, mpParse != NULL); mpRefer->setResourceContainer(mpResCont); mpCtrl->setSequenceProcessor(mpSeqProc); mpCtrl->setRenderingProcessor(mpRenProc); diff --git a/src/d/d_msg_unit.cpp b/src/d/d_msg_unit.cpp index f5075bad08..8c41510167 100644 --- a/src/d/d_msg_unit.cpp +++ b/src/d/d_msg_unit.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_msg_unit // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_msg_unit.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp index 06ec708f98..1c301e3e86 100644 --- a/src/d/d_name.cpp +++ b/src/d/d_name.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_name // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_name.h" #include "JSystem/J2DGraph/J2DTextBox.h" @@ -926,7 +926,7 @@ void dName_c::screenSet() { }; nameIn.NameInScr = new J2DScreen(); - JUT_ASSERT(0, nameIn.NameInScr != 0); + JUT_ASSERT(0, nameIn.NameInScr != NULL); archive = dComIfGp_getNameResArchive(); nameIn.NameInScr->setPriority("zelda_player_name.blo", 0x100000, archive); @@ -934,12 +934,12 @@ void dName_c::screenSet() { nameIn.field_0x10 = nameIn.NameInScr->search('name_n'); void* bpk = JKRGetNameResource("zelda_player_name.bpk", archive); - JUT_ASSERT(0, bpk != 0); + JUT_ASSERT(0, bpk != NULL); mCursorColorKey = (J2DAnmColorKey*)J2DAnmLoaderDataBase::load(bpk); mCursorColorKey->searchUpdateMaterialID(nameIn.NameInScr); void* btk = JKRGetNameResource("zelda_player_name.btk", archive); - JUT_ASSERT(0, btk != 0); + JUT_ASSERT(0, btk != NULL); mCursorTexKey = (J2DAnmTextureSRTKey*)J2DAnmLoaderDataBase::load(btk); mCursorTexKey->searchUpdateMaterialID(nameIn.NameInScr); @@ -1013,7 +1013,7 @@ void dName_c::screenSet() { mCharRow = 0; mSelIcon = new dSelect_cursor_c(0, 1.0f, NULL); - JUT_ASSERT(0, mSelIcon != 0); + JUT_ASSERT(0, mSelIcon != NULL); mSelIcon->setParam(0.82f, 0.77f, 0.05f, 0.4f, 0.4f); Vec pos = mMojiIcon[mCharRow + mCharColumn * 5]->getGlobalVtxCenter(false, 0); diff --git a/src/d/d_npc_lib.cpp b/src/d/d_npc_lib.cpp index 2ba5e7b816..8f8440e1d0 100644 --- a/src/d/d_npc_lib.cpp +++ b/src/d/d_npc_lib.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_npc_lib.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp index 824567942e..3d8e51ca8d 100644 --- a/src/d/d_ovlp_fade.cpp +++ b/src/d/d_ovlp_fade.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ovlp_fade.h" #include "d/d_com_inf_game.h" @@ -26,7 +26,7 @@ static int dOvlpFd_Draw(overlap1_class* i_this) { /* 80252184-802521F4 24CAC4 0070+00 1/1 0/0 0/0 .text dOvlpFd_startFadeIn__Fi */ static void dOvlpFd_startFadeIn(int param_0) { JUTFader* fader = JFWDisplay::getManager()->getFader(); - JUT_ASSERT(0, fader != 0); + JUT_ASSERT(0, fader != NULL); fader->setStatus(JUTFader::UNKSTATUS_0, 0); fader->setStatus(JUTFader::UNKSTATUS_0, -1); diff --git a/src/d/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp index 478c1aa718..897971a64a 100644 --- a/src/d/d_ovlp_fade2.cpp +++ b/src/d/d_ovlp_fade2.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_ovlp_fade2.h" #include "JSystem/J2DGraph/J2DOrthoGraph.h" diff --git a/src/d/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp index 05e1e0a612..fff134b974 100644 --- a/src/d/d_ovlp_fade3.cpp +++ b/src/d/d_ovlp_fade3.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "d/d_ovlp_fade3.h" diff --git a/src/d/d_pane_class.cpp b/src/d/d_pane_class.cpp index a5beceefce..3ce2ed5fc2 100644 --- a/src/d/d_pane_class.cpp +++ b/src/d/d_pane_class.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_pane_class // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPicture.h" diff --git a/src/d/d_pane_class_alpha.cpp b/src/d/d_pane_class_alpha.cpp index 0c44ae70c6..66e6cff567 100644 --- a/src/d/d_pane_class_alpha.cpp +++ b/src/d/d_pane_class_alpha.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_pane_class_alpha // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_pane_class_alpha.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_pane_class_ex.cpp b/src/d/d_pane_class_ex.cpp index f7612c3b69..cf97c872e1 100644 --- a/src/d/d_pane_class_ex.cpp +++ b/src/d/d_pane_class_ex.cpp @@ -2,7 +2,7 @@ // d_pane_class_ex // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_pane_class_ex.h" #include "JSystem/J2DGraph/J2DPane.h" diff --git a/src/d/d_particle_copoly.cpp b/src/d/d_particle_copoly.cpp index 59afa87f6f..f1c355eb16 100644 --- a/src/d/d_particle_copoly.cpp +++ b/src/d/d_particle_copoly.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_particle_copoly.h" #include "f_op/f_op_kankyo_mng.h" diff --git a/src/d/d_particle_name.cpp b/src/d/d_particle_name.cpp index b42b0be6cd..d261097864 100644 --- a/src/d/d_particle_name.cpp +++ b/src/d/d_particle_name.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_particle_name.h" diff --git a/src/d/d_path.cpp b/src/d/d_path.cpp index 64df1ae4bb..a3ddff6259 100644 --- a/src/d/d_path.cpp +++ b/src/d/d_path.cpp @@ -3,7 +3,7 @@ * dolzel2 - Room Path & Point Management */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_path.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index 949a3fc978..8fe21d8c7a 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_resorce.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" @@ -136,14 +136,14 @@ static void addWarpMaterial(J3DModelData* i_modelData) { static J3DTevOrderInfo l_tevOrderInfo = {0x00, 0x03, 0xFF, 0x00}; ResTIMG* resTimg = (ResTIMG*)dComIfG_getObjectRes("Always", 0x5d); - JUT_ASSERT(0x117, resTimg != 0); + JUT_ASSERT(279, resTimg != NULL); J3DTexture* texture = i_modelData->getTexture(); u16 textureNum = texture->getNum(); texture->addResTIMG(1, resTimg - textureNum); J3DTexMtx* newTexMtx = new J3DTexMtx(l_texMtxInfo); - JUT_ASSERT(0x11D, newTexMtx != 0); + JUT_ASSERT(0x11D, newTexMtx != NULL); for (u16 i = 0; i < i_modelData->getMaterialNum(); i++) { J3DMaterial* material = i_modelData->getMaterialNodePointer(i); @@ -320,7 +320,7 @@ J3DModelData* dRes_info_c::loaderBasicBmd(u32 i_tag, void* i_data) { /* 8003B30C-8003B8D0 035C4C 05C4+00 2/2 0/0 0/0 .text loadResource__11dRes_info_cFv */ int dRes_info_c::loadResource() { - JUT_ASSERT(0x2C5, mRes == 0); + JUT_ASSERT(0x2C5, mRes == NULL); s32 countFile = mArchive->countFile(); mRes = new void*[countFile]; @@ -350,7 +350,7 @@ int dRes_info_c::loadResource() { (mArchive->findIdxResource(fileIndex)->type_flags_and_name_offset & 0xFFFFFF)); } else if (nodeType == 'ARC ') { JKRArchive::SDIFileEntry* entry = mArchive->findIdxResource(fileIndex); - JUT_ASSERT(0x2FD, entry != 0); + JUT_ASSERT(0x2FD, entry != NULL); const char* name_p = mArchive->mStringTable + entry->getNameOffset(); size_t resNameLen = strlen(name_p) - 4; @@ -361,7 +361,7 @@ int dRes_info_c::loadResource() { arcName[resNameLen] = '\0'; JKRExpHeap* parentHeap = (JKRExpHeap*)JKRHeap::findFromRoot(JKRHeap::getCurrentHeap()); - JUT_ASSERT(0x308, parentHeap != 0 && (parentHeap == mDoExt_getGameHeap() || parentHeap == mDoExt_getArchiveHeap())); + JUT_ASSERT(0x308, parentHeap != NULL && (parentHeap == mDoExt_getGameHeap() || parentHeap == mDoExt_getArchiveHeap())); #ifdef DEBUG char* heapName; if (parentHeap == mDoExt_getGameHeap()) { @@ -500,7 +500,7 @@ int dRes_info_c::loadResource() { /* 8003B998-8003BA9C 0362D8 0104+00 1/1 0/0 0/0 .text deleteArchiveRes__11dRes_info_cFv */ void dRes_info_c::deleteArchiveRes() { - JUT_ASSERT(0x45E, mArchive != 0); + JUT_ASSERT(0x45E, mArchive != NULL); JKRArchive::SDIDirEntry* nodes = mArchive->mNodes; for (int i = 0; i < mArchive->countDirectory(); nodes++, i++) { @@ -542,7 +542,7 @@ static SArcHeader* getArcHeader(JKRArchive* i_archive) { /* 8003BAC4-8003BAF8 036404 0034+00 1/1 0/0 0/0 .text setRes__11dRes_info_cFP10JKRArchiveP7JKRHeap */ int dRes_info_c::setRes(JKRArchive* i_archive, JKRHeap* i_heap) { - JUT_ASSERT(0x4AD, mArchive == 0); + JUT_ASSERT(0x4AD, mArchive == NULL); mArchive = i_archive; heap = i_heap; mDataHeap = NULL; @@ -576,7 +576,7 @@ int dRes_info_c::setRes() { if (heap != NULL) { heap->lock(); mDataHeap = mDoExt_createSolidHeapToCurrent(0, heap, 0x20); - JUT_ASSERT(0x4EC, mDataHeap != 0); + JUT_ASSERT(0x4EC, mDataHeap != NULL); int rt = loadResource(); mDoExt_restoreCurrentHeap(); @@ -929,11 +929,11 @@ int dRes_control_c::syncAllRes(dRes_info_c* i_resInfo, int i_infoNum) { * setObjectRes__14dRes_control_cFPCcPvUlP7JKRHeap */ int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32 i_bufferSize, JKRHeap* i_heap) { - JUT_ASSERT(0x7A3, i_archiveRes != 0); + JUT_ASSERT(0x7A3, i_archiveRes != NULL); #ifdef DEBUG dRes_info_c* nowInfo = getResInfo(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo)); - JUT_ASSERT(0x7A6, nowInfo == 0); + JUT_ASSERT(0x7A6, nowInfo == NULL); #endif if (!setRes(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo), "", mDoDvd_MOUNT_DIRECTION_HEAD, NULL)) { @@ -946,7 +946,7 @@ int dRes_control_c::setObjectRes(char const* i_arcName, void* i_archiveRes, u32 } dRes_info_c* info = getResInfo(i_arcName, mObjectInfo, ARRAY_SIZEU(mObjectInfo)); - JUT_ASSERT(0x7B7, info != 0); + JUT_ASSERT(0x7B7, info != NULL); int rt = info->setRes(memArchive, i_heap); if (rt == 0) { diff --git a/src/d/d_s_logo.cpp b/src/d/d_s_logo.cpp index c61aa91ca4..c00237d690 100644 --- a/src/d/d_s_logo.cpp +++ b/src/d/d_s_logo.cpp @@ -3,7 +3,7 @@ * Game Boot Logo's Display */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_logo.h" #include "JSystem/JKernel/JKRAram.h" @@ -540,7 +540,7 @@ static int phase_0(dScnLogo_c* i_this) { dComIfGp_particle_create(); i_this->dummyGameAlloc = mDoExt_getGameHeap()->alloc(0x340000, -0x10); - JUT_ASSERT(1523, i_this->dummyGameAlloc != 0); + JUT_ASSERT(1523, i_this->dummyGameAlloc != NULL); i_this->field_0x1d0 = JKRExpHeap::create(i_this->dummyGameAlloc, 0x340000, NULL, false); i_this->field_0x1d4 = JKRExpHeap::create(0x130000, i_this->field_0x1d0, false); diff --git a/src/d/d_s_menu.cpp b/src/d/d_s_menu.cpp index 22b5ef3e49..7c5aa27d08 100644 --- a/src/d/d_s_menu.cpp +++ b/src/d/d_s_menu.cpp @@ -3,7 +3,7 @@ * Debug Level Select Menu */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_menu.h" #include "d/d_com_inf_game.h" @@ -1504,10 +1504,10 @@ int phase_1(dScnMenu_c* i_this) { OS_REPORT("Menu Create !!\n"); i_this->command = mDoDvdThd_toMainRam_c::create("/res/Menu/Menu1.dat", 0, NULL); - JUT_ASSERT(3083, i_this->command != 0); + JUT_ASSERT(3083, i_this->command != NULL); i_this->fontCommand = mDoDvdThd_toMainRam_c::create("/res/Menu/kanfont_fix16.bfn", 0, NULL); - JUT_ASSERT(3086, i_this->fontCommand != 0); + JUT_ASSERT(3086, i_this->fontCommand != NULL); dComIfG_playerStatusD(); dComIfGs_offDarkClearLV(0); @@ -1574,7 +1574,7 @@ int phase_2(dScnMenu_c* i_this) { } i_this->info = (menu_info_class*)i_this->command->getMemAddress(); - JUT_ASSERT(3237, i_this->info != 0); + JUT_ASSERT(3237, i_this->info != NULL); menu_info_class* menu_info = i_this->info; menu_info->stage_data = (menu_stage_class*)((uintptr_t)menu_info->stage_data + (uintptr_t)menu_info); @@ -1586,7 +1586,7 @@ int phase_2(dScnMenu_c* i_this) { if (l_groupPoint == NULL) { l_groupPoint = new s8[menu_info->num]; - JUT_ASSERT(3252, l_groupPoint != 0); + JUT_ASSERT(3252, l_groupPoint != NULL); if (mDoExt_getSafeZeldaHeapSize() >= 0) { mDoExt_addSafeZeldaHeapSize(-(mDoExt_getZeldaHeap()->getSize(l_groupPoint) + 0x10)); @@ -1607,7 +1607,7 @@ int phase_2(dScnMenu_c* i_this) { } i_this->category_info = (menu_category_class*)((uintptr_t)i_this->command->getMemAddress() + category_offset); - JUT_ASSERT(3282, i_this->category_info != 0); + JUT_ASSERT(3282, i_this->category_info != NULL); category_info = i_this->category_info; category_info->data = (menu_category_data_class*)((uintptr_t)category_info->data + (uintptr_t)menu_info); diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index 6d3984383f..d7bc5e558b 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -3,7 +3,7 @@ * File Select Scene */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_name.h" #include "JSystem/JKernel/JKRExpHeap.h" diff --git a/src/d/d_s_play.cpp b/src/d/d_s_play.cpp index d839ee5bd7..7851349f0a 100644 --- a/src/d/d_s_play.cpp +++ b/src/d/d_s_play.cpp @@ -3,7 +3,7 @@ * Main Gameplay Scene */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_play.h" #include "JSystem/JUtility/JUTConsole.h" @@ -680,7 +680,7 @@ static int phase_5(dScnPly_c* i_this) { const char** resNames = PreLoadInfoT[preLoadNo].resNameTbl; s32 resNameNum = PreLoadInfoT[preLoadNo].resNameNum; if (resNames != NULL && *resNames != NULL) { - JUT_ASSERT(2830, resNameNum <= (sizeof(resPhase) / sizeof(resPhase[0]))); + JUT_ASSERT(2830, resNameNum <= ARRAY_SIZEU(resPhase)); int goodLoads = 0; int loadNum = 0; for (int i = 0; i < resNameNum; i++) { @@ -711,7 +711,7 @@ static int phase_6(dScnPly_c* i_this) { const s16* dylKeyTbl = PreLoadInfoT[preLoadNo].profNameTbl; s32 dylKeyTblNum = PreLoadInfoT[preLoadNo].dylKeyTblNum; if (dylKeyTbl != NULL && *dylKeyTbl != 0) { - JUT_ASSERT(2864, dylKeyTblNum <= (sizeof(dylPhase) / sizeof(dylPhase[0]))); + JUT_ASSERT(2864, dylKeyTblNum <= ARRAY_SIZEU(dylPhase)); int goodLoads = 0; int loadNum = 0; for (int i = 0; i < dylKeyTblNum; i++) { diff --git a/src/d/d_s_room.cpp b/src/d/d_s_room.cpp index 53655146f2..69cf2ce18a 100644 --- a/src/d/d_s_room.cpp +++ b/src/d/d_s_room.cpp @@ -3,7 +3,7 @@ * Gameplay Room Scene */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRExpHeap.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index cc85f26789..82e6b1006a 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -3,7 +3,7 @@ * Title Screen Scene */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_s_title.h" #include "f_op/f_op_scene.h" diff --git a/src/d/d_save.cpp b/src/d/d_save.cpp index a212cfa91b..d2465d8967 100644 --- a/src/d/d_save.cpp +++ b/src/d/d_save.cpp @@ -3,7 +3,7 @@ * Save File Manager */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JHostIO/JORFile.h" #include "JSystem/JUtility/JUTGamePad.h" @@ -401,7 +401,7 @@ u8 dSv_player_item_c::getItem(int i_slotNo, bool i_checkCombo) const { } // Uncertain combination item＝＝＝＞%d, %d\n OSReport_Error("合成アイテム不定＝＝＝＞%d, %d\n", select_item, mix_item); - JUT_ASSERT(731, 0); + JUT_ASSERT(731, FALSE); } } } @@ -1729,7 +1729,7 @@ void dSv_info_c::offSwitch(int i_no, int i_roomNo) { BOOL dSv_info_c::isSwitch(int i_no, int i_roomNo) const { if (!((0 <= i_no && i_no < (MEMORY_SWITCH+ DAN_SWITCH+ ZONE_SWITCH+ ONEZONE_SWITCH)) || i_no == -1 || i_no == 255)) { OS_REPORT("i_no = %d\n", i_no); - JUT_ASSERT(4302, 0); + JUT_ASSERT(4302, FALSE); } if (i_no == -1 || i_no == 255) { diff --git a/src/d/d_save_HIO.cpp b/src/d/d_save_HIO.cpp index 59b9029ec3..2ecf7b542d 100644 --- a/src/d/d_save_HIO.cpp +++ b/src/d/d_save_HIO.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_save_HIO // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_save_HIO.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_save_init.cpp b/src/d/d_save_init.cpp index abf32fac90..000c069381 100644 --- a/src/d/d_save_init.cpp +++ b/src/d/d_save_init.cpp @@ -3,7 +3,7 @@ * */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_save_init.h" diff --git a/src/d/d_scope.cpp b/src/d/d_scope.cpp index 90f566740f..0ad5b572e8 100644 --- a/src/d/d_scope.cpp +++ b/src/d/d_scope.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_scope // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_scope.h" #include "JSystem/J2DGraph/J2DScreen.h" diff --git a/src/d/d_select_cursor.cpp b/src/d/d_select_cursor.cpp index 0fb1c32192..158c11590c 100644 --- a/src/d/d_select_cursor.cpp +++ b/src/d/d_select_cursor.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_select_cursor // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_select_cursor.h" #include "JSystem/J2DGraph/J2DGrafContext.h" diff --git a/src/d/d_select_icon.cpp b/src/d/d_select_icon.cpp index 8a73e5d8c5..cbf5f44381 100644 --- a/src/d/d_select_icon.cpp +++ b/src/d/d_select_icon.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_select_icon.h" #include "JSystem/J2DGraph/J2DAnimation.h" diff --git a/src/d/d_shop_camera.cpp b/src/d/d_shop_camera.cpp index 44853d976a..bfdfcaf6a8 100644 --- a/src/d/d_shop_camera.cpp +++ b/src/d/d_shop_camera.cpp @@ -3,7 +3,7 @@ * Shop Camera Handling */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_shop_camera.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_shop_item_ctrl.cpp b/src/d/d_shop_item_ctrl.cpp index 21ae19697a..9a0b49c5c8 100644 --- a/src/d/d_shop_item_ctrl.cpp +++ b/src/d/d_shop_item_ctrl.cpp @@ -2,7 +2,7 @@ // d/shop/d_shop_item_ctrl // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_shop_item_ctrl.h" #include "SSystem/SComponent/c_lib.h" diff --git a/src/d/d_shop_system.cpp b/src/d/d_shop_system.cpp index f7917145c9..2f40ea1fac 100644 --- a/src/d/d_shop_system.cpp +++ b/src/d/d_shop_system.cpp @@ -3,7 +3,7 @@ * Main Shop System */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_shop_system.h" #include "SSystem/SComponent/c_math.h" diff --git a/src/d/d_simple_model.cpp b/src/d/d_simple_model.cpp index c7a25d53e5..0db7de5c86 100644 --- a/src/d/d_simple_model.cpp +++ b/src/d/d_simple_model.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_simple_model // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_simple_model.h" #include "d/d_com_inf_game.h" @@ -11,7 +11,7 @@ /* 80048C54-80048CB4 043594 0060+00 1/1 0/0 0/0 .text dSmplMdl_modelUpdateDL__FP8J3DModel */ static void dSmplMdl_modelUpdateDL(J3DModel* i_model) { - JUT_ASSERT(61, i_model != 0); + JUT_ASSERT(61, i_model != NULL); J3DModelData* modelData = i_model->getModelData(); if (modelData->getMaterialNodePointer(0)->getMaterialAnm() != NULL) { OS_REPORT( @@ -93,7 +93,7 @@ void dSmplMdl_draw_c::entry(J3DModel* i_model, int roomNo) { /* 80048F70-80049058 0438B0 00E8+00 0/0 1/1 0/0 .text * addModel__15dSmplMdl_draw_cFP12J3DModelDataiUc */ BOOL dSmplMdl_draw_c::addModel(J3DModelData* i_modelData, int roomNo, u8 drawBG) { - JUT_ASSERT(307, i_modelData != 0); + JUT_ASSERT(307, i_modelData != NULL); if (roomNo == -1) { OS_REPORT("\x1b[43;30mシンプルモデル描画差分ＤＬモデル登録：部屋番号指定がありません！！！\n\x1b[m"); } @@ -142,7 +142,7 @@ int dSmplMdl_draw_c::removeModel(J3DModelData* i_modelData, int roomNo) { /* 800490EC-800491F4 043A2C 0108+00 1/1 0/0 0/0 .text create__12diff_model_cFP12J3DModelDataiUc */ BOOL diff_model_c::create(J3DModelData* i_modelData, int roomNo, u8 drawBG) { - JUT_ASSERT(397, i_modelData != 0); + JUT_ASSERT(397, i_modelData != NULL); if (mpHeap == NULL) { mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x2000, 0x20); diff --git a/src/d/d_spline_path.cpp b/src/d/d_spline_path.cpp index 1100428414..5c9c226c06 100644 --- a/src/d/d_spline_path.cpp +++ b/src/d/d_spline_path.cpp @@ -3,7 +3,7 @@ * dolzel2 - Spline Path Management */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_spline_path.h" #include "d/d_path.h" diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp index fb18904a87..9b2bf739c4 100644 --- a/src/d/d_stage.cpp +++ b/src/d/d_stage.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_stage // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRAramArchive.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -1346,7 +1346,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]; - JUT_ASSERT(1114, m_dzs != 0); + JUT_ASSERT(1114, m_dzs != NULL); if (m_dzs != NULL) { u32** dzs = (u32**)m_dzs; @@ -1393,7 +1393,7 @@ void* dStage_roomControl_c::roomDzs_c::add(u8 i_no, u8 roomNo) { JUT_ASSERT(1172, expandSize); OS_REPORT("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ <%s> <%d>\n", dzsName, expandSize); *dzs = mDoExt_getArchiveHeap()->alloc(expandSize, -0x20); - JUT_ASSERT(1179, *dzs != 0); + JUT_ASSERT(1179, *dzs != NULL); if (*dzs != NULL) { u32 readSize = dComIfGp_getFieldMapArchive2()->readResource(*dzs, expandSize, dzsName); @@ -1632,7 +1632,7 @@ static int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* } fopAcM_prm_class* appen = fopAcM_CreateAppend(); - JUT_ASSERT(1586, appen != 0); + JUT_ASSERT(1586, appen != NULL); int point = dComIfGp_getStartStagePoint(); u32 roomParam = dComIfGs_getRestartRoomParam(); @@ -1686,7 +1686,7 @@ static int dStage_playerInit(dStage_dt_c* i_stage, void* i_data, int num, void* base_process_class* stageProc = (base_process_class*)fopScnM_SearchByID(dStage_roomControl_c::getProcID()); - JUT_ASSERT(1683, stageProc != 0); + JUT_ASSERT(1683, stageProc != NULL); if (fpcM_GetName(stageProc) == PROC_PLAY_SCENE) { if (strcmp(dComIfGp_getStartStageName(), "S_MV000")) { fopMsgM_Create(PROC_METER2, NULL, NULL); @@ -2212,7 +2212,7 @@ static int dStage_memaInfoInit(dStage_dt_c* i_stage, void* i_data, int param_2, JUT_ASSERT(3208, pd->m_num <= dStage_roomControl_c::MEMORY_BLOCK_MAX); for (int i = 0; i < pd->m_num; i++) { JKRExpHeap* heap = dStage_roomControl_c::createMemoryBlock(i, *entry_p + 0x380); - JUT_ASSERT(3216, heap != 0); + JUT_ASSERT(3216, heap != NULL); OS_REPORT("\t%02d : size=%d\n", i, *entry_p); entry_p++; } @@ -2582,7 +2582,7 @@ void dStage_dt_c_fieldMapLoader(void* i_data, dStage_dt_c* i_stage) { {"MPAT", dStage_fieldMapMapPathInit}, }; - JUT_ASSERT(4428, i_data != 0); + JUT_ASSERT(4428, i_data != NULL); dStage_dt_c_offsetToPtr(i_data); dStage_dt_c_decode(i_data, i_stage, l_funcTable, ARRAY_SIZEU(l_funcTable)); @@ -2602,7 +2602,7 @@ char dStage_roomControl_c::mArcBank[32][10] = {0}; void dStage_infoCreate() { OS_REPORT("dStage_Create\n"); void* stageRsrc = dComIfG_getStageRes("stage.dzs"); - JUT_ASSERT(4451, stageRsrc != 0); + JUT_ASSERT(4451, stageRsrc != NULL); dComIfGp_roomControl_init(); dStage_dt_c_stageInitLoader(stageRsrc, dComIfGp_getStage()); @@ -2614,7 +2614,7 @@ char dStage_roomControl_c::mDemoArcName[10]; /* 80026D38-80026DF8 021678 00C0+00 0/0 1/1 0/0 .text dStage_Create__Fv */ void dStage_Create() { void* stageRsrc = dComIfG_getStageRes("stage.dzs"); - JUT_ASSERT(4451, stageRsrc != 0); + JUT_ASSERT(4451, stageRsrc != NULL); dStage_dt_c_stageLoader(stageRsrc, dComIfGp_getStage()); daSus_c::execute(); @@ -2653,7 +2653,7 @@ void dStage_Delete() { if (dStage_stagInfo_GetSTType(dComIfGp_getStage()->getStagInfo()) == ST_DUNGEON) { dRes_info_c* info = dComIfG_getStageResInfo("Stg_00"); - JUT_ASSERT(4579, info != 0); + JUT_ASSERT(4579, info != NULL); *info->getArchiveName() = 'X'; dComIfGp_setOldMulti(); } else { diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index aa2b5ab6b3..273d0162b3 100644 --- a/src/d/d_timer.cpp +++ b/src/d/d_timer.cpp @@ -3,7 +3,7 @@ * Minigame HUD Timer / Counter */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_timer.h" #include "JSystem/J2DGraph/J2DAnmLoader.h" @@ -36,7 +36,7 @@ int dTimer_c::_create() { } dRes_info_c* resInfo = dComIfG_getObjectResInfo("Timer"); - JUT_ASSERT(0, resInfo != 0); + JUT_ASSERT(0, resInfo != NULL); dComIfGp_setAllMapArchive(resInfo->getArchive()); mp_heap = fopMsgM_createExpHeap(0x11000, NULL); @@ -45,7 +45,7 @@ int dTimer_c::_create() { mp_heap->getTotalFreeSize(); mp_tm_scrn = new dDlst_TimerScrnDraw_c(); - JUT_ASSERT(0, mp_tm_scrn != 0); + JUT_ASSERT(0, mp_tm_scrn != NULL); if (appen->timer_mode == 10) { mp_tm_scrn->setScreen(dComIfG_getTimerMode(), resInfo->getArchive()); @@ -614,7 +614,7 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { setShowType(3); mpGetInScreen = new J2DScreen(); - JUT_ASSERT(0, mpGetInScreen != 0); + JUT_ASSERT(0, mpGetInScreen != NULL); bool fg = mpGetInScreen->setPriority("zelda_game_image_cow_get_in.blo", 0x20000, mpArchive); JUT_ASSERT(0, fg != false); @@ -625,13 +625,13 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { JKRGetNameResource("zelda_game_image_cow_get_in.bck", mpArchive)); mpGetInParent = new CPaneMgr(mpGetInScreen, 'get_in_n', 2, NULL); - JUT_ASSERT(0, mpGetInParent != 0); + JUT_ASSERT(0, mpGetInParent != NULL); mpGetInRoot = new CPaneMgr(mpGetInScreen, 'n_all', 0, NULL); - JUT_ASSERT(0, mpGetInRoot != 0); + JUT_ASSERT(0, mpGetInRoot != NULL); mpGetInText = new CPaneMgr(mpGetInScreen, 'get_in', 0, NULL); - JUT_ASSERT(0, mpGetInText != 0); + JUT_ASSERT(0, mpGetInText != NULL); static_cast(mpGetInScreen->search('get_in_s'))->setFont(mDoExt_getMesgFont()); static_cast(mpGetInScreen->search('get_in'))->setFont(mDoExt_getMesgFont()); @@ -654,7 +654,7 @@ void dDlst_TimerScrnDraw_c::setScreen(s32 param_0, JKRArchive* i_archive) { /* 8025E240-8025E66C 258B80 042C+00 1/1 0/0 0/0 .text setScreenBase__21dDlst_TimerScrnDraw_cFv */ void dDlst_TimerScrnDraw_c::setScreenBase() { mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image_cow_game.blo", 0x20000, mpArchive); JUT_ASSERT(0, fg != false); @@ -663,15 +663,15 @@ void dDlst_TimerScrnDraw_c::setScreenBase() { mpParent = NULL; mpCowParent = new CPaneMgr(mpScreen, 'cow_n', 2, NULL); - JUT_ASSERT(0, mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); mpTimeParent = new CPaneMgr(mpScreen, 'time_n', 2, NULL); - JUT_ASSERT(0, mpTimeParent != 0); + JUT_ASSERT(0, mpTimeParent != NULL); mpTimeParent->setAlphaRate(0.0f); mpImageParent = new CPaneMgr(mpScreen, 'cow_i_n', 2, NULL); - JUT_ASSERT(0, mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); field_0x5c[0][0] = mpScreen->search('c_n_2'); @@ -702,23 +702,23 @@ void dDlst_TimerScrnDraw_c::setScreenBase() { */ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + 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, 'ta_co_n', 2, NULL); - JUT_ASSERT(0, mpParent != 0); + JUT_ASSERT(0, mpParent != NULL); mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); - JUT_ASSERT(0, mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; mpImageParent = new CPaneMgr(mpScreen, 'target_n', 2, NULL); - JUT_ASSERT(0, mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); mpScreen->search('w_target')->hide(); @@ -745,7 +745,7 @@ void dDlst_TimerScrnDraw_c::setScreenBoatRace() { /* 8025E8B8-8025EB20 2591F8 0268+00 1/1 0/0 0/0 .text setScreenRider__21dDlst_TimerScrnDraw_cFv */ void dDlst_TimerScrnDraw_c::setScreenRider() { mpScreen = new J2DScreen(); - JUT_ASSERT(0, mpScreen != 0); + JUT_ASSERT(0, mpScreen != NULL); bool fg = mpScreen->setPriority("zelda_game_image_rider.blo", 0x20000, mpArchive); JUT_ASSERT(0, fg != false); @@ -754,13 +754,13 @@ void dDlst_TimerScrnDraw_c::setScreenRider() { mpParent = NULL; mpCowParent = new CPaneMgr(mpScreen, 'num_n', 2, NULL); - JUT_ASSERT(0, mpCowParent != 0); + JUT_ASSERT(0, mpCowParent != NULL); mpCowParent->setAlphaRate(0.0f); mpTimeParent = NULL; mpImageParent = new CPaneMgr(mpScreen, 'rid_i_n', 2, NULL); - JUT_ASSERT(0, mpImageParent != 0); + JUT_ASSERT(0, mpImageParent != NULL); mpImageParent->setAlphaRate(0.0f); field_0x5c[0][0] = mpScreen->search('n_n_2'); diff --git a/src/d/d_tresure.cpp b/src/d/d_tresure.cpp index c803de24b9..1eb4573bcf 100644 --- a/src/d/d_tresure.cpp +++ b/src/d/d_tresure.cpp @@ -3,7 +3,7 @@ // Translation Unit: d/d_tresure // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_tresure.h" #include "d/d_com_inf_game.h" diff --git a/src/d/d_vib_pattern.cpp b/src/d/d_vib_pattern.cpp index 90a0d9b2eb..d8263b45bd 100644 --- a/src/d/d_vib_pattern.cpp +++ b/src/d/d_vib_pattern.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_vibration.h" diff --git a/src/d/d_vibration.cpp b/src/d/d_vibration.cpp index 855e0c2eb0..4504d0b632 100644 --- a/src/d/d_vibration.cpp +++ b/src/d/d_vibration.cpp @@ -1,4 +1,4 @@ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/d_vibration.h" #include "d/d_com_inf_game.h" diff --git a/src/f_op/f_op_actor.cpp b/src/f_op/f_op_actor.cpp index 6efc5a5e4b..26642e928f 100644 --- a/src/f_op/f_op_actor.cpp +++ b/src/f_op/f_op_actor.cpp @@ -3,7 +3,7 @@ * Actor base process class */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "d/actor/d_a_alink.h" #include "d/d_com_inf_actor.h" diff --git a/src/f_op/f_op_actor_mng.cpp b/src/f_op/f_op_actor_mng.cpp index d13b8337ed..304790fc81 100644 --- a/src/f_op/f_op_actor_mng.cpp +++ b/src/f_op/f_op_actor_mng.cpp @@ -3,7 +3,7 @@ * Actor Manager */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J3DGraphBase/J3DMaterial.h" #include "JSystem/JKernel/JKRExpHeap.h" @@ -37,7 +37,7 @@ fopAc_ac_c* fopAcM_FastCreate(s16 i_procName, FastCreateReqFunc i_createFunc, vo /* 800198C4-80019934 014204 0070+00 1/1 5/5 18/18 .text fopAcM_setStageLayer__FPv */ void fopAcM_setStageLayer(void* i_proc) { scene_class* stageProc = fopScnM_SearchByID(dStage_roomControl_c::getProcID()); - JUT_ASSERT(0, stageProc != 0); + JUT_ASSERT(0, stageProc != NULL); fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(stageProc)); } @@ -46,7 +46,7 @@ void fopAcM_setStageLayer(void* i_proc) { void fopAcM_setRoomLayer(void* i_proc, int i_roomNo) { if (i_roomNo >= 0) { scene_class* roomProc = fopScnM_SearchByID(dStage_roomControl_c::getStatusProcID(i_roomNo)); - JUT_ASSERT(0, roomProc != 0); + JUT_ASSERT(0, roomProc != NULL); fpcM_ChangeLayerID(i_proc, fopScnM_LayerID(roomProc)); } @@ -266,7 +266,7 @@ fpc_ProcID fopAcM_createChildFromOffset(s16 i_procName, fpc_ProcID i_parentID, u BOOL fopAcM_createHeap(fopAc_ac_c* i_this, u32 size, u32 align) { JUT_ASSERT(0, i_this); - JUT_ASSERT(0, i_this->heap == 0); + JUT_ASSERT(0, i_this->heap == NULL); // "Creating Actor Heap" fopAcM_Log(i_this, "アクターのヒープの生成"); @@ -419,7 +419,7 @@ bool fopAcM_entrySolidHeap_(fopAc_ac_c* i_actor, heapCallbackFunc i_heapCallback } OSReport_Error("ばぐばぐです\n"); // "There's a big bug\n" - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); OSReport_Error("緊急回避措置\n"); // "Emergency action\n" fopAcM::HeapAdjustEntry = false; } @@ -1391,17 +1391,17 @@ fpc_ProcID fopAcM_createItem(const cXyz* i_pos, int i_itemNo, int i_itemBitNo, i case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; #endif case fpcNm_ITEM_KAKERA_HEART: @@ -1449,17 +1449,17 @@ fopAc_ac_c* fopAcM_fastCreateItem2(const cXyz* i_pos, int i_itemNo, int i_itemBi case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; #endif case fpcNm_ITEM_KAKERA_HEART: @@ -1509,17 +1509,17 @@ fopAc_ac_c* fopAcM_fastCreateItem(const cXyz* i_pos, int i_itemNo, int i_roomNo, case fpcNm_ITEM_SMALL_KEY: // "Small Key: Can't support map display, so program generation is prohibited!\n" OS_REPORT_ERROR("小さい鍵：マップ表示対応出来ないので、プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; case fpcNm_ITEM_KANTERA: // "Lantern: Program generation is prohibited!\n" OS_REPORT_ERROR("カンテラ：プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; case fpcNm_ITEM_LIGHT_DROP: // "Light Drop: Program generation is prohibited!\n" OS_REPORT_ERROR("光の雫：プログラム生成禁止！\n"); - JUT_ASSERT(0, 0); + JUT_ASSERT(0, FALSE); break; #endif case fpcNm_ITEM_KAKERA_HEART: @@ -1618,7 +1618,7 @@ fopAc_ac_c* fopAcM_myRoomSearchEnemy(s8 roomNo) { int procID = dStage_roomControl_c::getStatusProcID(roomNo); scene_class* roomProc = fopScnM_SearchByID(procID); - JUT_ASSERT(0, roomProc != 0); + JUT_ASSERT(0, roomProc != NULL); u32 actorID = ((daPy_py_c*)dComIfGp_getPlayer(0))->getGrabActorID(); fopAc_ac_c* actor = fopAcM_SearchByID(actorID); @@ -2015,7 +2015,7 @@ s32 fopAcM_getWaterY(cXyz const* param_0, f32* o_waterY) { *o_waterY = fopAcM_wt_c::getWaterY(); return 1; } else { - *o_waterY = -1000000000.0f; + *o_waterY = -G_CM3D_F_INF; return 0; } } @@ -2104,14 +2104,14 @@ bool fopAcM_lc_c::lineCheck(cXyz const* i_start, cXyz const* i_end, fopAc_ac_c c bool fopAcM_gc_c::gndCheck(cXyz const* i_pos) { mGndCheck.SetPos(i_pos); mGroundY = (f32)dComIfG_Bgsp().GroundCross(&mGndCheck); - return -1000000000.0f != mGroundY; + return -G_CM3D_F_INF != mGroundY; } /* 8001DD1C-8001DD84 01865C 0068+00 0/0 0/0 3/3 .text roofCheck__11fopAcM_rc_cFPC4cXyz */ bool fopAcM_rc_c::roofCheck(cXyz const* i_pos) { mRoofCheck.SetPos(*i_pos); mRoofY = dComIfG_Bgsp().RoofChk(&mRoofCheck); - return 1000000000.0f != mRoofY; + return G_CM3D_F_INF != mRoofY; } /* 8001DD84-8001DE10 0186C4 008C+00 1/1 4/4 22/22 .text waterCheck__11fopAcM_wt_cFPC4cXyz diff --git a/src/f_op/f_op_msg_mng.cpp b/src/f_op/f_op_msg_mng.cpp index d10d5f9d5e..ef3df380c7 100644 --- a/src/f_op/f_op_msg_mng.cpp +++ b/src/f_op/f_op_msg_mng.cpp @@ -3,7 +3,7 @@ // Translation Unit: f_op/f_op_msg_mng // -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/JKernel/JKRExpHeap.h" #include "SSystem/SComponent/c_malloc.h" diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp index 8a2dff317c..9f9dbe8049 100644 --- a/src/f_pc/f_pc_deletor.cpp +++ b/src/f_pc/f_pc_deletor.cpp @@ -80,7 +80,7 @@ s32 fpcDt_ToDeleteQ(base_process_class* i_proc) { layer_class* layer = &((process_node_class*)i_proc)->layer; if (fpcLy_Cancel(layer) == 0) { - JUT_ASSERT(196, 0); + JUT_ASSERT(196, FALSE); } if (fpcLyIt_OnlyHereLY(layer, (fpcLyIt_OnlyHereFunc)fpcDt_ToDeleteQ, NULL) == 0) diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 376bc52b08..75203aaa29 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -66,11 +66,11 @@ void fpcM_Management(fpcM_ManagementFunc i_preExecuteFn, fpcM_ManagementFunc i_p } if (!fpcPi_Handler()) { - JUT_ASSERT(353, 0); + JUT_ASSERT(353, FALSE); } if (!fpcCt_Handler()) { - JUT_ASSERT(357, 0); + JUT_ASSERT(357, FALSE); } if (i_preExecuteFn != NULL) { diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp index 3c28dc8e07..34a76f4ae8 100644 --- a/src/m_Do/m_Do_ext.cpp +++ b/src/m_Do/m_Do_ext.cpp @@ -3,7 +3,7 @@ * Model, Animation, and Heap Functions */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include #include @@ -225,7 +225,7 @@ void mDoExt_brkAnm::entry(J3DMaterialTable* i_matTable, f32 i_frame) { /* 8000D7DC-8000D8E4 00811C 0108+00 0/0 18/18 85/85 .text init__13mDoExt_bckAnmFP15J3DAnmTransformiifssb */ int mDoExt_bckAnm::init(J3DAnmTransform* i_bck, int i_play, int i_attr, f32 i_rate, s16 i_startF, s16 i_endF, bool i_modify) { - JUT_ASSERT(614, (i_modify || isCurrentSolidHeap()) && i_bck != 0); + JUT_ASSERT(614, (i_modify || isCurrentSolidHeap()) && i_bck != NULL); mAnm = i_bck; if (!i_modify) { mpMtxCalc = new J3DMtxCalcAnimation, J3DMtxCalcJ3DSysInitMaya>(mAnm); @@ -542,15 +542,15 @@ void mDoExt_invisibleModel::entryDL(cXyz* param_0) { /* 8000E834-8000EA80 009174 024C+00 0/0 0/0 7/7 .text * mDoExt_setupShareTexture__FP12J3DModelDataP12J3DModelData */ void mDoExt_setupShareTexture(J3DModelData* i_modelData, J3DModelData* i_shareModelData) { - JUT_ASSERT(1547, i_modelData != 0 && i_shareModelData != 0); + JUT_ASSERT(1547, i_modelData != NULL && i_shareModelData != NULL); J3DTexture* texture = i_modelData->getTexture(); - JUT_ASSERT(1549, texture != 0); + JUT_ASSERT(1549, texture != NULL); JUTNameTab* textureName = i_modelData->getTextureName(); - JUT_ASSERT(1551, textureName != 0); + JUT_ASSERT(1551, textureName != NULL); J3DTexture* shareTexture = i_shareModelData->getTexture(); - JUT_ASSERT(1553, shareTexture != 0); + JUT_ASSERT(1553, shareTexture != NULL); JUTNameTab* shareTextureName = i_shareModelData->getTextureName(); - JUT_ASSERT(1555, shareTextureName != 0) + JUT_ASSERT(1555, shareTextureName != NULL) bool bvar = false; for (u16 i = 0; i < texture->getNum(); i++) { @@ -572,7 +572,7 @@ void mDoExt_setupShareTexture(J3DModelData* i_modelData, J3DModelData* i_shareMo for (u16 i = 0; i < i_modelData->getMaterialNum(); i++) { J3DMaterial* mat = i_modelData->getMaterialNodePointer(i); J3DTevBlock* tevBlock = mat->getTevBlock(); - JUT_ASSERT(1577, tevBlock != 0); + JUT_ASSERT(1577, tevBlock != NULL); J3DDisplayListObj* dlObj = mat->getSharedDisplayListObj(); BOOL ret = OSDisableInterrupts(); @@ -2085,7 +2085,7 @@ void mDoExt_invJntPacket::draw() { GFSetBlendModeEtc(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_CLEAR, 0, 0, 1); J3DShapePacket* shapePkt = sp18->getShapePacket(); - JUT_ASSERT(0x1393, shapePkt != 0); + JUT_ASSERT(5011, shapePkt != NULL); shapePkt->getShape()->loadPreDrawSetting(); do { @@ -2453,7 +2453,7 @@ void mDoExt_3DlineMat0_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* pa sp_18 = sp_30->field_0x4; - JUT_ASSERT(0x1545, sp_18 != 0); + JUT_ASSERT(0x1545, sp_18 != NULL); sp_20 = ((mDoExt_3Dline_c*)((int)sp_30 + (field_0x16 << 2)))->field_0x8; sp_24 = sp_20; @@ -2807,7 +2807,7 @@ void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* p for (s32 sp_14 = 0; sp_14 < mNumLines; sp_14++) { local_r27 = sp_38[0].field_0x0; local_r18 = sp_38->field_0x4; - JUT_ASSERT(0x16f3, sp_18 != 0); + JUT_ASSERT(0x16f3, sp_18 != NULL); sp_24 = ((mDoExt_3Dline_c*)((int)sp_38 + (mIsDrawn << 2)))->field_0x8; sp_28 = sp_24; sp_20 = ((mDoExt_3Dline_c*)((int)sp_38 + (mIsDrawn << 2)))->field_0x10; @@ -3006,10 +3006,10 @@ void mDoExt_cylinderPacket::draw() { static void mDoExt_initFontCommon(JUTFont** mDoExt_font, ResFONT** mDoExt_resfont, JKRHeap* param_2, char const* param_3, JKRArchive* param_4, u8 param_5, u32 param_6, u32 param_7) { - JUT_ASSERT(7141, mDoExt_font == 0); - JUT_ASSERT(7142, mDoExt_resfont == 0); + JUT_ASSERT(7141, mDoExt_font == NULL); + JUT_ASSERT(7142, mDoExt_resfont == NULL); *mDoExt_resfont = (ResFONT*)JKRGetResource('ROOT', param_3, param_4); - JUT_ASSERT(7144, *mDoExt_resfont != 0); + JUT_ASSERT(7144, *mDoExt_resfont != NULL); if (param_5 == 0) { u32 cacheSize = JUTCacheFont::calcCacheSize(param_7, param_6); JUTCacheFont* cacheFont = new (param_2, 0) JUTCacheFont(*mDoExt_resfont, cacheSize, param_2); @@ -3029,7 +3029,7 @@ static void mDoExt_initFontCommon(JUTFont** mDoExt_font, ResFONT** mDoExt_resfon delete *mDoExt_font; *mDoExt_font = NULL; } - JUT_ASSERT(7183, mDoExt_font != 0); + JUT_ASSERT(7183, mDoExt_font != NULL); } /* 80450C44-80450C48 000144 0004+00 3/3 0/0 0/0 .sbss mDoExt_font0 */ diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp index e100b72622..9d5842e370 100644 --- a/src/m_Do/m_Do_graphic.cpp +++ b/src/m_Do/m_Do_graphic.cpp @@ -3,7 +3,7 @@ * Graphics Management Functions */ -#include "d/dolzel.h" +#include "d/dolzel.h" // IWYU pragma: keep #include "JSystem/J2DGraph/J2DOrthoGraph.h" #include "JSystem/J2DGraph/J2DPrint.h"