diff --git a/src/d/actor/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp index 451a4f9ac..08d4dc909 100644 --- a/src/d/actor/d_a_auction.cpp +++ b/src/d/actor/d_a_auction.cpp @@ -193,9 +193,9 @@ static daPy_py_c::daPy_FACE l_link_face[8] = { }; static daAuction_c::ProcFunc_t moveProc[] = { - daAuction_c::executeWait, - daAuction_c::executeNormal, - daAuction_c::executeStart, + &daAuction_c::executeWait, + &daAuction_c::executeNormal, + &daAuction_c::executeStart, }; extern void dAuction_screen_delete(); @@ -752,12 +752,12 @@ void daAuction_c::eventMainInit() { } static daAuction_c::ProcFunc_t eventProc[] = { - daAuction_c::eventMainKai, - daAuction_c::eventMainUri, - daAuction_c::eventMainMsgSet, - daAuction_c::eventMainMsgEnd, - daAuction_c::eventMainMsgBikonC, - daAuction_c::eventMainMsgBikonW, + &daAuction_c::eventMainKai, + &daAuction_c::eventMainUri, + &daAuction_c::eventMainMsgSet, + &daAuction_c::eventMainMsgEnd, + &daAuction_c::eventMainMsgBikonC, + &daAuction_c::eventMainMsgBikonW, }; /* 0000188C-00001A98 .text eventMain__11daAuction_cFv */ diff --git a/src/d/actor/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp index 6bad09b8a..6803e8b01 100644 --- a/src/d/actor/d_a_npc_ji1.cpp +++ b/src/d/actor/d_a_npc_ji1.cpp @@ -2635,7 +2635,7 @@ BOOL daNpc_Ji1_c::battleAction(void*) { dtParticle(); } - if(!isAttackAnim() || checkSubAction(battleSubActionNockBack)) { + if(!isAttackAnim() || checkSubAction(&daNpc_Ji1_c::battleSubActionNockBack)) { dtParticleAT(); } diff --git a/src/d/actor/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp index 0bef773cb..3a83fb2c7 100644 --- a/src/d/actor/d_a_npc_roten.cpp +++ b/src/d/actor/d_a_npc_roten.cpp @@ -1806,19 +1806,19 @@ bool daNpcRoten_c::_draw() { } static daNpcRoten_c::InitFunc_t l_execute_init[] = { - daNpcRoten_c::executeWaitInit, - daNpcRoten_c::executeTalkInit, - daNpcRoten_c::executeWalkInit, - daNpcRoten_c::executeTurnInit, - daNpcRoten_c::executeWindInit, + &daNpcRoten_c::executeWaitInit, + &daNpcRoten_c::executeTalkInit, + &daNpcRoten_c::executeWalkInit, + &daNpcRoten_c::executeTurnInit, + &daNpcRoten_c::executeWindInit, }; static daNpcRoten_c::MoveFunc_t moveProc[] = { - daNpcRoten_c::executeWait, - daNpcRoten_c::executeTalk, - daNpcRoten_c::executeWalk, - daNpcRoten_c::executeTurn, - daNpcRoten_c::executeWind, + &daNpcRoten_c::executeWait, + &daNpcRoten_c::executeTalk, + &daNpcRoten_c::executeWalk, + &daNpcRoten_c::executeTurn, + &daNpcRoten_c::executeWind, }; /* 000013F8-00001604 .text _execute__12daNpcRoten_cFv */ diff --git a/src/d/actor/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp index e7a912d84..08f322ec2 100644 --- a/src/d/actor/d_a_obj_ladder.cpp +++ b/src/d/actor/d_a_obj_ladder.cpp @@ -277,11 +277,11 @@ void daObjLadder::Act_c::init_mtx() { int daObjLadder::Act_c::Execute(Mtx** ppMtx) { typedef void (Act_c::*ModeFunc)(); static const ModeFunc mode_proc[] = { - mode_wait, - mode_demoreq, - mode_vib, - mode_drop, - mode_fell, + &daObjLadder::Act_c::mode_wait, + &daObjLadder::Act_c::mode_demoreq, + &daObjLadder::Act_c::mode_vib, + &daObjLadder::Act_c::mode_drop, + &daObjLadder::Act_c::mode_fell, }; demo_end_reset(); diff --git a/src/d/actor/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp index b959044a6..14c9bc226 100644 --- a/src/d/actor/d_a_pedestal.cpp +++ b/src/d/actor/d_a_pedestal.cpp @@ -201,10 +201,10 @@ BOOL daPds_c::waitAction(void*) { typedef void (daPds_c::* eventInitFunc)(int); static eventInitFunc event_init_tbl[] = { - daPds_c::initialDefault, - daPds_c::initialMoveEvent, - daPds_c::initialEffectSet, - daPds_c::initialEffectEnd, + &daPds_c::initialDefault, + &daPds_c::initialMoveEvent, + &daPds_c::initialEffectSet, + &daPds_c::initialEffectEnd, }; typedef BOOL (daPds_c::* eventActionFunc)(int); diff --git a/src/d/actor/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp index bbc711d17..f484320ac 100644 --- a/src/d/actor/d_a_race_item.cpp +++ b/src/d/actor/d_a_race_item.cpp @@ -138,7 +138,7 @@ BOOL daRaceItem_c::execute() { case 0: checkGet(); - s16 spin = 0xFFFF / daItemBase_c::m_data.mNumFramesPerFullSpin; + s16 spin = 0xFFFF / daItemBase_c::m_data.mRotateYSpeed; fopAcM_addAngleY(this, current.angle.y + spin, spin); mCyl.SetC(current.pos); dComIfG_Ccsp()->Set(&mCyl);