diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-02-11 17:08:48 -0500 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2025-02-11 17:08:48 -0500 |
| commit | f51b9b65df00a2cdcdaf859c9bca83bfcfe10059 (patch) | |
| tree | 806e25a33a21dc30d5c6e0425e9896223e862c0f /src/d/actor | |
| parent | 458c40ede8037c1ba40d2669edeef045e6f5cf60 (diff) | |
A few small matches for 2dnumber/meter
Diffstat (limited to 'src/d/actor')
| -rw-r--r-- | src/d/actor/d_a_branch.cpp | 1 | ||||
| -rw-r--r-- | src/d/actor/d_a_npc_ji1.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/d/actor/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp index 85feaeb4..2e603296 100644 --- a/src/d/actor/d_a_branch.cpp +++ b/src/d/actor/d_a_branch.cpp @@ -11,7 +11,6 @@ #include "m_Do/m_Do_mtx.h" #include "d/d_kankyo.h" #include "JSystem/J3DGraphBase/J3DMaterial.h" -#include "dolphin/mtx/mtx.h" static u16 anim_table[] = { KWOOD_00_BCK_SWING02, KWOOD_00_BAS_SWING02, diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index e797081d..a1393e99 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -3283,7 +3283,7 @@ BOOL daNpc_Ji1_c::CreateInit() { cXyz temp(190.0f, 230.0f, -1100.0f); csXyz temp2(0, 0, 0); - fopAcM_createChild("Kmon", fopAcM_GetID(this), 0, &temp, fopAcM_GetRoomNo(this), &temp2, 0, (createFunc)0); + fopAcM_createChild("Kmon", fopAcM_GetID(this), 0, &temp, fopAcM_GetRoomNo(this), &temp2); fopAcM_SetMtx(this, field_0x330->getModel()->getBaseTRMtx()); fopAcM_setCullSizeBox(this, -70.0f, 0.0f, -70.0f, 70.0f, 200.0f, 70.0f); gravity = -30.0f; |