mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-03 18:36:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make Proc_e enum values consistent across actors

Browse Source
This commit is contained in:
LagoLunatic
2026-03-12 17:26:42 -04:00
parent e580412bcf
commit 37000df61b
38 changed files with 192 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_daiocta.h
+2 -2
View File
@@ -21,8 +21,8 @@ public:
};
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1
PROC_INIT_e = 0,
PROC_EXEC_e = 1
};
enum Mode_e {
include/d/actor/d_a_fm.h
+5 -5
View File
@@ -9,13 +9,13 @@
class daFm_c : public fopEn_enemy_c {
public:
enum Proc_e {
PROC_0_e,
PROC_1_e,
PROC_INIT_e = 0,
PROC_EXEC_e = 1,
};
bool isBodyAppear() {return mMode != 1 && mMode != 0x12 && mMode != 0 && (mMode != 2 && (mMode != 4) && (mMode != 3 && (mMode != 0x11)));}
bool isHoleAppear() {return field_0x3E0 > 0.015f;}
void modeProcInit(int newMode) {modeProc(PROC_0_e, newMode);}
bool isBodyAppear() { return mMode != 1 && mMode != 0x12 && mMode != 0 && (mMode != 2 && (mMode != 4) && (mMode != 3 && (mMode != 0x11))); }
bool isHoleAppear() { return field_0x3E0 > 0.015f; }
void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
void _nodeControl(J3DNode*, J3DModel*);
BOOL _createHeap();
include/d/actor/d_a_gy_ctrl.h
+2 -2
View File
@@ -7,8 +7,8 @@
class daGy_Ctrl_c : public fopAc_ac_c {
public:
enum Proc_e {
PROC_0_e,
PROC_1_e,
PROC_INIT_e = 0,
PROC_EXEC_e = 1,
};
void getMode() {}
include/d/actor/d_a_npc_km1.h
+8 -8
View File
@@ -27,14 +27,14 @@ public:
/* 0x1 */ TEXPATTERN_END,
};
s8 getHeadJntNum() {return m_head_jnt_num;}
s8 getBackboneJntNum() {return m_backbone_jnt_num;}
s16 getBackbone_x() {return m_jnt.getBackbone_x();}
s16 getBackbone_y() {return m_jnt.getBackbone_y();}
s16 getHead_x() {return m_jnt.getHead_x();}
s16 getHead_y() {return m_jnt.getHead_y();}
Vec* getAttPos() {return &mAttPos;}
Vec* getEyePos() {return &mEyePos;}
s8 getHeadJntNum() { return m_head_jnt_num; }
s8 getBackboneJntNum() {return m_backbone_jnt_num; }
s16 getBackbone_x() { return m_jnt.getBackbone_x(); }
s16 getBackbone_y() { return m_jnt.getBackbone_y(); }
s16 getHead_x() { return m_jnt.getHead_x(); }
s16 getHead_y() { return m_jnt.getHead_y(); }
Vec* getAttPos() { return &mAttPos; }
Vec* getEyePos() { return &mEyePos; }
bool createInit();
void setMtx();
include/d/actor/d_a_npc_ls1.h
+2 -2
View File
@@ -12,8 +12,8 @@ class daNpc_Ls1_matAnm_c : public J3DMaterialAnm {
public:
daNpc_Ls1_matAnm_c();
void clrMoveFlag() { mbMove = 0; }
f32& getNowOffsetX() { return mOffset.x; }
f32& getNowOffsetY() { return mOffset.y; }
f32* getNowOffsetX() { return &mOffset.x; }
f32* getNowOffsetY() { return &mOffset.y; }
void setMoveFlag() { mbMove = 1; }
void calc(J3DMaterial*) const;
include/d/actor/d_a_npc_nz.h
+3 -3
View File
@@ -14,15 +14,15 @@ class J3DNode;
class daNpc_Nz_c : public fopNpc_npc_c {
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1,
PROC_INIT_e = 0,
PROC_EXEC_e = 1,
};
// objdiff says this is a weak function
// but defining it here with {} causes it to be inlined with fopAcM_SetupActor which breaks things
daNpc_Nz_c();
void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
BOOL NodeCallBack(J3DNode*, int);
BOOL TailNodeCallBack(J3DNode*, int);
include/d/actor/d_a_npc_zl1.h
+4 -4
View File
@@ -9,10 +9,10 @@ class J3DNode;
class daNpc_Zl1_matAnm_c : public J3DMaterialAnm{
public:
void clrMoveFlag() {field_0x7C = false;}
f32& getNowOffsetX() {return mOffset.x;}
f32& getNowOffsetY() {return mOffset.y;}
void setMoveFlag() {field_0x7C = true;}
void clrMoveFlag() { field_0x7C = false; }
f32* getNowOffsetX() { return &mOffset.x; }
f32* getNowOffsetY() { return &mOffset.y; }
void setMoveFlag() { field_0x7C = true; }
daNpc_Zl1_matAnm_c();
include/d/actor/d_a_obj_canon.h
+3 -3
View File
@@ -13,11 +13,11 @@ class dCcD_SrcSph;
class daObj_Canon_c : public fopAc_ac_c {
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1
PROC_INIT_e = 0,
PROC_EXEC_e = 1
};
void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
void _nodeControl(J3DNode*, J3DModel*);
BOOL _createHeap();
include/d/actor/d_a_obj_hole.h
+3 -3
View File
@@ -8,8 +8,8 @@
class daObj_Hole_c : public fopAc_ac_c {
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1,
PROC_INIT_e = 0,
PROC_EXEC_e = 1,
};
enum Mode {
@@ -20,7 +20,7 @@ public:
static const char m_arc_name[];
void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
void setMtx();
void getPosAndAngle();
include/d/actor/d_a_obj_ikada.h
+3 -3
View File
@@ -15,8 +15,8 @@
class daObj_Ikada_c : public fopAc_ac_c {
public:
enum Proc_e {
PROC_00_e = 0,
PROC_01_e = 1,
PROC_INIT_e = 0,
PROC_EXEC_e = 1,
};
void getCranePos() {}
@@ -27,7 +27,7 @@ public:
bool isCrane() {return mType == 4; }
bool isFlag() { return mType == 0 || mType == 4; }
bool isWave() { return mType == 4 || mType == 3 || mType == 1; }
void modeProcInit(int idx) { modeProc(PROC_00_e, idx); }
void modeProcInit(int idx) { modeProc(PROC_INIT_e, idx); }
void setInitPos() {}
void setStart() {}
void setStop() {}
include/d/actor/d_a_obj_pfall.h
+1 -1
View File
@@ -67,7 +67,7 @@ public:
class daObj_PfallHIO_c {
public:
daObj_PfallHIO_c();
virtual ~daObj_PfallHIO_c() {mNo = -1;}
virtual ~daObj_PfallHIO_c() { mNo = -1; }
public:
/* 0x04 */ s8 mNo;
include/d/actor/d_a_obj_toripost.h
+3 -3
View File
@@ -14,8 +14,8 @@ struct daObjTpost_c__letter_data {
class daObjTpost_c : public fopNpc_npc_c {
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1
PROC_INIT_e = 0,
PROC_EXEC_e = 1
};
enum Mode {
@@ -44,7 +44,7 @@ public:
void eventSet(s8 eventIdx) { mEventIdx = eventIdx; }
int getSendPrice() { return m_send_price[mPayType]; }
bool isAnm(s8 idx) { return mAnmPrmIdx == idx; }
void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
BOOL _createHeap();
void cutProc();
include/d/actor/d_a_obj_warpt.h
+1 -1
View File
@@ -12,7 +12,7 @@ class daObj_Warpt_c : public fopAc_ac_c {
public:
enum Proc_e {
PROC_INIT_e,
PROC_RUN_e,
PROC_EXEC_e,
};
void modeProcInit(int) {}
include/d/actor/d_a_oship.h
+3 -3
View File
@@ -15,8 +15,8 @@
class daOship_c : public fopAc_ac_c {
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1
PROC_INIT_e = 0,
PROC_EXEC_e = 1
};
enum Mode_e {
@@ -40,7 +40,7 @@ public:
u8 getSw() { return mSwitchA; }
bool isSpecial() { return mModelType != 0xFF || REG12_S(0) != 0; }
void modeProcInit(int i_newMode) { modeProc(PROC_INIT, i_newMode); }
void modeProcInit(int i_newMode) { modeProc(PROC_INIT_e, i_newMode); }
void _nodeControl(J3DNode*, J3DModel*);
BOOL _pathMove(cXyz*, cXyz*, cXyz*);
include/d/actor/d_a_rd.h
+3 -3
View File
@@ -16,8 +16,8 @@ class daRd_c
{
public:
enum Proc_e {
PROC_INIT = 0,
PROC_EXEC = 1,
PROC_INIT_e = 0,
PROC_EXEC_e = 1,
};
enum Mode {
@@ -82,7 +82,7 @@ public:
void onIkari() { mbIkari = true; }
void offIkari() { mbIkari = false; }
bool isIkari() { return mbIkari; }
void modeProcInit(int newMode) { modeProc(PROC_INIT, newMode); }
void modeProcInit(int newMode) { modeProc(PROC_INIT_e, newMode); }
fopAc_ac_c* _searchNearDeadRd(fopAc_ac_c*);
void _nodeControl(J3DNode*, J3DModel*);
include/d/actor/d_a_tag_ghostship.h
+2 -2
View File
@@ -6,8 +6,8 @@
class daTag_Gship_c : public fopAc_ac_c {
public:
enum Proc_e {
CLEAR_WAIT = 0,
CLEAR_EVENT
PROC_INIT_e = 0,
PROC_EXEC_e = 1,
};
void modeProcInit(int) {}
include/d/actor/d_a_tsubo.h
+1 -1
View File
@@ -214,7 +214,7 @@ namespace daTsubo {
void prm_off_stick() { fopAcM_SetParam(this, fopAcM_GetParam(this) & ~0x80000000); }
void prm_set_cull_non() { fopAcM_SetParam(this, fopAcM_GetParam(this) & ~0x70000000); }
void prm_set_itemNo(int) {}
void set_drop_spd_y0(f32 drop_speed) {speed.y = drop_speed;}
void set_drop_spd_y0(f32 drop_speed) { speed.y = drop_speed; }
bool spec_chk_prm_boko() const { return prm_get_spec() != 0x3F; }
void prmZ_init();
include/d/d_attention.h
+3 -1
View File
@@ -258,7 +258,9 @@ public:
void LookRequest(fopAc_ac_c* reqActor, f32 horizontalDist, f32 upDist, f32 downDist, s16 angle, int param_5) {
mLook[0].request(reqActor, horizontalDist, upDist, downDist, angle, param_5);
}
void Look2RequestF(fopAc_ac_c* param_1, s16 param_2, int param_3) {mLook[1].requestF(param_1,param_2,param_3);}
void Look2RequestF(fopAc_ac_c* param_1, s16 param_2, int param_3) {
mLook[1].requestF(param_1,param_2,param_3);
}
public:
/* 0x000 */ fopAc_ac_c* mpPlayer;
include/d/d_bg_s_acch.h
+1 -1
View File
@@ -209,7 +209,7 @@ public:
f32 GetCx() { return pm_pos->x; }
f32 GetCz() { return pm_pos->z; }
void SetOld() {*pm_old_pos = *pm_pos;}
void SetOld() { *pm_old_pos = *pm_pos; }
// TODO
void ChkGroundAway() {}
src/d/actor/d_a_bomb3.inc
+1 -1
View File
@@ -1063,7 +1063,7 @@ void daBomb_c::waitState_bomtyu() {
}
}
// assuming this was here and got stripped, given the leftover ptmf in .data and the other proc/proc_init pairs
// assuming this was here and got stripped, given the leftover ptmf in .data and the other proc/PROC_INIT_e pairs
bool daBomb_c::procSink_init() {
mFunc = &daBomb_c::procSink;
src/d/actor/d_a_daiocta.cpp
+25 -25
View File
@@ -173,7 +173,7 @@ void daDaiocta_c::_coHit(fopAc_ac_c* i_actor) {
if ((mMode == MODE_WAIT || mMode == MODE_DAMAGE_BOMB ||
mMode == MODE_APPEAR || mMode == MODE_DAMAGE) &&
bomb_p->chk_state(daBomb_c::STATE_4)) {
modeProc(PROC_INIT, MODE_DAMAGE_BOMB);
modeProc(PROC_INIT_e, MODE_DAMAGE_BOMB);
}
}
}
@@ -884,7 +884,7 @@ void daDaiocta_c::modeHide() {
f32 dist_xz = fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
if ((dist_xz < mAppearRadius || dist_xz < l_HIO.mMinAppearRadius) &&
dComIfGp_checkPlayerStatus0(0, daPyStts0_SHIP_RIDE_e)) {
modeProc(PROC_INIT, MODE_APPEAR);
modeProc(PROC_INIT_e, MODE_APPEAR);
}
}
@@ -925,7 +925,7 @@ void daDaiocta_c::modeAppearInit() {
/* 000020C8-0000236C .text modeAppear__11daDaiocta_cFv */
void daDaiocta_c::modeAppear() {
if (isDamageEye()) {
modeProc(PROC_INIT, MODE_DAMAGE);
modeProc(PROC_INIT_e, MODE_DAMAGE);
}
if (DEMO_SELECT(mpEmitter, mParticleCallback.getEmitter())) {
@@ -968,7 +968,7 @@ void daDaiocta_c::modeAppear() {
}
if (dist <= 0.1) {
modeProc(PROC_INIT, MODE_WAIT);
modeProc(PROC_INIT_e, MODE_WAIT);
} else {
s16 target = fopAcM_searchActorAngleY(this, dComIfGp_getPlayer(0));
cLib_addCalcAngleS2(&shape_angle.y, target, 4, l_HIO.m010);
@@ -980,7 +980,7 @@ void daDaiocta_c::modeAppear() {
/* 0000236C-000023B0 .text modeWaitInit__11daDaiocta_cFv */
void daDaiocta_c::modeWaitInit() {
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
}
}
@@ -988,18 +988,18 @@ void daDaiocta_c::modeWaitInit() {
void daDaiocta_c::modeWait() {
current.pos.y = mWaterY;
if (isDead() || l_HIO.m006 != 0) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else if (isDamageEye()) {
modeProc(PROC_INIT, MODE_DAMAGE);
modeProc(PROC_INIT_e, MODE_DAMAGE);
} else if (isDamageBombEye()) {
modeProc(PROC_INIT, MODE_DAMAGE_BOMB);
modeProc(PROC_INIT_e, MODE_DAMAGE_BOMB);
}
}
/* 00002458-000024D8 .text modeDamageInit__11daDaiocta_cFv */
void daDaiocta_c::modeDamageInit() {
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else {
mPrmIdx = 2;
setAnm();
@@ -1014,18 +1014,18 @@ void daDaiocta_c::modeDamageInit() {
void daDaiocta_c::modeDamage() {
current.pos.y = mWaterY;
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else if (isDamageEye()) {
modeProc(PROC_INIT, MODE_DAMAGE);
modeProc(PROC_INIT_e, MODE_DAMAGE);
} else if (isDamageBombEye()) {
modeProc(PROC_INIT, MODE_DAMAGE_BOMB);
modeProc(PROC_INIT_e, MODE_DAMAGE_BOMB);
}
if (mPrmIdx == 2) {
if (std::fabsf(current.pos.y - mWaterY) <= 0.1) {
modeProc(PROC_INIT, MODE_WAIT);
modeProc(PROC_INIT_e, MODE_WAIT);
} else {
modeProc(PROC_INIT, MODE_APPEAR);
modeProc(PROC_INIT_e, MODE_APPEAR);
}
}
}
@@ -1033,7 +1033,7 @@ void daDaiocta_c::modeDamage() {
/* 000025C4-0000268C .text modeDamageBombInit__11daDaiocta_cFv */
void daDaiocta_c::modeDamageBombInit() {
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else {
fopAcM_seStart(this, JA_SE_LK_LAST_HIT, 0);
mPrmIdx = 2;
@@ -1048,18 +1048,18 @@ void daDaiocta_c::modeDamageBombInit() {
void daDaiocta_c::modeDamageBomb() {
current.pos.y = mWaterY;
if (isDead()) {
modeProc(PROC_INIT, MODE_DELETE);
modeProc(PROC_INIT_e, MODE_DELETE);
} else if (isDamageEye()) {
modeProc(PROC_INIT, MODE_DAMAGE);
modeProc(PROC_INIT_e, MODE_DAMAGE);
} else if (isDamageBombEye()) {
modeProc(PROC_INIT, MODE_DAMAGE_BOMB);
modeProc(PROC_INIT_e, MODE_DAMAGE_BOMB);
}
if (mPrmIdx == 2) {
if (std::fabsf(current.pos.y - mWaterY) <= 0.1) {
modeProc(PROC_INIT, MODE_WAIT);
modeProc(PROC_INIT_e, MODE_WAIT);
} else {
modeProc(PROC_INIT, MODE_APPEAR);
modeProc(PROC_INIT_e, MODE_APPEAR);
}
}
}
@@ -1297,10 +1297,10 @@ void daDaiocta_c::modeProc(daDaiocta_c::Proc_e i_procType, daDaiocta_c::Mode_e i
{ &daDaiocta_c::modeDemoInit, &daDaiocta_c::modeDemo, "DEMO" }
};
if (i_procType == PROC_INIT) {
if (i_procType == PROC_INIT_e) {
mMode = i_modeProc;
(this->*mode_tbl[mMode].mInitFunc)();
} else if (i_procType == PROC_EXEC) {
} else if (i_procType == PROC_EXEC_e) {
(this->*mode_tbl[mMode].mUpdFunc)();
}
}
@@ -1410,7 +1410,7 @@ bool daDaiocta_c::_execute() {
mMode != MODE_DEMO &&
mMode != MODE_DELETE &&
dist_angle_s < l_HIO.m012) {
modeProc(PROC_INIT, MODE_DEMO);
modeProc(PROC_INIT_e, MODE_DEMO);
}
#if VERSION > VERSION_DEMO
}
@@ -1437,7 +1437,7 @@ bool daDaiocta_c::_execute() {
tevStr.mEnvrIdxOverride = dComIfG_Bgsp()->GetPolyColor(mAcch.m_gnd);
}
modeProc(PROC_EXEC, MODE_NULL);
modeProc(PROC_EXEC_e, MODE_NULL);
if (mMode != MODE_HIDE) {
setCollision();
@@ -1603,7 +1603,7 @@ void daDaiocta_c::getArg() {
void daDaiocta_c::createInit() {
m220C = current.pos;
initAwa();
modeProc(PROC_INIT, MODE_HIDE);
modeProc(PROC_INIT_e, MODE_HIDE);
initMtx();
attention_info.flags = 0;
shape_angle = current.angle;
src/d/actor/d_a_ep.cpp
+1 -1
View File
@@ -216,7 +216,7 @@ void ep_move(ep_class* i_this) {
switch (i_this->m4D0) {
case 0:
if (i_this->m508 != 0) {
cLib_addCalc0(&i_this->mLightPower, 0.5f, 0.05000000074505806f);
cLib_addCalc0(&i_this->mLightPower, 0.5f, 0.05f);
if (i_this->mSph1.ChkTgHit()) {
cCcD_Obj* hitObj = i_this->mSph1.GetTgHitObj();
src/d/actor/d_a_fm.cpp
+42 -42
View File
@@ -1308,7 +1308,7 @@ void daFm_c::modePathMove() {
resetInvKine();
turnToBaseTarget();
if(isGrabFoot() && !dComIfGp_event_runCheck()) {
modeProc(PROC_0_e,0xf);
modeProc(PROC_INIT_e,0xf);
} else {
dLib_pathMove(&field_0x3B0, &field_0x3BC, mpPath, 3.0f, pathMove_CB, this);
@@ -1316,7 +1316,7 @@ void daFm_c::modePathMove() {
daPy_lk_c* pLink = daPy_getPlayerLinkActorClass();
if(field_0x9D4 < l_HIO.field_0x0E4 && std::fabsf(pLink->current.pos.y - current.pos.y) < l_HIO.field_0x0A8 && field_0xAE5 == 0) {
modeProc(PROC_0_e,5);
modeProc(PROC_INIT_e,5);
}
}
}
@@ -1331,22 +1331,22 @@ void daFm_c::modeGoalKeeperInit() {
void daFm_c::modeGoalKeeper() {
if(field_0x2E5 && dComIfGp_evmng_endCheck("DEFAULT_FM_SUIKOMI_NPC")) {
modeProc(PROC_0_e,6);
modeProc(PROC_INIT_e,6);
return;
}
resetInvKine();
turnToBaseTarget();
if(isGrabFoot() && !dComIfGp_event_runCheck()) {
modeProc(PROC_0_e, 0xf);
modeProc(PROC_INIT_e, 0xf);
} else {
if(field_0x2E4 != 0) {
modeProc(PROC_0_e, 5);
modeProc(PROC_INIT_e, 5);
} else {
f32 temp = std::fabsf(current.pos.y - mBaseTarget->current.pos.y);
if(field_0x9D4 < l_HIO.field_0x0E8 && temp < l_HIO.field_0x0A8) {
if((mBaseTarget->current.pos - field_0x69C).absXZ() < field_0x2E0 && field_0xAE5 == 0) {
modeProc(PROC_0_e,5);
modeProc(PROC_INIT_e,5);
}
}
field_0x690 = field_0x69C;
@@ -1377,12 +1377,12 @@ void daFm_c::modeAppear() {
return;
}
if(isGrabPos()) {
modeProc(PROC_0_e,8);
modeProc(PROC_INIT_e,8);
return;
}
}
if(mAnmPrmIdx == 1) {
modeProc(PROC_0_e,7);
modeProc(PROC_INIT_e,7);
}
}
}
@@ -1408,21 +1408,21 @@ void daFm_c::modeDisappear() {
if(mAnmPrmIdx == 8) {
if(mpMorf->isStop()) {
if(field_0x2E4 != 0 || field_0x2E5) {
modeProc(PROC_0_e, 0x12);
modeProc(PROC_INIT_e, 0x12);
} else {
fopAcM_searchActorDistanceXZ(this, dComIfGp_getPlayer(0));
if(isGrabFoot() && !dComIfGp_event_runCheck()) {
modeProc(PROC_0_e, 0xf);
modeProc(PROC_INIT_e, 0xf);
} else {
switch(field_0x2D0) {
case 0:
modeProc(PROC_0_e, 1);
modeProc(PROC_INIT_e, 1);
break;
case 1:
modeProc(PROC_0_e, 3);
modeProc(PROC_INIT_e, 3);
break;
case 2:
modeProc(PROC_0_e, 4);
modeProc(PROC_INIT_e, 4);
break;
}
}
@@ -1450,11 +1450,11 @@ void daFm_c::modeWait() {
return;
}
if(!areaCheck()) {
modeProc(PROC_0_e, 6);
modeProc(PROC_INIT_e, 6);
return;
}
if(isGrabFoot()) {
modeProc(PROC_0_e, 6);
modeProc(PROC_INIT_e, 6);
return;
}
@@ -1473,7 +1473,7 @@ void daFm_c::modeWait() {
if(isGrabPos()) {
if(checkPlayerGrabTarget()) {
if(cLib_calcTimer(&field_0x65C) == 0) {
modeProc(PROC_0_e, 8);
modeProc(PROC_INIT_e, 8);
return;
}
} else {
@@ -1481,10 +1481,10 @@ void daFm_c::modeWait() {
if(cLib_calcTimer(&field_0x65C) != 0) {
return;
}
modeProc(PROC_0_e,8);
modeProc(PROC_INIT_e,8);
return;
}
modeProc(PROC_0_e,8);
modeProc(PROC_INIT_e,8);
return;
}
}
@@ -1494,7 +1494,7 @@ void daFm_c::modeWait() {
}
}
if(field_0x2D0 == 2 && (mBaseTarget->current.pos - field_0x69C).absXZ() > field_0x2E0) {
modeProc(PROC_0_e, 6);
modeProc(PROC_INIT_e, 6);
} else {
moveRndBack();
}
@@ -1503,7 +1503,7 @@ void daFm_c::modeWait() {
}
if(field_0x9D4 > l_HIO.field_0x0E8) {
if(cLib_calcTimer(&field_0x658) == 0) {
modeProc(PROC_0_e,6);
modeProc(PROC_INIT_e,6);
}
} else {
field_0x658 = l_HIO.field_0x088;
@@ -1513,7 +1513,7 @@ void daFm_c::modeWait() {
/* 00003F90-00003FF8 .text modeAttackInit__6daFm_cFv */
void daFm_c::modeAttackInit() {
if(dComIfGp_checkPlayerStatus0(0, daPyStts0_UNK400_e | daPyStts0_UNK2_e)) {
modeProc(PROC_0_e,7);
modeProc(PROC_INIT_e,7);
} else {
setAnm(4, false);
field_0x650 = l_HIO.field_0x094;
@@ -1689,10 +1689,10 @@ void daFm_c::modeThrowInit() {
void daFm_c::modeThrow() {
resetInvKine();
if(mAnmPrmIdx == 1 && cLib_calcTimer(&field_0x650) == 0) {
modeProc(PROC_0_e, 7);
modeProc(PROC_INIT_e, 7);
}
if(field_0x684 != 0 && mpActorTarget == NULL) {
modeProc(PROC_0_e, 10);
modeProc(PROC_INIT_e, 10);
return;
}
if(field_0x684 == 0) {
@@ -1771,7 +1771,7 @@ void daFm_c::modeGrabFootDemoInit() {
void daFm_c::modeGrabFootDemo() {
resetInvKine();
if(l_HIO.field_0x00D) {
modeProc(PROC_0_e, 5);
modeProc(PROC_INIT_e, 5);
} else {
if(eventInfo.mCommand == dEvtCmd_INDEMO_e) {
// char* cutName;
@@ -1848,7 +1848,7 @@ void daFm_c::modeParalysis() {
field_0x68C = 0x2b00;
}
if(cLib_calcTimer(&field_0x650) == 0) {
modeProc(PROC_0_e, 7);
modeProc(PROC_INIT_e, 7);
}
cancelGrab();
if (checkTgHit()) {
@@ -1872,10 +1872,10 @@ void daFm_c::modeDamage() {
if(mAnmPrmIdx == 1 && field_0x64C == 0) {
searchTarget();
if(mpActorTarget != NULL && !isNpc(mpActorTarget)) {
modeProc(PROC_0_e, 7);
modeProc(PROC_INIT_e, 7);
}
if(!cLib_calcTimer(&field_0x650)) {
modeProc(PROC_0_e, 7);
modeProc(PROC_INIT_e, 7);
}
}
if (checkTgHit()) {
@@ -2167,7 +2167,7 @@ void daFm_c::modePrepareItem() {
if(temp == 9) {
if(!daPy_getPlayerLinkActorClass()->checkPlayerGuard()) {
if(cLib_calcTimer(&field_0x650) == 0) {
modeProc(PROC_0_e,9);
modeProc(PROC_INIT_e,9);
}
} else {
field_0x650 = l_HIO.field_0x092;
@@ -2200,10 +2200,10 @@ void daFm_c::modeGrabNpcDemo() {
if(dComIfGp_evmng_endCheck("DEFAULT_FM_NPC_GRAB") != 0) {
if(field_0x2E4 != 0) {
dComIfGp_event_reset();
modeProc(PROC_0_e, 0xE);
modeProc(PROC_INIT_e, 0xE);
} else {
dComIfGp_event_reset();
modeProc(PROC_0_e, 0xD);
modeProc(PROC_INIT_e, 0xD);
}
}
}
@@ -2269,7 +2269,7 @@ void daFm_c::modePlayerStartDemo() {
}
} else if(strcmp(cutName, "DELETE") == 0) {
modeProc(PROC_0_e, 0x12);
modeProc(PROC_INIT_e, 0x12);
}
}
}
@@ -2320,7 +2320,7 @@ void daFm_c::modeBikubiku() {
if(mAnmPrmIdx == 0xe) {
if(cLib_calcTimer(&field_0x650) == 0) {
if(health <= 0) {
modeProc(PROC_0_e, 0xC);
modeProc(PROC_INIT_e, 0xC);
return;
} else {
setAnm(1, true);
@@ -2329,7 +2329,7 @@ void daFm_c::modeBikubiku() {
}
}
} else if(mAnmPrmIdx == 1 && field_0x64C == 0) {
modeProc(PROC_0_e,7);
modeProc(PROC_INIT_e,7);
}
}
@@ -2450,7 +2450,7 @@ void daFm_c::modeProc(daFm_c::Proc_e proc, int newMode) {
}
};
if(proc == PROC_0_e) {
if(proc == PROC_INIT_e) {
switch(newMode) {
case 0:
case 1:
@@ -2473,7 +2473,7 @@ void daFm_c::modeProc(daFm_c::Proc_e proc, int newMode) {
}
mMode = newMode;
(this->*mode_tbl[mMode].init)();
} else if(proc == PROC_1_e) {
} else if(proc == PROC_EXEC_e) {
(this->*mode_tbl[mMode].run)();
}
}
@@ -2670,7 +2670,7 @@ void daFm_c::resetInvKine() {
if (isBodyAppear()) {
field_0x390 = 0;
for(int i = 0; i < 6; i++) {
mDoMtx_quatSlerp(&field_0x330[i], &ZeroQuat, &field_0x330[i], 0.05000000074505806f);
mDoMtx_quatSlerp(&field_0x330[i], &ZeroQuat, &field_0x330[i], 0.05f);
}
mpMorf->calc();
}
@@ -3069,7 +3069,7 @@ bool daFm_c::_execute() {
spAttackNone();
}
}
modeProc(PROC_1_e, 0x15);
modeProc(PROC_EXEC_e, 0x15);
setAnm(0xF, false);
mpMorf->play(&current.pos, 0, 0);
mpMorf->calc();
@@ -3422,18 +3422,18 @@ void daFm_c::createInit() {
field_0x610 = l_HIO.field_0x02C;
if(mMode != 0x11) {
if(field_0x2D4 != 0xff && !dComIfGs_isSwitch(field_0x2D4, fopAcM_GetRoomNo(this))) {
modeProc(PROC_0_e, 0);
modeProc(PROC_INIT_e, 0);
} else {
switch(field_0x2D0) {
case 0:
modeProc(PROC_0_e, 2);
modeProc(PROC_INIT_e, 2);
break;
case 1:
modeProc(PROC_0_e, 3);
modeProc(PROC_INIT_e, 3);
JUT_ASSERT(VERSION_SELECT(0x1419, 0x1420, 0x1444, 0x1444), m_path_no != 0xff);
break;
case 2:
modeProc(PROC_0_e, 4);
modeProc(PROC_INIT_e, 4);
break;
}
}
@@ -3449,7 +3449,7 @@ cPhs_State daFm_c::_create() {
fopAc_ac_c* ac = fopAcM_SearchByID(parentActorID);
if(ac != NULL && fopAc_IsActor(ac) && isLink(ac)) {
modeProc(PROC_0_e, 0x11);
modeProc(PROC_INIT_e, 0x11);
}
}
src/d/actor/d_a_gy_ctrl.cpp
+14 -14
View File
@@ -320,7 +320,7 @@ void daGy_Ctrl_c::modeSwWait() {
}
if (dComIfGs_isSwitch(m330, sw)) {
modeProc(PROC_0_e, 1);
modeProc(PROC_INIT_e, 1);
}
}
@@ -332,11 +332,11 @@ void daGy_Ctrl_c::modeCreateInit() {
/* 00000CA0-00000E50 .text modeCreate__11daGy_Ctrl_cFv */
void daGy_Ctrl_c::modeCreate() {
if (m328 == 1 && m344 == 0) {
modeProc(PROC_0_e, 3);
modeProc(PROC_INIT_e, 3);
} else if (m3E8 == 0) {
modeProc(PROC_0_e, 3);
modeProc(PROC_INIT_e, 3);
} else if (fopAcM_Search(searchNearActor_CB, this) != NULL) {
modeProc(PROC_0_e, 3);
modeProc(PROC_INIT_e, 3);
} else {
if (m31C < m329 && cLib_calcTimer(&m350) == 0) {
cXyz sp18 = m290[m31C];
@@ -350,7 +350,7 @@ void daGy_Ctrl_c::modeCreate() {
}
if (m31C == m329) {
modeProc(PROC_0_e, 2);
modeProc(PROC_INIT_e, 2);
}
setPathPos();
}
@@ -365,11 +365,11 @@ void daGy_Ctrl_c::modeWaitInit() {
/* 00000E54-00000F00 .text modeWait__11daGy_Ctrl_cFv */
void daGy_Ctrl_c::modeWait() {
if (m328 == 1 && m344 == 0) {
modeProc(PROC_0_e, 3);
modeProc(PROC_INIT_e, 3);
} else if (m3E8 == 0) {
modeProc(PROC_0_e, 3);
modeProc(PROC_INIT_e, 3);
} else if (fopAcM_Search(searchNearActor_CB, this) != NULL) {
modeProc(PROC_0_e, 3);
modeProc(PROC_INIT_e, 3);
} else {
deadCheckGy();
setPathPos();
@@ -388,10 +388,10 @@ void daGy_Ctrl_c::modeHide() {
#if VERSION == VERSION_DEMO
if (m328 == 1) {
if (m344 == 1 && m3E8 == 1) {
modeProc(PROC_0_e, 1);
modeProc(PROC_INIT_e, 1);
}
} else if (m328 == 0 && m3E8 == 1) {
modeProc(PROC_0_e, 1);
modeProc(PROC_INIT_e, 1);
}
#else
bool bVar1 = false;
@@ -413,7 +413,7 @@ void daGy_Ctrl_c::modeHide() {
}
if (bVar1 && m3E8 == 1) {
modeProc(PROC_0_e, 1);
modeProc(PROC_INIT_e, 1);
}
#endif
}
@@ -437,7 +437,7 @@ bool daGy_Ctrl_c::_execute() {
setTarget();
m344 = setPathTargetPos();
m3E8 = checkPath();
modeProc(PROC_1_e, 4);
modeProc(PROC_EXEC_e, 4);
#if VERSION > VERSION_DEMO
m334 = fopAcM_GetRoomNo(this);
#endif
@@ -478,9 +478,9 @@ void daGy_Ctrl_c::createInitNoArer() {
/* 00001250-000012D4 .text createInit__11daGy_Ctrl_cFv */
void daGy_Ctrl_c::createInit() {
if (m330 != 0xff) {
modeProc(PROC_0_e, 0);
modeProc(PROC_INIT_e, 0);
} else {
modeProc(PROC_0_e, 1);
modeProc(PROC_INIT_e, 1);
}
m320 = 0;
src/d/actor/d_a_npc_hi1.cpp
-1
View File
@@ -40,7 +40,6 @@ public:
/* 0x07 */ s8 field_0x7;
/* 0x08 */ int field_0x8;
/* 0x0C */ hio_prm_c mPrmTbl;
/* Place member variables here */
};
static daNpc_Hi1_HIO_c l_HIO;
src/d/actor/d_a_npc_ls1.cpp
+4 -4
View File
@@ -562,14 +562,14 @@ void daNpc_Ls1_c::eye_ctrl() {
}
if (mpMatAnms[0]) {
cLib_addCalc(&mpMatAnms[0]->getNowOffsetX(), fVar2, 0.5f, 0.1f, 0.03f);
cLib_addCalc(&mpMatAnms[0]->getNowOffsetY(), fVar1, 0.5f, 0.1f, 0.03f);
cLib_addCalc(mpMatAnms[0]->getNowOffsetX(), fVar2, 0.5f, 0.1f, 0.03f);
cLib_addCalc(mpMatAnms[0]->getNowOffsetY(), fVar1, 0.5f, 0.1f, 0.03f);
}
fVar2 *= -1.0f;
if (mpMatAnms[1]) {
cLib_addCalc(&mpMatAnms[1]->getNowOffsetX(), fVar2, 0.5f, 0.1f, 0.03f);
cLib_addCalc(&mpMatAnms[1]->getNowOffsetY(), fVar1, 0.5f, 0.1f, 0.03f);
cLib_addCalc(mpMatAnms[1]->getNowOffsetX(), fVar2, 0.5f, 0.1f, 0.03f);
cLib_addCalc(mpMatAnms[1]->getNowOffsetY(), fVar1, 0.5f, 0.1f, 0.03f);
}
}
src/d/actor/d_a_npc_nz.cpp
+3 -3
View File
@@ -506,11 +506,11 @@ void daNpc_Nz_c::modeProc(daNpc_Nz_c::Proc_e proc, int newMode) {
}
};
if(proc == PROC_INIT) {
if(proc == PROC_INIT_e) {
mCurMode = newMode;
(this->*mode_tbl[mCurMode].init)();
}
else if(proc == PROC_EXEC) {
else if(proc == PROC_EXEC_e) {
(this->*mode_tbl[mCurMode].run)();
}
}
@@ -809,7 +809,7 @@ void daNpc_Nz_c::anmAtr(u16 i_msgStatus) {
bool daNpc_Nz_c::_execute() {
cLib_addCalc2(&speedF, field_0x6EC, 0.3f, 4.0f);
checkOrder();
modeProc(PROC_EXEC, 2);
modeProc(PROC_EXEC_e, 2);
LookBack();
eventOrder();
setAttention();
src/d/actor/d_a_npc_zl1.cpp
+4 -5
View File
@@ -70,7 +70,6 @@ public:
/* 0x07 */ s8 field_0x7;
/* 0x08 */ int field_0x8;
/* 0x0C */ hio_prm_c mPrmTbl;
/* Place member variables here */
};
static daNpc_Zl1_HIO_c l_HIO;
@@ -768,13 +767,13 @@ void daNpc_Zl1_c::eye_ctrl() {
if(field_0x6D4[0] != NULL) {
cLib_addCalc(&field_0x6D4[0]->getNowOffsetX(), temp2, 0.5f, 0.1f, 0.03f);
cLib_addCalc(&field_0x6D4[0]->getNowOffsetY(), temp, 0.5f, 0.1f, 0.03f);
cLib_addCalc(field_0x6D4[0]->getNowOffsetX(), temp2, 0.5f, 0.1f, 0.03f);
cLib_addCalc(field_0x6D4[0]->getNowOffsetY(), temp, 0.5f, 0.1f, 0.03f);
}
temp2 *= -1.0f;
if(field_0x6D4[1] != NULL) {
cLib_addCalc(&field_0x6D4[1]->getNowOffsetX(), temp2, 0.5f, 0.1f, 0.03f);
cLib_addCalc(&field_0x6D4[1]->getNowOffsetY(), temp, 0.5f, 0.1f, 0.03f);
cLib_addCalc(field_0x6D4[1]->getNowOffsetX(), temp2, 0.5f, 0.1f, 0.03f);
cLib_addCalc(field_0x6D4[1]->getNowOffsetY(), temp, 0.5f, 0.1f, 0.03f);
}
}
src/d/actor/d_a_obj_canon.cpp
+3 -3
View File
@@ -462,11 +462,11 @@ void daObj_Canon_c::modeProc(daObj_Canon_c::Proc_e proc, int newMode) {
},
};
if(proc == PROC_INIT) {
if(proc == PROC_INIT_e) {
mCurMode = newMode;
(this->*mode_tbl[mCurMode].init)();
}
else if(proc == PROC_EXEC) {
else if(proc == PROC_EXEC_e) {
(this->*mode_tbl[mCurMode].run)();
}
}
@@ -480,7 +480,7 @@ bool daObj_Canon_c::_execute() {
setAttention();
setCollision();
modeProc(PROC_EXEC, 5);
modeProc(PROC_EXEC_e, 5);
mpModel->calc();
Vec temp = {0.0f, 0.0f, 0.0f};
src/d/actor/d_a_obj_hole.cpp
+3 -3
View File
@@ -162,18 +162,18 @@ void daObj_Hole_c::modeProc(daObj_Hole_c::Proc_e proc, int newMode) {
}
};
if (proc == PROC_INIT) {
if (proc == PROC_INIT_e) {
mMode = newMode;
(this->*mode_tbl[mMode].init)();
}
else if (proc == PROC_EXEC) {
else if (proc == PROC_EXEC_e) {
(this->*mode_tbl[mMode].exec)();
}
}
/* 000006C0-00000700 .text _execute__12daObj_Hole_cFv */
bool daObj_Hole_c::_execute() {
modeProc(PROC_EXEC, MODE_NULL);
modeProc(PROC_EXEC_e, MODE_NULL);
setMtx();
return false;
}
src/d/actor/d_a_obj_ikada.cpp
+7 -7
View File
@@ -173,7 +173,7 @@ BOOL daObj_Ikada_c::_pathMove(cXyz* arg1, cXyz* arg2, cXyz* arg3) {
if ((*arg1 - mCurPathP1).absXZ() < speed * (REG12_F(2) + 1.0f) || (*arg1 - mCurPathP1).absXZ() == 0.0f) {
if (mbCraneMode != 0) {
modeProc(PROC_00_e, 5);
modeProc(PROC_INIT_e, 5);
}
return TRUE;
}
@@ -216,7 +216,7 @@ void daObj_Ikada_c::_ride(fopAc_ac_c* actor) {
}
mLinkRideRockAmpl = 300;
modeProc(PROC_00_e, 12);
modeProc(PROC_INIT_e, 12);
}
}
}
@@ -249,7 +249,7 @@ bool daObj_Ikada_c::checkTgHit() {
f32 abs = (sp58 - current.pos).absXZ();
if (abs < 1000.0f && mbIsLinkRiding) {
mLinkRideRockAmpl = 200;
modeProc(PROC_00_e, 11);
modeProc(PROC_INIT_e, 11);
return true;
}
}
@@ -287,7 +287,7 @@ bool daObj_Ikada_c::checkTgHit() {
m04A8 = 230;
}
mLinkRideRockAmpl = 300;
modeProc(PROC_00_e, 0xc);
modeProc(PROC_INIT_e, 0xc);
return true;
}
}
@@ -708,10 +708,10 @@ void daObj_Ikada_c::modeProc(daObj_Ikada_c::Proc_e proc, int mode) {
{&daObj_Ikada_c::modeStopBombTerryInit, &daObj_Ikada_c::modeStopBombTerry, "STOP_BOMB"},
};
if (proc == PROC_00_e) {
if (proc == PROC_INIT_e) {
mCurMode = mode;
(this->*mode_tbl[mCurMode].init)();
} else if (proc == PROC_01_e) {
} else if (proc == PROC_EXEC_e) {
(this->*mode_tbl[mCurMode].exec)();
}
}
@@ -1146,7 +1146,7 @@ bool daObj_Ikada_c::_execute() {
}
}
modeProc(PROC_01_e, 13);
modeProc(PROC_EXEC_e, 13);
current.pos.y = fVar8 + dLib_getWaterY(current.pos, mObjAcch);
setMtx();
src/d/actor/d_a_obj_stair.cpp
-1
View File
@@ -55,7 +55,6 @@ public:
/* 0x10 */ f32 m10;
/* 0x14 */ f32 m14;
/* 0x18 */ s16 m18;
/* Place member variables here */
};
static daobj_stairHIO_c l_HIO;
src/d/actor/d_a_obj_toripost.cpp
+3 -3
View File
@@ -851,11 +851,11 @@ void daObjTpost_c::modeProc(daObjTpost_c::Proc_e proc, int newMode) {
}
};
if(proc == PROC_INIT) {
if(proc == PROC_INIT_e) {
mCurMode = newMode;
(this->*mode_tbl[mCurMode].init)();
}
else if(proc == PROC_EXEC) {
else if(proc == PROC_EXEC_e) {
(this->*mode_tbl[mCurMode].run)();
}
}
@@ -872,7 +872,7 @@ bool daObjTpost_c::_execute() {
checkOrder();
setAttention();
setCollision(40.0f, 140.0f);
modeProc(PROC_EXEC, MODE_NULL);
modeProc(PROC_EXEC_e, MODE_NULL);
if(dComIfGp_event_runCheck() && !mEventCut.cutProc()) {
cutProc();
src/d/actor/d_a_obj_warpt.cpp
+2 -2
View File
@@ -635,7 +635,7 @@ void daObj_Warpt_c::modeProc(daObj_Warpt_c::Proc_e proc, int index) {
if (proc == PROC_INIT_e) {
m290 = index;
(this->*mode_tbl[m290].init)();
} else if (proc == PROC_RUN_e) {
} else if (proc == PROC_EXEC_e) {
(this->*mode_tbl[m290].run)();
}
}
@@ -667,7 +667,7 @@ bool daObj_Warpt_c::_execute() {
breakHuta(0);
modeProc(PROC_INIT_e, 2);
}
modeProc(PROC_RUN_e, 5);
modeProc(PROC_EXEC_e, 5);
fopAcM_posMoveF(this, mStts.GetCCMoveP());
mAcch.CrrPos(*dComIfG_Bgsp());
setMtx();
src/d/actor/d_a_oship.cpp
+3 -3
View File
@@ -777,12 +777,12 @@ void daOship_c::modeProc(daOship_c::Proc_e i_procType, int i_procNo) {
{ &daOship_c::modeRangeDInit, &daOship_c::modeRangeD, "RANGE_D" }
};
if (i_procType == PROC_INIT) {
if (i_procType == PROC_INIT_e) {
fopAcM_OnStatus(this, fopAcStts_SHOWMAP_e);
cLib_onBit<u32>(attention_info.flags, fopAc_Attn_LOCKON_BATTLE_e);
mCurrentProc = i_procNo;
(this->*mode_tbl[mCurrentProc].mInitFunc)();
} else if (i_procType == PROC_EXEC) {
} else if (i_procType == PROC_EXEC_e) {
(this->*mode_tbl[mCurrentProc].mUpdFunc)();
}
}
@@ -838,7 +838,7 @@ bool daOship_c::_execute() {
cLib_addCalcAngleS2(&mAimRotX, mAimRotXTarget, 6, 0x300);
cLib_addCalcAngleS2(&mAimRotY, mAimRotYTarget, 6, 0x300);
modeProc(PROC_EXEC, MODE_NULL);
modeProc(PROC_EXEC_e, MODE_NULL);
mpModel->calc();
src/d/actor/d_a_rd.cpp
+4 -4
View File
@@ -1350,7 +1350,7 @@ void daRd_c::modeProc(daRd_c::Proc_e proc, int newMode) {
},
};
if (proc == PROC_INIT) {
if (proc == PROC_INIT_e) {
if (newMode == MODE_CRY || newMode == MODE_ATTACK) {
onIkari();
setBtkAnm(3);
@@ -1369,7 +1369,7 @@ void daRd_c::modeProc(daRd_c::Proc_e proc, int newMode) {
mMode = newMode;
(this->*mode_tbl[mMode].init)();
} else if (proc == PROC_EXEC) {
} else if (proc == PROC_EXEC_e) {
(this->*mode_tbl[mMode].run)();
}
}
@@ -1624,7 +1624,7 @@ bool daRd_c::_execute() {
setMtx();
mpMorf->play(NULL, 0, 0);
mpMorf->calc();
modeProc(PROC_EXEC, MODE_NULL);
modeProc(PROC_EXEC_e, MODE_NULL);
return true;
}
@@ -1712,7 +1712,7 @@ bool daRd_c::_execute() {
mpMorf->play(&current.pos, 0, 0);
mpMorf->calc();
enemy_fire(&mEnemyFire);
modeProc(PROC_EXEC, MODE_NULL);
modeProc(PROC_EXEC_e, MODE_NULL);
setAnm(AnmPrm_NULL, false);
setBtkAnm(0x5);
g_env_light.settingTevStruct(TEV_TYPE_ACTOR, &current.pos, &tevStr);
src/d/actor/d_a_tag_ghostship.cpp
+4 -4
View File
@@ -25,7 +25,7 @@ void daTag_Gship_c::modeClearWaitInit() {
/* 00000110-000001C0 .text modeClearWait__13daTag_Gship_cFv */
void daTag_Gship_c::modeClearWait() {
if(dComIfGp_evmng_endCheck("DEFAULT_TREASURE") || dComIfGp_evmng_endCheck("DEFAULT_TREASURE2") || dComIfGp_evmng_endCheck("DEFAULT_TREASURE_A") || l_HIO.field_0x05) {
modeProc(CLEAR_WAIT, 1);
modeProc(PROC_INIT_e, 1);
}
}
@@ -84,18 +84,18 @@ void daTag_Gship_c::modeProc(daTag_Gship_c::Proc_e proc, int param_2) {
}
};
if(proc == CLEAR_WAIT) {
if(proc == PROC_INIT_e) {
mMode = param_2;
(this->*mode_proc[mMode].init)();
}
else if(proc == CLEAR_EVENT) {
else if(proc == PROC_EXEC_e) {
(this->*mode_proc[mMode].run)();
}
}
/* 00000508-00000534 .text _execute__13daTag_Gship_cFv */
bool daTag_Gship_c::_execute() {
modeProc(CLEAR_EVENT, 2);
modeProc(PROC_EXEC_e, 2);
return true;
}
src/d/actor/d_a_tsubo.cpp
+16 -16
View File
@@ -102,7 +102,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -167,7 +167,7 @@ const Act_c::Data_c Act_c::M_data[] = {
43.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0x3E8,
@@ -234,7 +234,7 @@ const Act_c::Data_c Act_c::M_data[] = {
43.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0x3E8,
@@ -301,7 +301,7 @@ const Act_c::Data_c Act_c::M_data[] = {
43.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0x3E8,
@@ -368,7 +368,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -433,7 +433,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -498,7 +498,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -563,7 +563,7 @@ const Act_c::Data_c Act_c::M_data[] = {
50.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0x3E8,
@@ -636,7 +636,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -705,7 +705,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -770,7 +770,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -835,7 +835,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -900,7 +900,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,
@@ -965,7 +965,7 @@ const Act_c::Data_c Act_c::M_data[] = {
45.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0x3E8,
@@ -1034,7 +1034,7 @@ const Act_c::Data_c Act_c::M_data[] = {
43.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0x3E8,
@@ -1105,7 +1105,7 @@ const Act_c::Data_c Act_c::M_data[] = {
36.0f,
0.0f,
0.002f,
0.00019999999f,
0.0002f,
0x7D0,
0x7D0,
0xF63C,