mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-31 17:31:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings and errors

Browse Source
This commit is contained in:
LagoLunatic
2024-06-03 20:10:38 -04:00
parent ed7a50cd86
commit 4767560aea
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_auction.cpp
+9 -9
View File
@@ -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 */
src/d/actor/d_a_npc_ji1.cpp
+1 -1
View File
@@ -2635,7 +2635,7 @@ BOOL daNpc_Ji1_c::battleAction(void*) {
dtParticle();
}
if(!isAttackAnim() || checkSubAction(battleSubActionNockBack)) {
if(!isAttackAnim() || checkSubAction(&daNpc_Ji1_c::battleSubActionNockBack)) {
dtParticleAT();
}
src/d/actor/d_a_npc_roten.cpp
+10 -10
View File
@@ -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 */
src/d/actor/d_a_obj_ladder.cpp
+5 -5
View File
@@ -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();
src/d/actor/d_a_pedestal.cpp
+4 -4
View File
@@ -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);
src/d/actor/d_a_race_item.cpp
+1 -1
View File
@@ -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);