diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-11-09 14:43:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-09 11:43:14 -0800 |
| commit | ba7cdd4fe9919cca0419950995f6d80583299953 (patch) | |
| tree | 826e1d78d0ddbade52462db553e4fce44aa52915 /src/d/actor/d_a_npc_toby.cpp | |
| parent | cefde2a42cab384221da75210601d72b5a64dcd3 (diff) | |
Debug work + some retail regalloc fixes (#2787)
* Debug work + some retail regalloc fixes
* Use AUDIO_INSTANCES in places it's missing, link d_a_e_bee
* Link m_Do_machine
* Fix clang putting other includes before the pchs
* Link some more debug TUs that already match
Diffstat (limited to 'src/d/actor/d_a_npc_toby.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_toby.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/actor/d_a_npc_toby.cpp b/src/d/actor/d_a_npc_toby.cpp index 6cdde5e0c8..78582617b6 100644 --- a/src/d/actor/d_a_npc_toby.cpp +++ b/src/d/actor/d_a_npc_toby.cpp @@ -1107,7 +1107,7 @@ int daNpc_Toby_c::cutTobyHouseFire(int arg0) { break; case 1: - JUT_ASSERT(2331, 0 != atmt_p); + JUT_ASSERT(2331, NULL != atmt_p); field_0x0FFF = 1; setParam(); setPos(atmt_p->current.pos); @@ -1402,7 +1402,7 @@ int daNpc_Toby_c::cutRepairSCannon(int arg0) { daPy_getPlayerActorClass()->setPlayerPosAndAngle(&work, angle.y, 0); } - JUT_ASSERT(2703, 0 != scannon_p); + JUT_ASSERT(2703, NULL != scannon_p); ((daSCannon_c*)scannon_p)->setCannonRepair(); if (mEventTimer) { Z2GetAudioMgr()->bgmStreamPrepare(0x02000003); @@ -2070,7 +2070,7 @@ int daNpc_Toby_c::walk(void*) { case 2: if (mStagger.checkStagger() == 0) { cXyz work; - JUT_ASSERT(3620, 0 != mPath.getPathInfo()); + JUT_ASSERT(3620, NULL != mPath.getPathInfo()); int dst_pos_h = mPath.getDstPosH(current.pos, &work, mPath.getNumPnts(), 2); calcSpeedAndAngle(work, dst_pos_h, 4, 0x800); if (dst_pos_h && cM3d_IsZero(speedF)) { |