falso
/
tp
mirror of https://github.com/zeldaret/tp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolve all gameInfo fakematches (#2995) 

* Clean up various inlines/fakematches/comments

* Copy OptRuby inline name from TWW debug

* Resolve all dEvt_control_c related fakematches, return pointer instead of reference

* Fix some more missing inline usages
This commit is contained in:
LagoLunatic 2025-12-24 19:57:36 -05:00 committed by GitHub
parent cefe919b8d
commit 229527daf7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
194 changed files with 767 additions and 1029 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/d/actor/d_a_alink.h
View File

@ -8271,7 +8271,7 @@ static void* daAlink_searchBoar(fopAc_ac_c* param_0, void* param_1);
static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1);
inline daAlink_c* daAlink_getAlinkActorClass() {
return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR);
return (daAlink_c*)dComIfGp_getLinkPlayer();
}
#endif /* D_A_D_A_ALINK_H */

12
include/d/actor/d_a_obj_table.h
View File

@ -15,17 +15,17 @@
*/
class daObjTable_c : public dBgS_MoveBgActor {
public:
int CreateHeap();
int Create();
int Execute(Mtx**);
int Draw();
int Delete();
inline int CreateHeap();
inline int Create();
inline int Execute(Mtx**);
inline int Draw();
inline int Delete();
inline void initBaseMtx();
inline void setBaseMtx();
inline int create();
s16 getMessageNo() { return (s16)fopAcM_GetParamBit(this, 0, 16); }
s16 getMessageNo() { return fopAcM_GetParam(this) & 0xFFFF; }
private:
/* 0x5A0 */ J3DModel* mpModel;

140
include/d/d_com_inf_game.h
View File

@ -285,7 +285,7 @@ public:
dMsgObject_c* getMsgObjectClass() { return mItemInfo.mMsgObjectClass; }
dStage_roomControl_c* getRoomControl() { return &mRoomControl; }
dStage_dt_c& getStage() { return mStageData; }
dEvt_control_c& getEvent() { return mEvent; }
dEvt_control_c* getEvent() { return &mEvent; }
daHorse_c* getHorseActor() { return (daHorse_c*)mPlayerPtr[1]; }
J2DGrafContext* getCurrentGrafPort() { return (J2DGrafContext*)mCurrentGrafPort; }
dVibration_c& getVibration() { return mVibration; }
@ -566,7 +566,7 @@ public:
void setStartStageLayer(s8 layer) { mStartStage.setLayer(layer); }
const char* getNextStageName() { return mNextStage.getName(); }
dStage_startStage_c* getNextStartStage() { return &mNextStage; }
dStage_startStage_c* getNextStartStage() { return mNextStage.getStartStage(); }
s8 getNextStageRoomNo() { return mNextStage.getRoomNo(); }
s8 getNextStageLayer() { return mNextStage.getLayer(); }
s16 getNextStagePoint() { return mNextStage.getPoint(); }
@ -840,7 +840,6 @@ public:
~dComIfG_inf_c() {}
void ct();
void createBaseCsr();
dComIfG_play_c& getPlay() { return play; } // fake inline
#if PLATFORM_WII || VERSION == VERSION_SHIELD_DEBUG
class baseCsr_c : public mDoGph_gInf_c::csr_c {
@ -1462,27 +1461,63 @@ inline u8 dComIfGs_getSelectItemIndex(int i_no) {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getSelectItemIndex(i_no);
}
//TODO: actual name is unknown
inline u8 dComIfGs_getOptUnk0() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getUnk0();
// Ruby inline names are from TWW debug.
inline u8 dComIfGs_getOptRuby() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getRuby();
}
inline void dComIfGs_setOptRuby(u8 i_ruby) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setRuby(i_ruby);
}
inline u8 dComIfGs_getOptVibration() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getVibration();
}
inline void dComIfGs_setOptVibration(u8 i_status) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setVibration(i_status);
}
inline u8 dComIfGs_getOptAttentionType() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getAttentionType();
}
inline void dComIfGs_setOptAttentionType(u8 i_attentionType) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setAttentionType(i_attentionType);
}
inline u8 dComIfGs_getOptCameraControl() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getCameraControl();
}
inline void dComIfGs_setOptCameraControl(u8 i_cameraControl) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCameraControl(i_cameraControl);
}
inline u8 dComIfGs_getOptSound() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getSound();
}
inline void dComIfGs_setOptSound(u8 i_mode) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(i_mode);
}
inline void dComIfGs_setOptCalValue(s8 i_calValue) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalValue(i_calValue);
}
inline void dComIfGs_setOptCalibrateDist(u16 i_calibrateDist) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalibrateDist(i_calibrateDist);
}
inline u8 dComIfGs_getOptPointer() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getPointer();
}
inline void dComIfGs_setOptPointer(u8 i_pointer) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setPointer(i_pointer);
}
inline BOOL dComIfGs_isTbox(int i_no) {
return g_dComIfG_gameInfo.info.getMemory().getBit().isTbox(i_no);
}
@ -2034,35 +2069,6 @@ inline void dComIfGs_setLastWarpAcceptStage(s8 param_0) {
g_dComIfG_gameInfo.info.getPlayer().getPlayerLastMarkInfo().setWarpAcceptStage(param_0);
}
//TODO: actual name is unknown
inline void dComIfGs_setOptUnk0(u8 i_unk0) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setUnk0(i_unk0);
}
inline void dComIfGs_setOptSound(u8 i_mode) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setSound(i_mode);
}
inline void dComIfGs_setOptVibration(u8 i_status) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setVibration(i_status);
}
inline void dComIfGs_setOptAttentionType(u8 i_attentionType) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setAttentionType(i_attentionType);
}
inline void dComIfGs_setOptCameraControl(u8 i_cameraControl) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCameraControl(i_cameraControl);
}
inline void dComIfGs_setOptPointer(u8 i_pointer) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setPointer(i_pointer);
}
inline u8 dComIfGs_getOptPointer() {
return g_dComIfG_gameInfo.info.getPlayer().getConfig().getPointer();
}
inline u8 dComIfGs_getNewFile() {
return g_dComIfG_gameInfo.info.getNewFile();
}
@ -2091,14 +2097,6 @@ inline u8 dComIfGs_getWalletSize() {
return g_dComIfG_gameInfo.info.getPlayer().getPlayerStatusA().getWalletSize();
}
inline void dComIfGs_setOptCalValue(s8 i_calValue) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalValue(i_calValue);
}
inline void dComIfGs_setOptCalibrateDist(u16 i_calibrateDist) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalibrateDist(i_calibrateDist);
}
inline u16 dComIfGs_getFishNum(u8 param_0) {
return g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().getFishCount(param_0);
}
@ -2572,7 +2570,7 @@ inline s8 dComIfGp_getNextStageLayer() {
return g_dComIfG_gameInfo.play.getNextStageLayer();
}
inline s32 dComIfGp_getNextStageWipe() {
inline s8 dComIfGp_getNextStageWipe() {
return g_dComIfG_gameInfo.play.getNextStageWipe();
}
@ -3582,7 +3580,7 @@ inline u8 dComIfGp_getAdvanceDirection() {
return g_dComIfG_gameInfo.play.getDirection();
}
inline dEvt_control_c& dComIfGp_getEvent() {
inline dEvt_control_c* dComIfGp_getEvent() {
return g_dComIfG_gameInfo.play.getEvent();
}
@ -3611,41 +3609,41 @@ inline s16 dComIfGp_getItemMaxBombNumCount() {
}
inline BOOL dComIfGp_event_compulsory(void* i_actor, const char* i_eventname, u16 i_hindFlag) {
return g_dComIfG_gameInfo.play.getEvent().compulsory(i_actor, i_eventname, i_hindFlag);
return g_dComIfG_gameInfo.play.getEvent()->compulsory(i_actor, i_eventname, i_hindFlag);
}
inline int dComIfGp_event_moveApproval(void* i_actor) {
return g_dComIfG_gameInfo.play.getEvent().moveApproval(i_actor);
return g_dComIfG_gameInfo.play.getEvent()->moveApproval(i_actor);
}
inline int dComIfGp_event_order(u16 i_type, u16 i_prio, u16 i_flags, u16 i_hindFlags, void* i_requestActor,
void* i_targetActor, s16 i_eventID, u8 i_mapToolId) {
return g_dComIfG_gameInfo.play.getEvent().order(i_type, i_prio, i_flags, i_hindFlags, i_requestActor,
return g_dComIfG_gameInfo.play.getEvent()->order(i_type, i_prio, i_flags, i_hindFlags, i_requestActor,
i_targetActor, i_eventID, i_mapToolId);
}
inline void dComIfGp_event_setGtItm(int i_itemNo) {
g_dComIfG_gameInfo.play.getEvent().setGtItm(i_itemNo);
g_dComIfG_gameInfo.play.getEvent()->setGtItm(i_itemNo);
}
inline void dComIfGp_event_reset() {
g_dComIfG_gameInfo.play.getEvent().reset();
g_dComIfG_gameInfo.play.getEvent()->reset();
}
inline void dComIfGp_event_remove() {
g_dComIfG_gameInfo.play.getEvent().remove();
g_dComIfG_gameInfo.play.getEvent()->remove();
}
inline void dComIfGp_event_onEventFlag(u16 i_flag) {
g_dComIfG_gameInfo.play.getEvent().onEventFlag(i_flag);
g_dComIfG_gameInfo.play.getEvent()->onEventFlag(i_flag);
}
inline void dComIfGp_event_onHindFlag(u16 i_flag) {
g_dComIfG_gameInfo.play.getEvent().onHindFlag(i_flag);
g_dComIfG_gameInfo.play.getEvent()->onHindFlag(i_flag);
}
inline void dComIfGp_event_offHindFlag(u16 i_flag) {
g_dComIfG_gameInfo.play.getEvent().offHindFlag(i_flag);
g_dComIfG_gameInfo.play.getEvent()->offHindFlag(i_flag);
}
inline void dComIfGp_evmng_cutEnd(int i_staffId) {
@ -3677,19 +3675,19 @@ inline int dComIfGp_evmng_cameraPlay() {
}
inline u8 dComIfGp_event_getPreItemNo() {
return g_dComIfG_gameInfo.play.getEvent().getPreItemNo();
return g_dComIfG_gameInfo.play.getEvent()->getPreItemNo();
}
inline void dComIfGp_event_setItemPartner(void* i_actor) {
g_dComIfG_gameInfo.play.getEvent().setPtI(i_actor);
g_dComIfG_gameInfo.play.getEvent()->setPtI(i_actor);
}
inline void dComIfGp_event_setItemPartnerId(fpc_ProcID i_id) {
g_dComIfG_gameInfo.play.getEvent().setPtI_Id(i_id);
g_dComIfG_gameInfo.play.getEvent()->setPtI_Id(i_id);
}
inline u8 dComIfGp_event_getGtItm() {
return g_dComIfG_gameInfo.play.getEvent().getGtItm();
return g_dComIfG_gameInfo.play.getEvent()->getGtItm();
}
inline int dComIfGp_evmng_startDemo(int i_mapToolId) {
@ -3697,58 +3695,58 @@ inline int dComIfGp_evmng_startDemo(int i_mapToolId) {
}
inline void dComIfGp_event_setTalkPartner(void* i_actor) {
g_dComIfG_gameInfo.play.getEvent().setPtT(i_actor);
g_dComIfG_gameInfo.play.getEvent()->setPtT(i_actor);
}
inline fopAc_ac_c* dComIfGp_event_getTalkPartner() {
return g_dComIfG_gameInfo.play.getEvent().getPtT();
return g_dComIfG_gameInfo.play.getEvent()->getPtT();
}
inline fopAc_ac_c* dComIfGp_event_getItemPartner() {
return g_dComIfG_gameInfo.play.getEvent().getPtI();
return g_dComIfG_gameInfo.play.getEvent()->getPtI();
}
inline fopAc_ac_c* dComIfGp_event_getPt1() {
return g_dComIfG_gameInfo.play.getEvent().getPt1();
return g_dComIfG_gameInfo.play.getEvent()->getPt1();
}
inline fopAc_ac_c* dComIfGp_event_getPt2() {
return g_dComIfG_gameInfo.play.getEvent().getPt2();
return g_dComIfG_gameInfo.play.getEvent()->getPt2();
}
inline BOOL dComIfGp_event_runCheck() {
return g_dComIfG_gameInfo.play.getEvent().runCheck();
return g_dComIfG_gameInfo.play.getEvent()->runCheck();
}
inline f32 dComIfGp_event_getCullRate() {
return g_dComIfG_gameInfo.play.getEvent().getCullRate();
return g_dComIfG_gameInfo.play.getEvent()->getCullRate();
}
inline u16 dComIfGp_event_checkHind(u16 i_hindFlag) {
if (!dComIfGp_event_runCheck()) {
return false;
}
return g_dComIfG_gameInfo.play.getEvent().checkHind(i_hindFlag);
return g_dComIfG_gameInfo.play.getEvent()->checkHind(i_hindFlag);
}
inline u16 dComIfGp_event_chkEventFlag(u16 i_flag) {
return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(i_flag);
return g_dComIfG_gameInfo.play.getEvent()->chkEventFlag(i_flag);
}
inline BOOL dComIfGp_event_chkTalkXY() {
return g_dComIfG_gameInfo.play.getEvent().chkTalkXY();
return g_dComIfG_gameInfo.play.getEvent()->chkTalkXY();
}
inline void dComIfGp_event_setCullRate(f32 i_rate) {
g_dComIfG_gameInfo.play.getEvent().setCullRate(i_rate);
g_dComIfG_gameInfo.play.getEvent()->setCullRate(i_rate);
}
inline u8 dComIfGp_event_getMode() {
return g_dComIfG_gameInfo.play.getEvent().getMode();
return g_dComIfG_gameInfo.play.getEvent()->getMode();
}
inline fopAc_ac_c* dComIfGp_event_getDoorPartner() {
return g_dComIfG_gameInfo.play.getEvent().getPtD();
return g_dComIfG_gameInfo.play.getEvent()->getPtD();
}
inline int dComIfGp_evmng_getMyStaffId(const char* i_staffname, fopAc_ac_c* i_actor, int i_tagId) {

9
include/d/d_save.h
View File

@ -506,10 +506,9 @@ public:
void setVibration(u8 i_status);
u8 getPalLanguage() const;
//TODO: placeholder name, actual name is not known
u8 getUnk0() { return unk0; }
void setUnk0(u8 i_unk0) { unk0 = i_unk0; }
// Ruby inline names are from TWW debug.
u8 getRuby() { return mRuby; }
void setRuby(u8 i_ruby) { mRuby = i_ruby; }
u8 getAttentionType() { return mAttentionType; }
void setAttentionType(u8 i_mAttentionType) { mAttentionType = i_mAttentionType; }
u16 getCalibrateDist() { return mCalibrateDist; }
@ -532,7 +531,7 @@ public:
};
private:
/* 0x0 */ u8 unk0;
/* 0x0 */ u8 mRuby;
/* 0x1 */ u8 mSoundMode;
/* 0x2 */ u8 mAttentionType; // Lock-On Type; 0 : hold, 1 : switch
/* 0x3 */ u8 mVibration; // Rumble status

3
include/d/d_stage.h
View File

@ -1100,7 +1100,7 @@ public:
static void setZoneNo(int, int);
static dBgp_c* getBgp(int i_roomNo) {
#if DEBUG
// NONMATCHING
// DEBUG NONMATCHING
#else
return NULL;
#endif
@ -1230,6 +1230,7 @@ public:
BOOL isEnable() const { return enabled; }
s8 getWipe() const { return wipe; }
u8 getWipeSpeed() const { return wipe_speed; }
dStage_startStage_c* getStartStage() { return this; }
private:
s8 enabled;

6
src/d/actor/d_a_alink.cpp
View File

@ -4608,7 +4608,7 @@ int daAlink_c::create() {
}
if (var_r24 != NULL) {
dComIfGp_getEvent().setPtD(var_r24);
dComIfGp_getEvent()->setPtD(var_r24);
}
bgWaitFlg = 0;
@ -16597,7 +16597,7 @@ int daAlink_c::procCrouch() {
int daAlink_c::procCoMetamorphoseInit() {
int var_r29 = 0;
if (dComIfGp_getEvent().isOrderOK()) {
if (dComIfGp_getEvent()->isOrderOK()) {
if (!dComIfGp_event_compulsory(this, NULL, 0xFFFF)) {
return 0;
}
@ -17275,7 +17275,7 @@ int daAlink_c::execute() {
mWolfEyeUp = mpHIO->mWolf.m.mSensesLingerTime;
} else if (mTargetedActor != NULL || dComIfGp_checkPlayerStatus0(0, 0x2000)) {
mWolfEyeUp = mpHIO->mWolf.m.mSensesLingerTime - 1;
} else if (!dComIfGp_getEvent().isOrderOK() && mProcID != PROC_GET_ITEM &&
} else if (!dComIfGp_getEvent()->isOrderOK() && mProcID != PROC_GET_ITEM &&
mWolfEyeUp <= mpHIO->mWolf.m.mSensesLingerTime)
{
offWolfEyeUp();

5
src/d/actor/d_a_alink_HIO.inc
View File

@ -77,7 +77,7 @@ static void daAlinkHIO_setReverseAnmGenMessage(daAlinkHIO_anm_c* i_anmP, JORMCon
0x18);
}
// NONMATCHING - regalloc + extra mr instruction
// DEBUG NONMATCHING - regalloc + extra mr instruction
void daAlinkHIO_data_c::setStructData(char* param_1) {
u8* pfVar2;
u8* pfVar4;
@ -146,7 +146,7 @@ void daAlinkHIO_data_c::baseCopy() {
cLib_memCpy(mp_data, mp_src_data, m_len);
}
// NONMATCHING
// DEBUG NONMATCHING
void daAlinkHIO_data_c::update() {
baseCopy();
JORMContext* ctx = attachJORMContext(8);
@ -5764,7 +5764,6 @@ void daAlinkHIO_wolf_c::genMessage(JORMContext* ctx) {
ctx->genSlider("光雫Ｂ", &m.mLightDropB, -0x40, 0x40, 0, NULL, 0xffff, 0xffff, 0x200, 0x18);
}
// NONMATCHING
daAlinkHIO_wolf_c::daAlinkHIO_wolf_c()
: mWlMove(), mWlMoveNoP(), mWlAtnMove(), mWlSideStep(), mWlBackJump(), mWlHowl(), mWlAutoJump(),
mWlPush(), mWlLie(), mLight(1), mWlWallHang(), mWlDamage(), mWlSlide(), mWlRope(),

4
src/d/actor/d_a_alink_demo.inc
View File

@ -70,7 +70,7 @@ bool daAlink_c::checkSetNpcTks(cXyz* i_basePos, int i_roomNo, int param_2) {
}
int daAlink_c::checkDemoAction() {
if (dComIfGp_getEvent().isOrderOK()) {
if (dComIfGp_getEvent()->isOrderOK()) {
if (!dComIfGp_event_runCheck()) {
offNoResetFlg0(FLG0_UNK_200000);
}
@ -566,7 +566,7 @@ void daAlink_c::setNoDrawSwordShield(int param_0, u16 param_1) {
}
void daAlink_c::setDemoData() {
if (dComIfGp_getEvent().isOrderOK()) {
if (dComIfGp_getEvent()->isOrderOK()) {
if (checkPlayerDemoMode() && mClothesChangeWaitTimer == 0) {
endDemoMode();
}

10
src/d/actor/d_a_alink_wolf.inc
View File

@ -3967,7 +3967,7 @@ int daAlink_c::procWolfHowlDemo() {
daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
daNpc_GWolf_c* gwolf_p = (daNpc_GWolf_c*)field_0x280c.getActor();
BOOL skip_edge = dComIfGp_getEvent().checkSkipEdge();
BOOL skip_edge = dComIfGp_getEvent()->checkSkipEdge();
if (skip_edge) {
mZ2WolfHowlMgr.skipCorrectDemo();
}
@ -4012,11 +4012,11 @@ int daAlink_c::procWolfHowlDemo() {
if (checkUnderMove0BckNoArcWolf(WANM_HOWL_SUCCESS)) {
if (gwolf_p == NULL) {
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
}
} else if (checkUnderMove0BckNoArcWolf(WANM_HOWL_END)) {
if (gwolf_p == NULL) {
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
}
} else if ((var_r26 || mZ2WolfHowlMgr.getTimer() != 0) &&
mZ2WolfHowlMgr.getReleaseTimer() != 30)
@ -4143,7 +4143,7 @@ int daAlink_c::procWolfHowlDemo() {
dCam_getBody()->EndEventCamera(fopAcM_GetID(this));
} else {
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
}
}
@ -9281,7 +9281,7 @@ int daAlink_c::procWolfGetSmell() {
if (field_0x319c >= 0) {
if (checkSpecialDemoMode()) {
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
dComIfGp_clearPlayerStatus1(0, 0x4000000);
if (mProcVar5.field_0x3012 == fpcNm_ITEM_SMELL_YELIA_POUCH) {

2
src/d/actor/d_a_alldie.cpp
View File

@ -62,7 +62,7 @@ int daAlldie_c::actionOrder() {
int daAlldie_c::actionEvent() {
if (dComIfGp_evmng_endCheck(mEventIdx)) {
dComIfGp_getEvent().reset();
dComIfGp_getEvent()->reset();
if (mNextEventIdx != -1) {
mAction = ACT_NEXT;

4
src/d/actor/d_a_b_bq.cpp
View File

@ -1423,7 +1423,7 @@ static void demo_camera(b_bq_class* i_this) {
i_this->mDemoCamEye = camera0->lookat.eye;
i_this->mDemoCamCenter = camera0->lookat.center;
dComIfGp_getEvent().startCheckSkipEdge(a_this);
dComIfGp_getEvent()->startCheckSkipEdge(a_this);
// fallthrough
case 11:
if (i_this->mDemoModeTimer == (s16)(VREG_S(0) + 8)) {
@ -2136,7 +2136,7 @@ static void demo_camera(b_bq_class* i_this) {
}
if (i_this->mDemoMode >= 11 && i_this->mDemoMode < 20) {
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
cDmr_SkipInfo = 20;
Z2GetAudioMgr()->subBgmStop();
OS_REPORT("//////////////B_BQ SKIP 11\n");

2
src/d/actor/d_a_b_dr.cpp
View File

@ -3859,7 +3859,7 @@ int daB_DR_c::execute() {
fopAc_ac_c* parent;
if (fopAcM_SearchByID(parentActorID, &parent) != 0 && parent != NULL && parent->argument != 1) {
if (dComIfGs_isZoneSwitch(20, fopAcM_GetRoomNo(this))) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
}
} else if (!dComIfGs_isZoneSwitch(0, fopAcM_GetRoomNo(this)) && cLib_calcTimer<int>(&mTimer[0]) == 0) {
dComIfGs_onZoneSwitch(0, fopAcM_GetRoomNo(this));

4
src/d/actor/d_a_b_ds.cpp
View File

@ -1234,7 +1234,7 @@ void daB_DS_c::executeOpeningDemo() {
Z2GetAudioMgr()->setDemoName("force_start");
if (mMode == 10) {
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
sp298.set(mOpPlayerDt[1]);
daPy_getPlayerActorClass()->changeDemoMode(4, 2, 0, 0);
@ -1713,7 +1713,7 @@ void daB_DS_c::executeOpeningDemo() {
}
}
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
cDmr_SkipInfo = 1;
dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
dComIfGs_onZoneSwitch(5, fopAcM_GetRoomNo(this));

8
src/d/actor/d_a_b_gg.cpp
View File

@ -935,8 +935,8 @@ void daB_GG_c::St_CamAction() {
}
if (mCamMode != 0) {
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
}
}
@ -1373,8 +1373,8 @@ void daB_GG_c::Gn_CamAction() {
}
if (mCamMode > 1) {
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
}
}

4
src/d/actor/d_a_b_gm.cpp
View File

@ -1038,7 +1038,7 @@ static void demo_camera(b_gm_class* i_this) {
spBC.set(0.0f, 0.0f, 2418.0f);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&spBC, 0x8000, 0);
dComIfGp_getEvent().startCheckSkipEdge(i_this);
dComIfGp_getEvent()->startCheckSkipEdge(i_this);
camera->mCamera.SetTrimSize(3);
mDoAud_seStart(Z2SE_EN_GO_DEMO_OP, NULL, 0, 0);
@ -1563,7 +1563,7 @@ static void demo_camera(b_gm_class* i_this) {
}
if (i_this->mDemoMode != 0 && i_this->mDemoMode < 10) {
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
i_this->mMode = 4;
i_this->mTimers[2] = cM_rndF(100.0f) + 200.0f;
sp10 = 1;

10
src/d/actor/d_a_b_gnd.cpp
View File

@ -2878,6 +2878,7 @@ static void demo_camera(b_gnd_class* i_this) {
if (i_this->mDemoCamMode != 0) {
// fakematch - dComIfGp_getHorseActor() isn't getting inlined for some reason
horse = (daHorse_c*)g_dComIfG_gameInfo.play.getPlayerPtr(1);
// horse = (daHorse_c*)dComIfGp_getHorseActor();
}
cXyz sp114;
@ -3483,8 +3484,7 @@ static void demo_camera(b_gnd_class* i_this) {
a_this->current.pos.set(0.0f, 1100.0f, 0.0f);
a_this->old.pos = a_this->current.pos;
a_this->shape_angle.y = -0x2000;
a_this->current.angle.y = -0x2000;
a_this->current.angle.y = a_this->shape_angle.y = -0x2000;
cMtx_YrotS(*calc_mtx, a_this->shape_angle.y);
sp114.x = -300.0f;
@ -3653,8 +3653,7 @@ static void demo_camera(b_gnd_class* i_this) {
player->setPlayerPosAndAngle(&sp108, -0x4802, 0);
a_this->current.pos.set(-600.0f, 1100.0f, 0.0f);
a_this->old.pos = a_this->current.pos;
a_this->current.angle.y = 0x37FE;
a_this->shape_angle.y = 0x37FE;
a_this->shape_angle.y = a_this->current.angle.y = 0x37FE;
sp8 = TRUE;
}
break;
@ -3679,8 +3678,7 @@ static void demo_camera(b_gnd_class* i_this) {
a_this->current.pos.set(-600.0f, 1100.0f, 0.0f);
a_this->old.pos = a_this->current.pos;
a_this->current.angle.y = 0x37FE;
a_this->shape_angle.y = 0x37FE;
a_this->shape_angle.y = a_this->current.angle.y = 0x37FE;
sp108.set(0.0f, 1100.0f, 0.0f);
fopAcM_create(PROC_OBJ_GB, 0xF0069600, &sp108, fopAcM_GetRoomNo(a_this), NULL, NULL, -1);

4
src/d/actor/d_a_b_mgn.cpp
View File

@ -2814,8 +2814,8 @@ void daB_MGN_c::executeOpening() {
}
camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamFovy, 0);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
mSound.startCreatureVoiceLevel(Z2SE_EN_MGN_DEMO_OP, -1);
}

4
src/d/actor/d_a_b_ob.cpp
View File

@ -2369,7 +2369,7 @@ static void demo_camera(b_ob_class* i_this) {
}
if (i_this->mDemoActionTimer == 30) {
dComIfGp_getEvent().startCheckSkipEdge(a_this);
dComIfGp_getEvent()->startCheckSkipEdge(a_this);
}
sp88 = a_this->current.pos;
@ -2975,7 +2975,7 @@ static void demo_camera(b_ob_class* i_this) {
cLib_addCalcAngleS2(&i_this->mBlureRate, i_this->mBlureRateTarget, 1, 8);
if (i_this->mDemoAction >= 31 && i_this->mDemoAction < 40) {
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
cDmr_SkipInfo = JREG_S(8) + 30;
dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(a_this), 0, -1);
}

8
src/d/actor/d_a_b_tn.cpp
View File

@ -1817,8 +1817,8 @@ void daB_TN_c::executeRoomDemo() {
}
camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
}
void daB_TN_c::executeOpening() {
@ -2014,8 +2014,8 @@ void daB_TN_c::executeOpening() {
}
camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
}
void daB_TN_c::executeWaitH() {

4
src/d/actor/d_a_b_yo.cpp
View File

@ -1241,8 +1241,8 @@ void daB_YO_c::executeOpening() {
}
camera->mCamera.Set(mCamCenter, mCamEye, mCamFovY, 0);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
}
static f32 yo_max_bound_speed[8] = {10.0f, 12.0f, 15.0f, 18.0f, 21.0f, 24.0f, 27.0f, 30.0f};

4
src/d/actor/d_a_door_shutter.cpp
View File

@ -2015,7 +2015,7 @@ int daDoor20_c::chkStopOpen() {
roomNo = door_param2_c::getBRoomNo(this);
}
if ((field_0x68c == 0 && frontOption == 3) || (field_0x68c == 1 && backOption == 3)) {
if (dComIfGp_event_runCheck() == 0 || (field_0x68d == 0)) {
if (dComIfGp_event_runCheck() == FALSE || (field_0x68d == 0)) {
if (dComIfGp_roomControl_checkRoomDisp(roomNo) &&
fopAcM_myRoomSearchEnemy(roomNo) == NULL)
{
@ -2024,7 +2024,7 @@ int daDoor20_c::chkStopOpen() {
return 0;
}
if (swBit != 0xff) {
g_dComIfG_gameInfo.info.onSwitch(swBit, roomNo);
dComIfGs_onSwitch(swBit, roomNo);
}
return 1;
}

4
src/d/actor/d_a_e_dt.cpp
View File

@ -1933,8 +1933,8 @@ void daE_DT_c::executeOpening() {
}
camera->Set(mCamCenter, mCamEye, mCamFovy, mCamBank);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
}
void daE_DT_c::calcCamera() {

2
src/d/actor/d_a_e_fb.cpp
View File

@ -461,7 +461,7 @@ void daE_FB_c::executeAttack() {
}
}
if (dComIfGp_event_runCheck() == FALSE) {
if (!dComIfGp_event_runCheck()) {
cMtx_YrotS(*calc_mtx, current.angle.y);
cMtx_XrotM(*calc_mtx, sp_0x28.x);
sp_0x48.x = 0.0f;

4
src/d/actor/d_a_e_fm.cpp
View File

@ -1284,7 +1284,7 @@ static void demo_camera(e_fm_class* i_this) {
i_this->mDemoCamCenter = camera0->lookat.center;
i_this->field_0x778 = 0.0f;
camera->mCamera.SetTrimSize(3);
dComIfGp_getEvent().startCheckSkipEdge(actor);
dComIfGp_getEvent()->startCheckSkipEdge(actor);
case 11:
if (i_this->mDemoCamTimer == (s16)(VREG_S(0) + 8)) {
daPy_getPlayerActorClass()->changeDemoMode(0x19, 0, 0, 0);
@ -1974,7 +1974,7 @@ static s8 e_fm_start(e_fm_class* i_this) {
i_this->mDamageInvulnerabilityTimer = 5;
int var_r26 = 0;
if (i_this->mDemoCamMode >= 11 && dComIfGp_getEvent().checkSkipEdge()) {
if (i_this->mDemoCamMode >= 11 && dComIfGp_getEvent()->checkSkipEdge()) {
cDmr_SkipInfo = 1;
i_this->mDemoCamMode = 1000;
dComIfGp_event_reset();

6
src/d/actor/d_a_e_gb.cpp
View File

@ -1137,7 +1137,7 @@ static void demo_camera(e_gb_class* i_this) {
i_this->demoCamStepScale = 0.0;
Z2GetAudioMgr()->setBattleBgmOff(true);
dComIfGp_getEvent().startCheckSkipEdge(actor);
dComIfGp_getEvent()->startCheckSkipEdge(actor);
swBit = (fopAcM_GetParam(actor) & 0xFF00) >> 8;
dComIfGs_onSwitch(swBit, fopAcM_GetRoomNo(actor));
// fallthrough
@ -1290,8 +1290,8 @@ static void demo_camera(e_gb_class* i_this) {
i_this->demoCounter++;
if (i_this->demoMode < 10) {
dComIfGp_getEvent().setSkipProc(i_this, dEv_defaultSkipProc, 0);
if (dComIfGp_getEvent().checkSkipEdge()) {
dComIfGp_getEvent()->setSkipProc(i_this, dEv_defaultSkipProc, 0);
if (dComIfGp_getEvent()->checkSkipEdge()) {
i_this->demoMode = 100;
cMtx_YrotS(*calc_mtx, player->shape_angle.y);
work.x = 0.0;

4
src/d/actor/d_a_e_gob.cpp
View File

@ -1670,7 +1670,7 @@ static void demo_camera(e_gob_class* i_this) {
player->changeOriginalDemo();
Z2GetAudioMgr()->subBgmStart(Z2BGM_MAGNE_GORON_D01);
dComIfGp_getEvent().startCheckSkipEdge(i_this);
dComIfGp_getEvent()->startCheckSkipEdge(i_this);
// fallthrough
case 2:
if (i_this->mDemoCamTimer < 20) {
@ -1993,7 +1993,7 @@ static void demo_camera(e_gob_class* i_this) {
i_this->mDemoCamTimer = 10000;
}
if (i_this->mDemoCamMode >= 2 && i_this->mDemoCamMode < 10 && dComIfGp_getEvent().checkSkipEdge()) {
if (i_this->mDemoCamMode >= 2 && i_this->mDemoCamMode < 10 && dComIfGp_getEvent()->checkSkipEdge()) {
cDmr_SkipInfo = 20;
i_this->mDemoCamMode = 1000;
dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(actor), 0, -1);

14
src/d/actor/d_a_e_hp.cpp
View File

@ -705,7 +705,6 @@ void daE_HP_c::executeDown() {
}
}
// NONMATCHING - g_dComIfG_gameInfo loading
void daE_HP_c::executeDead() {
if (field_0x78d == 0 && field_0x71c == 1) {
mSound1.startCreatureSound(Z2SE_EN_PO_SOUL_PULLOUT, 0, -1);
@ -735,21 +734,10 @@ void daE_HP_c::executeDead() {
movemode++;
}
case 1: {
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandDemoAccrpt()) {
if (dComIfGp_getEventManager().endCheck(field_0x778)) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
} else if (strcmp(dComIfGp_getEventManager().getRunEventName(),
"DEFAULT_GETITEM") == 0 &&
field_0x784 != -1)

10
src/d/actor/d_a_e_mk.cpp
View File

@ -1288,7 +1288,7 @@ static void demo_camera_start(e_mk_class* i_this) {
i_this->distToCamCenterTarget.y = fabsf(i_this->camCenterTarget.y - i_this->camCenter.y);
i_this->distToCamCenterTarget.z = fabsf(i_this->camCenterTarget.z - i_this->camCenter.z);
dComIfGp_getEvent().startCheckSkipEdge(actor);
dComIfGp_getEvent()->startCheckSkipEdge(actor);
// fallthrough
case 2:
if (i_this->demoCamCounter == (s16)(8 + VREG_S(0))) {
@ -1532,7 +1532,7 @@ static void demo_camera_start(e_mk_class* i_this) {
break;
}
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
u8 sw_bit = (fopAcM_GetParam(actor) & 0xff0000) >> 16;
if (sw_bit != 0xff) {
dComIfGs_onSwitch(sw_bit, fopAcM_GetRoomNo(actor));
@ -1850,7 +1850,7 @@ static void demo_camera_end(e_mk_class* i_this) {
if (i_this->demoCamCounter == 200) {
player->changeDemoMode(1, 3, 0, 0);
player->changeDemoParam0(3);
dComIfGp_getEvent().setPtT(boomerang_p);
dComIfGp_getEvent()->setPtT(boomerang_p);
}
if (i_this->demoCamCounter != (s16)(KREG_S(9) + 250)) {
@ -2011,7 +2011,7 @@ static void demo_camera_r04(e_mk_class* i_this) {
i_this->distToCamEyeTarget.y = fabsf(i_this->camEyeTarget.y - i_this->camEye.y) * 0.02f;
i_this->distToCamEyeTarget.z = fabsf(i_this->camEyeTarget.z - i_this->camEye.z) * 0.02f;
dComIfGp_getEvent().startCheckSkipEdge(i_this);
dComIfGp_getEvent()->startCheckSkipEdge(i_this);
// fallthrough
case 2:
if (i_this->demoCamCounter > 60) {
@ -2308,7 +2308,7 @@ static void demo_camera(e_mk_class* i_this) {
case e_mk_class::DEMO_MODE_R04:
demo_camera_r04(i_this);
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
npc_ks_class* monkey_p = (npc_ks_class*)fpcM_Search(s_ks_sub, i_this);
if (monkey_p != NULL) {
u8 sw_bit = (fopAcM_GetParam(actor) & 0xFF0000) >> 16;

6
src/d/actor/d_a_e_oc.cpp
View File

@ -1127,7 +1127,7 @@ void daE_OC_c::executeFind() {
s16 pl_ang = fopAcM_searchPlayerAngleY(this);
f32 pl_dist = fopAcM_searchPlayerDistance(this);
if (mOcState < 3 || !setWatchMode()) {
if (field_0x6b4 == 2 && dComIfGp_event_runCheck() == FALSE) {
if (field_0x6b4 == 2 && !dComIfGp_event_runCheck()) {
fopAcM_OffStatus(this, 0x4000);
field_0x6b4 = 0;
}
@ -2255,7 +2255,7 @@ void daE_OC_c::executeFindStay() {
current.angle.y = shape_angle.y;
if (target_dist < 400.0f && target_dist > 200.0f) {
if (abs(shape_angle.y - fopAcM_searchPlayerAngleY(this)) < 0x1000 && checkBeforeFloorBg(100.0f)
&& dComIfGp_event_runCheck() == FALSE) {
&& !dComIfGp_event_runCheck()) {
setActionMode(E_OC_ACTION_ATTACK, 0);
}
@ -2353,7 +2353,7 @@ void daE_OC_c::executeMoveOut() {
if (player_distance < 400.0f && player_distance > 200.0f) {
if (abs(shape_angle.y - fopAcM_searchPlayerAngleY(this)) < 0x1000
&& dComIfGp_event_runCheck() == FALSE) {
&& !dComIfGp_event_runCheck()) {
setActionMode(E_OC_ACTION_ATTACK, 0);
}

2
src/d/actor/d_a_e_oct_bg.cpp
View File

@ -220,7 +220,7 @@ void daE_OctBg_c::mtx_set() {
bool daE_OctBg_c::checkNormalAttack() {
daPy_py_c* player = daPy_getPlayerActorClass();
if (dComIfGp_event_runCheck() != 0) {
if (dComIfGp_event_runCheck()) {
return false;
}
if (unk_bss_7A < l_HIO.field_0x20 &&

8
src/d/actor/d_a_e_pm.cpp
View File

@ -788,8 +788,8 @@ void daE_PM_c::AppearAction() {
cLib_addCalcAngleS2(&current.angle.y, mTargetAngleY, 5, 0x1000);
cLib_addCalcAngleS2(&mHeadAngleX, mTargetHeadAngleX, 4, 0x1000);
if (mAction != ACT_START || mMode != 0) {
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
}
}
@ -2039,8 +2039,8 @@ void daE_PM_c::BossAction() {
} else {
DemoBossStart();
}
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
}
if (mSecondEncounter && daPy_getPlayerActorClass()->checkWolfLock(this)) {

15
src/d/actor/d_a_e_po.cpp
View File

@ -1231,21 +1231,10 @@ static void e_po_dead(e_po_class* i_this) {
i_this->mType += 1;
case 51:
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (a_this->eventInfo.checkCommandDemoAccrpt()) {
if (dComIfGp_getEventManager().endCheck(i_this->field_0x762) != 0) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
} else {
if (strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM") ==
0 &&
@ -1259,7 +1248,7 @@ static void e_po_dead(e_po_class* i_this) {
}
}
} else if (i_this->field_0x75B != 0) {
if (dComIfGp_getEvent().isOrderOK()) {
if (dComIfGp_getEvent()->isOrderOK()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, -1, 0);
a_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e);

6
src/d/actor/d_a_e_pz.cpp
View File

@ -503,7 +503,7 @@ void daE_PZ_c::executeOpeningDemo() {
field_0x7d0 = 2;
setBck(8, 0, 3.0f, -1.0f);
mpModelMorf->setFrame(0.0f);
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
dComIfGs_onSaveDunSwitch(41);
mMoveMode++;
break;
@ -717,7 +717,7 @@ void daE_PZ_c::executeOpeningDemo() {
mMoveMode = 130;
}
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 3);
}
break;
@ -1146,7 +1146,7 @@ void daE_PZ_c::executeOpeningDemo() {
camera->mCamera.Set(mDemoCameraCenter, mDemoCameraEye);
}
if (((mMoveMode >= 2 && mMoveMode <= 17) || (mMoveMode >= 102 && mMoveMode <= 125)) && dComIfGp_getEvent().checkSkipEdge()) {
if (((mMoveMode >= 2 && mMoveMode <= 17) || (mMoveMode >= 102 && mMoveMode <= 125)) && dComIfGp_getEvent()->checkSkipEdge()) {
cDmr_SkipInfo = 1;
dStage_changeScene(1, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
Z2GetAudioMgr()->bgmStreamStop(0x1E);

4
src/d/actor/d_a_e_rdb.cpp
View File

@ -1105,7 +1105,7 @@ static void demo_camera(e_rdb_class* i_this) {
i_this->mDemoCamFovy = 55.0f;
camera->mCamera.SetTrimSize(3);
player->changeOriginalDemo();
dComIfGp_getEvent().startCheckSkipEdge(i_this);
dComIfGp_getEvent()->startCheckSkipEdge(i_this);
Z2GetAudioMgr()->setDemoName("force_start");
// [[fallthrough]]
case 2:
@ -1352,7 +1352,7 @@ static void demo_camera(e_rdb_class* i_this) {
}
if (i_this->mDemoMode > 0 && i_this->mDemoMode < 10) {
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
sVar1 = 1;
i_this->mAction = ACTION_WAIT;
i_this->mMode = 10;

10
src/d/actor/d_a_e_rdy.cpp
View File

@ -3838,7 +3838,7 @@ static void demo_camera(e_rdy_class* i_this) {
daPy_getPlayerActorClass()->changeOriginalDemo();
daPy_getPlayerActorClass()->changeDemoMode(0x17, 0, 0, 0);
i_this->mCamDist = 300.0f;
dComIfGp_getEvent().startCheckSkipEdge(a_this);
dComIfGp_getEvent()->startCheckSkipEdge(a_this);
i_this->mTargetAngleY = i_this->mPlayerAngle;
a_this->current.angle.y = -0x3384;
a_this->shape_angle.y = a_this->current.angle.y;
@ -3996,7 +3996,7 @@ static void demo_camera(e_rdy_class* i_this) {
daPy_getPlayerActorClass()->changeOriginalDemo();
daPy_getPlayerActorClass()->changeDemoMode(4, 0, 0, 0);
Z2GetAudioMgr()->bgmStop(70, 0);
dComIfGp_getEvent().offFlag2(8);
dComIfGp_getEvent()->offFlag2(8);
dComIfGs_offTmpBit(dSv_event_tmp_flag_c::tempBitLabels[11] & 0xffff);
// fallthrough
@ -4008,7 +4008,7 @@ static void demo_camera(e_rdy_class* i_this) {
i_this->mMsgFlow.init(a_this, 0x7d1, 0, NULL);
}
if (i_this->mDemoTimer == 50) {
dComIfGp_getEvent().startCheckSkipEdge(a_this);
dComIfGp_getEvent()->startCheckSkipEdge(a_this);
}
if (i_this->mDemoTimer == 55) {
daPy_getPlayerActorClass()->changeDemoMode(1, 4, 0, 0);
@ -4197,7 +4197,7 @@ static void demo_camera(e_rdy_class* i_this) {
}
if (i_this->mDemoMode >= 11 && i_this->mDemoMode < 20) {
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
a_this->current.pos.set(-103242.0f, -22894.0f, 38097.0f);
a_this->current.angle.y = 0x44a3;
a_karg->current.pos.set(-103242.0f, -22894.0f, 38097.0f);
@ -4213,7 +4213,7 @@ static void demo_camera(e_rdy_class* i_this) {
Z2GetAudioMgr()->setBattleBgmOff(false);
}
} else if (i_this->mDemoMode >= 20 && i_this->mDemoMode < 29) {
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
cVar13 = 2;
vec2.set(-93666.0f, -5951.0f, 39000.0f);
player->setPlayerPosAndAngle(&vec2, 0, 0);

4
src/d/actor/d_a_e_sf.cpp
View File

@ -847,7 +847,7 @@ static s16 e_sf_sitwait(e_sf_class* i_this) {
rv = 0xFF;
i_this->mSound.startCreatureVoiceLevel(Z2SE_EN_SF_V_FIRST_DEMO, -1);
if (dComIfGp_getEvent().checkSkipEdge() || i_this->mpModelMorf->isStop()) {
if (dComIfGp_getEvent()->checkSkipEdge() || i_this->mpModelMorf->isStop()) {
i_this->mAction = ACTION_FIGHT_RUN;
i_this->mActionPhase = FIGHT_RUN_PHASE_NEG_10;
i_this->mTimers[0] = 60;
@ -1384,7 +1384,7 @@ static void demo_camera(e_sf_class* i_this) {
i_this->field_0xfda = 0;
i_this->mDemoCamFovy = 75.0f;
camera->mCamera.SetTrimSize(3);
dComIfGp_getEvent().startCheckSkipEdge(a_this);
dComIfGp_getEvent()->startCheckSkipEdge(a_this);
daPy_getPlayerActorClass()->changeOriginalDemo();
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0);
// fallthrough

4
src/d/actor/d_a_e_th.cpp
View File

@ -708,7 +708,7 @@ static void demo_camera(e_th_class* i_this) {
daPy_getPlayerActorClass()->changeOriginalDemo();
daPy_getPlayerActorClass()->changeDemoMode(1, 0, 0, 0);
dComIfGp_getEvent().startCheckSkipEdge(i_this);
dComIfGp_getEvent()->startCheckSkipEdge(i_this);
case 2:
sp80.set(1.9f, 0.0f, -1127.0f);
player->setPlayerPosAndAngle(&sp80, -0x8000, 0);
@ -993,7 +993,7 @@ static void demo_camera(e_th_class* i_this) {
camera->mCamera.Set(i_this->mDemoCamCenter, i_this->mDemoCamEye, i_this->mDemoCamFovy, 0);
i_this->mDemoCamTimer++;
if (i_this->mDemoCamMode >= 2 && i_this->mDemoCamMode < 10 && dComIfGp_getEvent().checkSkipEdge()) {
if (i_this->mDemoCamMode >= 2 && i_this->mDemoCamMode < 10 && dComIfGp_getEvent()->checkSkipEdge()) {
Z2GetAudioMgr()->subBgmStop();
cDmr_SkipInfo = 30;
dStage_changeScene(4, 0.0f, 0, fopAcM_GetRoomNo(i_this), 0, -1);

4
src/d/actor/d_a_e_vt.cpp
View File

@ -1728,8 +1728,8 @@ void daE_VA_c::executeDemoOp() {
calcTagAngle();
camera->mCamera.Set(mDemoCamCenter, mDemoCamEye, mDemoCamBank, 0);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
}
void daE_VA_c::executeClearWait() {

9
src/d/actor/d_a_e_warpappear.cpp
View File

@ -274,10 +274,11 @@ static void demo_camera(e_warpappear_class* i_this) {
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_class* camera0 = dComIfGp_getCamera(0);
daHorse_c* horseActor = (daHorse_c*)dComIfGp_getHorseActor();
cXyz sp48, sp54;
dComIfG_play_c* play;
cXyz temp1, temp2;
switch (i_this->field_0x59e) {
case 1:
if (!i_this->eventInfo.checkCommandDemoAccrpt()) {
@ -464,9 +465,7 @@ static void demo_camera(e_warpappear_class* i_this) {
i_this->field_0x5f8 = 0.0f;
}
// TODO: gameInfo fake match to force reuse of pointer
play = &g_dComIfG_gameInfo.play;
play->getEvent().onHindFlag(15);
dComIfGp_event_onHindFlag(15);
if (i_this->field_0x59e == 5) {
if (i_this->field_0x5a0 >= 310) {
@ -496,7 +495,7 @@ static void demo_camera(e_warpappear_class* i_this) {
camera->mCamera.Reset(i_this->field_0x5b0, i_this->field_0x5a4, i_this->field_0x5f4, 0);
camera->mCamera.Start();
camera->mCamera.SetTrimSize(0);
play->getEvent().reset();
dComIfGp_event_reset();
daPy_getPlayerActorClass()->cancelOriginalDemo();
fopAcM_delete(i_this);
fpcM_Search(s_s1fight_sub, i_this);

11
src/d/actor/d_a_e_wb.cpp
View File

@ -3409,7 +3409,6 @@ static s8 e_wb_c_run(e_wb_class* i_this) {
return return_value;
}
// NONMATCHING - regalloc / conditional pathing
static void action(e_wb_class* i_this) {
fopEn_enemy_c* a_this = (fopEn_enemy_c*)i_this;
cXyz pos1;
@ -3740,7 +3739,7 @@ static void demo_camera(e_wb_class* i_this) {
daPy_getPlayerActorClass()->changeOriginalDemo();
horse->changeOriginalDemo();
fpcM_Search(s_wbdel_sub, a_this);
dComIfGp_getEvent().startCheckSkipEdge(a_this);
dComIfGp_getEvent()->startCheckSkipEdge(a_this);
// fallthrough
case 2:
if (i_this->field_0x16a0 == 0xa0) {
@ -4085,7 +4084,7 @@ static void demo_camera(e_wb_class* i_this) {
}
if (i_this->field_0x16a0 == 40) {
horse->changeDemoMode(8, 0);
dComIfGp_getEvent().startCheckSkipEdge(a_this);
dComIfGp_getEvent()->startCheckSkipEdge(a_this);
}
if (i_this->field_0x16a0 == 80) {
horse->changeDemoMode(9, 0);
@ -4305,7 +4304,7 @@ static void demo_camera(e_wb_class* i_this) {
horse->changeDemoPos0(&cStack_48);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[87]);
Z2GetAudioMgr()->bgmStart(Z2BGM_HORSE_BATTLE_D02, 0, 0);
dComIfGp_getEvent().startCheckSkipEdge(i_this);
dComIfGp_getEvent()->startCheckSkipEdge(i_this);
// fallthrough
case 0x29:
if (i_this->field_0x16a0 == 30) {
@ -4428,7 +4427,7 @@ static void demo_camera(e_wb_class* i_this) {
i_this->field_0x16bc.set(1679.0, 100.0, 852.0);
i_this->field_0x16a4.set(1873.0, 64.0, 527.0);
daPy_getPlayerActorClass()->changeOriginalDemo();
dComIfGp_getEvent().startCheckSkipEdge(i_this);
dComIfGp_getEvent()->startCheckSkipEdge(i_this);
dComIfGs_onOneZoneSwitch(4, -1);
case 0x33:
if (i_this->field_0x16a0 < 30) {
@ -4956,7 +4955,7 @@ static void demo_camera(e_wb_class* i_this) {
}
if (i_this->field_0x169e < 10 || (i_this->field_0x169e >= 30 && i_this->field_0x169e < 60)) {
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
cDmr_SkipInfo = 0x28;
Z2GetAudioMgr()->bgmStop(0, 0);
if (i_this->field_0x169e < 10 || dComIfG_play_c::getLayerNo(0) == 4) {

4
src/d/actor/d_a_e_ym.cpp
View File

@ -780,7 +780,7 @@ void daE_YM_c::executeEscape() {
field_0x6dc = 0.0f;
}
}
if (dComIfGp_event_runCheck() == 0) {
if (!dComIfGp_event_runCheck()) {
fopAcM_OffStatus(this, 0x4000);
}
switch (mMode) {
@ -2517,7 +2517,7 @@ void daE_YM_c::executeFire() {
shape_angle.y = current.angle.y;
break;
case 3:
if (dComIfGp_event_runCheck() == 0) {
if (!dComIfGp_event_runCheck()) {
mSphCc.OnCoSetBit();
} else {
mSphCc.OffCoSetBit();

24
src/d/actor/d_a_e_ymb.cpp
View File

@ -2302,7 +2302,7 @@ void daE_YMB_c::executeLakeDemo() {
break;
case 2:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
field_0x760 += field_0x762;
mDemoCamCenter.set(-81000.0f, -17000.0f, 33000.0f);
sp24.set(0.0f, 0.0f, 1000.0f);
@ -2320,7 +2320,7 @@ void daE_YMB_c::executeLakeDemo() {
break;
case 3:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
cLib_chaseF(&field_0x75c, 300.0f, 10.0f);
cLib_chaseAngleS(&field_0x762, 0, 0x10);
field_0x760 += field_0x762;
@ -2344,7 +2344,7 @@ void daE_YMB_c::executeLakeDemo() {
break;
case 5:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
if (field_0x6fc != 0) {
cXyz sp30(mDemoCamCenter);
@ -2438,7 +2438,7 @@ void daE_YMB_c::executeStartDemo() {
break;
case 2:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
setBoilEffect(0);
sp34.set(-89100.0f, player->current.pos.y, 39410.0f);
player->setPlayerPosAndAngle(&sp34, 0x5400, 0);
@ -2455,7 +2455,7 @@ void daE_YMB_c::executeStartDemo() {
break;
case 3:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
setBoilEffect(0);
sp34.set(current.pos.x, field_0x6cc - 120.0f, current.pos.z);
cLib_chasePos(&mDemoCamCenter, sp34, 1.5f);
@ -2471,7 +2471,7 @@ void daE_YMB_c::executeStartDemo() {
break;
case 4:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
if (field_0x6fc >= 95) {
setBoilEffect(1);
@ -2498,7 +2498,7 @@ void daE_YMB_c::executeStartDemo() {
break;
case 8:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
if (field_0x6f0 == 0) {
if (current.pos.y >= field_0x6cc) {
@ -2531,7 +2531,7 @@ void daE_YMB_c::executeStartDemo() {
break;
case 9:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1);
sp34.set(-89000.0f, -18583.0f, 39350.0f);
cLib_chasePos(&mDemoCamEye, sp34, 10.0f);
@ -2545,7 +2545,7 @@ void daE_YMB_c::executeStartDemo() {
break;
case 10:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1);
sp34.set(-89260.0f, -18650.0f, 39500.0f);
cLib_chasePos(&mDemoCamEye, sp34, 10.0f);
@ -2559,7 +2559,7 @@ void daE_YMB_c::executeStartDemo() {
break;
case 11:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
mSound.startCreatureSoundLevel(Z2SE_EN_YB_FLY, 0, -1);
setElecEffect2();
@ -2633,7 +2633,7 @@ void daE_YMB_c::executeBattleDemo() {
break;
case 2:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 3);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 3);
if (mpModelMorf->checkFrame(30.0f)) {
dComIfGp_getVibration().StopQuake(31);
@ -2675,7 +2675,7 @@ void daE_YMB_c::executeBattleDemo() {
// fallthrough
case 4:
case 5:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2);
cLib_chaseF(&mDemoCamCenter.y, current.pos.y - 200.0f, 3.0f);
sp34.set(current.pos.x, mDemoCamCenter.y, current.pos.z);
cLib_chasePosXZ(&mDemoCamCenter, sp34, 5.0f);

8
src/d/actor/d_a_e_zh.cpp
View File

@ -747,7 +747,7 @@ void daE_ZH_c::executeStartDemo() {
switch (mMoveMode) {
case 0:
if (startDemoCheck()) {
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
mDemoCamCenter.set(-30.0f, 650.0f, 1955.0f);
mDemoCamEye.set(-25.0f, 720.0f, 2330.0f);
field_0x794[0] = 60;
@ -792,7 +792,7 @@ void daE_ZH_c::executeStartDemo() {
}
if (mMoveMode != 0 && mActionMode != ACTION_EXECUTE_WAIT) {
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
fopAcM_onSwitch(this, 0x12);
dStage_changeScene(2, 0.0f, 0, fopAcM_GetRoomNo(this), 0, -1);
}
@ -895,11 +895,11 @@ void daE_ZH_c::executeBallWait() {
}
dCam_getBody()->StartBlure(100, this, 0.8f, 1.4f);
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
mMoveMode++;
// fallthrough
case 12:
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
dCam_getBody()->ResetBlure();
field_0x794[2] = 2;
camera->mCamera.Start();

2
src/d/actor/d_a_econt.cpp
View File

@ -24,7 +24,7 @@ static void* s_rd_sub(void* i_this, void* param_1) {
}
static void rider_game(econt_class* i_this) {
if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && dComIfGp_event_runCheck() == 0) {
if (dComIfGs_isSwitch(0x2e,fopAcM_GetRoomNo(i_this)) && !dComIfGp_event_runCheck()) {
data_805197E0[0] = 0;
fpcM_Search(s_rd_sub,i_this);

4
src/d/actor/d_a_horse.cpp
View File

@ -1002,7 +1002,7 @@ int daHorse_c::checkDemoAction() {
return procMoveInit();
}
if (dComIfGp_getEvent().isOrderOK()) {
if (dComIfGp_getEvent()->isOrderOK()) {
return 0;
}
@ -1200,7 +1200,7 @@ void daHorse_c::setDemoData() {
offStateFlg0(FLG0_UNK_2000000);
}
if (dComIfGp_getEvent().isOrderOK()) {
if (dComIfGp_getEvent()->isOrderOK()) {
u32 unused;
if (checkHorseDemoMode()) {
u32 old_demoMode = m_demoMode;

48
src/d/actor/d_a_kago.cpp
View File

@ -218,7 +218,7 @@ int daKago_c::executeBalloonMenu() {
switch (field_0x6eb) {
case 0:
if (field_0x6e7 == 1 && (mCurrentAction == 0 || mCurrentAction == 5) &&
dComIfGp_event_runCheck() == 0 && mDoCPd_c::getTrigB(0))
!dComIfGp_event_runCheck() && mDoCPd_c::getTrigB(0))
{
field_0x6eb = 1;
return 1;
@ -1917,7 +1917,7 @@ bool daKago_c::executePerchDemo() {
return true;
}
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
break;
}
@ -1940,16 +1940,16 @@ bool daKago_c::executePerchDemo() {
return true;
}
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 0);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 0);
break;
}
case 2: {
if (field_0x6e4 == 0) {
if (field_0x73c == 0) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 4);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4);
} else if (field_0x73c == 2) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 5);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 5);
}
}
@ -2020,9 +2020,9 @@ bool daKago_c::executePerchDemo() {
case 3: {
if (field_0x6e4 == 0) {
if (field_0x73c == 0) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 4);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4);
} else if (field_0x73c == 2) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 5);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 5);
}
}
@ -2056,9 +2056,9 @@ bool daKago_c::executePerchDemo() {
case 4: {
if (field_0x6e4 == 0) {
if (field_0x73c == 0) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 4);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 4);
} else if (field_0x73c == 2) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 6);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 6);
}
}
@ -2497,7 +2497,7 @@ bool daKago_c::executeFirstDemo() {
int switchVal = field_0x748;
switch (switchVal) {
case 0:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2);
cLib_chaseAngleS(&field_0x6bc, 0x1400, 0x40);
cLib_chaseF(&field_0x6cc, 1250.0f, 6.7f);
@ -2524,7 +2524,7 @@ bool daKago_c::executeFirstDemo() {
break;
case 1:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2);
cLib_chaseAngleS(&field_0x6bc, 0x1000, 0x20);
@ -2571,7 +2571,7 @@ bool daKago_c::executeFirstDemo() {
}
break;
case 2:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 3);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 3);
setMidnaTagPos();
cLib_addCalcPos(&field_0x68c, midnaPos, 0.5f, 10.0f, 10.0f);
@ -2598,7 +2598,7 @@ bool daKago_c::executeFirstDemo() {
break;
case 3: {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 3);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 3);
setMidnaTagPos();
cLib_addCalcAngleS(
@ -2620,7 +2620,7 @@ bool daKago_c::executeFirstDemo() {
break;
}
case 4:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2);
cLib_addCalcAngleS(&field_0x718, 0, 8, 0x100, 0x10);
cLib_addCalcAngleS(&field_0x71a, 0, 8, 0x100, 0x10);
@ -2663,7 +2663,7 @@ bool daKago_c::executeFirstDemo() {
break;
case 5:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2);
cLib_addCalcAngleS(&current.angle.y, cLib_targetAngleY(&current.pos, &field_0x6a4), 4, 0x800, 0x100);
cLib_addCalcAngleS(&current.angle.x, -cLib_targetAngleX(&current.pos, &field_0x6a4), 4, 0x400, 0x100);
@ -2696,7 +2696,7 @@ bool daKago_c::executeFirstDemo() {
}
break;
case 6:
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 2);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 2);
cLib_addCalcAngleS(&current.angle.x, 0xffffe000, 8, 0x100, 0x40);
shape_angle.x = current.angle.x;
@ -2758,7 +2758,7 @@ bool daKago_c::executeFirstDemo() {
}
if (field_0x728 != 0) {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 1);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 1);
} else {
if (field_0x73c == 0 && setSceneChange(0)) {
field_0x748 = 9;
@ -2864,7 +2864,7 @@ void daKago_c::executeLandingLakeHairia() {
field_0x744 = 3;
}
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 7);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7);
break;
case 3:
@ -2897,7 +2897,7 @@ void daKago_c::executeLandingLakeHairia() {
field_0x728 = 0x28;
}
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 7);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7);
break;
case 5:
@ -2917,7 +2917,7 @@ void daKago_c::executeLandingLakeHairia() {
setBck(0xf, 0x02, 10.0f, 1.0f);
} else {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 7);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 7);
}
field_0x6cc = 50.0f;
@ -2968,7 +2968,7 @@ void daKago_c::executeLandingLakeHairia() {
return;
}
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 8);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 8);
}
camera->Set(field_0x68c, field_0x698, field_0x6d4, 0);
@ -3033,7 +3033,7 @@ void daKago_c::executeLandingBoartHouse() {
field_0x728 = 0x28;
}
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 9);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 9);
break;
}
@ -3051,7 +3051,7 @@ void daKago_c::executeLandingBoartHouse() {
field_0x744 = 3;
field_0x728 = 90;
} else {
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 9);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 9);
}
field_0x6cc = 40.0f;
@ -3106,7 +3106,7 @@ void daKago_c::executeLandingBoartHouse() {
return;
}
dComIfGp_getEvent().setSkipProc(this, DemoSkipCallBack, 10);
dComIfGp_getEvent()->setSkipProc(this, DemoSkipCallBack, 10);
break;
}

4
src/d/actor/d_a_kytag04.cpp
View File

@ -116,7 +116,7 @@ static int daKytag04_Execute(kytag04_class* i_this) {
s32 room_no = dComIfGp_roomControl_getStayNo();
if (dComIfGs_isSwitch(i_this->field_0x5b5, room_no) && i_this->field_0x5d0 == 0) {
if (dComIfGp_getEvent().isOrderOK() &&
if (dComIfGp_getEvent()->isOrderOK() &&
fopAcM_orderOtherEvent(i_this, "WITHWARP_OPEN", 0xFFFF, 1, 0))
{
i_this->field_0x5d1 = 1;
@ -168,7 +168,7 @@ static int daKytag04_Execute(kytag04_class* i_this) {
switch (i_this->field_0x5c4) {
case 0:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
dComIfGp_getEvent().reset(a_this);
dComIfGp_getEvent()->reset(a_this);
fopAcM_orderPotentialEvent(a_this, 0x400, 0xFFFF, 0);
} else {
i_this->field_0x5c5 = 1;

15
src/d/actor/d_a_mg_fish.cpp
View File

@ -1842,7 +1842,7 @@ static void mf_hit(mg_fish_class* i_this) {
i_this->mCurAction = ACTION_MG_FISH_MF_CATCH;
i_this->mActionPhase = 0;
g_dComIfG_gameInfo.play.mVibration.StartShock(4, 1, cXyz(0.0f, 1.0f, 0.0f));
Z2AudioMgr::getInterface()->changeBgmStatus(4);
Z2GetAudioMgr()->changeBgmStatus(4);
pvVar5->action = 6;
pvVar5->play_cam_mode = 10;
pvVar5->play_cam_timer = 0;
@ -1853,11 +1853,11 @@ static void mf_hit(mg_fish_class* i_this) {
daPy_py_c* player = daPy_getLinkPlayerActorClass();
player->onFishingRodGetFish();
if (pvVar5->lure_type == MG_LURE_SP) {
u8 bVar7 = g_dComIfG_gameInfo.info.mSavedata.mEvent.getEventReg(0xf11f);
u8 bVar7 = dComIfGs_getEventReg(0xf11f);
if (bVar7 < 0x1f) {
bVar7++;
}
g_dComIfG_gameInfo.info.mSavedata.mEvent.setEventReg(0xf11f, bVar7);
dComIfGs_setEventReg(0xf11f, bVar7);
}
} else if (iVar1 != 0) {
if (iVar1 == 2) {
@ -2015,7 +2015,7 @@ static void mf_jump(mg_fish_class* i_this) {
fopAcM_effSmokeSet1(&i_this->field_0xc34, &i_this->field_0xc38, &i_this->actor.current.pos,
NULL, 0.6f * i_this->mJointScale, &i_this->actor.tevStr, 1);
Z2AudioMgr::getInterface()->seStart(Z2SE_OBJ_NIOIMASU_BOUND, (Vec*)&i_this->actor.current,
Z2GetAudioMgr()->seStart(Z2SE_OBJ_NIOIMASU_BOUND, &i_this->actor.current.pos,
0x14, 0,1.0f, 1.0f,
-1.0f, -1.0f, 0);
}
@ -2041,8 +2041,7 @@ static void mf_jump(mg_fish_class* i_this) {
commonXyz2.z += i_this->actor.current.pos.z;
commonXyz2.y = 10.0f + i_this->mSurfaceY;
fopAcM_createItem(&commonXyz2, 0, -1, -1, NULL, NULL, 0);
g_dComIfG_gameInfo.info.mSavedata.mEvent.onEventBit(
dSv_event_flag_c::saveBitLabels[0x1d6]);
dComIfGs_onEventBit(dSv_event_flag_c::saveBitLabels[0x1d6]);
}
break;
}
@ -2460,7 +2459,7 @@ static s32 mf_esa_catch(mg_fish_class* i_this) {
position = i_this->actor.current.pos;
position.y = i_this->mSurfaceY;
fopKyM_createWpillar(&position, 0.7f, 0);
Z2AudioMgr::getInterface()->changeFishingBgm(4);
Z2GetAudioMgr()->changeFishingBgm(4);
i_this->mActionPhase = 1;
i_this->mBobAmp = 50.0f;
i_this->mSound.startCreatureSound(Z2SE_AL_FISH_CATCH, 0, -1);
@ -3859,7 +3858,7 @@ static int daMg_Fish_Create(fopAc_ac_c* i_this) {
if (phase == cPhs_COMPLEATE_e) {
s32 params_0 = fopAcM_GetParam(i_this) >> 24;
if (params_0 != 0 && params_0 != 0xff &&
g_dComIfG_gameInfo.info.isSwitch(params_0, fopAcM_GetRoomNo(i_this)))
dComIfGs_isSwitch(params_0, fopAcM_GetRoomNo(i_this)))
{
return cPhs_ERROR_e;
}

6
src/d/actor/d_a_mg_rod.cpp
View File

@ -3545,7 +3545,7 @@ static void uki_ready(dmg_rod_class* i_this) {
cLib_addCalc2(&i_this->field_0xf64, -30.0f + ZREG_F(1), 1.0f, 0.5f + BREG_F(14));
cLib_addCalc2(&i_this->field_0xf68, -(20.0f + AREG_F(10)), 1.0f, 0.02f * (20.0f + AREG_F(10)));
if (i_this->timers[0] != 0 || dComIfGp_event_runCheck() != 0 || i_this->play_cam_mode >= 1000 || (henna != NULL && henna->cam_mode != 0) || dComIfGp_checkPlayerStatus0(0, 0x100000)) {
if (i_this->timers[0] != 0 || dComIfGp_event_runCheck() || i_this->play_cam_mode >= 1000 || (henna != NULL && henna->cam_mode != 0) || dComIfGp_checkPlayerStatus0(0, 0x100000)) {
return;
}
@ -3758,7 +3758,7 @@ static void uki_standby(dmg_rod_class* i_this) {
Z2GetAudioMgr()->changeFishingBgm(0);
}
if (i_this->timers[0] == 0 && (dComIfGp_checkPlayerStatus0(0, 0x100000) || i_this->ccSph.ChkCoHit() || dComIfGp_event_runCheck() != 0 || uki_rod_bg_check(i_this) || (i_this->is_hook_in_water == 0 && player->current.pos.y - actor->current.pos.y > (350.0f + nREG_F(11))) || i_this->field_0x102e != 0)) {
if (i_this->timers[0] == 0 && (dComIfGp_checkPlayerStatus0(0, 0x100000) || i_this->ccSph.ChkCoHit() || dComIfGp_event_runCheck() || uki_rod_bg_check(i_this) || (i_this->is_hook_in_water == 0 && player->current.pos.y - actor->current.pos.y > (350.0f + nREG_F(11))) || i_this->field_0x102e != 0)) {
i_this->play_cam_mode = 90;
}
@ -4492,7 +4492,7 @@ static void play_camera(dmg_rod_class* i_this) {
camera_class* sp58;
switch (i_this->play_cam_mode) {
case 0:
if (dComIfGp_checkPlayerStatus0(0, 0x2000) || dComIfGp_event_runCheck() != 0) {
if (dComIfGp_checkPlayerStatus0(0, 0x2000) || dComIfGp_event_runCheck()) {
i_this->input_cooldown = 20;
}

8
src/d/actor/d_a_midna.cpp
View File

@ -2778,7 +2778,7 @@ void daMidna_c::setDemoData() {
mStaffID = dComIfGp_evmng_getMyStaffId("Midna", this, 0);
}
if (dComIfGp_getEvent().isOrderOK()) {
if (dComIfGp_getEvent()->isOrderOK()) {
if (mDemoType != 0) {
mDemoType = 0;
mDemoMode = 0;
@ -3256,7 +3256,7 @@ int daMidna_c::execute() {
}
if (event_id == 4 || event_id == 5) {
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
offStateFlg0(FLG0_UNK_8000);
fopAcM_orderPotentialEvent(this, 0x400, 0xffff, 1);
link->changeOriginalDemo();
@ -3283,13 +3283,13 @@ int daMidna_c::execute() {
link->onMidnaTalkPolySpeed();
}
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
offStateFlg0(FLG0_UNK_8000);
}
}
}
} else if (eventInfo.checkCommandDemoAccrpt() && !link->checkMetamorphose()) {
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
}
if (link->checkMidnaRide()) {

2
src/d/actor/d_a_myna.cpp
View File

@ -1240,7 +1240,7 @@ void daMyna_c::talkAnime(msg_class* param_0) {
int daMyna_c::chkEvent() {
int retVal = 1;
if (daPy_py_c::checkNowWolf()) {
if (!dComIfGp_getEvent().isOrderOK()) {
if (!dComIfGp_getEvent()->isOrderOK()) {
retVal = 0;
if (eventInfo.checkCommandTalk()) {
if (field_0x92C == 0x10) {

18
src/d/actor/d_a_npc.cpp
View File

@ -1426,7 +1426,7 @@ int daNpcT_c::execute() {
setCollision();
if (!field_0xe2c) {
if ((field_0xe33 && dComIfGp_getEvent().isOrderOK()) || dComIfGp_event_runCheck() == FALSE) {
if ((field_0xe33 && dComIfGp_getEvent()->isOrderOK()) || dComIfGp_event_runCheck() == FALSE) {
evtOrder();
}
}
@ -1899,15 +1899,7 @@ int daNpcT_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
BOOL daNpcT_c::evtProc() {
BOOL ret = FALSE;
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!checkChangeEvt()) {
evtTalk();
@ -1916,11 +1908,7 @@ BOOL daNpcT_c::evtProc() {
} else if (eventInfo.checkCommandDemoAccrpt()
&& dComIfGp_getEventManager().endCheck(mEvtId)) {
if (evtEndProc()) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
mEvtId = -1;
}
} else {
@ -2088,7 +2076,7 @@ void daNpcT_c::evtChange() {
}
mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEvtData[mEvtNo].eventName, 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, mEvtId, 1, 0xFFFF);
}
}

2
src/d/actor/d_a_npc4.cpp
View File

@ -1308,7 +1308,7 @@ void daNpcF_c::changeEvent(char* i_arcName, char* i_evtName, u16 param_2, u16 pa
JUT_ASSERT(2887, NULL != i_evtName);
mEventIdx = dComIfGp_getEventManager().getEventIdx(this, i_evtName, 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, mEventIdx, param_2, param_3);
}

4
src/d/actor/d_a_npc_ash.cpp
View File

@ -963,7 +963,7 @@ bool daNpcAsh_c::demo(void* param_0) {
// fallthrough
case 2:
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
s32 staff_id = eventManager.getMyStaffId(l_myName, NULL, 0);
if (staff_id != -1) {
@ -1244,7 +1244,7 @@ BOOL daNpcAsh_c::main() {
if (mpActionFn != NULL) {
(this->*mpActionFn)(NULL);
}
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && mItemPartnerId != -1) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mItemPartnerId != -1) {
dComIfGp_event_setItemPartnerId(mItemPartnerId);
mItemPartnerId = -1;
}

24
src/d/actor/d_a_npc_ashB.cpp
View File

@ -752,7 +752,7 @@ bool daNpcAshB_c::wait(void* param_0) {
}
}
if (dComIfGp_event_runCheck() != false) {
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (dComIfGp_event_chkTalkXY()) {
if (!dComIfGp_evmng_ChkPresentEnd()) {
@ -765,7 +765,7 @@ bool daNpcAshB_c::wait(void* param_0) {
} else {
s16 evt_idx =
dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xff);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, evt_idx, 1, -1);
}
}
@ -878,7 +878,7 @@ bool daNpcAshB_c::talk(void* param_0) {
if (mItemPartnerId != 0xffffffff) {
s16 evt_idx =
dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, evt_idx, 1, -1);
field_0x9ec = 1;
setAction(&daNpcAshB_c::wait);
@ -939,14 +939,7 @@ bool daNpcAshB_c::demo(void* param_0) {
// fallthrough
case 2:
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck() && !eventInfo.checkCommandTalk())
#else
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk())
#endif
{
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
s32 staff_id = evtmgr.getMyStaffId(l_myName, NULL, 0);
if (staff_id != -1) {
mStaffID = staff_id;
@ -957,13 +950,8 @@ bool daNpcAshB_c::demo(void* param_0) {
r26 = TRUE;
}
if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && evtmgr.endCheck(mEventIdx))
{
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1 && evtmgr.endCheck(mEventIdx)) {
dComIfGp_event_reset();
#endif
mOrderEvtNo = 0;
mEventIdx = -1;
setAction(&daNpcAshB_c::wait);
@ -1113,7 +1101,7 @@ BOOL daNpcAshB_c::main() {
(this->*mpActionFn)(NULL);
}
if (mItemPartnerId != -1 && dComIfGp_event_runCheck() != 0 &&
if (mItemPartnerId != -1 && dComIfGp_event_runCheck() &&
!strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM"))
{
dComIfGp_event_setItemPartnerId(mItemPartnerId);

5
src/d/actor/d_a_npc_besu.cpp
View File

@ -1419,8 +1419,7 @@ void daNpc_Besu_c::setCollision() {
mCyl1.SetR(wallR);
mCyl1.SetC(cStack_48);
dComIfG_Ccsp()->Set(&mCyl1);
if ((mType == 11 && !dComIfGp_event_runCheck()) || mType == 3)
{
if ((mType == 11 && !dComIfGp_event_runCheck()) || mType == 3) {
switch (mType) {
case 3:
wallR = 100.0f;
@ -2623,7 +2622,7 @@ int daNpc_Besu_c::wait(void* param_0) {
}
/* dSv_event_flag_c::M_027 - Cutscene - [cutscene: 13] kids in the church (beast eyes) */
if (field_0x112f && daNpcT_chkEvtBit(0x3C) && dComIfGp_event_runCheck() == 0) {
if (field_0x112f && daNpcT_chkEvtBit(0x3C) && !dComIfGp_event_runCheck()) {
field_0x112f = 0;
}

4
src/d/actor/d_a_npc_blue_ns.cpp
View File

@ -842,7 +842,7 @@ int daNpcBlueNS_c::wait(int param_0) {
break;
case 2:
chkFindPlayer();
if (dComIfGp_event_runCheck() != 0) {
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd() != 0) {
setAction(&daNpcBlueNS_c::talk);
@ -939,7 +939,7 @@ int daNpcBlueNS_c::demo(int param_0) {
field_0xdc0 = 2;
break;
case 2:
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
evtmgr = &dComIfGp_getEventManager();
int staffId = evtmgr->getMyStaffId(l_myName, this, 0);

4
src/d/actor/d_a_npc_bou.cpp
View File

@ -784,7 +784,7 @@ int daNpc_Bou_c::cutWildGoat(int arg) {
case 2: {
actor_p = mActorMngr[0].getActorP();
JUT_ASSERT(0x811, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
Z2GetAudioMgr()->subBgmStart(0x1000011);
break;
}
@ -1160,7 +1160,7 @@ int daNpc_Bou_c::cutFindWolf(int arg) {
case 0: {
mFaceMotionSeqMngr.setNo(1, -1.0f, 0, 0);
mMotionSeqMngr.setNo(3, -1.0f, 0, 0);
dComIfGp_getEvent().setPtT(this);
dComIfGp_getEvent()->setPtT(this);
initTalk(0xD4, NULL);
break;
}

4
src/d/actor/d_a_npc_bouS.cpp
View File

@ -714,7 +714,7 @@ BOOL daNpcBouS_c::main() {
(this->*mAction)(NULL);
}
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk() && mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_setItemPartnerId(mItemPartnerId);
mItemPartnerId = fpcM_ERROR_PROCESS_ID_e;
}
@ -1183,7 +1183,7 @@ bool daNpcBouS_c::demo(void* param_1) {
mMode = 2;
// fallthrough
case 2:
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
staffId = eventManager.getMyStaffId(l_myName, NULL, 0);
if (staffId != -1) {

7
src/d/actor/d_a_npc_chat.cpp
View File

@ -3869,10 +3869,9 @@ bool daNpcChat_c::wait(void* param_1) {
}
}
} else {
dComIfG_play_c& play = g_dComIfG_gameInfo.play; // fakematch
if (play.getEvent().runCheck()) {
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!play.getEvent().chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) {
if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) {
setAction(&daNpcChat_c::talk);
}
} else {
@ -4060,7 +4059,7 @@ bool daNpcChat_c::demo(void* param_1) {
break;
case 2:
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk() == false) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0);

4
src/d/actor/d_a_npc_chin.cpp
View File

@ -485,7 +485,7 @@ void daNpcChin_c::setParam() {
int daNpcChin_c::main() {
Action();
if (dComIfGp_event_runCheck() != FALSE && eventInfo.checkCommandTalk() == FALSE &&
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() == FALSE &&
field_0xdf4 != fpcM_ERROR_PROCESS_ID_e)
{
dComIfGp_event_setItemPartnerId(field_0xdf4);
@ -1214,7 +1214,7 @@ bool daNpcChin_c::wait(void* param_0) {
eventInfo.setArchiveName(l_arcNames[4]);
}
if (!dComIfGp_getEvent().isOrderOK()) {
if (!dComIfGp_getEvent()->isOrderOK()) {
return true;
}

4
src/d/actor/d_a_npc_doorboy.cpp
View File

@ -658,7 +658,7 @@ bool daNpcDoorBoy_c::talk(void* param_1) {
field_0xdf0 = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);
if (field_0xdf0 != fpcM_ERROR_PROCESS_ID_e) {
s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF);
field_0x9ec = true;
setAction(&daNpcDoorBoy_c::wait);
@ -699,7 +699,7 @@ bool daNpcDoorBoy_c::demo(void* param_1) {
break;
case 2:
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
s32 staffId = eventManager.getMyStaffId(l_myName, NULL, 0);
if (staffId != -1) {

2
src/d/actor/d_a_npc_drainSol.cpp
View File

@ -279,7 +279,7 @@ bool daNpcDrSol_c::wait(void* param_0) {
mMode = 2;
break;
case 2:
if (dComIfGp_event_runCheck() != 0 && eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk()) {
if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) {
setAction(&daNpcDrSol_c::talk);
}

2
src/d/actor/d_a_npc_du.cpp
View File

@ -347,7 +347,7 @@ static void npc_du_message(npc_du_class* i_this) {
cLib_addCalcAngleS2(&actor->current.angle.y, i_this->mPlayerAngleY, 2, maxStep);
if (dComIfGp_event_runCheck() == FALSE && i_this->mPlayerDist > 220.0f) {
if (!dComIfGp_event_runCheck() && i_this->mPlayerDist > 220.0f) {
if (i_this->mSwimFlag == 0) {
i_this->mAction = ACTION_NORMAL;
} else {

8
src/d/actor/d_a_npc_gra.cpp
View File

@ -784,7 +784,7 @@ BOOL daNpc_grA_c::main() {
attention_info.flags = 0;
}
if (GET_HIO(mNpcFParams.debug_mode_ON) == 0 &&
(!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())))
(!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())))
{
u16 j = 1;
if (mOrderEvtNo != 0) {
@ -1795,7 +1795,7 @@ enum Event_Cut_Nums {
BOOL daNpc_grA_c::doEvent() {
dEvent_manager_c* manager = NULL;
BOOL ret = FALSE;
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
manager = &dComIfGp_getEventManager();
if (field_0x1691 == 0) {
mOrderNewEvt = 0;
@ -4024,7 +4024,7 @@ BOOL daNpc_grA_c::talk(void*) {
fopAcM_createItemForPresentDemo(&current.pos, sp8, 0, -1, -1, NULL, NULL);
if (field_0x1480 != fpcM_ERROR_PROCESS_ID_e) {
s16 r25 = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, r25, 1, -1);
field_0x9ec = 1;
r29 = 1;
@ -4035,7 +4035,7 @@ BOOL daNpc_grA_c::talk(void*) {
}
} else {
if (mType == 0xa && field_0x1486 == 0 && daNpcF_chkEvtBit(0x187)) {
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
field_0x9ec = 1;
mOrderNewEvt = 1;
mOrderEvtNo = 0xa;

6
src/d/actor/d_a_npc_grc.cpp
View File

@ -500,7 +500,7 @@ BOOL daNpc_grC_c::main() {
attention_info.flags = 0;
}
if (!daNpc_grC_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) {
if (!daNpc_grC_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) {
if (mOrderEvtNo != 0) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -1066,7 +1066,7 @@ void daNpc_grC_c::doNormalAction(int param_1) {
BOOL daNpc_grC_c::doEvent() {
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != 0) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
if (!field_0xe51) {
@ -1451,7 +1451,7 @@ BOOL daNpc_grC_c::talk(void* param_1) {
if (mItemID != fpcM_ERROR_PROCESS_ID_e) {
s16 i_eventID = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, i_eventID, 1, 0xFFFF);
field_0x9ec = true;
rv = TRUE;

4
src/d/actor/d_a_npc_grd.cpp
View File

@ -382,7 +382,7 @@ BOOL daNpc_Grd_c::main() {
}
if (!mpHIO->m.common.debug_mode_ON &&
(!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())))
(!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())))
{
if (mOrderEvtNo != 0) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
@ -843,7 +843,7 @@ void daNpc_Grd_c::doNormalAction(int param_1) {
BOOL daNpc_Grd_c::doEvent() {
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != 0) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
if (eventInfo.mCommand == 1 || eventInfo.mCommand == 2) {

10
src/d/actor/d_a_npc_grm.cpp
View File

@ -392,13 +392,7 @@ void daNpc_grM_c::srchActors() {
BOOL daNpc_grM_c::evtProc() {
BOOL ret = FALSE;
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck()) {
#else
if (dComIfGp_event_runCheck()) {
#endif
if (eventInfo.checkCommandTalk()) {
if (!checkChangeEvt()) {
evtTalk();
@ -408,11 +402,7 @@ BOOL daNpc_grM_c::evtProc() {
dComIfGp_getEventManager().endCheck(mEvtId))
{
if (evtEndProc()) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
mEvtId = -1;
}
} else {

8
src/d/actor/d_a_npc_gro.cpp
View File

@ -639,7 +639,7 @@ BOOL daNpc_grO_c::main() {
attention_info.flags = 0;
}
if (!mpHIO->m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) {
if (!mpHIO->m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) {
if (mOrderEvtNo != EVT_NONE) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -1289,7 +1289,7 @@ BOOL daNpc_grO_c::doEvent() {
int evtCutNo = 0;
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != 0) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mUnkFlag) {
@ -1672,7 +1672,7 @@ int daNpc_grO_c::talk(void* param_1) {
mItemID = fopAcM_createItemForPresentDemo(&current.pos, itemId, 0, -1, -1, NULL, NULL);
if (mItemID != fpcM_ERROR_PROCESS_ID_e) {
s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF);
mUnkFlag = 1;
field_0x9ec = true;
@ -1684,7 +1684,7 @@ int daNpc_grO_c::talk(void* param_1) {
// dSv_event_tmp_flag_c::T_0081 - Kakariko Village - For use in fundraiser event completion cutscene
daNpcF_chkTmpBit(81)
) {
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
field_0x9ec = true;
mOrderNewEvt = true;
mOrderEvtNo = EVT_BOKIN_FINISH;

6
src/d/actor/d_a_npc_grr.cpp
View File

@ -489,7 +489,7 @@ BOOL daNpc_grR_c::main() {
attention_info.flags = 0;
}
if (!daNpc_grR_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) {
if (!daNpc_grR_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) {
if (mOrderEvtNo != 0) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -1048,7 +1048,7 @@ void daNpc_grR_c::doNormalAction(int param_1) {
BOOL daNpc_grR_c::doEvent() {
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != 0) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !field_0xe18) {
@ -1333,7 +1333,7 @@ int daNpc_grR_c::talk(void* param_1) {
if (mItemID != fpcM_ERROR_PROCESS_ID_e) {
s16 i_eventID = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, i_eventID, 1, 0xFFFF);
field_0xe18 = true;
field_0x9ec = true;

6
src/d/actor/d_a_npc_grs.cpp
View File

@ -385,7 +385,7 @@ int daNpc_grS_c::main() {
}
if (!mpHIO->m.common.debug_mode_ON) {
if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())) {
if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())) {
if (mOrderEvtNo != 0) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -896,7 +896,7 @@ int daNpc_grS_c::doEvent() {
int evtCutNo;
int staffId;
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
eventManager = &dComIfGp_getEventManager();
if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) &&
!mIsSpeaking)
@ -1187,7 +1187,7 @@ int daNpc_grS_c::talk(void* param_0) {
if (mPresentItemId != fpcM_ERROR_PROCESS_ID_e) {
s16 eventIdx =
dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, eventIdx, 1, 0xffff);
mIsSpeaking = true;
field_0x9ec = true;

8
src/d/actor/d_a_npc_grz.cpp
View File

@ -711,7 +711,7 @@ BOOL daNpc_Grz_c::main() {
}
if (!daNpc_Grz_Param_c::m.common.debug_mode_ON) {
if (!dComIfGp_event_runCheck() || mOrderNewEvt && dComIfGp_getEvent().isOrderOK()) {
if (!dComIfGp_event_runCheck() || mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()) {
if (mOrderEvtNo != EVT_NONE) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -1500,7 +1500,7 @@ void daNpc_Grz_c::doNormalAction(int param_1) {
BOOL daNpc_Grz_c::doEvent() {
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) {
@ -1601,8 +1601,8 @@ bool daNpc_Grz_c::setSkipZev(int param_1, int param_2) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
if (strcmp(eventManager.getRunEventName(), l_evtNames[param_1]) == 0) {
dComIfGp_getEvent().setSkipZev(this, l_evtNames[param_2]);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent()->setSkipZev(this, l_evtNames[param_2]);
dComIfGp_getEvent()->onSkipFade();
return true;
}

8
src/d/actor/d_a_npc_gwolf.cpp
View File

@ -558,7 +558,7 @@ BOOL daNpc_GWolf_c::main() {
attention_info.flags = 0;
}
if (!daNpc_GWolf_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) {
if (!daNpc_GWolf_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) {
if (mOrderEvtNo != EVT_NONE) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -1057,7 +1057,7 @@ void daNpc_GWolf_c::doNormalAction(int param_1) {
BOOL daNpc_GWolf_c::doEvent() {
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) {
@ -1636,8 +1636,8 @@ BOOL daNpc_GWolf_c::ECut_meetGWolf(int i_staffId) {
case 0:
setMotion(MOT_WAITSIT, -1.0f, 0);
setLookMode(LOOK_PLAYER);
dComIfGp_getEvent().setSkipProc(this, callback_proc, 0);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent()->setSkipProc(this, callback_proc, 0);
dComIfGp_getEvent()->onSkipFade();
break;
}
}

15
src/d/actor/d_a_npc_hanjo.cpp
View File

@ -1102,7 +1102,7 @@ int daNpc_Hanjo_c::cutConversation(int param_1) {
if (iVar6 == 1) {
fopAc_ac_c* actor_p =field_0x10c8[0].getActorP();
JUT_ASSERT(2650, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
}
break;
}
@ -1163,7 +1163,7 @@ int daNpc_Hanjo_c::cutPursuitBee(int param_1) {
setAngle(home.angle.y);
actor_p = field_0x10c8[0].getActorP();
JUT_ASSERT(2748, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
for (int i = 0; i < 4; i++) {
if (mStones[i].chkActive()) {
mStones[i].initialize();
@ -1309,8 +1309,8 @@ int daNpc_Hanjo_c::cutAppearHawker(int param_1) {
initTalk(0xcf, NULL);
strcpy(acStack_98, l_evtList[9].eventName);
strcat(acStack_98, "@");
dComIfGp_getEvent().setSkipZev(this, acStack_98);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent()->setSkipZev(this, acStack_98);
dComIfGp_getEvent()->onSkipFade();
dComIfGp_getVibration().StartShock( 9, 15, cXyz(0.0f, 1.0f, 0.0f));
break;
case 1:
@ -1747,9 +1747,8 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
}
case 2: {
field_0xe2d = 0;
dComIfG_play_c& play = g_dComIfG_gameInfo.play;
if (play.getEvent().runCheck()) {
if (strcmp("toal_enter01", play.getEvtManager().getRunEventName()) == 0) {
if (dComIfGp_event_runCheck() != FALSE) {
if (strcmp("toal_enter01", dComIfGp_getEventManager().getRunEventName()) == 0) {
dComIfGp_event_setTalkPartner(this);
field_0xe2d = 1;
}
@ -1835,7 +1834,7 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
}
}
} else {
if (!g_dComIfG_gameInfo.play.getEvent().mEventStatus &&
if (!dComIfGp_event_runCheck() &&
cLib_calcTimer(&field_0x1710) == 0)
{
field_0x1714++;

19
src/d/actor/d_a_npc_henna.cpp
View File

@ -274,7 +274,7 @@ static void message_shop(npc_henna_class* i_this) {
i_this->actor.attention_info.distances[1] = 4;
i_this->actor.attention_info.distances[3] = 4;
i_this->actor.eventInfo.onCondition(1);
if (dComIfGp_event_runCheck() != 0 && i_this->cam_mode == 0 &&
if (dComIfGp_event_runCheck() && i_this->cam_mode == 0 &&
i_this->actor.eventInfo.checkCommandTalk() != 0)
{
dComIfGp_event_reset();
@ -450,7 +450,7 @@ static void henna_ride(npc_henna_class* i_this) {
i_this->field_0x70e = 1300;
i_this->field_0x720 = player->eyePos;
if (dComIfGp_checkPlayerStatus0(0, 0x2000) != 0 || dComIfGp_event_runCheck() != 0) {
if (dComIfGp_checkPlayerStatus0(0, 0x2000) != 0 || dComIfGp_event_runCheck()) {
stickX = stickY = 0.0f;
}
stickMag = JMAFastSqrt(stickX * stickX + stickY * stickY);
@ -1015,7 +1015,7 @@ static void demo_camera_shop(npc_henna_class* i_this) {
switch (i_this->cam_mode) {
case 0: {
if (dComIfGp_event_runCheck() == FALSE) {
if (!dComIfGp_event_runCheck()) {
if (i_this->field_0x7b5 != 0) {
if (i_this->field_0x7b5 == 1 || i_this->field_0x7b5 == 21 ||
i_this->field_0x7b5 == 41)
@ -2197,14 +2197,7 @@ static void message_guide(npc_henna_class* i_this) {
return;
}
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (!actor->eventInfo.checkCommandTalk()) {
return;
}
@ -2234,11 +2227,7 @@ static void message_guide(npc_henna_class* i_this) {
}
if (i_this->mMsgFlow.doFlow(actor, NULL, 0) != 0) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
i_this->mIsTalking = 0;
}
} else {

13
src/d/actor/d_a_npc_hoz.cpp
View File

@ -660,14 +660,7 @@ BOOL daNpc_Hoz_c::evtCutProc() {
int daNpc_Hoz_c::evtProc() {
BOOL ret = FALSE;
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!checkChangeEvt()) {
evtTalk();
@ -676,11 +669,7 @@ int daNpc_Hoz_c::evtProc() {
} else if (eventInfo.checkCommandDemoAccrpt()
&& dComIfGp_getEventManager().endCheck(mEvtId)) {
if (evtEndProc()) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
mEvtId = -1;
}
} else {

12
src/d/actor/d_a_npc_impal.cpp
View File

@ -727,7 +727,7 @@ bool daNpcImpal_c::wait(void* param_0) {
}
}
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (dComIfGp_event_chkTalkXY()) {
if (dComIfGp_evmng_ChkPresentEnd() == FALSE) {
@ -740,7 +740,7 @@ bool daNpcImpal_c::wait(void* param_0) {
} else {
s16 evt_idx =
dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xff);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, evt_idx, 1, -1);
}
} else {
@ -814,7 +814,7 @@ bool daNpcImpal_c::talk(void* param_0) {
if (mItemPartnerId != 0xffffffff) {
s16 evt_idx =
dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, evt_idx, 1, -1);
field_0x9ec = 1;
}
@ -864,7 +864,7 @@ bool daNpcImpal_c::demo(void* param_0) {
setMotion(MOT_0, -1.0f, false);
mMode = 2;
case 2: {
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
dEvent_manager_c& event_manager = dComIfGp_getEventManager();
s32 staff_id = dComIfGp_evmng_getMyStaffId(l_myName, NULL, 0);
@ -975,7 +975,7 @@ BOOL daNpcImpal_c::EvCut_ImpalAppear1(int i_cut_index) {
if (mItemPartnerId != 0xffffffff) {
s16 evt_idx =
dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xff);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, evt_idx, 1, -1);
field_0x9ec = 1;
mOrderEvtNo = 2;
@ -1153,7 +1153,7 @@ BOOL daNpcImpal_c::main() {
(this->*mpActionFn)(NULL);
}
if (mItemPartnerId != -1 && dComIfGp_event_runCheck() != 0 &&
if (mItemPartnerId != -1 && dComIfGp_event_runCheck() &&
!strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM"))
{
dComIfGp_event_setItemPartnerId(mItemPartnerId);

8
src/d/actor/d_a_npc_ins.cpp
View File

@ -710,7 +710,7 @@ BOOL daNpcIns_c::main() {
(this->*mAction)(NULL);
}
if (mItemID != fpcM_ERROR_PROCESS_ID_e && dComIfGp_event_runCheck() != FALSE) {
if (mItemID != fpcM_ERROR_PROCESS_ID_e && dComIfGp_event_runCheck()) {
if (strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM") == 0) {
dComIfGp_event_setItemPartnerId(mItemID);
mItemID = fpcM_ERROR_PROCESS_ID_e;
@ -1053,7 +1053,7 @@ BOOL daNpcIns_c::setAction(actionFunc action) {
}
void daNpcIns_c::waitEventMng() {
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
setAction(&daNpcIns_c::talk);
} else if (dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0) != -1) {
@ -1469,7 +1469,7 @@ int daNpcIns_c::talk(void* param_1) {
if (mItemID != fpcM_ERROR_PROCESS_ID_e) {
daPy_getPlayerActorClass()->cancelOriginalDemo();
s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF);
field_0x9ec = true;
mOrderSpeakEvent = 1;
@ -1533,7 +1533,7 @@ int daNpcIns_c::demo(void* param_1) {
mMode = 2;
// fallthrough
case 2:
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
eventManager = &dComIfGp_getEventManager();
s32 staffId = eventManager->getMyStaffId(l_myName, NULL, 0);
if (staffId != -1) {

6
src/d/actor/d_a_npc_jagar.cpp
View File

@ -954,7 +954,7 @@ int daNpc_Jagar_c::cutNeedYourHelp(int i_cutIndex) {
if (dComIfGp_getEventManager().getIsAddvance(i_cutIndex)) {
switch(prm) {
case 0:
dComIfGp_getEvent().setPt2(mActorMngr[0].getActorP());
dComIfGp_getEvent()->setPt2(mActorMngr[0].getActorP());
break;
case 1:
@ -964,7 +964,7 @@ int daNpc_Jagar_c::cutNeedYourHelp(int i_cutIndex) {
case 7: {
fopAc_ac_c* iVar6 = mActorMngr[1].getActorP();
if (iVar6) {
dComIfGp_getEvent().setPt2(iVar6);
dComIfGp_getEvent()->setPt2(iVar6);
}
break;
}
@ -1170,7 +1170,7 @@ int daNpc_Jagar_c::cutConfidentialConversation(int i_cutIndex) {
break;
case 1:
dComIfGp_getEvent().setPt2(mActorMngr[1].getActorP());
dComIfGp_getEvent()->setPt2(mActorMngr[1].getActorP());
break;
case 2:

17
src/d/actor/d_a_npc_kasi_hana.cpp
View File

@ -1591,7 +1591,7 @@ int daNpcKasiHana_c::demo(int param_1) {
break;
case 1:
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
s32 staffId = dComIfGp_getEventManager().getMyStaffId(l_myName, NULL, 0);
if (staffId != -1) {
@ -1721,22 +1721,11 @@ int daNpcKasiHana_c::cheer(int param_1) {
field_0x1440 = 1;
}
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) {
if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) {
mTalked = true;
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
}
}
} else {

30
src/d/actor/d_a_npc_kasi_kyu.cpp
View File

@ -771,24 +771,13 @@ int daNpcKasiKyu_c::wait(int param_1) {
}
}
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) {
if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) {
OS_REPORT("------------------kyu talk reset!!\n");
mTalked = true;
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
}
}
} else {
@ -1335,22 +1324,11 @@ int daNpcKasiKyu_c::cheer(int param_1) {
current.angle.y = mCurAngle.y;
shape_angle.y = mCurAngle.y;
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) {
if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) {
mTalked = true;
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
}
}
} else {

30
src/d/actor/d_a_npc_kasi_mich.cpp
View File

@ -770,24 +770,13 @@ int daNpcKasiMich_c::wait(int param_1) {
}
}
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) {
if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) {
OS_REPORT("------------------mich talk reset!!\n");
mTalked = true;
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
}
}
} else {
@ -1321,22 +1310,11 @@ int daNpcKasiMich_c::cheer(int param_1) {
current.angle.y = mCurAngle.y;
shape_angle.y = mCurAngle.y;
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!dComIfGp_event_chkTalkXY() || dComIfGp_evmng_ChkPresentEnd()) {
if (dComIfGp_event_chkTalkXY() == FALSE || dComIfGp_evmng_ChkPresentEnd()) {
mTalked = true;
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
}
}
} else {

2
src/d/actor/d_a_npc_kkri.cpp
View File

@ -722,7 +722,7 @@ void daNpc_Kkri_c::setCollision() {
if (!mHide) {
u32 tg_type = 0xD8FBFDFF;
u32 tg_sprm = 0x1F;
if (dComIfGp_event_runCheck() != 0) {
if (dComIfGp_event_runCheck()) {
tg_type = 0;
tg_sprm = 0;
} else if (mTwilight) {

17
src/d/actor/d_a_npc_kn_base.inc
View File

@ -140,7 +140,7 @@ int daNpc_Kn_c::execute() {
setCollision();
if (field_0xe33 == 0) {
if ((field_0xe39 != 0 && dComIfGp_getEvent().isOrderOK()) || dComIfGp_event_runCheck() == FALSE)
if ((field_0xe39 != 0 && dComIfGp_getEvent()->isOrderOK()) || dComIfGp_event_runCheck() == FALSE)
{
evtOrder();
}
@ -603,14 +603,7 @@ int daNpc_Kn_c::ctrlJoint(J3DJoint* i_joint, J3DModel* i_model) {
int daNpc_Kn_c::evtProc() {
BOOL ret = FALSE;
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck())
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (!checkChangeEvt()) {
evtTalk();
@ -618,11 +611,7 @@ int daNpc_Kn_c::evtProc() {
ret = TRUE;
} else if (eventInfo.checkCommandDemoAccrpt() && dComIfGp_getEventManager().endCheck(mEvtId)) {
if (evtEndProc()) {
#if VERSION != VERSION_SHIELD_DEBUG
play->getEvent().reset();
#else
dComIfGp_event_reset();
#endif
mEvtId = -1;
}
} else {
@ -789,7 +778,7 @@ void daNpc_Kn_c::evtChange() {
}
mEvtId = dComIfGp_getEventManager().getEventIdx(this, mpEventData[mEvtNo].eventName, 0xff);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, mEvtId, 1, 0xffff);
}
}

9
src/d/actor/d_a_npc_ks.cpp
View File

@ -5811,7 +5811,6 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
int frame = i_this->model->getFrame();
int iVar1 = 0;
s16 sVar1 = 0x1000;
s16 range;
i_this->field_0x5fc = 0;
i_this->field_0xaec = 1;
@ -5936,7 +5935,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
}
iVar1 = 1;
range = actor->current.angle.y - i_this->target_angle;
s16 range = actor->current.angle.y - i_this->target_angle;
if ((range > 0x3000 || range < -0x3000) && i_this->mode < 22) {
anm_init(i_this, 28, 3.0f, 0, 1.0f);
i_this->mode = 22;
@ -6000,9 +5999,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
fopAcM_OnStatus(actor, 0);
cLib_onBit<u32>(actor->attention_info.flags, fopAc_AttnFlag_SPEAK_e | fopAc_AttnFlag_TALK_e);
actor->eventInfo.onCondition(dEvtCnd_CANTALK_e);
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck()) {
if (dComIfGp_event_runCheck()) {
if (actor->eventInfo.checkCommandTalk()) {
if (i_this->field_0xaee == 0) {
i_this->msg_flow.init(actor, 0x74, 0, NULL);
@ -6010,7 +6007,7 @@ static int npc_ks_fsdemo(npc_ks_class* i_this) {
}
if (i_this->msg_flow.doFlow(actor, NULL, 0)) {
play->getEvent().reset();
dComIfGp_event_reset();
i_this->field_0xaee = 0;
}
}

2
src/d/actor/d_a_npc_kyury.cpp
View File

@ -667,7 +667,7 @@ int daNpc_Kyury_c::cutConversation(int param_0) {
switch (local_34) {
case 0:
actor_p = mActorMngr[0].getActorP();
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
mPlayerAngle = fopAcM_searchPlayerAngleY(this);
if (checkStep()) {
mStepMode = 0;

46
src/d/actor/d_a_npc_maro.cpp
View File

@ -923,7 +923,7 @@ void daNpc_Maro_c::action() {
mMode = 1;
}
if (dComIfGp_event_runCheck() == 0) {
if (!dComIfGp_event_runCheck()) {
field_0x1138 = 0;
if (daNpcT_chkTmpBit(0x3C)) {
if (dComIfGs_getArrowNum() == 0) {
@ -1770,7 +1770,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
mActorMngr[4].entry(getItaMatoP(1));
actor_p = mActorMngr[4].getActorP();
JUT_ASSERT(0xCC3, NULL != actor_p);
dComIfGp_getEvent().setPtI(actor_p);
dComIfGp_getEvent()->setPtI(actor_p);
break;
}
@ -1783,7 +1783,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
case 4: {
actor_p = mActorMngr[4].getActorP();
JUT_ASSERT(0xCCE, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
break;
}
@ -1835,11 +1835,11 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
mFaceMotionSeqMngr.setNo(9, 0.0f, 0, 0);
mMotionSeqMngr.setNo(0, 0.0f, 0, 0);
mEventTimer = timer_val;
dComIfGp_getEvent().setPtT(this);
dComIfGp_getEvent()->setPtT(this);
mActorMngr[4].entry(getItaMatoP(1));
actor_p = mActorMngr[4].getActorP();
JUT_ASSERT(0xD0B, NULL != actor_p);
dComIfGp_getEvent().setPtI(actor_p);
dComIfGp_getEvent()->setPtI(actor_p);
break;
}
@ -1850,7 +1850,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
setAngle(mPlayerAngle);
mHide = false;
mEventTimer = timer_val;
dComIfGp_getEvent().setPt2(this);
dComIfGp_getEvent()->setPt2(this);
break;
}
@ -1858,8 +1858,8 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
mActorMngr[4].entry(getItaMatoP(2));
actor_p = mActorMngr[4].getActorP();
JUT_ASSERT(0xD1E, NULL != actor_p);
dComIfGp_getEvent().setPtI(actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPtI(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
}
// fallthrough intentional.
case 33: {
@ -1874,8 +1874,8 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
mActorMngr[4].entry(getItaMatoP(2));
actor_p = mActorMngr[4].getActorP();
JUT_ASSERT(0xD2E, NULL != actor_p);
dComIfGp_getEvent().setPtI(actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPtI(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
break;
}
@ -1910,7 +1910,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
case 65: {
actor_p = mActorMngr[1].getActorP();
JUT_ASSERT(0xD2E, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
break;
}
@ -1962,12 +1962,12 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
setAngle(fopAcM_searchPlayerAngleY(this));
mHide = false;
initTalk(mFlowNodeNo, local_4c);
dComIfGp_getEvent().setPtT(this);
dComIfGp_getEvent()->setPtT(this);
break;
}
case 7: {
dComIfGp_getEvent().setPt2(this);
dComIfGp_getEvent()->setPt2(this);
break;
}
@ -1990,8 +1990,8 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
mActorMngr[4].entry(getItaMatoP(2));
actor_p = mActorMngr[4].getActorP();
JUT_ASSERT(0xDB3, NULL != actor_p);
dComIfGp_getEvent().setPtI(actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPtI(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
}
// fallthrough intentional.
case 35: {
@ -2002,7 +2002,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
case 44: {
actor_p = mActorMngr[1].getActorP();
JUT_ASSERT(0xDBD, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
break;
}
@ -2045,7 +2045,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
if (prm_val == 1 && retval != 0) {
actor_p = mActorMngr[4].getActorP();
JUT_ASSERT(0xDF0, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
}
break;
@ -2088,7 +2088,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
switch (prm_val) {
case 2:
case 4: {
dComIfGp_getEvent().setPt2(this);
dComIfGp_getEvent()->setPt2(this);
break;
}
}
@ -2208,7 +2208,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
if (retval != 0) {
actor_p = mActorMngr[1].getActorP();
JUT_ASSERT(0xE48, NULL != actor_p);
dComIfGp_getEvent().setPt2(actor_p);
dComIfGp_getEvent()->setPt2(actor_p);
}
break;
@ -2284,7 +2284,7 @@ int daNpc_Maro_c::cutArrowTutorial(int arg0) {
my_s_vec.y = fopAcM_searchActorAngleY(daPy_getPlayerActorClass(), this);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&daPy_getPlayerActorClass()->current.pos,
my_s_vec.y, 0);
dComIfGp_getEvent().setPt2(this);
dComIfGp_getEvent()->setPt2(this);
setAngle(fopAcM_searchPlayerAngleY(this));
} else if (prm_val == 63) {
if (!daNpcT_chkEvtBit(0x4B)) {
@ -2555,8 +2555,8 @@ int daNpc_Maro_c::cutMarosWhisper(int arg0) {
mDoMtx_stack_c::multVec(&my_vec_0, &field_0xd6c);
mJntAnm.sorasu2(&field_0xd6c, 1);
initTalk(22, NULL);
dComIfGp_getEvent().setPtT(this);
dComIfGp_getEvent().setPt2(this);
dComIfGp_getEvent()->setPtT(this);
dComIfGp_getEvent()->setPt2(this);
}
}
}
@ -2870,7 +2870,7 @@ int daNpc_Maro_c::wait(void* param_0) {
field_0x1133 = 1;
}
if (field_0x1133 && daNpcT_chkEvtBit(0x3C) && dComIfGp_event_runCheck() == 0) {
if (field_0x1133 && daNpcT_chkEvtBit(0x3C) && !dComIfGp_event_runCheck()) {
field_0x1133 = 0;
}

2
src/d/actor/d_a_npc_moi.cpp
View File

@ -1477,7 +1477,7 @@ int daNpc_Moi_c::cutAppearanceMoi(int param_1) {
case 2:
mFaceMotionSeqMngr.setNo(MOT_UNK_21, -1.0f, 0, 0);
mMotionSeqMngr.setNo(MOT_UNK_45, -1.0f, 0, 0);
dComIfGp_getEvent().setPt2(this);
dComIfGp_getEvent()->setPt2(this);
mEventTimer = local_78;
break;
case 3:

6
src/d/actor/d_a_npc_moir.cpp
View File

@ -1336,7 +1336,7 @@ bool daNpcMoiR_c::talk(void* param_1) {
if (field_0xdf8 != -1) {
s16 i_eventID = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, i_eventID, 1, 0xFFFF);
field_0x9ec = true;
}
@ -1513,7 +1513,7 @@ bool daNpcMoiR_c::demo(void* param_1) {
field_0xe08 = 2;
// fallthrough
case 2:
if (dComIfGp_event_runCheck() != 0 && eventInfo.checkCommandTalk() == 0) {
if (dComIfGp_event_runCheck() && eventInfo.checkCommandTalk() == 0) {
evt_mng = &dComIfGp_getEventManager();
s32 staffIdx = evt_mng->getMyStaffId(l_myName, NULL, 0);
if (staffIdx != -1) {
@ -1860,7 +1860,7 @@ BOOL daNpcMoiR_c::main() {
(this->*mAction)(NULL);
}
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && field_0xdf8 != -1) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && field_0xdf8 != -1) {
dComIfGp_event_setItemPartnerId(field_0xdf8);
field_0xdf8 = -1;
}

8
src/d/actor/d_a_npc_myna2.cpp
View File

@ -307,7 +307,7 @@ BOOL daNpc_myna2_c::main() {
attention_info.flags = 0;
}
if (!daNpc_myna2_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK()))) {
if (!daNpc_myna2_Param_c::m.common.debug_mode_ON && (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK()))) {
if (mOrderEvtNo != 0) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -687,7 +687,7 @@ void daNpc_myna2_c::doNormalAction(int param_0) {
BOOL daNpc_myna2_c::doEvent() {
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) {
@ -854,7 +854,7 @@ int daNpc_myna2_c::waitFailure(void* param_0) {
fopAcM_delete(myna);
}
if (dComIfGp_getEvent().isOrderOK()) {
if (dComIfGp_getEvent()->isOrderOK()) {
mOrderEvtNo = 2;
mOrderNewEvt = 1;
}
@ -878,7 +878,7 @@ int daNpc_myna2_c::waitGoal(void* param_0) {
case 2:
mSound.playSumomoBgm(0);
if (!daPy_getPlayerActorClass()->checkCargoCarry() && dComIfGp_getEvent().isOrderOK()) {
if (!daPy_getPlayerActorClass()->checkCargoCarry() && dComIfGp_getEvent()->isOrderOK()) {
if (dComIfGp_getMessageCountNumber() >= 10000 && (!daNpcF_chkEvtBit(0x11E) || dComIfGp_getMessageCountNumber() > dComIfGs_getBalloonScore() || (dComIfGp_getMessageCountNumber() >= 0xF00E))) {
mOrderEvtNo = 4;
} else {

4
src/d/actor/d_a_npc_pachi_taro.cpp
View File

@ -1471,7 +1471,7 @@ int daNpc_Pachi_Taro_c::wait(void* param_1) {
if (field_0x1004 == 0) {
mEvtNo = EVT_TUTRIAL_BEGIN;
mPrevEvtNo = mEvtNo;
dComIfGp_getEvent().setSkipProc(this, dEv_defaultSkipProc, 0);
dComIfGp_getEvent()->setSkipProc(this, dEv_defaultSkipProc, 0);
} else if (field_0x1004 == 1) {
watch_tutrial();
}
@ -1801,7 +1801,7 @@ BOOL daNpc_Pachi_Taro_c::evtEndProc() {
BOOL daNpc_Pachi_Taro_c::cutTutrialBegin(int i_staffId) {
field_0x1004 = 1;
dComIfGp_getEvent().setSkipZev(this, "TUTRIAL_BEGIN_SKIP");
dComIfGp_getEvent()->setSkipZev(this, "TUTRIAL_BEGIN_SKIP");
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
int* cutId = NULL;
cutId = dComIfGp_evmng_getMyIntegerP(i_staffId, "cutId");

2
src/d/actor/d_a_npc_prayer.cpp
View File

@ -651,7 +651,7 @@ bool daNpcPray_c::demo(void*) {
mActionMode = 2;
break;
case 2:
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
dEvent_manager_c& evtmgr = dComIfGp_getEventManager();
const int staffID = evtmgr.getMyStaffId(l_myName, NULL, 0);
if (staffID != -1) {

32
src/d/actor/d_a_npc_rafrel.cpp
View File

@ -439,7 +439,7 @@ BOOL daNpcRafrel_c::main() {
(this->*field_0xde0)(NULL);
}
if (field_0xe00 != fpcM_ERROR_PROCESS_ID_e && dComIfGp_event_runCheck() != 0) {
if (field_0xe00 != fpcM_ERROR_PROCESS_ID_e && dComIfGp_event_runCheck()) {
if (strcmp(dComIfGp_getEventManager().getRunEventName(), "DEFAULT_GETITEM") == 0) {
dComIfGp_event_setItemPartnerId(field_0xe00);
field_0xe00 = -1;
@ -1065,7 +1065,6 @@ BOOL daNpcRafrel_c::chkFindPlayer() {
return ret;
}
// NONMATCHING - gameinfo event load stuff
bool daNpcRafrel_c::wait_type01(void* param_0) {
switch (field_0xe10) {
case 0:
@ -1130,26 +1129,13 @@ bool daNpcRafrel_c::wait_type01(void* param_0) {
field_0xe15 = 1;
}
#if VERSION != VERSION_SHIELD_DEBUG
// TODO: gameInfo fake match to force reuse of pointer
dComIfG_play_c* play = &g_dComIfG_gameInfo.play;
if (play->getEvent().runCheck())
#else
if (dComIfGp_event_runCheck() != 0)
#endif
{
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (isSneaking()) {
mOrderEvtNo = 6;
changeEvent(l_arcNames[0], l_evtNames[mOrderEvtNo], 1, 0xFFFF);
} else if (dComIfGp_event_chkTalkXY()) {
#if VERSION != VERSION_SHIELD_DEBUG
dEvent_manager_c* evtmng_p = &play->getEvtManager();
if (evtmng_p->ChkPresentEnd() == 0)
#else
if (dComIfGp_evmng_ChkPresentEnd() == 0)
#endif
{
if (dComIfGp_evmng_ChkPresentEnd() == 0) {
return 1;
}
@ -1157,12 +1143,8 @@ bool daNpcRafrel_c::wait_type01(void* param_0) {
field_0xe0c = 0x21;
setAction(&daNpcRafrel_c::talk);
} else {
#if VERSION != VERSION_SHIELD_DEBUG
s16 sp8 = evtmng_p->getEventIdx(this, "NO_RESPONSE", 0xFF);
#else
s16 sp8 = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xFF);
#endif
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, sp8, 1, 0xFFFF);
}
} else {
@ -1332,7 +1314,7 @@ bool daNpcRafrel_c::talk(void* param_0) {
field_0xe00 = fopAcM_createItemForPresentDemo(&current.pos, itemNo, 0, -1, -1, NULL, NULL);
if (field_0xe00 != fpcM_ERROR_PROCESS_ID_e) {
s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF);
field_0xe16 = 1;
field_0x9ec = 1;
@ -1382,7 +1364,7 @@ bool daNpcRafrel_c::demo(void* param_0) {
field_0xe10 = 2;
/* fallthrough */
case 2:
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
evtmgr = &dComIfGp_getEventManager();
const int staffId = evtmgr->getMyStaffId(l_myName, NULL, 0);
@ -1611,7 +1593,7 @@ int daNpcRafrel_c::EvCut_Appear(int i_staffId) {
OS_REPORT("二択分岐 %s\n", choiceNo == 0 ? "はい" : "いいえ");
if (choiceNo > 0) {
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
}
return 1;

4
src/d/actor/d_a_npc_saru.cpp
View File

@ -935,8 +935,8 @@ int daNpc_Saru_c::cutYmLook(int param_1) {
case 0:
strcpy(acStack_88, l_evtList[2].eventName);
strcat(acStack_88, "@");
dComIfGp_getEvent().setSkipZev(this, acStack_88);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent()->setSkipZev(this, acStack_88);
dComIfGp_getEvent()->onSkipFade();
field_0xfd9 = 1;
case 1:

2
src/d/actor/d_a_npc_seira.cpp
View File

@ -670,7 +670,7 @@ void daNpc_Seira_c::setCollision() {
cXyz cStack_48;
f32 cylH, wallR;
if (!mHide) {
if (mTwilight == 1 && dComIfGp_event_runCheck() == FALSE) {
if (mTwilight == 1 && !dComIfGp_event_runCheck()) {
mCyl1.SetCoSPrm(0x69);
} else {
mCyl1.SetCoSPrm(0x79);

2
src/d/actor/d_a_npc_seira2.cpp
View File

@ -579,7 +579,7 @@ void daNpc_Seira2_c::setCollision() {
cXyz cStack_48;
f32 cylH, wallR;
if (!mHide) {
if (mTwilight == 1 && dComIfGp_event_runCheck() == FALSE) {
if (mTwilight == 1 && !dComIfGp_event_runCheck()) {
mCyl1.SetCoSPrm(0x69);
} else {
mCyl1.SetCoSPrm(0x79);

24
src/d/actor/d_a_npc_shad.cpp
View File

@ -1327,7 +1327,7 @@ bool daNpcShad_c::wait_type1(void* param_1) {
}
}
if (dComIfGp_event_runCheck() != 0) {
if (dComIfGp_event_runCheck()) {
if (eventInfo.checkCommandTalk()) {
if (dComIfGp_event_chkTalkXY()) {
if (!dComIfGp_evmng_ChkPresentEnd()) {
@ -1352,7 +1352,7 @@ bool daNpcShad_c::wait_type1(void* param_1) {
changeEvent(l_evtArcs[mOrderEvtNo], l_evtNames[mOrderEvtNo], 1, 0xFFFF);
} else {
s16 eventIdx = dComIfGp_getEventManager().getEventIdx(this, "NO_RESPONSE", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF);
}
} else if (daNpcF_chkEvtBit(0x313)) {
@ -1493,7 +1493,7 @@ bool daNpcShad_c::talk(void* param_1) {
if (mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) {
eventIdx = dComIfGp_getEventManager().getEventIdx(this, "DEFAULT_GETITEM", 0xFF);
dComIfGp_getEvent().reset(this);
dComIfGp_getEvent()->reset(this);
fopAcM_orderChangeEventId(this, eventIdx, 1, 0xFFFF);
field_0x9ec = true;
setWaitAction();
@ -1546,7 +1546,7 @@ bool daNpcShad_c::demo(void* param_1) {
field_0xe1a = 2;
// fallthrough
case 2:
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
s32 iVar1 = eventManager.getMyStaffId(l_myName, NULL, 0);
if (iVar1 != -1) {
@ -1859,8 +1859,8 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) {
fopAcM_OnStatus(actor, fopAcM_STATUS_UNK_0x800);
}
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent().onSkipFade();
dComIfGp_getEvent()->startCheckSkipEdge(this);
dComIfGp_getEvent()->onSkipFade();
// fallthrough
case '0003':
setLookMode(LOOK_NONE, NULL, NULL);
@ -1913,7 +1913,7 @@ BOOL daNpcShad_c::EvCut_ToChantSpell2(int i_cutIndex) {
}
}
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
Z2GetAudioMgr()->unMuteSceneBgm(70);
daNpcF_clearMessageTmpBit();
daNpcF_onEvtBit(0x12F);
@ -2046,7 +2046,7 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannon(int i_cutIndex) {
if (eventManager->getIsAddvance(i_cutIndex)) {
switch (*cutName) {
case '0001':
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
Z2GetAudioMgr()->bgmStreamPrepare(0x200007C);
Z2GetAudioMgr()->bgmStreamPlay();
setExpression(EXPR_NONE, 0.0f);
@ -2097,7 +2097,7 @@ BOOL daNpcShad_c::EvCut_DiscoveryCannon(int i_cutIndex) {
}
}
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
Z2GetAudioMgr()->bgmStreamStop(30);
daNpcF_clearMessageTmpBit();
daNpcF_onEvtBit(0x312);
@ -2201,7 +2201,7 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) {
if (eventManager->getIsAddvance(i_cutIndex)) {
switch (*cutName) {
case '0001':
dComIfGp_getEvent().startCheckSkipEdge(this);
dComIfGp_getEvent()->startCheckSkipEdge(this);
// fallthrough
case '0004':
setExpression(EXPR_NONE, -1.0f);
@ -2264,7 +2264,7 @@ BOOL daNpcShad_c::EvCut_Disappear(int i_cutIndex) {
setExpressionTalkAfter();
}
if (dComIfGp_getEvent().checkSkipEdge()) {
if (dComIfGp_getEvent()->checkSkipEdge()) {
daNpcF_clearMessageTmpBit();
daNpcF_onEvtBit(0x311);
mOrderEvtNo = 9;
@ -2553,7 +2553,7 @@ BOOL daNpcShad_c::main() {
(this->*mActionFn)(NULL);
}
if (dComIfGp_event_runCheck() != 0 && !eventInfo.checkCommandTalk() && mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && mItemPartnerId != fpcM_ERROR_PROCESS_ID_e) {
dComIfGp_event_setItemPartnerId(mItemPartnerId);
mItemPartnerId = fpcM_ERROR_PROCESS_ID_e;
}

4
src/d/actor/d_a_npc_shoe.cpp
View File

@ -602,7 +602,7 @@ bool daNpcShoe_c::demo(void* param_0) {
case 1:
break;
case 2:
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk()) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk()) {
dEvent_manager_c& eventManager = dComIfGp_getEventManager();
s32 staff_id = eventManager.getMyStaffId(l_myName, NULL, 0);
if (staff_id != -1) {
@ -674,7 +674,7 @@ BOOL daNpcShoe_c::main() {
if (mpActionFn != NULL) {
(this->*mpActionFn)(0);
}
if (dComIfGp_event_runCheck() != FALSE && !eventInfo.checkCommandTalk() && field_0xe00 != -1) {
if (dComIfGp_event_runCheck() && !eventInfo.checkCommandTalk() && field_0xe00 != -1) {
dComIfGp_event_setItemPartnerId(field_0xe00);
field_0xe00 = -1;
}

4
src/d/actor/d_a_npc_soldierA.cpp
View File

@ -427,7 +427,7 @@ BOOL daNpc_SoldierA_c::main() {
}
if (!mHIO->m.common.debug_mode_ON) {
if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())) {
if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())) {
if (mOrderEvtNo != EVT_NONE) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -766,7 +766,7 @@ BOOL daNpc_SoldierA_c::doEvent() {
int unused = 0;
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& event_manager = dComIfGp_getEventManager();
if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) {

4
src/d/actor/d_a_npc_soldierB.cpp
View File

@ -386,7 +386,7 @@ BOOL daNpc_SoldierB_c::main() {
}
if (!mHIO->m.common.debug_mode_ON) {
if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent().isOrderOK())) {
if (!dComIfGp_event_runCheck() || (mOrderNewEvt && dComIfGp_getEvent()->isOrderOK())) {
if (mOrderEvtNo != EVT_NONE) {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo].arcIdx]);
}
@ -661,7 +661,7 @@ void daNpc_SoldierB_c::doNormalAction(int param_1) {
BOOL daNpc_SoldierB_c::doEvent() {
BOOL rv = FALSE;
if (dComIfGp_event_runCheck() != FALSE) {
if (dComIfGp_event_runCheck()) {
dEvent_manager_c& event_manager = dComIfGp_getEventManager();
if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) {

Some files were not shown because too many files have changed in this diff Show More