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

include/d/actor/d_a_alink.h

@@ -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 */

include/d/actor/d_a_obj_table.h

@@ -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;

include/d/d_com_inf_game.h

@@ -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) {

include/d/d_save.h

@@ -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

include/d/d_stage.h

@@ -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;

src/d/actor/d_a_alink.cpp

@@ -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();

src/d/actor/d_a_alink_HIO.inc

@@ -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(),

src/d/actor/d_a_alink_demo.inc

@@ -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();
         }

src/d/actor/d_a_alink_wolf.inc

@@ -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) {

src/d/actor/d_a_alldie.cpp

@@ -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;

src/d/actor/d_a_b_bq.cpp

@@ -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");

src/d/actor/d_a_b_dr.cpp

@@ -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));

src/d/actor/d_a_b_ds.cpp

@@ -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));

src/d/actor/d_a_b_gg.cpp

@@ -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);
     }
 }
 

src/d/actor/d_a_b_gm.cpp

@@ -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;

src/d/actor/d_a_b_gnd.cpp

@@ -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);

src/d/actor/d_a_b_mgn.cpp

@@ -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);
 }
 

src/d/actor/d_a_b_ob.cpp

@@ -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);
             }

src/d/actor/d_a_b_tn.cpp

@@ -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() {

src/d/actor/d_a_b_yo.cpp

@@ -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};