diff options
| author | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-10-17 21:35:18 -0400 |
|---|---|---|
| committer | LagoLunatic <LagoLunatic@users.noreply.github.com> | 2024-10-17 21:35:18 -0400 |
| commit | 34afbd84db8d66dd634fa19e94a737d40dfe7995 (patch) | |
| tree | fb950a75f3928b8283874b277a9ab9baf1345392 /src/d/actor/d_a_npc_kamome.cpp | |
| parent | f1d73f7fc721e957303d4e6541ec165c3ad9aea5 (diff) | |
clangd: Started fixing warnings and errors, code cleanup
Diffstat (limited to 'src/d/actor/d_a_npc_kamome.cpp')
| -rw-r--r-- | src/d/actor/d_a_npc_kamome.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/d/actor/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp index ec456eb9..3e5a479f 100644 --- a/src/d/actor/d_a_npc_kamome.cpp +++ b/src/d/actor/d_a_npc_kamome.cpp @@ -394,7 +394,7 @@ BOOL daNpc_kam_c::init() { mTargetAngVelY = l_HIO.mHio1.mGlidingAngVelY; mTargetAngVelX = l_HIO.mHio1.mGlidingAngVelX; - setNpcAction(&waitNpcAction, NULL); + setNpcAction(&daNpc_kam_c::waitNpcAction, NULL); mAcchCirs[0].SetWall(20.0f, 50.0f); mAcchCirs[1].SetWall(-20.0f, 50.0f); @@ -452,7 +452,7 @@ void daNpc_kam_c::npcAction(void* arg) { if (!mCurrNpcActionFunc) { speedF = 0.0f; offHyoiKamome(); - setNpcAction(&waitNpcAction, NULL); + setNpcAction(&daNpc_kam_c::waitNpcAction, NULL); #if VERSION != VERSION_JPN mDoAud_zelAudio_c::getInterface()->field_0x0062 = 0; #endif @@ -471,7 +471,7 @@ void daNpc_kam_c::setNpcAction(ActionFunc actionFunc, void* arg) { void daNpc_kam_c::playerAction(void* arg) { if (!mCurrPlayerActionFunc) { speedF = 0.0f; - setPlayerAction(&waitPlayerAction, NULL); + setPlayerAction(&daNpc_kam_c::waitPlayerAction, NULL); } dComIfGp_setRStatusForce(0x07); // Show "Return" on the R button @@ -805,7 +805,7 @@ int daNpc_kam_c::waitPlayerAction(void*) { } if (mTgSph.ChkTgHit()) { - setPlayerAction(&damagePlayerAction, NULL); + setPlayerAction(&daNpc_kam_c::damagePlayerAction, NULL); } } return TRUE; |