mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-05-30 00:16:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

b_gnd equivalent (#2340)

Browse Source 
* b_gnd equivalent

* fix dEvt_info_c inlines

* fix some more inlines
This commit is contained in:
TakaRikka
2025-03-23 12:55:28 -07:00
committed by GitHub
parent 4dc0cd9d09
commit a4cdad86f4
178 changed files with 4611 additions and 5262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/SSystem/SComponent/c_bg_s_lin_chk.h
-1
View File
@@ -36,7 +36,6 @@ public:
void SetHit() { mStts |= STTS_HIT; }
u32 ChkHit() const { return mStts & STTS_HIT; }
void SetCross(const cXyz& pos) { mLin.SetEnd(pos); }
cXyz& i_GetCross() { return mLin.GetEnd(); }
cXyz* GetCrossP() { return &mLin.GetEndP(); }
cM3dGLin* GetLinP() { return &mLin; }
bool ChkBackFlag() const { return mBackFlag; }
include/Z2AudioLib/Z2LinkMgr.h
+1 -2
View File
@@ -18,7 +18,6 @@ public:
Z2CreatureLink();
~Z2CreatureLink();
void setLinkState(u8);
void setLinkGroupInfo(u8);
void setLinkHp(s32, s32);
void setLinkSwordType(s32, s32);
@@ -48,7 +47,7 @@ public:
u8 getLinkState() const { return mLinkState; }
u8 getMoveSpeed() const { return mMoveSpeed; }
bool isRiding() const { return mRiding; }
void i_setLinkState(u8 i_state) { mLinkState = i_state; }
void setLinkState(u8 i_state) { mLinkState = i_state; }
Z2SoundObjSimple& getKantera() { return mKantera; }
u8 getLinkHp() const { return mLinkHp; }
u8 getMovingTime() { return mMovingTime; }
include/d/actor/d_a_alink.h
+3 -3
View File
@@ -3183,7 +3183,7 @@ public:
virtual f32 getSinkShapeOffset() const;
virtual BOOL checkSinkDead() const;
virtual BOOL checkHorseStart();
virtual Z2WolfHowlMgr* getWolfHowlMgrP();
virtual Z2WolfHowlMgr* getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
virtual BOOL checkWolfHowlSuccessAnime() const;
virtual BOOL checkCopyRodTopUse();
virtual bool checkCopyRodEquip() const;
@@ -3192,7 +3192,7 @@ public:
u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
BOOL checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
// this might be a fake match, but helps fix usage in many functions
#pragma optimization_level 2
@@ -3359,7 +3359,7 @@ public:
var_r5 = 0;
if (mItemAcKeep.getActor() != NULL &&
mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt() != 0) {
mItemAcKeep.getActor()->eventInfo.checkCommandDemoAccrpt() != 0) {
var_r5 = 1;
}
include/d/actor/d_a_b_gnd.h
+112 -117
View File
@@ -18,9 +18,6 @@
*/
struct g_himo_s {
/* 80601D40 */ ~g_himo_s();
/* 80601DA0 */ g_himo_s();
/* 0x0 */ cXyz field_0x0[16];
};
@@ -32,94 +29,85 @@ public:
/* 0x05AC */ request_of_phase_process_class mPhaseReq;
/* 0x05B4 */ request_of_phase_process_class mHorsePhaseReq;
/* 0x05BC */ s16 field_0x05bc;
/* 0x05BE */ u8 field_0x05be;
/* 0x05BF */ u8 field_0x05BF[0x05C0 - 0x05BF];
/* 0x05C0 */ cXyz field_0x05c0;
/* 0x05CC */ s16 field_0x05cc;
/* 0x05CE */ u8 field_0x05CE[0x05D0 - 0x05CE];
/* 0x05BC */ s16 mMoveMode;
/* 0x05BE */ u8 field_0x5be;
/* 0x05C0 */ cXyz field_0x5c0;
/* 0x05CC */ s16 field_0x5cc;
/* 0x05D0 */ mDoExt_McaMorfSO* mpModelMorf;
/* 0x05D4 */ mDoExt_McaMorfSO* mpHorseMorf;
/* 0x05D8 */ mDoExt_McaMorf* field_0x05d8;
/* 0x05DC */ Z2CreatureEnemy mZ2Creature;
/* 0x0680 */ Z2CreatureEnemy field_0x0680;
/* 0x0724 */ mDoExt_brkAnm* field_0x0724;
/* 0x0728 */ mDoExt_btkAnm* field_0x0728[6];
/* 0x0740 */ u8 field_0x0740[0x0744 - 0x0740];
/* 0x0744 */ mDoExt_btpAnm* field_0x0744;
/* 0x0748 */ int field_0x0748;
/* 0x074C */ mDoExt_btpAnm* field_0x074c;
/* 0x0750 */ mDoExt_btkAnm* field_0x0750;
/* 0x0754 */ u8 field_0x0754;
/* 0x0755 */ u8 field_0x0755[0x0758 - 0x0755];
/* 0x05D8 */ mDoExt_McaMorf* mpZeldaModel;
/* 0x05DC */ Z2CreatureEnemy mGndSound;
/* 0x0680 */ Z2CreatureEnemy mHorseSound;
/* 0x0724 */ mDoExt_brkAnm* mpGndCoreBrk;
/* 0x0728 */ mDoExt_btkAnm* mpGndEyeBtk[6];
/* 0x0740 */ u8 field_0x740[0x0744 - 0x0740];
/* 0x0744 */ mDoExt_btpAnm* mpGndEyeBtp;
/* 0x0748 */ int mGndEyeBtkNo;
/* 0x074C */ mDoExt_btpAnm* mpZeldaBtp;
/* 0x0750 */ mDoExt_btkAnm* mpZeldaBtk;
/* 0x0754 */ u8 mDrawZelda;
/* 0x0758 */ int mAnmID;
/* 0x075C */ int mHorseAnmID;
/* 0x0760 */ f32 mPlaySpeed;
/* 0x0764 */ u8 field_0x0764[0x0768 - 0x0764];
/* 0x0768 */ J3DModel* field_0x0768;
/* 0x076C */ J3DModel* field_0x076c;
/* 0x0770 */ u8 field_0x0770;
/* 0x0771 */ u8 field_0x0771;
/* 0x0772 */ s16 field_0x0772;
/* 0x0774 */ dKy_tevstr_c field_0x0774;
/* 0x0AFC */ s16 field_0x0afc;
/* 0x0AFE */ s16 mActionID;
/* 0x0B00 */ s16 field_0x0b00;
/* 0x0B02 */ u8 field_0x0B02[0x0B94 - 0x0B02];
/* 0x0B94 */ J3DModel* field_0x0b94[36];
/* 0x0C24 */ s16 field_0x0c24;
/* 0x0C26 */ s16 field_0x0c26;
/* 0x0C28 */ s16 field_0x0c28;
/* 0x0C2A */ u8 field_0x0C2A[0x0C2C - 0x0C2A];
/* 0x0C2C */ J3DModel* field_0x0c2c[2];
/* 0x0C34 */ u8 field_0x0C34[0x0C38 - 0x0C34];
/* 0x0C38 */ f32 field_0x0c38;
/* 0x0C3C */ s16 field_0x0c3c;
/* 0x0C3E */ u8 field_0x0C3E[0x0C40 - 0x0C3E];
/* 0x0764 */ u8 field_0x764[0x0768 - 0x0764];
/* 0x0768 */ J3DModel* mpSwordModel;
/* 0x076C */ J3DModel* mpSheathModel;
/* 0x0770 */ u8 field_0x770;
/* 0x0771 */ u8 mHideSheath;
/* 0x0772 */ s16 field_0x772;
/* 0x0774 */ dKy_tevstr_c mSwordTevstr;
/* 0x0AFC */ s16 mCounter;
/* 0x0AFE */ s16 mActionMode;
/* 0x0B00 */ s16 field_0xb00;
/* 0x0B02 */ u8 field_0xB02[0x0B94 - 0x0B02];
/* 0x0B94 */ J3DModel* mpMantShadowModel[36];
/* 0x0C24 */ s16 mSwordBlurAlpha;
/* 0x0C26 */ s16 mSwordBlurType;
/* 0x0C28 */ s16 field_0xc28;
/* 0x0C2C */ J3DModel* mpSwordBlurModel[2];
/* 0x0C34 */ u8 field_0xC34[0x0C38 - 0x0C34];
/* 0x0C38 */ f32 mPlayerDistXZ;
/* 0x0C3C */ s16 mPlayerAngleY;
/* 0x0C40 */ u32 mShadowID;
/* 0x0C44 */ s16 field_0x0c44[10];
/* 0x0C58 */ s16 field_0x0c58;
/* 0x0C5A */ s16 field_0x0c5a;
/* 0x0C5C */ s16 field_0x0c5c;
/* 0x0C5D */ u8 field_0x0C5E[0x0C60 - 0x0C5E];
/* 0x0C60 */ int field_0x0c60;
/* 0x0C64 */ int field_0x0c64;
/* 0x0C68 */ s16 field_0x0c68;
/* 0x0C6A */ s16 field_0x0c6a;
/* 0x0C6C */ f32 field_0x0c6c;
/* 0x0C70 */ s16 field_0x0c70;
/* 0x0C72 */ s16 field_0x0c72;
/* 0x0C74 */ s16 field_0x0c74;
/* 0x0C76 */ u8 field_0x0c76;
/* 0x0C77 */ u8 field_0x0c77;
/* 0x0C78 */ u8 field_0x0c78;
/* 0x0C79 */ u8 field_0x0c79;
/* 0x0C7A */ u8 field_0x0c7a;
/* 0x0C7B */ u8 field_0x0c7b;
/* 0x0C7C */ u8 field_0x0c7c;
/* 0x0C7D */ u8 field_0x0c7d;
/* 0x0C7E */ u8 field_0x0C7E[0x0C80 - 0x0C7E];
/* 0x0C80 */ cXyz field_0x0c80;
/* 0x0C8C */ s16 field_0x0c8c;
/* 0x0C8E */ s16 field_0x0c8e;
/* 0x0C90 */ s16 field_0x0c90;
/* 0x0C92 */ s16 field_0x0c92;
/* 0x0C94 */ dBgS_AcchCir mWall;
/* 0x0CD4 */ dBgS_ObjAcch field_0x0cd4;
/* 0x0EAC */ s16 field_0x0eac;
/* 0x0EAE */ u8 field_0x0EAE[0x0EB0 - 0x0EAE];
/* 0x0EB0 */ f32 field_0x0eb0;
/* 0x0EB4 */ cXyz field_0x0eb4;
/* 0x0EC0 */ csXyz field_0x0ec0;
/* 0x0EC6 */ u8 field_0x0EC6[0x0EC8 - 0x0EC6];
/* 0x0EC8 */ dCcD_Stts field_0x0ec8;
/* 0x0F04 */ dCcD_Sph mHorseSpheres1[2];
/* 0x1174 */ dCcD_Sph mHorseSpheres2[4];
/* 0x1654 */ dCcD_Stts field_0x1654;
/* 0x1690 */ dCcD_Sph field_0x1690[3];
/* 0x1A38 */ dCcD_Sph field_0x1a38;
/* 0x1B70 */ dCcD_Sph field_0x1b70;
/* 0x1CA8 */ dCcD_Cyl field_0x1ca8;
/* 0x0C44 */ s16 field_0xc44[10];
/* 0x0C58 */ s16 mDamageInvulnerabilityTimer;
/* 0x0C5A */ s16 field_0xc5a;
/* 0x0C5C */ s16 mHorseLegRot;
/* 0x0C60 */ int field_0xc60;
/* 0x0C64 */ int field_0xc64;
/* 0x0C68 */ s16 field_0xc68;
/* 0x0C6A */ s16 field_0xc6a;
/* 0x0C6C */ f32 field_0xc6c;
/* 0x0C70 */ s16 field_0xc70;
/* 0x0C72 */ s16 field_0xc72;
/* 0x0C74 */ s16 field_0xc74;
/* 0x0C76 */ u8 mGakeChkType;
/* 0x0C77 */ u8 field_0xc77;
/* 0x0C78 */ u8 field_0xc78;
/* 0x0C79 */ u8 field_0xc79;
/* 0x0C7A */ u8 field_0xc7a;
/* 0x0C7B */ u8 field_0xc7b;
/* 0x0C7C */ u8 field_0xc7c;
/* 0x0C7D */ s8 field_0xc7d;
/* 0x0C80 */ cXyz field_0xc80;
/* 0x0C8C */ s16 mGndBodyRotX;
/* 0x0C8E */ s16 mGndHeadRotZ;
/* 0x0C90 */ s16 field_0xc90;
/* 0x0C92 */ s16 field_0xc92;
/* 0x0C94 */ dBgS_AcchCir mAcchCir;
/* 0x0CD4 */ dBgS_ObjAcch mAcch;
/* 0x0EAC */ s16 field_0xeac;
/* 0x0EB0 */ f32 field_0xeb0;
/* 0x0EB4 */ cXyz field_0xeb4;
/* 0x0EC0 */ csXyz field_0xec0;
/* 0x0EC8 */ dCcD_Stts mHorseCcStts;
/* 0x0F04 */ dCcD_Sph mHorseBodySph[2];
/* 0x1174 */ dCcD_Sph mHorseFootSph[4];
/* 0x1654 */ dCcD_Stts mGndCcStts;
/* 0x1690 */ dCcD_Sph mGndSph[3];
/* 0x1A38 */ dCcD_Sph mAtSph;
/* 0x1B70 */ dCcD_Sph mDefSph;
/* 0x1CA8 */ dCcD_Cyl mCoCyl;
/* 0x1DE4 */ dCcU_AtInfo mAtInfo;
/* 0x1E08 */ u8 field_0x1e08;
/* 0x1E09 */ u8 field_0x1e09;
@@ -133,61 +121,69 @@ public:
/* 0x1E2C */ Z2SoundObjSimple field_0x1e2c;
/* 0x1E4C */ f32 field_0x1e4c;
/* 0x1E50 */ csXyz field_0x1e50;
/* 0x1E56 */ u8 field_0x1e56[5];
/* 0x1E5B */ u8 field_0x1E5B[0x1E5C - 0x1E5B];
/* 0x1E5C */ cXyz field_0x1e5c[5];
/* 0x1E56 */ s8 field_0x1e56[5];
/* 0x1E5C */ cXyz mLightBallPos[5];
/* 0x1E98 */ cXyz field_0x1e98[5];
/* 0x1ED4 */ cXyz field_0x1ed4[5];
/* 0x1F10 */ Z2SoundObjSimple field_0x1f10[5];
/* 0x1F10 */ Z2SoundObjSimple mLightBallSound[5];
/* 0x1FB0 */ u8 mInitHIO;
/* 0x1FB0 */ u8 field_0x1FB1[0x1FB4 - 0x1FB1];
/* 0x1FB4 */ fpc_ProcID mMantChildID;
/* 0x1FB8 */ cXyz field_0x1fb8;
/* 0x1FC4 */ int field_0x1fc4;
/* 0x1FC4 */ int mDrawHorse;
/* 0x1FC8 */ s16 field_0x1fc8;
/* 0x1FCA */ s16 field_0x1fca;
/* 0x1FCC */ s16 field_0x1fcc;
/* 0x1FCE */ u8 field_0x1FCE[0x1FD0 - 0x1FCE];
/* 0x1FCA */ s16 mGndArmRRotX;
/* 0x1FCC */ s16 mGndShoulderLRotY;
/* 0x1FD0 */ f32 field_0x1fd0;
/* 0x1FD4 */ s16 field_0x1fd4;
/* 0x1FD6 */ s16 field_0x1fd6;
/* 0x1FD8 */ cXyz field_0x1fd8[2];
/* 0x1FF0 */ g_himo_s field_0x1ff0[2];
/* 0x2170 */ mDoExt_3DlineMat1_c field_0x2170[2];
/* 0x2170 */ mDoExt_3DlineMat1_c mHorseReins[2];
/* 0x21E8 */ mDoExt_3DlineMat1_c field_0x21e8;
/* 0x2224 */ dKy_tevstr_c field_0x2224;
/* 0x25AC */ u32 field_0x25ac[17];
/* 0x25F0 */ u8 field_0x25F0[0x2688 - 0x25F0];
/* 0x25AC */ u32 field_0x25ac[2];
/* 0x25B4 */ u32 field_0x25b4;
/* 0x25B8 */ u32 field_0x25b8;
/* 0x25BC */ u32 field_0x25bc;
/* 0x25C0 */ u32 field_0x25c0;
/* 0x25C4 */ u32 field_0x25c4;
/* 0x25C8 */ u32 field_0x25c8;
/* 0x25CC */ u32 field_0x25cc;
/* 0x25D0 */ u32 field_0x25d0;
/* 0x25D4 */ u32 field_0x25d4;
/* 0x25D8 */ u32 field_0x25d8;
/* 0x25DC */ u32 field_0x25dc;
/* 0x25E0 */ u32 field_0x25e0;
/* 0x25E4 */ u32 field_0x25e4[3];
/* 0x25F0 */ u32 field_0x25f0[6];
/* 0x2608 */ u32 field_0x2608[5][6];
/* 0x2680 */ u32 field_0x2680[2];
/* 0x2688 */ u32 field_0x2688;
/* 0x268C */ u32 field_0x268c[3];
/* 0x2698 */ u8 field_0x2698;
/* 0x2699 */ u8 field_0x2699;
/* 0x269C */ cXyz field_0x269c;
/* 0x26A8 */ cXyz field_0x26a8[2];
/* 0x26C0 */ s16 field_0x26c0;
/* 0x26C0 */ s16 mGndLegRotX;
/* 0x26C2 */ s16 field_0x26c2;
/* 0x26C4 */ s16 field_0x26c4;
/* 0x26C6 */ s16 field_0x26c6;
/* 0x26C8 */ cXyz field_0x26c8;
/* 0x26D4 */ cXyz field_0x26d4;
/* 0x26E0 */ cXyz field_0x26e0;
/* 0x26EC */ cXyz field_0x26ec;
/* 0x26F8 */ cXyz field_0x26f8;
/* 0x2704 */ cXyz field_0x2704;
/* 0x26C4 */ s16 mDemoCamMode;
/* 0x26C6 */ s16 mDemoCamTimer;
/* 0x26C8 */ cXyz mDemoCamEye;
/* 0x26D4 */ cXyz mDemoCamCenter;
/* 0x26E0 */ cXyz mDemoCamEyeTarget;
/* 0x26EC */ cXyz mDemoCamCenterTarget;
/* 0x26F8 */ cXyz mDemoCamEyeSpd;
/* 0x2704 */ cXyz mDemoCamCenterSpd;
/* 0x2710 */ cXyz field_0x2710;
/* 0x271C */ s16 field_0x271c;
/* 0x271E */ u8 field_0x271E[0x2720 - 0x271E];
/* ox2720 */ cXyz field_0x2720;
/* 0x272C */ s16 field_0x272c;
/* 0x272E */ u8 field_0x272E[0x2730 - 0x272E];
/* 0x2730 */ f32 field_0x2730;
/* 0x2734 */ f32 field_0x2734;
/* 0x2738 */ u8 field_0x2738;
/* 0x2730 */ f32 mTubazeriPushValue;
/* 0x2734 */ f32 mTubazeriPushAmount;
/* 0x2738 */ u8 mNoDrawTimer;
/* 0x2739 */ u8 field_0x2739;
/* 0x273A */ u8 field_0x273A[0x273C - 0x273A];
/* 0x273C */ f32 field_0x273c;
/* 0x273C */ f32 mKankyoBlend;
/* 0x2740 */ u8 field_0x2740;
/* 0x2741 */ u8 field_0x2741[0x2744 - 0x2741];
/* 0x2744 */ dMsgFlow_c mMsgFlow;
};
@@ -196,10 +192,9 @@ STATIC_ASSERT(sizeof(b_gnd_class) == 0x2790);
class daB_GND_HIO_c {
public:
/* 805F4A4C */ daB_GND_HIO_c();
/* 80602230 */ ~daB_GND_HIO_c();
/* 80602230 */ virtual ~daB_GND_HIO_c() {}
/* 0x00 */ f32 field_0x0;
/* 0x04 */ s8 field_0x4;
/* 0x04 */ s8 no;
/* 0x08 */ f32 model_size;
/* 0x0C */ f32 field_0xc;
/* 0x10 */ f32 field_0x10;
include/d/actor/d_a_formation_mng.h
+1 -1
View File
@@ -185,7 +185,7 @@ struct daFmtMng_c : public fopAc_ac_c {
}
bool checkEmergency() {
if (dKy_darkworld_check() || !daPy_py_c::i_checkNowWolf()) {
if (dKy_darkworld_check() || !daPy_py_c::checkNowWolf()) {
return false;
}
FmtMember_c* member = mMember;
include/d/actor/d_a_guard_mng.h
+1 -1
View File
@@ -24,7 +24,7 @@ public:
0x00000200, 0x00000201,
};
if (!daPy_py_c::i_checkNowWolf() || field_0x573 >= mLimitNum) {
if (!daPy_py_c::checkNowWolf() || field_0x573 >= mLimitNum) {
return 1;
} else {
if (field_0x571 < mMerchantNum) {
include/d/actor/d_a_horse.h
+2 -6
View File
@@ -130,8 +130,6 @@ public:
PROC_NONE_e = 8,
};
fopAc_ac_c* getZeldaActor();
void cancelOriginalDemo() {
field_0x16b8 = 2;
m_demoMode = 1;
@@ -139,7 +137,6 @@ public:
/* 807E27F8 */ void onDemoJumpDistance(f32, f32);
/* 807E28B8 */ void changeDemoPos0(cXyz const*);
/* 807E28E0 */ void setHorsePosAndAngle(cXyz const*, s16);
/* 80838498 */ void coHitCallbackBoarJump(fopAc_ac_c*);
/* 80838798 */ void coHitCallbackBoarHit(fopAc_ac_c*, dCcD_GObjInf*);
/* 80838904 */ void coHitCallbackCowHit(fopAc_ac_c*);
@@ -225,7 +222,6 @@ public:
/* 8084478C */ ~daHorse_c();
/* 80182D04 */ void getLashDashStart() const;
bool checkNoBombProc() const { return m_procID == PROC_WAIT_e || m_procID == PROC_MOVE_e; }
bool checkResetStateFlg0(daHorse_RFLG0 flag) const { return m_resetStateFlg0 & flag; }
@@ -237,7 +233,7 @@ public:
void setDemoStickR(f32 stick) { m_demoStickR = stick; }
void changeDemoMode(u32 param_0, int param_1) { m_demoMode = param_0; field_0x1728 = param_1; }
void changeOriginalDemo() { field_0x16b8 = 3; field_0x1728 = 0; }
void i_setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*m_setHorsePosAngle)(i_pos, i_angle); }
void setHorsePosAndAngle(cXyz const* i_pos, s16 i_angle) { (this->*m_setHorsePosAngle)(i_pos, i_angle); }
void onRideFlg() { (this->*m_onRideFlg)(); }
void offRideFlg() { (this->*m_offRideFlg)(); }
void onStateFlg0(daHorse_FLG0 flag) { m_stateFlg0 |= flag; }
@@ -257,7 +253,7 @@ public:
u16 getAnmIdx(int i_idx) const { return m_anmIdx[i_idx]; }
int callHorse(const cXyz* param_0) { return (this->*m_callHorse)(param_0); }
daHoZelda_c* i_getZeldaActor() { return (daHoZelda_c*)m_zeldaActorKeep.getActor(); }
daHoZelda_c* getZeldaActor() { return (daHoZelda_c*)m_zeldaActorKeep.getActor(); }
bool checkTurnStandCamera() const { return checkResetStateFlg0(RFLG0_TURN_STAND_CAMERA); }
bool checkTurnStand() const { return checkResetStateFlg0(RFLG0_TURN_STAND); }
include/d/actor/d_a_midna.h
+1 -2
View File
@@ -215,7 +215,6 @@ public:
void onForcePanic() { onEndResetStateFlg0(ERFLG0_FORCE_PANIC); }
u32 checkForceNormalColor() const;
u32 checkForceTiredColor() const;
static bool checkMidnaTired();
void onNoServiceWait();
/* 804BC3E0 */ int modelCallBack(int);
@@ -357,7 +356,7 @@ public:
return dKy_darkworld_check() == true || dComIfGs_isTransformLV(3);
}
static bool i_checkMidnaTired() {
static bool checkMidnaTired() {
return dComIfGs_isTransformLV(3) && !dComIfGs_isEventBit(0x1E08);
}
include/d/actor/d_a_player.h
+9 -10
View File
@@ -690,9 +690,9 @@ public:
static void setPlayerDamage(int, int);
static void setMidnaMotionNum(int);
static void setMidnaFaceNum(int);
static BOOL checkShieldGet();
static BOOL checkSwordGet();
void changeDemoParam2(s16);
static BOOL checkShieldGet() { return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE; }
inline static BOOL checkSwordGet();
cXyz getHeadTopPos() const { return mHeadTopPos; }
BOOL checkThrowDamage() const { return checkNoResetFlg1(FLG1_THROW_DAMAGE); }
BOOL checkGoronSideMove() const { return mSpecialMode == 0x2B; }
@@ -1060,7 +1060,7 @@ public:
mDemo.setParam1(i_param1);
}
void i_changeDemoParam2(s16 i_param2) {
void changeDemoParam2(s16 i_param2) {
mDemo.setParam2(i_param2);
}
@@ -1070,6 +1070,8 @@ public:
void setItemPos(cXyz* i_itemPos) { mItemPos = *i_itemPos; }
cXyz* getViewerCurrentPosP() { return &field_0x5f8; }
static bool checkPeepEndSceneChange() { return getLastSceneMode() == 7; }
static int getLastSceneDamage() { return (dComIfGs_getLastSceneMode() >> 4) & 0x7F; }
@@ -1077,19 +1079,16 @@ public:
static BOOL checkNormalSwordEquip() { return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_SWORD; }
inline static u32 i_getLastSceneMode();
inline static u32 getLastSceneMode();
inline static bool checkWoodSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_WOOD_STICK;
}
inline static bool checkLightMasterSwordEquip();
inline BOOL i_checkSwordGet();
inline bool i_checkShieldGet() const;
inline static BOOL checkNowWolf();
inline static u32 i_checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
inline static u32 checkNowWolf() { return ((daPy_py_c*)dComIfGp_getLinkPlayer())->checkWolf(); }
inline bool checkZoraWearFlg() const;
inline bool checkMagicArmorWearFlg() const;
inline static BOOL i_checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
inline static BOOL checkFirstMidnaDemo() { return dComIfGs_isEventBit(0xc10); }
static int checkNowWolfPowerUp() { return checkNowWolfEyeUp(); }
static daMidna_c* getMidnaActor() { return m_midnaActor; }
include/d/d_meter2_info.h
+1 -1
View File
@@ -417,7 +417,7 @@ inline void dMeter2Info_allUseButton() {
g_meter2_info.allUseButton();
}
inline void i_dMeter2Info_offUseButton(int flag) {
inline void dMeter2Info_offUseButton(int flag) {
g_meter2_info.offUseButton(flag);
}
include/f_op/f_op_actor.h
+6 -12
View File
@@ -129,11 +129,13 @@ public:
void setEventName(char*);
char* getEventName();
void beforeProc();
void onCondition(u16);
void offCondition(u16);
BOOL checkCommandCatch();
BOOL checkCommandDoor();
void onCondition(u16 cond) { mCondition |= cond; }
void offCondition(u16 cond) { mCondition &= ~cond; }
BOOL checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; }
BOOL checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; }
BOOL checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; }
bool checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; }
bool checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; }
void setCommand(u16 command) { mCommand = command; }
void setMapToolId(u8 id) { mMapToolId = id; }
@@ -147,14 +149,6 @@ public:
void setIdx(u8 i_idx) { mIndex = i_idx; }
char* getArchiveName() { return mArchiveName; }
BOOL chkCondition(u16 condition) { return (mCondition & condition) == condition; }
void i_onCondition(u16 cond) { mCondition |= cond; }
void i_offCondition(u16 cond) { mCondition &= ~cond; }
bool checkCommandTalk() { return mCommand == dEvtCmd_INTALK_e; }
bool checkCommandItem() { return mCommand == dEvtCmd_INGETITEM_e; }
BOOL i_checkCommandDoor() { return mCommand == dEvtCmd_INDOOR_e; }
bool i_checkCommandDemoAccrpt() { return mCommand == dEvtCmd_INDEMO_e; }
bool i_checkCommandCatch() { return mCommand == dEvtCmd_INCATCH_e; }
void suspendProc(void* actor) {
if (field_0x10 != NULL) {
src/d/actor/d_a_alink.cpp
+38 -44
View File
@@ -132,12 +132,6 @@ u8 daAlink_matAnm_c::m_morf_frame;
bool daAlink_c::checkWindSpeedOnXZ() const {
return field_0x35b8.abs2XZ() > 1.0f;
}
bool daPy_py_c::i_checkShieldGet() const {
return dComIfGs_getSelectEquipShield() != fpcNm_ITEM_NONE;
}
u32 daPy_py_c::getLastSceneMode() {
return dComIfGs_getLastSceneMode() & 0xF;
}
/* 8009D8E4-8009D90C 098224 0028+00 2/2 0/0 0/0 .text init__16daAlink_matAnm_cFv */
void daAlink_matAnm_c::init() {
@@ -5513,7 +5507,7 @@ bool daPy_py_c::checkLightMasterSwordEquip() {
return dComIfGs_getSelectEquipSword() == fpcNm_ITEM_LIGHT_SWORD;
}
BOOL daPy_py_c::i_checkSwordGet() {
BOOL daPy_py_c::checkSwordGet() {
return dComIfGs_getSelectEquipSword() != fpcNm_ITEM_NONE;
}
@@ -5529,14 +5523,14 @@ void daAlink_c::setSelectEquipItem(int param_0) {
mSwordModel = mpSwMModel;
mSheathModel = mpSwMSheathModel;
} else {
if (!i_checkSwordGet()) {
if (!checkSwordGet()) {
mSwordChangeWaitTimer = 100;
}
mSwordModel = mpSwAModel;
mSheathModel = mpSwASheathModel;
}
if (!i_checkSwordGet() || checkWoodSwordEquip() || checkNoResetFlg3(FLG3_UNK_1000000)) {
if (!checkSwordGet() || checkWoodSwordEquip() || checkNoResetFlg3(FLG3_UNK_1000000)) {
if (field_0x06ec != NULL) {
field_0x06ec->hide();
}
@@ -5603,7 +5597,7 @@ BOOL daAlink_c::checkCanoeStart() {
return (checkStageName("F_SP115") && getStartRoomNo() == 0) && dComIfGs_getStartPoint() == 2;
}
u32 daPy_py_c::i_getLastSceneMode() {
u32 daPy_py_c::getLastSceneMode() {
return dComIfGs_getLastSceneMode() & 0xF;
}
@@ -5752,7 +5746,7 @@ void daAlink_c::playerInit() {
} else if (dComIfGp_getStartStagePoint() == -4) {
field_0x3188 = dComIfGp_evmng_startDemo(0xD5);
} else {
if (i_getLastSceneMode() == 9) {
if (getLastSceneMode() == 9) {
field_0x3188 = dComIfGp_evmng_startDemo(0xD3);
} else if (startMode == 10) {
if (startEvent != 0xFF) {
@@ -5778,9 +5772,9 @@ void daAlink_c::playerInit() {
}
} else if (startMode == 12) {
field_0x3188 = dComIfGp_evmng_startDemo(0xC9);
} else if (i_getLastSceneMode() == 11) {
} else if (getLastSceneMode() == 11) {
field_0x3188 = dComIfGp_evmng_startDemo(0xFF);
} else if (i_getLastSceneMode() == 12) {
} else if (getLastSceneMode() == 12) {
field_0x3188 = dComIfGp_evmng_startDemo(0xD1);
} else {
field_0x3188 = dComIfGp_evmng_startDemo(startEvent);
@@ -5858,7 +5852,7 @@ int daAlink_c::setStartProcInit() {
}
if (horse_start) {
horsep->i_setHorsePosAndAngle(&current.pos, shape_angle.y);
horsep->setHorsePosAndAngle(&current.pos, shape_angle.y);
horsep->initHorseMtx();
initForceRideHorse();
}
@@ -6041,7 +6035,7 @@ int daAlink_c::create() {
static int bgWaitFlg = 0;
u32 sceneMode = i_getLastSceneMode();
u32 sceneMode = getLastSceneMode();
s32 startMode = getStartMode();
s16 startPoint = dComIfGp_getStartStagePoint();
BOOL horseStart = checkHorseStart(sceneMode, startMode);
@@ -6404,8 +6398,8 @@ void daAlink_c::iceSlipBgCheck() {
sp48.z += field_0x35c4.z * var_f31;
if (commonLineCheck(&sp3C, &sp48) && dBgS_CheckBWallPoly(mLinkLinChk)) {
current.pos.x = mLinkLinChk.i_GetCross().x - field_0x35c4.x * var_f31;
current.pos.z = mLinkLinChk.i_GetCross().z - field_0x35c4.z * var_f31;
current.pos.x = mLinkLinChk.GetCross().x - field_0x35c4.x * var_f31;
current.pos.z = mLinkLinChk.GetCross().z - field_0x35c4.z * var_f31;
}
}
}
@@ -6573,7 +6567,7 @@ f32 daAlink_c::checkWindWallRate(cXyz const& param_0) {
f32 var_f31;
if (commonLineCheck(&sp24, &sp18) && dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 0xA) {
var_f31 = (1.0f / (daAlinkHIO_basic_c0::m.mMaxWindInfluenceDist - daAlinkHIO_basic_c0::m.mNoWindInfluenceDist)) * (sp24.abs(mLinkLinChk.i_GetCross()) - daAlinkHIO_basic_c0::m.mNoWindInfluenceDist);
var_f31 = (1.0f / (daAlinkHIO_basic_c0::m.mMaxWindInfluenceDist - daAlinkHIO_basic_c0::m.mNoWindInfluenceDist)) * (sp24.abs(mLinkLinChk.GetCross()) - daAlinkHIO_basic_c0::m.mNoWindInfluenceDist);
if (var_f31 < 0.0f) {
var_f31 = 0.0f;
}
@@ -7024,7 +7018,7 @@ void daAlink_c::setMatrix() {
} else if (checkReelAnime()) {
field_0x2fb6 = 4;
} else if (checkEquipAnime() && !checkModeFlg(1)) {
if (checkSwordEquipAnime() && !i_checkShieldGet()) {
if (checkSwordEquipAnime() && !checkShieldGet()) {
field_0x2fb6 = 5;
} else {
field_0x2fb6 = 1;
@@ -7037,7 +7031,7 @@ void daAlink_c::setMatrix() {
field_0x2fb6 = 7;
} else if (checkUpperAnime(0x96) || checkCutDashChargeAnime() || (checkReinRide() && (checkUpperReadyThrowAnime() || checkGrabAnime()))) {
field_0x2fb6 = 3;
} else if (checkSwordEquipAnime() && !i_checkShieldGet()) {
} else if (checkSwordEquipAnime() && !checkShieldGet()) {
field_0x2fb6 = 2;
} else if (checkIronBallWaitAnime()) {
if (checkUnderMove0BckNoArc(ANM_IRONBALL_WAIT)) {
@@ -7152,7 +7146,7 @@ void daAlink_c::setItemMatrix(int param_0) {
}
int var_r28;
if (!i_checkSwordGet()) {
if (!checkSwordGet()) {
var_r28 = 0;
} else if (checkLightMasterSwordEquip()) {
var_r28 = 3;
@@ -7168,7 +7162,7 @@ void daAlink_c::setItemMatrix(int param_0) {
if (param_0 != 0 || (checkPlayerGuardAndAttack() && mEquipItem != fpcNm_ITEM_IRONBALL && !checkModeFlg(0x400)) || checkNoResetFlg0(FLG0_UNK_2) || (mProcID == PROC_TOOL_DEMO && mProcVar4.field_0x3010 != 0) || (mProcID == PROC_CUT_REVERSE && mProcVar2.field_0x300c != 0) || mProcID == PROC_GUARD_BREAK || (mEquipItem == 0x103 && !checkEndResetFlg1(ERFLG1_GANON_FINISH) && !checkModeFlg(0x400))) {
mShieldModel->setBaseTRMtx(mpLinkModel->getAnmMtx(field_0x30c2));
if (i_checkShieldGet()) {
if (checkShieldGet()) {
field_0x2e44.offPassNum(0xF);
mDoAud_setLinkShieldType(1, 1);
} else {
@@ -7187,7 +7181,7 @@ void daAlink_c::setItemMatrix(int param_0) {
mDoMtx_stack_c::XYZrotM(cM_deg2s(91.0f), cM_deg2s(57.0f), cM_deg2s(180.0f));
mShieldModel->setBaseTRMtx(mDoMtx_stack_c::get());
if (!i_checkShieldGet()) {
if (!checkShieldGet()) {
mDoAud_setLinkShieldType(0, 2);
field_0x2e44.onPassNum(0x10);
} else {
@@ -7469,7 +7463,7 @@ BOOL daAlink_c::checkNoCollisionCorret() {
(!strcmp(dComIfGp_getEventManager().getRunEventName(), "SCENE_EXIT") ||
(fopAcM_getTalkEventPartner(this) &&
fopAcM_getTalkEventPartner(this) == getMidnaActor()))) ||
eventInfo.i_checkCommandDoor())
eventInfo.checkCommandDoor())
{
return true;
}
@@ -7710,7 +7704,7 @@ void daAlink_c::setAtCollision() {
mRopeLinChk.Set(&spBC, &spB0, this);
if (dComIfG_Bgsp().LineCross(&mRopeLinChk)) {
spB0 = mRopeLinChk.i_GetCross();
spB0 = mRopeLinChk.GetCross();
}
mAtCps[0].SetStartEnd(spBC, spB0);
@@ -9923,7 +9917,7 @@ void daAlink_c::setFrontWallType() {
f32 sp40;
if (checkModeFlg(2)) {
field_0x34ec = mLinkLinChk.i_GetCross();
field_0x34ec = mLinkLinChk.GetCross();
} else {
sp40 = linchk_tri.getSignedLenPos(&current.pos);
field_0x34ec.set(current.pos.x - (sp40 * linchk_tri.mNormal.x), current.pos.y, current.pos.z - (sp40 * linchk_tri.mNormal.z));
@@ -10102,7 +10096,7 @@ void daAlink_c::setFrontWallType() {
BOOL sp24 = commonLineCheck(&chk_start_pos, &chk_end_pos);
if (sp24) {
chk_start_pos = mLinkLinChk.i_GetCross();
chk_start_pos = mLinkLinChk.GetCross();
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &spCC);
chk_start_pos.x = (chk_start_pos.x + (25.0f * spCC.mNormal.x));
chk_start_pos.z = (chk_start_pos.z + (25.0f * spCC.mNormal.z));
@@ -10571,7 +10565,7 @@ void daAlink_c::setPlayerPosAndAngle(cXyz const* p_pos, s16 i_angle, int param_2
}
if (checkHorseRide()) {
dComIfGp_getHorseActor()->i_setHorsePosAndAngle(&current.pos, shape_angle.y);
dComIfGp_getHorseActor()->setHorsePosAndAngle(&current.pos, shape_angle.y);
} else if (checkSpinnerRide()) {
fopAc_ac_c* rideAc = mRideAcKeep.getActor();
rideAc->current.pos = current.pos;
@@ -12181,8 +12175,8 @@ BOOL daAlink_c::checkAutoJumpAction() {
if (field_0x3178 != 3 && !checkEndResetFlg0(ERFLG0_NOT_AUTO_JUMP)) {
if (sp14 >= sp10 && (!checkBootsOrArmorHeavy() || checkIronBallWaitAnime()) && (field_0x33a8 > 0.85f || (checkIronBallWaitAnime() && field_0x33ac > 0.85f) || mProcID == PROC_WOLF_GIANT_PUZZLE || checkEndResetFlg0(ERFLG0_FORCE_AUTO_JUMP)) && cLib_distanceAngleS(temp_r26, shape_angle.y) < 0x800) {
if (var_r29) {
current.pos.x = mLinkLinChk.i_GetCross().x;
current.pos.z = mLinkLinChk.i_GetCross().z;
current.pos.x = mLinkLinChk.GetCross().x;
current.pos.z = mLinkLinChk.GetCross().z;
}
if (checkWolf()) {
@@ -12197,9 +12191,9 @@ BOOL daAlink_c::checkAutoJumpAction() {
}
}
if (!checkEndResetFlg0(ERFLG0_NOT_HANG) && mSpecialMode != 0x2B && var_r29 && dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 2 && sp28 < -daAlinkHIO_wallHang_c0::m.hang_foot_pos_height && current.pos.y - mWaterY > sp18 && (fabsf(sp44.mNormal.y) <= 0.05f || (sp44.mNormal.y < 0.05f && var_r27 && getWallEdgePos(mLinkLinChk.i_GetCross(), &sp44, &sp58, mLinkLinChk.GetCrossP(), 0)))) {
current.pos.x = mLinkLinChk.i_GetCross().x;
current.pos.z = mLinkLinChk.i_GetCross().z;
if (!checkEndResetFlg0(ERFLG0_NOT_HANG) && mSpecialMode != 0x2B && var_r29 && dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 2 && sp28 < -daAlinkHIO_wallHang_c0::m.hang_foot_pos_height && current.pos.y - mWaterY > sp18 && (fabsf(sp44.mNormal.y) <= 0.05f || (sp44.mNormal.y < 0.05f && var_r27 && getWallEdgePos(mLinkLinChk.GetCross(), &sp44, &sp58, mLinkLinChk.GetCrossP(), 0)))) {
current.pos.x = mLinkLinChk.GetCross().x;
current.pos.z = mLinkLinChk.GetCross().z;
if (!checkWolf() && checkClimbCode(mLinkLinChk)) {
mPolyInfo1.SetPolyInfo(mLinkLinChk);
@@ -13141,7 +13135,7 @@ BOOL daAlink_c::checkItemAction() {
}
}
if (((dComIfGs_isEventBit(0x2908) || checkNoResetFlg3(FLG3_UNK_8)) && checkGuardActionChange() && !checkUpperReadyThrowAnime() && !checkModeFlg(0x70C52) && i_checkShieldGet() && !checkNotBattleStage()) && ((mLinkAcch.ChkGroundHit() || checkMagneBootsOn()) && dComIfGp_getRStatus() == 0)) {
if (((dComIfGs_isEventBit(0x2908) || checkNoResetFlg3(FLG3_UNK_8)) && checkGuardActionChange() && !checkUpperReadyThrowAnime() && !checkModeFlg(0x70C52) && checkShieldGet() && !checkNotBattleStage()) && ((mLinkAcch.ChkGroundHit() || checkMagneBootsOn()) && dComIfGp_getRStatus() == 0)) {
setRStatus(0x3A);
if (spActionTrigger()) {
@@ -13249,7 +13243,7 @@ BOOL daAlink_c::checkSwordTwirlAnime() const {
/* 800B93F4-800B9580 0B3D34 018C+00 7/7 0/0 0/0 .text swordEquip__9daAlink_cFi */
void daAlink_c::swordEquip(int param_0) {
if (i_checkSwordGet()) {
if (checkSwordGet()) {
field_0x2fde = 0x103;
if (checkReinRide()) {
@@ -14593,7 +14587,7 @@ void daAlink_c::posMove() {
if (commonLineCheck(&spC0, &spB4)) {
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &plane);
f32 temp_f31 = spB4.abs(mLinkLinChk.i_GetCross());
f32 temp_f31 = spB4.abs(mLinkLinChk.GetCross());
mDoMtx_multVecSR(mMagneBootInvMtx, &plane.mNormal, &spCC);
if (cBgW_CheckBWall(spCC.y)) {
@@ -14639,7 +14633,7 @@ void daAlink_c::autoGroundHit() {
sp5C = current.pos + (sp50 * 100.0f);
if (commonMagneLineCheck(&sp68, &sp5C)) {
current.pos = mMagneLineChk.i_GetCross();
current.pos = mMagneLineChk.GetCross();
onNoResetFlg0(FLG0_UNK_2000);
if (checkNoResetFlg1(FLG1_UNK_20000000)) {
@@ -15112,7 +15106,7 @@ int daAlink_c::checkSceneChange(int exitID) {
exit_mode = 0;
}
if (eventInfo.i_checkCommandDoor() || mProcID == PROC_WARP || mProcID == PROC_WOLF_DIG ||
if (eventInfo.checkCommandDoor() || mProcID == PROC_WARP || mProcID == PROC_WOLF_DIG ||
mProcID == PROC_WOLF_DIG_THROUGH || field_0x3106 != 0 ||
dComIfGp_event_compulsory(this, NULL, -1))
{
@@ -15146,7 +15140,7 @@ int daAlink_c::checkSceneChange(int exitID) {
if (scn_changed) {
onNoResetFlg0(FLG0_UNK_4000);
if (!eventInfo.i_checkCommandDoor()) {
if (!eventInfo.checkCommandDoor()) {
mDemo.setOriginalDemoType();
if (checkUpperReadyThrowAnime()) {
@@ -15327,7 +15321,7 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) {
mRopeLinChk.Set(&field_0x3834, &mHeldItemRootPos, this);
if (dComIfG_Bgsp().LineCross(&mRopeLinChk)) {
*param_1 = mRopeLinChk.i_GetCross();
*param_1 = mRopeLinChk.GetCross();
onResetFlg0(RFLG0_UNK_2000000);
return 1;
}
@@ -15352,7 +15346,7 @@ BOOL daAlink_c::checkSightLine(f32 param_0, cXyz* param_1) {
BOOL temp_r3 = dComIfG_Bgsp().LineCross(var_r30);
if (temp_r3) {
*param_1 = var_r30->i_GetCross();
*param_1 = var_r30->GetCross();
onResetFlg0(RFLG0_UNK_2000000);
}
@@ -15913,10 +15907,10 @@ int daAlink_c::checkNewItemChange(u8 param_0) {
if (commonLineCheck(&sp38, &sp2C)) {
sp2C.x = (sp38.x * 2.0f) - sp2C.x;
sp2C.z = (sp38.z * 2.0f) - sp2C.z;
sp20 = mLinkLinChk.i_GetCross();
sp20 = mLinkLinChk.GetCross();
if (commonLineCheck(&sp38, &sp2C)) {
if (mLinkLinChk.i_GetCross().abs2XZ(sp20) < 14400.0f) {
if (mLinkLinChk.GetCross().abs2XZ(sp20) < 14400.0f) {
return ITEM_PROC_NONE;
}
}
@@ -16438,7 +16432,7 @@ void daAlink_c::commonProcInit(daAlink_c::daAlink_PROC i_procID) {
if (prev_proc_fishcast &&
(mItemAcKeep.getActor() == NULL ||
!mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt()) &&
!mItemAcKeep.getActor()->eventInfo.checkCommandDemoAccrpt()) &&
!checkEndResetFlg0(ERFLG0_UNK_1000))
{
deleteEquipItem(0, 0);
src/d/actor/d_a_alink_bottle.inc
+1 -1
View File
@@ -641,7 +641,7 @@ int daAlink_c::procBottleSwing() {
daPy_frameCtrl_c* frameCtrl_p = mUnderFrameCtrl;
if (mProcVar2.field_0x300c == 0) {
if (eventInfo.i_checkCommandCatch()) {
if (eventInfo.checkCommandCatch()) {
if (mProcVar3.field_0x300e == 0) {
dComIfGp_getVibration().StartShock(1, 1, cXyz(0.0f, 1.0f, 0.0f));
mProcVar3.field_0x300e = 1;
src/d/actor/d_a_alink_crawl.inc
+4 -4
View File
@@ -167,7 +167,7 @@ int daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int
int temp_r27 = dComIfG_Bgsp().GetSpecialCode(mLinkLinChk);
if (cBgW_CheckBWall(sp3C.mNormal.y) || (param_3 == 2 && cBgW_CheckBGround(sp3C.mNormal.y))) {
cXyz sp1C = *param_1 - mLinkLinChk.i_GetCross();
cXyz sp1C = *param_1 - mLinkLinChk.GetCross();
s16 temp_r26 = sp3C.mNormal.atan2sX_Z();
s16 temp_r3 = sp1C.atan2sX_Z();
@@ -205,7 +205,7 @@ int daAlink_c::getCrawlMoveVec(cXyz* param_0, cXyz* param_1, cXyz* param_2, int
}
if (param_3 == 1 && (temp_r27 == 1 || (sp3C.mNormal.y < field_0x3470 && temp_r27 == 2))) {
*param_2 = *param_1 - mLinkLinChk.i_GetCross();
*param_2 = *param_1 - mLinkLinChk.GetCross();
return 1;
}
}
@@ -247,7 +247,7 @@ BOOL daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param_2,
if (commonLineCheck(param_0, param_1)) {
cM3dGPla sp64;
*param_2 = mLinkLinChk.i_GetCross();
*param_2 = mLinkLinChk.GetCross();
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &sp64);
*param_4 = sp64.mNormal.atan2sX_Z();
@@ -255,7 +255,7 @@ BOOL daAlink_c::checkCrawlSideWall(cXyz* param_0, cXyz* param_1, cXyz* param_2,
sp4C = *param_2 + (sp64.mNormal * 95.0f);
sp58 = (sp4C + *param_2) * 0.5f;
if (commonLineCheck(&sp58, &sp4C)) {
*param_3 = mLinkLinChk.i_GetCross();
*param_3 = mLinkLinChk.GetCross();
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &sp64);
*param_5 = sp64.mNormal.atan2sX_Z();
src/d/actor/d_a_alink_cut.inc
+1 -1
View File
@@ -119,7 +119,7 @@ bool daAlink_c::checkCutFastReady() {
if (mEquipItem == fpcNm_ITEM_NONE && (dComIfGs_isEventBit(0x2A80) || checkNoResetFlg3(FLG3_UNK_80)))
{
if (checkModeFlg(1) && !checkRideOn() && i_checkSwordGet() && checkModeFlg(4) &&
if (checkModeFlg(1) && !checkRideOn() && checkSwordGet() && checkModeFlg(4) &&
!checkModeFlg(0x40000) && mTargetedActor == NULL && checkEnemyGroup(target_p))
{
f32 xz_dist = target_p->eyePos.abs2XZ(current.pos);
src/d/actor/d_a_alink_damage.inc
+3 -3
View File
@@ -106,7 +106,7 @@ void daAlink_c::checkCutLandDamage() {
/* 800D70A0-800D7160 0D19E0 00C0+00 2/2 0/0 0/0 .text checkCaughtEscapeCutTurn__9daAlink_cFv */
BOOL daAlink_c::checkCaughtEscapeCutTurn() {
if (mLinkAcch.ChkGroundHit() && (i_checkSwordGet() || checkWolf()) &&
if (mLinkAcch.ChkGroundHit() && (checkSwordGet() || checkWolf()) &&
checkCutTurnInputTrigger())
{
if (checkWolf()) {
@@ -1458,8 +1458,8 @@ int daAlink_c::procCoLargeDamageWallInit(int param_0, int param_1, s16 param_2,
s16 temp_r29 = cM_atan2s(sp18.mNormal.y, sp18.mNormal.absXZ());
current.angle.y = temp_r26;
current.pos.x = mLinkLinChk.i_GetCross().x;
current.pos.z = mLinkLinChk.i_GetCross().z;
current.pos.x = mLinkLinChk.GetCross().x;
current.pos.z = mLinkLinChk.GetCross().z;
setOldRootQuaternion(param_2, 0, param_3);
src/d/actor/d_a_alink_demo.inc
+1 -1
View File
@@ -199,7 +199,7 @@ int daAlink_c::checkDemoAction() {
if (mDemo.getParam0() != 0) {
freeGrabItem();
if (mDemo.getParam0() == 1 && i_checkSwordGet()) {
if (mDemo.getParam0() == 1 && checkSwordGet()) {
if (mEquipItem != 0x103) {
deleteEquipItem(FALSE, TRUE);
if (checkEquipAnime()) {
src/d/actor/d_a_alink_grab.inc
+3 -3
View File
@@ -362,7 +362,7 @@ void daAlink_c::setGrabItemPos() {
if (grabLineCheck(&sp110, &sp104)) {
if (temp_r3->current.pos.abs(sp110) > mObjLinChk.GetCrossP()->abs(sp110)) {
temp_r3->speedF = 0.0f;
temp_r3->current.pos = mObjLinChk.i_GetCross();
temp_r3->current.pos = mObjLinChk.GetCross();
freeGrabItem();
return;
}
@@ -431,7 +431,7 @@ void daAlink_c::freeGrabItem() {
cXyz sp14(current.pos.x, field_0x34e0.y, current.pos.z);
if (grabLineCheck(&sp14, &temp_r3->current.pos)) {
temp_r3->current.pos = mObjLinChk.i_GetCross();
temp_r3->current.pos = mObjLinChk.GetCross();
cM3dGPla sp20;
dComIfG_Bgsp().GetTriPla(mObjLinChk, &sp20);
@@ -659,7 +659,7 @@ void daAlink_c::putObjLineCheck(dBgS_LinChk& param_0, cXyz* param_1, fopAc_ac_c*
param_0.Set(&field_0x37c8, param_1, param_2);
if (dComIfG_Bgsp().LineCross(&param_0) && dBgS_CheckBWallPoly(param_0)) {
cXyz sp8 = *param_1 - param_0.i_GetCross();
cXyz sp8 = *param_1 - param_0.GetCross();
f32 temp_f31 = sp8.abs();
f32 temp_f1 = sp8.absXZ();
src/d/actor/d_a_alink_guard.inc
+3 -3
View File
@@ -63,7 +63,7 @@ void daAlink_c::stickArrowIncrement(int param_0) {
}
if (arrow_num != 0) {
if (i_checkShieldGet() && checkItemGet(fpcNm_ITEM_BOW, true)) {
if (checkShieldGet() && checkItemGet(fpcNm_ITEM_BOW, true)) {
int arrow_type = arrow_num == 1 ? fpcNm_ITEM_ARROW_1 : fpcNm_ITEM_ARROW_10;
dComIfGp_setItemArrowNumCount(arrow_num);
@@ -175,7 +175,7 @@ BOOL daAlink_c::checkUpperGuardAnime() const {
/* 800DCE6C-800DCF04 0D77AC 0098+00 1/0 0/0 0/0 .text checkPlayerGuard__9daAlink_cCFv */
BOOL daAlink_c::checkPlayerGuard() const {
return (checkSmallUpperGuardAnime() || (i_checkShieldGet() && checkHorseLieAnime())) ||
return (checkSmallUpperGuardAnime() || (checkShieldGet() && checkHorseLieAnime())) ||
checkUpperGuardAnime();
}
@@ -186,7 +186,7 @@ BOOL daAlink_c::checkPlayerGuardAndAttack() const {
/* 800DCF64-800DD008 0D78A4 00A4+00 2/2 0/0 0/0 .text checkGuardAccept__9daAlink_cFv */
BOOL daAlink_c::checkGuardAccept() {
return checkModeFlg(0x80) && i_checkShieldGet() && !checkFmChainGrabAnime() &&
return checkModeFlg(0x80) && checkShieldGet() && !checkFmChainGrabAnime() &&
!checkNotBattleStage();
}
src/d/actor/d_a_alink_hang.inc
+9 -9
View File
@@ -83,7 +83,7 @@ BOOL daAlink_c::hangMoveBgCheck(s16 param_0, cXyz* param_1) {
return true;
}
sp9C = mLinkLinChk.i_GetCross() - sp90;
sp9C = mLinkLinChk.GetCross() - sp90;
if (sp9C.abs2XZ() > param_1->abs2XZ()) {
*param_1 = sp9C;
rt = true;
@@ -664,7 +664,7 @@ int daAlink_c::procHangMove() {
if (abs(temp_r25) < 100) {
field_0x308c = 0;
} else {
cXyz spC8(mLinkLinChk.i_GetCross());
cXyz spC8(mLinkLinChk.GetCross());
spC8.x -= spA4.mNormal.x * 1.5f;
spC8.y += 25.0f;
spC8.z -= spA4.mNormal.z * 1.5f;
@@ -1743,7 +1743,7 @@ void daAlink_c::setClimbShapeOffset() {
sp60.z += var_f30;
if (commonLineCheck(&sp54, &sp60) && (!checkModeFlg(0x10000) || checkClimbCode(mLinkLinChk))) {
sp78 = mLinkLinChk.i_GetCross();
sp78 = mLinkLinChk.GetCross();
} else {
field_0x308c = 0;
return;
@@ -1757,7 +1757,7 @@ void daAlink_c::setClimbShapeOffset() {
if (!commonLineCheck(&sp54, &sp60) || (checkModeFlg(0x10000) && !checkClimbCode(mLinkLinChk))) {
field_0x308c = 0;
} else {
sp78 -= mLinkLinChk.i_GetCross();
sp78 -= mLinkLinChk.GetCross();
cLib_addCalcAngleS(&field_0x308c, (s16)((sp78.atan2sX_Z() - 0x4000) - shape_angle.y), 5,
2000, 400);
}
@@ -1928,8 +1928,8 @@ int daAlink_c::setMoveBGClimbCorrect() {
s16 temp_r28 = shape_angle.y;
shape_angle.y = temp_r29 + 0x8000;
current.pos.x = mLinkLinChk.i_GetCross().x;
current.pos.z = mLinkLinChk.i_GetCross().z;
current.pos.x = mLinkLinChk.GetCross().x;
current.pos.z = mLinkLinChk.GetCross().z;
current.angle.y += (s16)(shape_angle.y - temp_r28);
field_0x308c += (s16)(temp_r28 - shape_angle.y);
@@ -1948,7 +1948,7 @@ int daAlink_c::checkBgCorrectClimbMove(cXyz* i_startPos, cXyz* i_endPos) {
if (cLib_distanceAngleS(tri_plane.mNormal.atan2sX_Z(), shape_angle.y) < 0x549F ||
(checkModeFlg(0x10000) && !checkClimbCode(mLinkLinChk)))
{
current.pos += mLinkLinChk.i_GetCross() - *i_endPos;
current.pos += mLinkLinChk.GetCross() - *i_endPos;
return 1;
}
}
@@ -2911,8 +2911,8 @@ int daAlink_c::procRoofHangFrontMove() {
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &sp70);
if (cLib_distanceAngleS(sp70.mNormal.atan2sX_Z(), shape_angle.y) > 0x6000) {
current.pos.x = sp70.mNormal.x * 15.0f + mLinkLinChk.i_GetCross().x;
current.pos.z = sp70.mNormal.z * 15.0f + mLinkLinChk.i_GetCross().z;
current.pos.x = sp70.mNormal.x * 15.0f + mLinkLinChk.GetCross().x;
current.pos.z = sp70.mNormal.z * 15.0f + mLinkLinChk.GetCross().z;
return procFallInit(1, daAlinkHIO_autoJump_c0::m.mFallInterpolation);
}
}
src/d/actor/d_a_alink_hook.inc
+2 -2
View File
@@ -1155,7 +1155,7 @@ void daAlink_c::setHookshotPos() {
}
}
mHookshotTopPos = mRopeLinChk.i_GetCross() - (mIronBallCenterPos * 15.0f);
mHookshotTopPos = mRopeLinChk.GetCross() - (mIronBallCenterPos * 15.0f);
cM3dGPla poly;
dComIfG_Bgsp().GetTriPla(mRopeLinChk, &poly);
@@ -1649,7 +1649,7 @@ int daAlink_c::procHookshotFly() {
} else {
cXyz spA0 = current.pos - field_0x37c8;
if (commonLineCheck(&field_0x37c8, &current.pos)) {
current.pos = mLinkLinChk.i_GetCross();
current.pos = mLinkLinChk.GetCross();
spA0.y = 0.0f;
spA0.normalizeZP();
src/d/actor/d_a_alink_horse.inc
+6 -6
View File
@@ -38,7 +38,7 @@ BOOL daAlink_c::checkHorseZeldaBowMode() {
return false;
}
daHoZelda_c* zelda_p = dComIfGp_getHorseActor()->i_getZeldaActor();
daHoZelda_c* zelda_p = dComIfGp_getHorseActor()->getZeldaActor();
return zelda_p != NULL && zelda_p->checkBowMode();
}
@@ -46,7 +46,7 @@ BOOL daAlink_c::checkHorseZeldaBowMode() {
*/
void daAlink_c::setHorseZeldaDamage() {
if (dComIfGp_getHorseActor() != NULL) {
daHoZelda_c* zelda_p = dComIfGp_getHorseActor()->i_getZeldaActor();
daHoZelda_c* zelda_p = dComIfGp_getHorseActor()->getZeldaActor();
if (zelda_p != NULL) {
zelda_p->setDamageInit();
}
@@ -559,7 +559,7 @@ void daAlink_c::getBaseHorseAnime(daAlink_c::daAlink_ANM* param_0) {
if (checkHorseNoUpperAnime() || checkUpperHorseLieAnime()) {
if (!dComIfGp_checkPlayerStatus0(0, 0x2000)) {
if (i_checkShieldGet()) {
if (checkShieldGet()) {
setRStatus(0xB);
} else {
setRStatus(0x3E);
@@ -1764,7 +1764,7 @@ int daAlink_c::procHorseTurn() {
temp_r29->onTurnCancelKeep();
if (checkHorseNoUpperAnime()) {
if (i_checkShieldGet()) {
if (checkShieldGet()) {
setRStatus(0xB);
} else {
setRStatus(0x3E);
@@ -2045,7 +2045,7 @@ int daAlink_c::procHorseCut() {
} else if (checkNoResetFlg2(FLG2_UNK_2)) {
checkCutAction();
} else {
if (i_checkShieldGet()) {
if (checkShieldGet()) {
setRStatus(0xB);
} else {
setRStatus(0x3E);
@@ -2057,7 +2057,7 @@ int daAlink_c::procHorseCut() {
}
} else {
if (temp_r30->getFrame() > field_0x3484) {
if (i_checkShieldGet()) {
if (checkShieldGet()) {
setRStatus(0xB);
} else {
setRStatus(0x3E);
src/d/actor/d_a_alink_hvyboots.inc
+1 -1
View File
@@ -342,7 +342,7 @@ int daAlink_c::procMagneBootsFlyInit() {
dComIfG_Bgsp().GetTriPla(mMagneLineChk, &sp50);
mPolyInfo2.SetPolyInfo(mMagneLineChk);
field_0x37c8 = mMagneLineChk.i_GetCross();
field_0x37c8 = mMagneLineChk.GetCross();
setSpecialGravity(0.0f, maxFallSpeed, 0);
speed.y = 0.0f;
src/d/actor/d_a_alink_link.inc
+7 -7
View File
@@ -3411,13 +3411,13 @@ void daAlink_c::setDrawHand() {
u8 var_r30;
u8 var_r29;
if (checkNoResetFlg2(FLG2_STATUS_WINDOW_DRAW)) {
if (i_checkSwordGet()) {
if (checkSwordGet()) {
var_r30 = 0;
} else {
var_r30 = 0xFE;
}
if (i_checkShieldGet()) {
if (checkShieldGet()) {
var_r29 = 6;
} else {
var_r29 = 0xFE;
@@ -3527,14 +3527,14 @@ void daAlink_c::setDrawHand() {
/* 800CB480-800CB53C 0C5DC0 00BC+00 3/3 0/0 0/0 .text checkSwordDraw__9daAlink_cFv */
bool daAlink_c::checkSwordDraw() {
return ((i_checkSwordGet() && mSwordChangeWaitTimer == 0) &&
return ((checkSwordGet() && mSwordChangeWaitTimer == 0) &&
!checkNoResetFlg2(FLG2_UNK_2080000)) &&
(!checkWolf() || !dComIfGs_isEventBit(0x0C08));
}
/* 800CB53C-800CB5F8 0C5E7C 00BC+00 3/3 0/0 0/0 .text checkShieldDraw__9daAlink_cFv */
bool daAlink_c::checkShieldDraw() {
return ((i_checkShieldGet() && mShieldChangeWaitTimer == 0) &&
return ((checkShieldGet() && mShieldChangeWaitTimer == 0) &&
!checkNoResetFlg2(FLG2_UNK_4080000)) &&
(!checkWolf() || !dComIfGs_isEventBit(0x0C08));
}
@@ -3542,7 +3542,7 @@ bool daAlink_c::checkShieldDraw() {
/* 800CB5F8-800CB694 0C5F38 009C+00 2/2 0/0 0/0 .text checkItemDraw__9daAlink_cFv */
bool daAlink_c::checkItemDraw() {
if (mHeldItemModel != NULL && (mEquipItem != fpcNm_ITEM_IRONBALL || !checkSwordEquipAnime())) {
if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !i_checkShieldGet() ||
if (!checkBowAndSlingItem(mEquipItem) || checkBowGrabLeftHand() || !checkShieldGet() ||
field_0x2e44.checkPassNum(15))
{
return true;
@@ -4397,7 +4397,7 @@ s16 daAlink_c::checkBodyAngleX(s16 param_0) {
mDoMtx_stack_c::multVec(&sp2C, &sp14);
if (commonLineCheck(&sp20, &sp14)) {
cXyz sp8 = sp14 - mLinkLinChk.i_GetCross();
cXyz sp8 = sp14 - mLinkLinChk.GetCross();
multVecMagneBootInvMtx(&sp8);
current.pos.x -= sp8.x;
@@ -4465,7 +4465,7 @@ void daAlink_c::setSubjectMode() {
/* 800CEB58-800CEBD8 0C9498 0080+00 2/2 0/0 0/0 .text subjectCancelTrigger__9daAlink_cFv
*/
BOOL daAlink_c::subjectCancelTrigger() {
if (checkWolf() || checkNotBattleStage() || !i_checkSwordGet() ||
if (checkWolf() || checkNotBattleStage() || !checkSwordGet() ||
(checkModeFlg(0x40000) && !checkEquipHeavyBoots()))
{
return itemTriggerCheck(BTN_B);
src/d/actor/d_a_alink_swim.inc
+2 -2
View File
@@ -163,7 +163,7 @@ void daAlink_c::swimBgCheck(f32 param_0) {
if (cBgW_CheckBWall(tri.mNormal.y) &&
(mProcID != PROC_METAMORPHOSE || dComIfG_Bgsp().GetWallCode(mLinkLinChk) != 7))
{
cXyz sp14 = end_pos - mLinkLinChk.i_GetCross();
cXyz sp14 = end_pos - mLinkLinChk.GetCross();
f32 temp_f1 = sp14.absXZ();
s16 var_r28 = sp14.atan2sX_Z();
@@ -189,7 +189,7 @@ void daAlink_c::swimBgCheck(f32 param_0) {
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &tri);
if (cBgW_CheckBWall(tri.mNormal.y)) {
sp14 = end_pos - mLinkLinChk.i_GetCross();
sp14 = end_pos - mLinkLinChk.GetCross();
temp_f1 = sp14.absXZ();
var_r28 = sp14.atan2sX_Z();
src/d/actor/d_a_alink_swindow.inc
+1 -1
View File
@@ -31,7 +31,7 @@ inline bool checkShopWoodShieldEquip() {
/* 8013FF90-8013FFD8 13A8D0 0048+00 2/2 0/0 0/0 .text setShieldArcName__9daAlink_cFv */
void daAlink_c::setShieldArcName() {
if (checkCarvingWoodShieldEquip() || !i_checkShieldGet()) {
if (checkCarvingWoodShieldEquip() || !checkShieldGet()) {
mShieldArcName = l_cWShdArcName;
} else if (checkShopWoodShieldEquip()) {
mShieldArcName = l_sWShdArcName;
src/d/actor/d_a_alink_weakfn.inc
+1 -1
View File
@@ -1171,7 +1171,7 @@ extern "C" void dMeter2Info_offUseButton__Fi() {
/* 80141988-80141990 -00001 0008+00 0/0 0/0 0/0 .text setLinkState__14Z2CreatureLinkFUc
*/
extern "C" void setLinkState__14Z2CreatureLinkFUc(Z2CreatureLink* this_, u8 param_0) {
*(u8*)(((u8*)this_) + 192) /* this->field_0xc0 */ = (u8)(param_0);
//*(u8*)(((u8*)this_) + 192) this->field_0xc0 = (u8)(param_0);
}
/* 80141990-801419A0 13C2D0 0010+00 1/1 0/0 0/0 .text dComIfGs_getRupee__Fv */
src/d/actor/d_a_alink_wolf.inc
+7 -7
View File
@@ -186,7 +186,7 @@ void daAlink_c::changeWolf() {
field_0x309a[i] = 0;
}
mZ2Link.i_setLinkState(1);
mZ2Link.setLinkState(1);
field_0x30d6 = 0;
field_0x2fa6 = 0;
field_0x2e54.changeWaterOffset(daAlinkHIO_basic_c0::m.mWolfWaterSurfaceEffectHeight);
@@ -411,7 +411,7 @@ void daAlink_c::changeLink(int param_0) {
mpKanteraModel->setUserArea((u32)this);
mpKanteraModel->getModelData()->getJointNodePointer(1)->setCallBack(
daAlink_kandelaarModelCallBack);
mZ2Link.i_setLinkState(var_r27);
mZ2Link.setLinkState(var_r27);
if (checkHookshotReadyMaterialOffMode()) {
setHookshotReadyMaterial();
@@ -1677,7 +1677,7 @@ void daAlink_c::wolfBgCheck() {
} else {
onNoResetFlg3(FLG3_UNK_800000);
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &sp44);
field_0x378c = mLinkLinChk.i_GetCross();
field_0x378c = mLinkLinChk.GetCross();
}
}
@@ -1695,7 +1695,7 @@ void daAlink_c::wolfBgCheck() {
} else {
onNoResetFlg3(FLG3_UNK_800000);
dComIfG_Bgsp().GetTriPla(mLinkLinChk, &sp44);
field_0x378c = mLinkLinChk.i_GetCross();
field_0x378c = mLinkLinChk.GetCross();
}
}
@@ -2850,7 +2850,7 @@ int daAlink_c::procWolfWaitTurn() {
/* 8012DEC8-8012E0AC 128808 01E4+00 2/2 0/0 0/0 .text procWolfSideStepInit__9daAlink_cFi
*/
int daAlink_c::procWolfSideStepInit(int param_0) {
if (field_0x2f98 == 1 && !param_0 && i_checkFirstMidnaDemo() && !checkWolfGrabAnime() &&
if (field_0x2f98 == 1 && !param_0 && checkFirstMidnaDemo() && !checkWolfGrabAnime() &&
field_0x2fcc != 0)
{
return procWolfBackJumpInit(0);
@@ -7203,7 +7203,7 @@ void daAlink_c::setWolfBiteDamage(fopEn_enemy_c* i_enemy) {
/* 801397A4-801398A8 1340E4 0104+00 1/1 0/0 0/0 .text checkWolfLockAttackChargeState__9daAlink_cFv
*/
BOOL daAlink_c::checkWolfLockAttackChargeState() {
return checkMidnaRide() && checkMidnaChargeAttack() && !daMidna_c::i_checkMidnaTired() &&
return checkMidnaRide() && checkMidnaChargeAttack() && !daMidna_c::checkMidnaTired() &&
daMidna_c::checkMidnaRealBody();
}
@@ -8660,7 +8660,7 @@ int daAlink_c::procWolfGrabPut() {
if (grabLineCheck(&field_0x34e0, &actor_p->current.pos) && dBgS_CheckBWallPoly(mObjLinChk))
{
cXyz sp8 = actor_p->current.pos - mObjLinChk.i_GetCross();
cXyz sp8 = actor_p->current.pos - mObjLinChk.GetCross();
current.pos.x -= sp8.x * 1.5f;
current.pos.z -= sp8.z * 1.5f;
}
src/d/actor/d_a_andsw2.cpp
+1 -1
View File
@@ -250,7 +250,7 @@ static int daAndsw2_actionTimer(daAndsw2_c* i_this) {
/* 804D6704-804D68A4 000984 01A0+00 1/0 0/0 0/0 .text daAndsw2_actionOrder__FP10daAndsw2_c */
static int daAndsw2_actionOrder(daAndsw2_c* i_this) {
if (i_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (i_this->eventInfo.checkCommandDemoAccrpt()) {
i_this->setActio(daAndsw2_c::ACT_EVENT_e);
dComIfGs_onSwitch(i_this->getSwbit(), fopAcM_GetRoomNo(i_this));
} else if ((i_this->getType() == 1 && !i_this->chkAllSw2()) ||
src/d/actor/d_a_arrow.cpp
+8 -8
View File
@@ -184,11 +184,11 @@ int daArrow_c::setArrowWaterNextPos(cXyz* i_start, cXyz* i_end) {
if (dComIfG_Bgsp().LineCross(&field_0x5dc)) {
if (dComIfG_Bgsp().GetPolyAtt0(field_0x5dc) == 6) {
*i_end = field_0x5dc.i_GetCross();
*i_end = field_0x5dc.GetCross();
return 2;
}
cXyz v = *i_end - field_0x5dc.i_GetCross();
cXyz v = *i_end - field_0x5dc.GetCross();
f32 dis = (*i_end).abs(*i_start);
if (dis > 0.0001f) {
@@ -198,7 +198,7 @@ int daArrow_c::setArrowWaterNextPos(cXyz* i_start, cXyz* i_end) {
}
v.normalizeZP();
*i_end = field_0x5dc.i_GetCross() + v * 80.0f * dis;
*i_end = field_0x5dc.GetCross() + v * 80.0f * dis;
return 1;
}
@@ -261,7 +261,7 @@ void daArrow_c::setArrowAt(f32 param_0) {
field_0x56c.Set(&current.pos, &target, this);
if (dComIfG_Bgsp().LineCross(&field_0x56c)) {
target = field_0x56c.i_GetCross();
target = field_0x56c.GetCross();
}
static_cast<cM3dGCps*>(&field_0x688)->Set(current.pos, target, radius);
@@ -603,7 +603,7 @@ int daArrow_c::procMove() {
cXyz v2;
if (dComIfG_Bgsp().LineCross(&field_0x56c)) {
v2 = field_0x56c.i_GetCross();
v2 = field_0x56c.GetCross();
} else {
v2 = v;
}
@@ -621,7 +621,7 @@ int daArrow_c::procMove() {
if (water_next_pos == 4 || water_next_pos == 3) {
field_0x9fc = old.pos;
} else {
field_0x9fc = field_0x5dc.i_GetCross();
field_0x9fc = field_0x5dc.GetCross();
}
speed.normalizeZP();
@@ -753,7 +753,7 @@ int daArrow_c::procMove() {
}
if (line_cross) {
current.pos = field_0x56c.i_GetCross();
current.pos = field_0x56c.GetCross();
if (field_0x945 != 0 && (mArrowType == 1 || current.pos.y - field_0x9fc.y < -300.0f)) {
field_0x93f = 1;
@@ -802,7 +802,7 @@ int daArrow_c::procMove() {
speedF = 0.0f;
se_id = Z2SE_HIT_AL_ARROW_STICK;
current.angle.x = shape_angle.x;
dComIfG_Bgsp().ArrowStickCallBack(field_0x56c, this, field_0x56c.i_GetCross());
dComIfG_Bgsp().ArrowStickCallBack(field_0x56c, this, field_0x56c.GetCross());
}
daAlink_getAlinkActorClass()->itemHitSE(se_id, dKy_pol_sound_get(&field_0x56c) & 0xff, &mSoundObjArrow);
src/d/actor/d_a_b_bq.cpp
+2 -2
View File
@@ -848,7 +848,7 @@ static s8 b_bq_attack(b_bq_class* i_this) {
lin_chk.Set(&i_this->mMizuAtStartPos, &i_this->field_0x12bc, a_this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
spD8 = lin_chk.i_GetCross();
spD8 = lin_chk.GetCross();
for (int i = 0; i < 2; i++) {
static u16 fireno[] = {0x82D4, 0x82D5};
@@ -2182,7 +2182,7 @@ static void demo_camera(b_bq_class* i_this) {
lin_chk.Set(&center, &eye, a_this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
eye = lin_chk.i_GetCross();
eye = lin_chk.GetCross();
}
}
src/d/actor/d_a_b_dr.cpp
+2 -2
View File
@@ -3026,9 +3026,9 @@ bool daB_DR_c::startDemoCheck() {
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
camera_class* camera0 = dComIfGp_getCamera(0);
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
mDemoCamEye = camera0->lookat.eye;
mDemoCamCenter = camera0->lookat.center;
return false;
src/d/actor/d_a_b_dre.cpp
+2 -2
View File
@@ -76,9 +76,9 @@ bool daB_DRE_c::CameraSet() {
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
dCamera_c* cam_body = dCam_getBody();
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(0);
eventInfo.onCondition(0);
return 0;
}
src/d/actor/d_a_b_ds.cpp
+3 -3
View File
@@ -1317,13 +1317,13 @@ bool daB_DS_c::mCutTypeCheck() {
bool daB_DS_c::startDemoCheck() {
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
return false;
}
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
mCameraEye = dCam_getBody()->Center();
mCameraCenter = dCam_getBody()->Eye();
mCameraFovy = dCam_getBody()->Fovy();
@@ -5273,7 +5273,7 @@ void daB_DS_c::mBattle2_mtx_set() {
lin_chk.Set(&mMouthPos, &field_0x6d0, this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
field_0x6d0 = lin_chk.i_GetCross();
field_0x6d0 = lin_chk.GetCross();
}
}
src/d/actor/d_a_b_gm.cpp
+17 -17
View File
@@ -319,7 +319,7 @@ static BOOL bg_check(b_gm_class* i_this) {
i_this->field_0x5ce = cM_atan2s(sp14.x, sp14.z) + 0x8000;
}
i_this->field_0x73c = line_chk.i_GetCross();
i_this->field_0x73c = line_chk.GetCross();
return TRUE;
}
@@ -809,7 +809,7 @@ static int foot_IK(b_gm_class* i_this, b_gm_foot* i_foot) {
i_foot->field_0x1c = i_foot->field_0x10;
line_chk.Set(&i_this->field_0x730, &i_foot->field_0x10, i_this);
if (dComIfG_Bgsp().LineCross(&line_chk)) {
i_foot->field_0x1c = line_chk.i_GetCross();
i_foot->field_0x1c = line_chk.GetCross();
f32 temp_f31 = (i_foot->field_0x1c - i_foot->field_0x10).abs();
i_foot->field_0x0 += 10.0f + (10.0f + (temp_f31 * 4.0f));
@@ -1031,9 +1031,9 @@ static void demo_camera(b_gm_class* i_this) {
switch (i_this->mDemoMode) {
case 1:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1164,9 +1164,9 @@ static void demo_camera(b_gm_class* i_this) {
}
break;
case 10:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1206,9 +1206,9 @@ static void demo_camera(b_gm_class* i_this) {
}
break;
case 20:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1245,9 +1245,9 @@ static void demo_camera(b_gm_class* i_this) {
}
break;
case 30:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1399,9 +1399,9 @@ static void demo_camera(b_gm_class* i_this) {
}
break;
case 40:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1422,7 +1422,7 @@ static void demo_camera(b_gm_class* i_this) {
i_this->field_0x1ce0 = 600.0f;
i_this->field_0x1ce6 = cM_atan2s(-i_this->field_0x1cec.x, -i_this->field_0x1cec.z);
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
daPy_getPlayerActorClass()->changeDemoMode(daPy_demo_c::DEMO_METAMORPHOSE_UNK2_e, 0, 0, 0);
a_this->field_0x567 = 1;
} else {
@@ -1510,9 +1510,9 @@ static void demo_camera(b_gm_class* i_this) {
}
break;
case 50:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1561,7 +1561,7 @@ static void demo_camera(b_gm_class* i_this) {
i_this->field_0x1ce0 = 600.0f;
i_this->field_0x1ce6 = cM_atan2s(-i_this->field_0x1cec.x, -i_this->field_0x1cec.z);
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
daPy_getPlayerActorClass()->changeDemoMode(daPy_demo_c::DEMO_METAMORPHOSE_UNK2_e, 0, 0, 0);
a_this->field_0x567 = 1;
} else {
@@ -1911,7 +1911,7 @@ static int daB_GM_Execute(b_gm_class* i_this) {
line_chk.Set(&spC8, &spD4, i_this);
if (dComIfG_Bgsp().LineCross(&line_chk)) {
spD4 = line_chk.i_GetCross();
spD4 = line_chk.GetCross();
i_this->field_0x6d8 = spD4;
i_this->mBeamSound.startLevelSound(Z2SE_EN_GO_BEAM, 0, -1);
src/d/actor/d_a_b_gnd.cpp
+3876 -4478
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_b_ob.cpp
+7 -7
View File
@@ -2385,7 +2385,7 @@ static void demo_camera(b_ob_class* i_this) {
case 1:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFEF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -2510,7 +2510,7 @@ static void demo_camera(b_ob_class* i_this) {
case 10:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFEF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -2611,7 +2611,7 @@ static void demo_camera(b_ob_class* i_this) {
case 20:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -2714,7 +2714,7 @@ static void demo_camera(b_ob_class* i_this) {
case 30:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -2882,7 +2882,7 @@ static void demo_camera(b_ob_class* i_this) {
case 40:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -3174,7 +3174,7 @@ static void demo_camera(b_ob_class* i_this) {
case 50:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -3262,7 +3262,7 @@ static void demo_camera(b_ob_class* i_this) {
case 60:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
src/d/actor/d_a_b_yo.cpp
+7 -7
View File
@@ -802,7 +802,7 @@ void daB_YO_c::executeOpening() {
case 0:
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xffff, 0);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
Z2GetAudioMgr()->seStart(Z2SE_EN_YO_DEMO_OP1, NULL, 0, 0, 1.0f, 1.0f, -1.0f, -1.0f, 0);
@@ -1558,9 +1558,9 @@ void daB_YO_c::executeSeriousDemo() {
switch (mMode) {
case 0:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xffff, 0);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
dComIfGs_onOneZoneSwitch(7, fopAcM_GetRoomNo(this));
@@ -2161,9 +2161,9 @@ void daB_YO_c::executeDemoRevival() {
switch (mMode) {
case 0:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xffff, 0);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
mMode = 1;
@@ -2342,9 +2342,9 @@ void daB_YO_c::executeDeath() {
switch (mMode) {
case 0:
setChillEffect();
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xffff, 0);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
fopAcM_OnStatus(this, 0x4000);
src/d/actor/d_a_b_zant.cpp
+8 -8
View File
@@ -1473,9 +1473,9 @@ void daB_ZANT_c::executeOpening() {
current.pos.set(0.0f, 0.0f, 160.0f);
shape_angle.y = -0x8000;
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 4);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
return;
}
@@ -3817,9 +3817,9 @@ void daB_ZANT_c::executeLastStartDemo() {
switch (mMode) {
case 0:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
} else {
camera->Stop();
camera->SetTrimSize(3);
@@ -4522,9 +4522,9 @@ void daB_ZANT_c::executeLastEndDemo() {
switch (mMode) {
case 0:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
return;
}
@@ -4795,9 +4795,9 @@ void daB_ZANT_c::executeRoomChange() {
switch (mMode) {
case 0:
setTgHitBit(FALSE);
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
return;
}
src/d/actor/d_a_bg_obj.cpp
+1 -1
View File
@@ -1133,7 +1133,7 @@ int daBgObj_c::actionOrderWait() {
/* 8045BBE0-8045BD50 002600 0170+00 1/0 0/0 0/0 .text actionOrder__9daBgObj_cFv */
int daBgObj_c::actionOrder() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(2);
if (field_0xd01 < 5) {
src/d/actor/d_a_boomerang.cpp
+3 -3
View File
@@ -756,7 +756,7 @@ void daBoomerang_c::setAimPos() {
void daBoomerang_c::checkBgHit(cXyz* i_start, cXyz* i_end) {
m_lineChk.Set(i_start, i_end, this);
if (dComIfG_Bgsp().LineCross(&m_lineChk)) {
current.pos = m_lineChk.i_GetCross();
current.pos = m_lineChk.GetCross();
onStateFlg0(FLG0_1);
field_0x957 = 0;
current.angle.y -= -0x8000;
@@ -778,7 +778,7 @@ void daBoomerang_c::checkBgHit(cXyz* i_start, cXyz* i_end) {
}
if (field_0x718[field_0x951] != 0) {
if (m_lockActorsPositions[field_0x951].abs2(m_boomLineChk.i_GetCross()) < 2500.0f) {
if (m_lockActorsPositions[field_0x951].abs2(m_boomLineChk.GetCross()) < 2500.0f) {
if (field_0x951 < m_lockCnt - 1) {
field_0x718[field_0x951] = 0;
field_0x951++;
@@ -792,7 +792,7 @@ void daBoomerang_c::checkBgHit(cXyz* i_start, cXyz* i_end) {
return;
}
current.pos = m_boomLineChk.i_GetCross();
current.pos = m_boomLineChk.GetCross();
onStateFlg0(FLG0_1);
field_0x957 = 0;
current.angle.y -= -0x8000;
src/d/actor/d_a_demo_item.cpp
+1 -1
View File
@@ -362,7 +362,7 @@ void daDitem_c::set_pos() {
offset = offset_tbl[0];
}
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
offset = l_wolf_offset;
sp38.y = player->getLeftFootPosP()->y;
} else if (player->checkHorseRide()) {
src/d/actor/d_a_do.cpp
+6 -6
View File
@@ -1118,7 +1118,7 @@ static s16 hang_set(do_class* i_this) {
vec3[i] += vec2;
lin_chk.Set(&vec2, &vec3[i], _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec3[i] = lin_chk.i_GetCross();
vec3[i] = lin_chk.GetCross();
} else {
return 0xDCF;
}
@@ -1760,7 +1760,7 @@ static s8 do_boat(do_class* i_this) {
lin_chk.Set(&i_this->field_0xc90, &i_this->field_0xc9c, _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
i_this->field_0xc80 = false;
i_this->mTargetPos = lin_chk.i_GetCross();
i_this->mTargetPos = lin_chk.GetCross();
i_this->mMode = 5;
}
}
@@ -1883,7 +1883,7 @@ static s8 do_carry(do_class* i_this) {
vec.y += 2.0f;
lin_chk.Set(&player->eyePos, &vec, _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
_this->current.pos = lin_chk.i_GetCross();
_this->current.pos = lin_chk.GetCross();
}
return ret;
@@ -2035,7 +2035,7 @@ static void action(do_class* i_this) {
}
}
if (i_this->mMessageState == 1 && daPy_py_c::i_checkNowWolf()
if (i_this->mMessageState == 1 && daPy_py_c::checkNowWolf()
&& i_this->mDistFromPlayer < 300.0f)
{
i_this->mAction = ACT_MESSAGE;
@@ -2328,10 +2328,10 @@ static void message(do_class* i_this) {
i_this->mIsTalking = 1;
}
if (i_this->mMessageState == 2 && i_this->mFlowID != -1 && daPy_py_c::i_checkNowWolf()) {
if (i_this->mMessageState == 2 && i_this->mFlowID != -1 && daPy_py_c::checkNowWolf()) {
fopAcM_OnStatus(i_this, 0);
cLib_onBit<u32>(i_this->attention_info.flags, 0xa);
i_this->eventInfo.i_onCondition(dEvtCnd_CANTALK_e);
i_this->eventInfo.onCondition(dEvtCnd_CANTALK_e);
} else {
fopAcM_OffStatus(i_this, 0);
cLib_offBit<u32>(i_this->attention_info.flags, 0xa);
src/d/actor/d_a_door_boss.cpp
+3 -3
View File
@@ -296,7 +296,7 @@ BOOL daBdoor_c::checkFront() {
/* 80670294-80670320 000EF4 008C+00 1/1 0/0 0/0 .text checkOpen__9daBdoor_cFv */
BOOL daBdoor_c::checkOpen() {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
return false;
}
if (!dComIfGs_isDungeonItemBossKey()) {
@@ -324,14 +324,14 @@ static char const l_staff_name[13] = "SHUTTER_DOOR";
/* 80670328-806703C0 000F88 0098+00 1/0 0/0 0/0 .text actionCloseWait__9daBdoor_cFv */
BOOL daBdoor_c::actionCloseWait() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
mStaffID = dComIfGp_evmng_getMyStaffId(l_staff_name, NULL, 0);
demoProc();
setAction(ACT_OPEN);
} else {
if (checkOpen()) {
eventInfo.setEventName((char*)l_door_open_demo);
eventInfo.i_onCondition(dEvtCnd_CANDOOR_e);
eventInfo.onCondition(dEvtCnd_CANDOOR_e);
}
}
return 1;
src/d/actor/d_a_door_bossL1.cpp
+2 -2
View File
@@ -923,14 +923,14 @@ int daBdoorL1_c::actionWait() {
/* 804E441C-804E44B4 0026FC 0098+00 1/0 0/0 0/0 .text actionCloseWait__11daBdoorL1_cFv */
int daBdoorL1_c::actionCloseWait() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
field_0x5a0 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
demoProc();
setAction(ACTION_OPEN);
} else if (checkOpen()) {
eventInfo.setEventId(field_0x59e);
eventInfo.setMapToolId(0xff);
eventInfo.i_onCondition(4);
eventInfo.onCondition(4);
}
return 1;
}
src/d/actor/d_a_door_bossL5.cpp
+3 -3
View File
@@ -412,7 +412,7 @@ int daBdoorL5_c::checkFront() {
/* 80671DE4-80671E70 001224 008C+00 1/1 0/0 0/0 .text checkOpen__11daBdoorL5_cFv */
int daBdoorL5_c::checkOpen() {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
return 0;
}
@@ -436,7 +436,7 @@ int daBdoorL5_c::actionWait() {
/* 80671E78-80671F58 0012B8 00E0+00 1/0 0/0 0/0 .text actionCloseWait__11daBdoorL5_cFv */
int daBdoorL5_c::actionCloseWait() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
field_0x59c = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
demoProc();
setAction(ACTION_OPEN);
@@ -449,7 +449,7 @@ int daBdoorL5_c::actionCloseWait() {
eventInfo.setEventId(field_0x598);
eventInfo.setMapToolId(field_0x593);
}
eventInfo.i_onCondition(4);
eventInfo.onCondition(4);
}
}
return 1;
src/d/actor/d_a_door_dbdoor00.cpp
+3 -3
View File
@@ -341,7 +341,7 @@ int daDbDoor00_c::actionLockWait() {
/* 8045E000-8045E094 000D00 0094+00 1/0 0/0 0/0 .text actionLockOff__12daDbDoor00_cFv */
int daDbDoor00_c::actionLockOff() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
field_0x598 = dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0);
demoProc();
setAction(3);
@@ -365,7 +365,7 @@ int daDbDoor00_c::actionLockDemo() {
/* 8045E108-8045E1C8 000E08 00C0+00 1/0 0/0 0/0 .text actionCloseWait__12daDbDoor00_cFv
*/
int daDbDoor00_c::actionCloseWait() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
field_0x598 = dComIfGp_evmng_getMyStaffId("DOUBLE_DOOR", NULL, 0);
demoProc();
setAction(5);
@@ -374,7 +374,7 @@ int daDbDoor00_c::actionCloseWait() {
} else {
if (checkArea() != 0) {
eventInfo.setEventName("DEFAULT_DOUBLE_DOOR_OPEN");
eventInfo.i_onCondition(4);
eventInfo.onCondition(4);
}
}
return 1;
src/d/actor/d_a_door_knob00.cpp
+5 -5
View File
@@ -307,13 +307,13 @@ void daKnob20_c::setEventPrm() {
field_0x5b9 = 5;
}
}
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
if (!checkArea(80.0f, 110.0f, 250.0f)) {
offFlag(4);
} else {
eventInfo.setEventId(field_0x5a4[field_0x5b9]);
eventInfo.setMapToolId(field_0x5b2[field_0x5b9]);
eventInfo.i_onCondition(4);
eventInfo.onCondition(4);
}
}
}
@@ -594,7 +594,7 @@ void daKnob20_c::startDemoProc() {
/* 8045FF08-8045FFB0 001728 00A8+00 1/0 0/0 0/0 .text actionWait__10daKnob20_cFv */
int daKnob20_c::actionWait() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
initOpenDemo();
setAction(ACTION_DEMO);
demoProc();
@@ -649,7 +649,7 @@ int daKnob20_c::actionTalk() {
/* 8046012C-804601D4 00194C 00A8+00 1/0 0/0 0/0 .text actionTalkWait__10daKnob20_cFv */
int daKnob20_c::actionTalkWait() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
initOpenDemo();
setAction(ACTION_TALK);
demoProc();
@@ -667,7 +667,7 @@ int daKnob20_c::actionTalkWait() {
/* 804601D4-8046027C 0019F4 00A8+00 1/0 0/0 0/0 .text actionTalkOpen__10daKnob20_cFv */
int daKnob20_c::actionTalkOpen() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
initOpenDemo();
setAction(ACTION_DEMO);
demoProc();
src/d/actor/d_a_door_mbossL1.cpp
+5 -5
View File
@@ -1363,7 +1363,7 @@ int daMBdoorL1_c::checkArea() {
daPy_py_c* player = daPy_getPlayerActorClass();
cXyz local_48;
cXyz local_54;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
local_48 = player->attention_info.position - current.pos;
local_54 = player->current.pos - current.pos;
} else {
@@ -1378,7 +1378,7 @@ int daMBdoorL1_c::checkArea() {
if (fabsf(local_48.x) > 130.0f) {
return 0;
}
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
mDoMtx_stack_c::multVec(&local_54, &local_54);
if (fabsf(local_54.x) > 130.0f) {
return 0;
@@ -1410,7 +1410,7 @@ int daMBdoorL1_c::checkFront() {
/* 80676308-806764D0 003B48 01C8+00 1/1 0/0 0/0 .text checkOpen__12daMBdoorL1_cFv */
int daMBdoorL1_c::checkOpen() {
daPy_py_c* player = daPy_getPlayerActorClass();
if (getDoorType() == DOOR_TYPE_2 && daPy_py_c::i_checkNowWolf()) {
if (getDoorType() == DOOR_TYPE_2 && daPy_py_c::checkNowWolf()) {
return 0;
}
if ((checkFrontKey() || checkBackKey()) && dComIfGs_getKeyNum() == 0) {
@@ -1618,7 +1618,7 @@ int daMBdoorL1_c::actionWait() {
/* 80676BE8-80676DEC 004428 0204+00 2/1 0/0 0/0 .text actionCloseWait__12daMBdoorL1_cFv
*/
int daMBdoorL1_c::actionCloseWait() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
field_0x5e8 = dComIfGp_evmng_getMyStaffId(l_staff_name, 0, 0);
demoProc();
setAction(ACTION_OPEN);
@@ -1653,7 +1653,7 @@ int daMBdoorL1_c::actionCloseWait() {
if (checkOpen()) {
eventInfo.setEventId(field_0x5d4[field_0x5de]);
eventInfo.setMapToolId(0xff);
eventInfo.i_onCondition(4);
eventInfo.onCondition(4);
}
}
}
src/d/actor/d_a_door_push.cpp
+3 -3
View File
@@ -245,19 +245,19 @@ void daDoorPush_c::actionOpenWait() {
if (mIndex != 2) {
setAction(1);
fopAcM_orderOtherEventId(this, field_0x63a[mIndex], field_0x63e[mIndex], 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
/* 8067877C-806787F8 000A3C 007C+00 1/0 0/0 0/0 .text actionOrderEvent__12daDoorPush_cFv
*/
void daDoorPush_c::actionOrderEvent() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(2);
demoProc();
} else {
fopAcM_orderOtherEventId(this, field_0x63a[mIndex], field_0x63e[mIndex], 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
src/d/actor/d_a_door_shutter.cpp
+19 -19
View File
@@ -225,7 +225,7 @@ void daDoor20_c::setEventPrm() {
}
if (dComIfGp_roomControl_checkStatusFlag(roomNo, 1)) {
if (door_param2_c::getKind(this) == 9) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
return;
}
int iStack_48;
@@ -256,7 +256,7 @@ void daDoor20_c::setEventPrm() {
}
}
} else {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (!player->checkMidnaRide() || !daMidna_c::checkMidnaRealBody()) {
return;
}
@@ -279,7 +279,7 @@ void daDoor20_c::setEventPrm() {
}
if (chkMakeKey()) {
if (field_0x5f0) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (dComIfGs_getKeyNum() == 0) {
return;
}
@@ -318,7 +318,7 @@ void daDoor20_c::setEventPrm() {
if (checkArea(getSize2X(), 12100.0f, 62500.0f)) {
eventInfo.setEventId(field_0x692[field_0x6cb]);
eventInfo.setMapToolId(field_0x6b8[field_0x6cb]);
eventInfo.i_onCondition(4);
eventInfo.onCondition(4);
}
}
}
@@ -422,7 +422,7 @@ static u16 const l_eff_id_lv4[5] = {
/* 80461A60-80461D24 000FA0 02C4+00 1/1 0/0 0/0 .text openInit_0__10daDoor20_cFv */
void daDoor20_c::openInit_0() {
J3DAnmTransform* anm;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (door_param2_c::getKind(this) == 10) {
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "md_oj_DoorOpF.bck");
} else {
@@ -462,7 +462,7 @@ void daDoor20_c::openInit_0() {
/* 80461D24-80461EC4 001264 01A0+00 1/1 0/0 0/0 .text openInit_1__10daDoor20_cFv */
void daDoor20_c::openInit_1() {
J3DAnmTransform* anm;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "md_oj_DoorOpC.bck");
} else {
anm = (J3DAnmTransform*)dComIfG_getObjectRes(getArcName(), "oj_DoorOpC.bck");
@@ -518,7 +518,7 @@ int daDoor20_c::openProc(int param_1) {
dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f));
} else {
if (field_0x584.getFrame() == 18.0f) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
u32 mdnfx;
if (field_0x672) {
mdnfx = Z2SE_OBJ_WOOD_DR_OP_MDN_FX;
@@ -546,7 +546,7 @@ int daDoor20_c::openProc(int param_1) {
{
dComIfGp_getVibration().StartShock(4, 15, cXyz(0.0f, 1.0f, 0.0f));
}
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (field_0x584.getFrame() == 20.0f) {
if (door_param2_c::getKind(this) == 2) {
sfx = Z2SE_OBJ_L8_SHTR_OP;
@@ -1211,7 +1211,7 @@ int daDoor20_c::orderStopEvent() {
/* 80463FBC-80464118 0034FC 015C+00 2/2 0/0 0/0 .text actionWait__10daDoor20_cFv */
int daDoor20_c::actionWait() {
if (eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDoor()) {
initOpenDemo(1);
setAction(ACTION_DEMO);
demoProc();
@@ -1344,7 +1344,7 @@ int daDoor20_c::draw() {
return 1;
}
calcMtx();
if (!eventInfo.i_checkCommandDoor() && field_0x5c8 != dComIfGp_roomControl_getStayNo()) {
if (!eventInfo.checkCommandDoor() && field_0x5c8 != dComIfGp_roomControl_getStayNo()) {
field_0x5c4->Move();
field_0x5c8 = dComIfGp_roomControl_getStayNo();
}
@@ -1531,7 +1531,7 @@ int daDoor20_c::frontCheck() {
/* 80464CEC-80464E18 00422C 012C+00 1/1 0/0 0/0 .text drawCheck__10daDoor20_cFi */
int daDoor20_c::drawCheck(int param_1) {
if (!adjoinPlayer() && !eventInfo.i_checkCommandDemoAccrpt() && !eventInfo.i_checkCommandDoor())
if (!adjoinPlayer() && !eventInfo.checkCommandDemoAccrpt() && !eventInfo.checkCommandDoor())
{
return 0;
}
@@ -1566,7 +1566,7 @@ int daDoor20_c::checkExecute() {
if (fopAcM_checkStatus(this, 0x1000)) {
return 1;
}
if (eventInfo.i_checkCommandDemoAccrpt() || eventInfo.i_checkCommandDoor()) {
if (eventInfo.checkCommandDemoAccrpt() || eventInfo.checkCommandDoor()) {
return 2;
}
if (field_0x67d != dComIfGp_roomControl_getStayNo()) {
@@ -1720,7 +1720,7 @@ void daDoor20_c::makeEventId() {
int i;
switch (field_0x691) {
case 1:
if (player != NULL && player->i_checkNowWolf()) {
if (player != NULL && player->checkNowWolf()) {
int j = 0;
for (i = 4; i < 8; i++, j++) {
field_0x692[i] =
@@ -1735,7 +1735,7 @@ void daDoor20_c::makeEventId() {
}
break;
case 3:
if (player != NULL && player->i_checkNowWolf()) {
if (player != NULL && player->checkNowWolf()) {
int j = 0;
for (i = 4; i < 8; i++, j++) {
field_0x692[i] =
@@ -1750,7 +1750,7 @@ void daDoor20_c::makeEventId() {
}
break;
case 2:
if (player != NULL && player->i_checkNowWolf()) {
if (player != NULL && player->checkNowWolf()) {
int j = 0;
for (i = 4; i < 8; i++, j++) {
field_0x692[i] =
@@ -1772,7 +1772,7 @@ void daDoor20_c::makeEventId() {
}
break;
case 5:
if (player != NULL && player->i_checkNowWolf()) {
if (player != NULL && player->checkNowWolf()) {
int j = 0;
for (i = 4; i < 8; i++, j++) {
field_0x692[i] =
@@ -1787,7 +1787,7 @@ void daDoor20_c::makeEventId() {
}
break;
case 6:
if (player != NULL && player->i_checkNowWolf()) {
if (player != NULL && player->checkNowWolf()) {
int j = 0;
for (i = 4; i < 8; i++, j++) {
field_0x692[i] =
@@ -1903,7 +1903,7 @@ void daDoor20_c::getRestartPos(cXyz* param_1) {
cXyz acStack_78 = player->current.pos - current.pos;
f32 dVar9 = acStack_78.inprodXZ(field_0x680);
f32 fVar1;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (dVar9 < 0.0f) {
fVar1 = 300.0f;
} else {
@@ -1969,7 +1969,7 @@ void daDoor20_c::setGoal() {
mDoMtx_stack_c::multVec(&local_1c, &local_1c);
local_1c.x = local_1c.x * 0.8f;
local_1c.y = 0.0f;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
local_1c.z = -300.0f;
} else {
local_1c.z = -200.0f;
src/d/actor/d_a_e_arrow.cpp
+1 -1
View File
@@ -216,7 +216,7 @@ static void hit_check(e_arrow_class* i_this) {
line_chk.Set(&line_chk_start, &i_this->current.pos, i_this);
if (dComIfG_Bgsp().LineCross(&line_chk)) {
i_this->current.pos = line_chk.i_GetCross();
i_this->current.pos = line_chk.GetCross();
dComIfG_Bgsp().ArrowStickCallBack(line_chk, i_this, i_this->current.pos);
if (i_this->mFlags & 0x10) {
src/d/actor/d_a_e_bee.cpp
+4 -4
View File
@@ -168,10 +168,10 @@ static void bee_ground_ang_set(bee_s* i_bee) {
s8 bvar1 = false;
lin_chk.Set(&vec1, &vec2, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec2 = lin_chk.i_GetCross();
vec2 = lin_chk.GetCross();
lin_chk.Set(&vec1, &vec3, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec3 = lin_chk.i_GetCross();
vec3 = lin_chk.GetCross();
bvar1 = true;
}
}
@@ -186,10 +186,10 @@ static void bee_ground_ang_set(bee_s* i_bee) {
bvar1 = false;
lin_chk.Set(&vec1, &vec2, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec2 = lin_chk.i_GetCross();
vec2 = lin_chk.GetCross();
lin_chk.Set(&vec1, &vec3, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec3 = lin_chk.i_GetCross();
vec3 = lin_chk.GetCross();
bvar1 = true;
}
}
src/d/actor/d_a_e_dt.cpp
+4 -4
View File
@@ -1508,9 +1508,9 @@ void daE_DT_c::executeDeath() {
break;
case 2:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xffff, 0);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
} else {
setDeadShibukiEffect();
setDeadYodareEffect();
@@ -1753,9 +1753,9 @@ void daE_DT_c::executeOpening() {
return;
case 3:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xffff, 0);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
} else {
mMode = 4;
mTimer = 60;
src/d/actor/d_a_e_fs.cpp
+1 -1
View File
@@ -263,7 +263,7 @@ static void e_fs_move(e_fs_class* i_this) {
f32 target_speed = l_HIO.mMoveSpeedRatio
* (0.8f * fopAcM_GetSpeedF(daPy_getPlayerActorClass()) + 20.0f);
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
target_speed = 0.7f * (0.8f * fopAcM_GetSpeedF(daPy_getPlayerActorClass()) + 20.0f);
}
cLib_addCalc2(&i_this->speedF, target_speed, 1.0f, 0.5f);
src/d/actor/d_a_e_hzelda.cpp
+1 -1
View File
@@ -855,7 +855,7 @@ static void demo_camera(e_hzelda_class* i_this) {
case 1:
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
src/d/actor/d_a_e_nest.cpp
+5 -5
View File
@@ -359,7 +359,7 @@ static s16 wall_angle_get(e_nest_class* i_this) {
vec3[i] += vec2;
lin_chk.Set(&vec2, &vec3[i], a_this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec3[i] = lin_chk.i_GetCross();
vec3[i] = lin_chk.GetCross();
} else {
return 0x23;
}
@@ -492,7 +492,7 @@ static int water_check(e_nest_class* i_this) {
vec.z = i_this->current.pos.z;
lin_chk.Set(&i_this->current.pos, &vec, i_this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec.y = lin_chk.i_GetCross().y - 10.0f;
vec.y = lin_chk.GetCross().y - 10.0f;
}
dBgS_ObjGndChk_Spl gnd_chk;
gnd_chk.SetPos(&vec);
@@ -605,12 +605,12 @@ static void e_nest_hahen(e_nest_class* i_this) {
a_this->current.pos = i_this->mDebris[i].mPos;
a_this->attention_info.position = a_this->current.pos;
a_this->eyePos = a_this->attention_info.position;
if (a_this->eventInfo.i_checkCommandCatch()) {
if (a_this->eventInfo.checkCommandCatch()) {
i_this->mMode = 2;
i_this->mTimers[0] = 60;
} else {
dComIfGp_att_CatchRequest(a_this, 0x76, 100.0f, 50.0f, -150.0f, 0x5000, 1);
a_this->eventInfo.i_onCondition(0x40);
a_this->eventInfo.onCondition(0x40);
}
break;
}
@@ -809,7 +809,7 @@ static void demo_camera(e_nest_class* i_this) {
case 1:
if (!i_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(i_this, 2, -1, 0);
i_this->eventInfo.i_onCondition(2);
i_this->eventInfo.onCondition(2);
return;
}
camera->mCamera.Stop();
src/d/actor/d_a_e_oc.cpp
+1 -1
View File
@@ -393,7 +393,7 @@ int daE_OC_c::checkBeforeBg() {
link_chk.Set(&my_vec_0, &my_vec_1, this);
if (dComIfG_Bgsp().LineCross(&link_chk)) {
dComIfG_Bgsp().GetTriPla(link_chk, &plane);
if (my_vec_0.abs(link_chk.i_GetCross()) < 100.0f) {
if (my_vec_0.abs(link_chk.GetCross()) < 100.0f) {
return 1;
}
if ( (s16) (cM_atan2s(plane.mNormal.x, plane.mNormal.z) - shape_angle.y) > 0)
src/d/actor/d_a_e_pm.cpp
+1 -1
View File
@@ -382,7 +382,7 @@ bool daE_PM_c::CameraSet() {
camera_class* camera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
dCamera_c* camera_body = dCam_getBody();
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xffff, 0);
return false;
}
src/d/actor/d_a_e_po.cpp
+2 -2
View File
@@ -3037,9 +3037,9 @@ extern "C" void fopAcM_searchPlayerAngleY__FPC10fopAc_ac_c() {
}
/* 8075764C-8075765C 00B1EC 0010+00 1/1 0/0 0/0 .text onCondition__11dEvt_info_cFUs */
void dEvt_info_c::onCondition(u16 param_0) {
/* void dEvt_info_c::onCondition(u16 param_0) {
// NONMATCHING
}
} */
/* 8075765C-80757670 00B1FC 0014+00 1/1 0/0 0/0 .text checkCommandDemoAccrpt__11dEvt_info_cFv */
// void dEvt_info_c::checkCommandDemoAccrpt() {
src/d/actor/d_a_e_pz.cpp
+14 -14
View File
@@ -480,7 +480,7 @@ void daE_PZ_c::executeOpeningDemo() {
case 101:
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
mDemoCameraEye = camera0->lookat.eye;
mDemoCameraCenter = camera0->lookat.center;
break;
@@ -593,7 +593,7 @@ void daE_PZ_c::executeOpeningDemo() {
current.angle.y = fopAcM_searchPlayerAngleY(this);
if (field_0x7d0 == 1) {
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0);
} else {
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 0, 0);
@@ -674,7 +674,7 @@ void daE_PZ_c::executeOpeningDemo() {
((daE_PZ_c*)parent)->mMoveMode = 20;
dComIfGp_particle_set(0x889D, &parent->current.pos, &shape_angle, NULL);
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0);
} else {
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 0, 0);
@@ -732,7 +732,7 @@ void daE_PZ_c::executeOpeningDemo() {
data_80761E29 = 2;
data_80761E28 = 0;
case 30:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 3);
break;
}
@@ -741,7 +741,7 @@ void daE_PZ_c::executeOpeningDemo() {
sp120.set(0.0f, player->current.pos.y, -1300.0f);
daPy_getPlayerActorClass()->setPlayerPosAndAngle(&sp120, -0x8000, 0);
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 2, 0);
} else {
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 0, 0);
@@ -772,7 +772,7 @@ void daE_PZ_c::executeOpeningDemo() {
case 31:
case 131:
if (mMoveMode == 31) {
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
sp120.set(-70.0f, 250.0f + XREG_F(1), -950.0f + XREG_F(2));
} else {
sp120.set(-70.0f, 200.0f + XREG_F(3), -700.0f + XREG_F(4));
@@ -809,7 +809,7 @@ void daE_PZ_c::executeOpeningDemo() {
if (field_0x7d7 == 0) {
if (field_0x7d0 >= 30) {
if (arg0 == 0) {
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
sp120.set(0.0f, 0.0f, -800.0f);
} else {
sp120.set(0.0f, 0.0f, -700.0f);
@@ -1015,7 +1015,7 @@ void daE_PZ_c::executeOpeningDemo() {
break;
}
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
current.pos.set(0.0f, 0.0f, -2850.0f);
} else {
current.pos.set(0.0f, 0.0f, -3000.0f);
@@ -1030,7 +1030,7 @@ void daE_PZ_c::executeOpeningDemo() {
case 110:
mSetFirePos();
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
mDemoCameraCenter.set(mPzCenterInit_dt[14]);
mDemoCameraEye.set(mPzEyeInit_dt[14]);
} else {
@@ -1050,7 +1050,7 @@ void daE_PZ_c::executeOpeningDemo() {
case 111:
if (field_0x7d0 != 0) {
if (field_0x7d0 == 1) {
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
daPy_getPlayerActorClass()->changeDemoMode(0xC, 1, 1, 0);
} else {
daPy_getPlayerActorClass()->changeDemoMode(0x2B, 0, 0, 0);
@@ -1062,7 +1062,7 @@ void daE_PZ_c::executeOpeningDemo() {
break;
}
if (field_0x7d7 < 10 && !daPy_py_c::i_checkNowWolf()) {
if (field_0x7d7 < 10 && !daPy_py_c::checkNowWolf()) {
field_0x7d7++;
if (field_0x7d7 == 10) {
daPy_getPlayerActorClass()->changeDemoMode(0x24, 0x16, 0, 0);
@@ -1127,7 +1127,7 @@ void daE_PZ_c::executeOpeningDemo() {
break;
case 114:
if (field_0x7d0 == 0) {
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
daPy_getPlayerActorClass()->changeDemoMode(0x22, 1, 0, 0);
} else {
daPy_getPlayerActorClass()->changeDemoMode(0x17, 1, 0, 0);
@@ -1577,9 +1577,9 @@ void daE_PZ_c::executeDead() {
case 0:
case 10:
field_0x7d0 = 0;
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
mDemoCameraEye = sp18->lookat.eye;
mDemoCameraCenter = sp18->lookat.center;
src/d/actor/d_a_e_rdy.cpp
+13 -13
View File
@@ -2057,7 +2057,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
i_this->mTargetEyeScale = 0.0f;
if (!daPy_py_c::i_checkNowWolf() && i_this->checkCutDownHitFlg()) {
if (!daPy_py_c::checkNowWolf() && i_this->checkCutDownHitFlg()) {
i_this->offCutDownHitFlg();
i_this->mMode = 3;
i_this->mTimer[0] = 100;
@@ -2160,7 +2160,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
i_this->shape_angle.y = i_this->current.angle.y;
cLib_addCalcAngleS2(&i_this->field_0xadc.x, -0x4000, 1, 0x300);
if (i_this->mAcch.ChkGroundHit()) {
if (i_this->health > 0 && !daPy_py_c::i_checkNowWolf()) {
if (i_this->health > 0 && !daPy_py_c::checkNowWolf()) {
i_this->onDownFlg();
}
dKy_Sound_set(i_this->current.pos, 100, fopAcM_GetID(i_this), 5);
@@ -2182,7 +2182,7 @@ static void e_rdy_damage(e_rdy_class* i_this) {
angle_y = i_this->field_0xadc.y + 0x8000;
}
i_this->current.angle.y = angle_y;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
i_this->mTimer[0] = 80;
i_this->mTimer[1] = 55;
} else {
@@ -3726,9 +3726,9 @@ static void demo_camera(e_rdy_class* i_this) {
switch (i_this->mDemoMode) {
case 1:
if (!i_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!i_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(i_this, 2, 0xffef, 0);
i_this->eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
i_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
player_camera->mCamera.Stop();
@@ -3767,9 +3767,9 @@ static void demo_camera(e_rdy_class* i_this) {
break;
case 5:
if (!i_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!i_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(i_this, 2, 0xffff, 0);
i_this->eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
i_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
player_camera->mCamera.Stop();
@@ -3812,9 +3812,9 @@ static void demo_camera(e_rdy_class* i_this) {
break;
case 10:
if (!i_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!i_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(i_this, 2, 0xffff, 0);
i_this->eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
i_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
player_camera->mCamera.Stop();
@@ -3968,9 +3968,9 @@ static void demo_camera(e_rdy_class* i_this) {
break;
case 20:
if (!i_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!i_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(i_this, 2, 0xffff, 0);
i_this->eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
i_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
player_camera->mCamera.Stop();
@@ -4257,7 +4257,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) {
if (!c_start && dComIfGp_event_runCheck()) {
if (fopAcM_getTalkEventPartner(daPy_getLinkPlayerActorClass())
== daPy_py_c::getMidnaActor()
|| daPy_getPlayerActorClass()->eventInfo.i_checkCommandDoor())
|| daPy_getPlayerActorClass()->eventInfo.checkCommandDoor())
{
return 1;
}
@@ -4468,7 +4468,7 @@ static int daE_RDY_Execute(e_rdy_class* i_this) {
vec1.set(20.0f, 0.0f, 0.0f);
MtxPosition(&vec1, &i_this->eyePos);
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
cc_offset.y += 30.0f;
i_this->mCcSph[0].SetC(i_this->eyePos + cc_offset);
i_this->mCcSph[0].SetR(50.0f);
src/d/actor/d_a_e_s1.cpp
+8 -8
View File
@@ -346,7 +346,7 @@ static void damage_check(e_s1_class* i_this) {
i_this->field_0x6ac = TREG_F(1) + 65.0f;
}
} else {
if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::i_checkNowWolf()) {
if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::checkNowWolf()) {
i_this->mAtInfo.field_0x18 = 36;
} else {
i_this->mAtInfo.field_0x18 = 0;
@@ -365,7 +365,7 @@ static void damage_check(e_s1_class* i_this) {
if (i_this->mAtInfo.mAttackPower < 20) {
i_this->field_0x6ac = TREG_F(0) + 20.0f;
} else if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::i_checkNowWolf()) {
} else if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::checkNowWolf()) {
i_this->field_0x6ac = 0.0f;
a_this->health = 0;
@@ -389,7 +389,7 @@ static void damage_check(e_s1_class* i_this) {
}
if (!l_no_fail) {
if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::i_checkNowWolf()) {
if (i_this->mAtInfo.mAttackPower >= 60 && daPy_py_c::checkNowWolf()) {
i_this->mAction = ACT_FAIL_WAIT;
i_this->mHitInvincibilityTimer = 10;
i_this->mSound.startCreatureVoice(Z2SE_EN_NS_V_DEATH, -1);
@@ -1644,9 +1644,9 @@ static void demo_camera(e_s1_class* i_this) {
switch (i_this->mDemoMode) {
case 1:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1690,9 +1690,9 @@ static void demo_camera(e_s1_class* i_this) {
}
break;
case 10:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1766,7 +1766,7 @@ static void demo_camera(e_s1_class* i_this) {
linchk.Set(&i_this->mDemoCamCenter, &i_this->mDemoCamEye, a_this);
if (dComIfG_Bgsp().LineCross(&linchk)) {
eye = linchk.i_GetCross() + ((center - eye) * 0.1f);
eye = linchk.GetCross() + ((center - eye) * 0.1f);
f32 dist_x = eye.x - center.x;
f32 dist_z = eye.z - center.z;
src/d/actor/d_a_e_vt.cpp
+11 -11
View File
@@ -1566,7 +1566,7 @@ void daE_VA_c::executeDemoOpWait() {
mDrawRopes = true;
case 1:
for (int i = 0; i < 190; i++) {
if (!daPy_getPlayerActorClass()->i_checkNowWolf()) {
if (!daPy_getPlayerActorClass()->checkNowWolf()) {
mLineSphs[i].OffTgShield();
} else {
mLineSphs[i].OnTgShield();
@@ -1590,9 +1590,9 @@ void daE_VA_c::executeDemoOp() {
switch (mMode) {
case 0:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
return;
}
@@ -1729,7 +1729,7 @@ void daE_VA_c::executeDemoOp() {
mWeponEfMode = 1;
mDemoModeTimer = 130;
if (!player->i_checkNowWolf()) {
if (!player->checkNowWolf()) {
player->changeDemoMode(0x17, 0, 0, 0);
}
@@ -2355,9 +2355,9 @@ void daE_VA_c::executeOpaciWait() {
Z2GetAudioMgr()->changeSubBgmStatus(3);
break;
case 10:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
} else {
mAlphaType = 2;
field_0x1380 = 30;
@@ -2681,7 +2681,7 @@ void daE_VA_c::executeOpaciChase() {
field_0x1388 = 1;
mSound.startCreatureVoiceLevel(Z2SE_EN_VA_V_ROTATE, -1);
if (mDownTimer == 0 && !player->i_checkNowWolf()) {
if (mDownTimer == 0 && !player->checkNowWolf()) {
mBodyCyls[0].OnTgSetBit();
mBodyCyls[1].OnTgSetBit();
}
@@ -2747,7 +2747,7 @@ void daE_VA_c::executeOpaciChase() {
case 12:
mSound.startCreatureVoiceLevel(Z2SE_EN_VA_V_ROTATE, -1);
if (!player->i_checkNowWolf()) {
if (!player->checkNowWolf()) {
mBodyCyls[0].OnTgSetBit();
mBodyCyls[1].OnTgSetBit();
}
@@ -2767,7 +2767,7 @@ void daE_VA_c::executeOpaciChase() {
case 13:
mSound.startCreatureVoiceLevel(Z2SE_EN_VA_V_ROTATE, -1);
if (!player->i_checkNowWolf()) {
if (!player->checkNowWolf()) {
mBodyCyls[0].OnTgSetBit();
mBodyCyls[1].OnTgSetBit();
}
@@ -3087,9 +3087,9 @@ void daE_VA_c::executeOpaciDeath() {
switch (mMode) {
case 0:
if (!eventInfo.i_checkCommandDemoAccrpt()) {
if (!eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(this, 2, 0xFFFF, 0);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
return;
}
src/d/actor/d_a_e_wb.cpp
+5 -5
View File
@@ -4126,9 +4126,9 @@ extern "C" void changeDemoMode__9daPy_py_cFUliis() {
}
/* 807E2348-807E2350 -00001 0008+00 0/0 0/0 0/0 .text changeDemoParam2__9daPy_py_cFs */
void daPy_py_c::changeDemoParam2(s16 param_0) {
*(u16*)(((u8*)this) + 1546) /* this->field_0x60a */ = (u16)(param_0);
}
/* void daPy_py_c::changeDemoParam2(s16 param_0) {
//*(u16*)(((u8*)this) + 1546) this->field_0x60a = (u16)(param_0);
} */
/* 807E2350-807E235C 00FFB0 000C+00 1/1 0/0 0/0 .text fabsf__3stdFf */
extern "C" void fabsf__3stdFf() {
@@ -4339,9 +4339,9 @@ extern "C" void changeDemoMode__9daHorse_cFUli() {
}
/* 807E28E0-807E2908 010540 0028+00 1/1 0/0 0/0 .text setHorsePosAndAngle__9daHorse_cFPC4cXyzs */
void daHorse_c::setHorsePosAndAngle(cXyz const* param_0, s16 param_1) {
/* void daHorse_c::setHorsePosAndAngle(cXyz const* param_0, s16 param_1) {
// NONMATCHING
}
} */
/* 807E2908-807E2934 010568 002C+00 1/1 0/0 0/0 .text startCheckSkipEdge__14dEvt_control_cFPv */
extern "C" void startCheckSkipEdge__14dEvt_control_cFPv() {
src/d/actor/d_a_formation_mng.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ void daFmtMng_c::executeWait() {
((daNpcFgd_c*)npcFgd)->offDrawFlag();
}
}
if (!dKy_darkworld_check() && daPy_py_c::i_checkNowWolf()) {
if (!dKy_darkworld_check() && daPy_py_c::checkNowWolf()) {
fopAcM_delete(this);
}
}
src/d/actor/d_a_horse.cpp
+9 -9
View File
@@ -1329,7 +1329,7 @@ void daHorse_c::setDemoData() {
if (mode == 5) {
speedF = 0.0f;
m_cc_stts.ClrCcMove();
i_setHorsePosAndAngle(pos_p, angle);
setHorsePosAndAngle(pos_p, angle);
m_demoMoveAngle = angle;
} else if (mode == 2 || mode == 10 || mode == 3 || mode == 11 || mode == 4) {
setDemoMoveData(&mode, pos_p);
@@ -1390,7 +1390,7 @@ void daHorse_c::setDemoData() {
/* 8083B578-8083B600 003738 0088+00 4/4 0/0 0/0 .text acceptPlayerRide__9daHorse_cFv */
void daHorse_c::acceptPlayerRide() {
if (!checkStateFlg0(FLG0_UNK_1) && !daPy_py_c::i_checkNowWolf()) {
if (!checkStateFlg0(FLG0_UNK_1) && !daPy_py_c::checkNowWolf()) {
int angle = fopAcM_seenPlayerAngleY(this);
if (angle > 0x2800 && (!daAlink_getAlinkActorClass()->checkHorseZelda() || angle < 0x5800)) {
attention_info.flags |= 0x80;
@@ -1704,7 +1704,7 @@ int daHorse_c::checkHorseNoMove(int param_0) {
if (line_cross) {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(m_linechk, &plane);
sp50 = m_linechk.i_GetCross();
sp50 = m_linechk.GetCross();
if (cBgW_CheckBWall(plane.mNormal.y) && ((param_0 != 0 && cLib_distanceAngleS(plane.mNormal.atan2sX_Z(), shape_angle.y) > 0x6000) || (param_0 == 0 && cLib_distanceAngleS(plane.mNormal.atan2sX_Z(), shape_angle.y) < 0x2000))) {
m_linechk.Set(&start, &end, this);
@@ -2208,7 +2208,7 @@ void daHorse_c::setMatrix() {
mDoMtx_stack_c::ZXYrotM(shape_angle.x, shape_angle.y, shape_angle.z);
m_model->setBaseTRMtx(mDoMtx_stack_c::get());
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
attention_info.position.set(current.pos.x + (140.0f * cM_ssin(shape_angle.y)), 200.0f + current.pos.y, current.pos.z + (140.0f * cM_scos(shape_angle.y)));
} else {
attention_info.position.set(current.pos.x, 200.0f + current.pos.y, current.pos.z);
@@ -2976,8 +2976,8 @@ void daHorse_c::setReinPosNormalSubstance() {
static cXyz saddleLeft(29.0f, -2.0f, 30.0f);
static cXyz saddleRight(29.0f, 2.0f, 30.0f);
if (!checkStateFlg0(FLG0_UNK_1) && i_getZeldaActor() != NULL) {
if (((daHoZelda_c*)i_getZeldaActor())->checkSingleRide()) {
if (!checkStateFlg0(FLG0_UNK_1) && getZeldaActor() != NULL) {
if (((daHoZelda_c*)getZeldaActor())->checkSingleRide()) {
offStateFlg0(FLG0_UNK_4000000);
return;
}
@@ -3360,7 +3360,7 @@ int daHorse_c::callHorseSubstance(cXyz const* i_pos) {
}
cXyz pos(farthest_pos->x, farthest_pos->y, farthest_pos->z);
i_setHorsePosAndAngle(&pos, shape_angle.y);
setHorsePosAndAngle(&pos, shape_angle.y);
rt = 1;
} else if (dist_xz2 <= SQUARE(800.0f)) {
return 3;
@@ -3581,9 +3581,9 @@ int daHorse_c::procWait() {
}
if (!checkStateFlg0(FLG0_UNK_1)) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
attention_info.flags |= 0x8;
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
} else if (m_procID == PROC_WAIT_e) {
acceptPlayerRide();
}
src/d/actor/d_a_kytag03.cpp
+1 -1
View File
@@ -373,7 +373,7 @@ static int daKytag03_Execute(kytag03_class* i_this) {
if (i_this->field_0x587 == 0) {
if (player->current.pos.abs(a_this->current.pos) < i_this->field_0x574 &&
daPy_py_c::i_checkNowWolf() && !var_r28)
daPy_py_c::checkNowWolf() && !var_r28)
{
i_this->attention_info.distances[fopAc_attn_ETC_e] = 0x3D;
a_this->attention_info.flags |= 0x80;
src/d/actor/d_a_kytag04.cpp
+1 -1
View File
@@ -168,7 +168,7 @@ static int daKytag04_Execute(kytag04_class* i_this) {
{
switch (i_this->field_0x5c4) {
case 0:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
dComIfGp_getEvent().reset(a_this);
fopAcM_orderPotentialEvent(a_this, 0x400, 0xFFFF, 0);
} else {
src/d/actor/d_a_kytag12.cpp
+6 -6
View File
@@ -308,7 +308,7 @@ static int daKytag12_Execute_standard(kytag12_class* i_this) {
}
}
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
if (effect_p->field_0x38 >= 9000.0f) {
var_f29 = 0.0f;
}
@@ -389,7 +389,7 @@ static int daKytag12_Execute_standard(kytag12_class* i_this) {
}
if (i_this->field_0x578 != 0 && i_this->field_0x578 <= 60) {
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
temp_r25->mEffect[0].field_0x42 = 45;
}
@@ -412,7 +412,7 @@ static int daKytag12_Execute_standard(kytag12_class* i_this) {
g_env_light.mEvilInitialized &= 0x7F;
if (daPy_py_c::i_checkNowWolf() && var_r22 > 0) {
if (daPy_py_c::checkNowWolf() && var_r22 > 0) {
g_env_light.mEvilInitialized |= 0x80;
}
@@ -616,7 +616,7 @@ static int daKytag12_Execute_arrival(kytag12_class* i_this) {
}
}
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
if (effect_p->field_0x38 >= 9000.0f) {
var_f27 = 0.0f;
}
@@ -692,7 +692,7 @@ static int daKytag12_Execute_arrival(kytag12_class* i_this) {
g_env_light.mEvilInitialized &= 0x7F;
if (daPy_py_c::i_checkNowWolf() && var_r20 > 0) {
if (daPy_py_c::checkNowWolf() && var_r20 > 0) {
g_env_light.mEvilInitialized |= 0x80;
}
@@ -909,7 +909,7 @@ static int daKytag12_Execute_R00(kytag12_class* i_this) {
}
}
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
if (effect_p->field_0x38 >= 9000.0f) {
var_f25 = 0.0f;
}
src/d/actor/d_a_mant.cpp
+2 -2
View File
@@ -397,7 +397,7 @@ static void joint_control(mant_class* i_this, mant_j_s* param_2, int param_3, f3
f32 fVar1;
b_gnd_class* gndActor = (b_gnd_class*)fopAcM_SearchByID(i_this->parentActorID);
if (gndActor->field_0x1fc4 != 0) {
if (gndActor->mDrawHorse != 0) {
bVar2 = TRUE;
local_158 = gndActor->field_0x1fb8;
} else if (i_this->field_0x3966 != 0) {
@@ -642,7 +642,7 @@ static int daMant_Execute(mant_class* i_this) {
b_gnd_class* gndActor = (b_gnd_class*)fopAcM_SearchByID(i_this->parentActorID);
if (gndActor && gndActor->field_0x1fc4 != 0) {
if (gndActor && gndActor->mDrawHorse != 0) {
i_this->field_0x394c = 21.0f;
i_this->field_0x3950 = 0.75f;
i_this->field_0x3958 = -5.0f;
src/d/actor/d_a_midna.cpp
+16 -16
View File
@@ -574,7 +574,7 @@ cPhs__Step daMidna_c::create() {
daPy_py_c::setMidnaActor(this);
mpMorf->setMorf(1.0f);
if (fopAcM_GetParam(this) == 1 && checkMidnaRealBody() && !i_checkMidnaTired()) {
if (fopAcM_GetParam(this) == 1 && checkMidnaRealBody() && !checkMidnaTired()) {
changeOriginalDemo();
changeDemoMode(11);
}
@@ -767,7 +767,7 @@ void daMidna_c::setMatrix() {
mDoMtx_stack_c::transM(0.0f, -98.0f, 17.0f);
mpShadowModel->setBaseTRMtx(mDoMtx_stack_c::get());
} else if (!checkStateFlg0(FLG0_WOLF_NO_POS) &&
(!daPy_py_c::i_checkNowWolf() || checkShadowModelDrawSmode())) {
(!daPy_py_c::checkNowWolf() || checkShadowModelDrawSmode())) {
if (field_0x84e != 4) {
f32 sin_link_y = cM_ssin(link->shape_angle.y);
f32 cos_link_y = cM_scos(link->shape_angle.y);
@@ -1060,7 +1060,7 @@ void daMidna_c::setBodyPartPos() {
}
if (field_0x84e == 1 || (checkSetAnime(0, ANM_S_APPEAR) && mpMorf->getFrame() < 3.0f)) {
daAlink_c* link = daAlink_getAlinkActorClass();
f32 fvar1 = daPy_py_c::i_checkNowWolf() ? 250.0f : 50.0f;
f32 fvar1 = daPy_py_c::checkNowWolf() ? 250.0f : 50.0f;
attention_info.position.set(
link->current.pos.x + fvar1 * cM_ssin(link->shape_angle.y),
link->current.pos.y - 30.0f,
@@ -1083,7 +1083,7 @@ void daMidna_c::setBodyPartPos() {
/* 804BEFA0-804BF070 002E00 00D0+00 1/1 0/0 0/0 .text checkAppear__9daMidna_cFv */
BOOL daMidna_c::checkAppear() {
if (daPy_py_c::i_checkNowWolf() && daPy_py_c::i_checkFirstMidnaDemo() &&
if (daPy_py_c::checkNowWolf() && daPy_py_c::checkFirstMidnaDemo() &&
(!daAlink_getAlinkActorClass()->checkMidnaDisappearMode()
|| checkStateFlg0(FLG0_WOLF_NO_POS)
|| (checkSetAnime(0, ANM_RETURN) && !mpMorf->isStop())))
@@ -1207,7 +1207,7 @@ void daMidna_c::checkMidnaPosState() {
}
if (mDemoMode == 12) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
onStateFlg0(FLG0_WOLF_NO_POS);
Vec vec1 = {0.0f, daMidna_hio_c0::m.field_0x18, daMidna_hio_c0::m.field_0x1c};
cXyz vec2;
@@ -1795,7 +1795,7 @@ void daMidna_c::setAnm() {
}
BOOL bVar2 = FALSE;
BOOL bVar3 = TRUE;
bool tired = i_checkMidnaTired();
bool tired = checkMidnaTired();
daMidna_ANM anm;
if (link->checkMidnaWolfDeadAnime() && !checkStateFlg0(FLG0_TAG_WAIT)) {
@@ -2049,7 +2049,7 @@ void daMidna_c::setAnm() {
}
if (anm == ANM_WARPIN) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
u32 sound_id;
if (checkStateFlg1(FLG1_SIDE_WARP)) {
sound_id = Z2SE_MDN_WARP_IN_YOKO;
@@ -2145,7 +2145,7 @@ void daMidna_c::setAnm() {
J3DAnmTransform* bck = (J3DAnmTransform*)mBckHeap[0].loadDataIdx(res_id);
setBckAnime(bck, J3DFrameCtrl::EMode_NONE, 0.0f);
}
} else if (daPy_py_c::i_checkNowWolf() && !bVar1
} else if (daPy_py_c::checkNowWolf() && !bVar1
&& ((mNeckAngle.y == 0 && mNeckAngle.x == 0 && anm != ANM_LEADWAIT && cM_rnd() < 0.01f)
|| (anm == ANM_LEADWAIT && !checkStateFlg0(FLG0_NO_HAIR_LEAD) && cM_rnd() < 0.0125f)))
{
@@ -2455,7 +2455,7 @@ void daMidna_c::setNeckAngle() {
s16 eye_y = 0;
cXyz* pos;
if (field_0x84e == 2 || i_checkMidnaTired() || checkSetAnime(0, ANM_CLINGB)
if (field_0x84e == 2 || checkMidnaTired() || checkSetAnime(0, ANM_CLINGB)
|| (checkStateFlg0((daMidna_FLG0)(FLG0_NO_HAIR_SCALE | FLG0_UNK_200000))
&& !checkEndResetStateFlg0(ERFLG0_UNK_100))
|| (clear_eye_move && !checkStateFlg0(FLG0_NO_DRAW))
@@ -2546,7 +2546,7 @@ void daMidna_c::setHairAngle() {
cXyz* atn_pos = NULL;
daAlink_c* link = daAlink_getAlinkActorClass();
if (link->checkMidnaHairAtnPos() && !i_checkMidnaTired() && !checkStateFlg0((daMidna_FLG0)
if (link->checkMidnaHairAtnPos() && !checkMidnaTired() && !checkStateFlg0((daMidna_FLG0)
(FLG0_NO_HAIR_SCALE | FLG0_UNK_200000 | FLG0_TAG_WAIT | FLG0_UNK_100))) {
atn_pos = link->getMidnaHairAtnPos();
onStateFlg0(FLG0_UNK_10000000);
@@ -3033,7 +3033,7 @@ void daMidna_c::setSound() {
mSound.updateAnime(mpMorf->getFrame(), mpMorf->getPlaySpeed());
}
if (i_checkMidnaTired() && !dComIfGp_checkPlayerStatus0(0, 0x20000000)) {
if (checkMidnaTired() && !dComIfGp_checkPlayerStatus0(0, 0x20000000)) {
mSound.startCreatureVoiceLevel(Z2SE_MDN_V_WAITD, -1);
}
}
@@ -3042,7 +3042,7 @@ void daMidna_c::setSound() {
int daMidna_c::execute() {
daAlink_c* link = daAlink_getAlinkActorClass();
if (!link->checkMetamorphose()) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
onStateFlg0(FLG0_UNK_40000000);
} else {
offStateFlg0(FLG0_UNK_40000000);
@@ -3059,7 +3059,7 @@ int daMidna_c::execute() {
}
daMidna_matAnm_c::decMorfFrame();
checkMidnaPosState();
if (daPy_py_c::i_checkFirstMidnaDemo() && !checkStateFlg0(FLG0_WOLF_NO_POS)) {
if (daPy_py_c::checkFirstMidnaDemo() && !checkStateFlg0(FLG0_WOLF_NO_POS)) {
link->onMidnaRide();
} else {
link->offMidnaRide();
@@ -3115,7 +3115,7 @@ int daMidna_c::execute() {
field_0x84e = 0;
}
if (checkSetAnime(0, ANM_LEADTOWAITA) && mpMorf->checkFrame(2.0f) && daPy_py_c::i_checkNowWolf()
if (checkSetAnime(0, ANM_LEADTOWAITA) && mpMorf->checkFrame(2.0f) && daPy_py_c::checkNowWolf()
&& mpKago == NULL) {
dComIfGp_getVibration().StartShock(2, 0x1f, cXyz(0.0f, 1.0f, 0.0f));
}
@@ -3187,12 +3187,12 @@ int daMidna_c::execute() {
}
}
}
} else if (eventInfo.i_checkCommandDemoAccrpt() && !link->checkMetamorphose()) {
} else if (eventInfo.checkCommandDemoAccrpt() && !link->checkMetamorphose()) {
dComIfGp_getEvent().reset(this);
}
if (link->checkMidnaRide()) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
}
if (mpModel != NULL && !checkStateFlg0(FLG0_NO_DRAW)) {
src/d/actor/d_a_myna.cpp
+23 -23
View File
@@ -535,12 +535,12 @@ void daMyna_c::attack_wait_move() {
current.angle = home.angle;
}
}
if (!daPy_py_c::i_checkNowWolf() && daMyna_evtTagActor0 != NULL) {
if (!daPy_py_c::checkNowWolf() && daMyna_evtTagActor0 != NULL) {
cXyz var1(1.0f, 1.0f, 1.0f);
if (!dComIfGs_isSaveSwitch(0x3C)) {
if (chkPlayerInEvtArea(daMyna_evtTagActor0, var1)) {
if (!isEventFlag(1)) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
if (eventInfo.checkCommandTalk()) {
field_0x92C = 1;
@@ -552,7 +552,7 @@ void daMyna_c::attack_wait_move() {
} else if (field_0x92A < l_HOSTIO.field_0x24) {
field_0x92A++;
} else {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
if (eventInfo.checkCommandTalk()) {
field_0x92C = 4;
@@ -590,7 +590,7 @@ void daMyna_c::attack_fly_move() {
if (field_0x926 > 0 && dComIfGs_isSaveSwitch(0x3C)) {
field_0x926 = 0;
}
if (chkPlayerInEvtArea(daMyna_evtTagActor0, var1) && !daPy_py_c::i_checkNowWolf() &&
if (chkPlayerInEvtArea(daMyna_evtTagActor0, var1) && !daPy_py_c::checkNowWolf() &&
!dComIfGs_isSaveSwitch(0x3C) && field_0x926 == 0)
{
mStatus.Move();
@@ -645,17 +645,17 @@ void daMyna_c::greet_wait_init() {
/* 80946EB0-80947030 001330 0180+00 1/0 0/0 0/0 .text greet_wait_move__8daMyna_cFv */
void daMyna_c::greet_wait_move() {
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
if (daMyna_evtTagActor0 != NULL) {
if (chkPlayerInEvtArea(daMyna_evtTagActor0, cXyz(cXyz(1.0f, 1.0f, 1.0f)))) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
if (eventInfo.checkCommandTalk()) {
field_0x92C = 6;
}
} else {
if (isEventFlag(0)) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
if (eventInfo.checkCommandTalk()) {
field_0x92C = 10;
@@ -664,14 +664,14 @@ void daMyna_c::greet_wait_move() {
}
} else {
if (fopAcM_searchPlayerDistanceXZ(this) < 350.0f) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
if (eventInfo.checkCommandTalk()) {
field_0x92C = 6;
}
} else {
if (isEventFlag(0)) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
if (eventInfo.checkCommandTalk()) {
field_0x92C = 10;
@@ -727,7 +727,7 @@ void daMyna_c::shopping_wait_init() {
/* 809471E8-809475B4 001668 03CC+00 1/0 0/0 0/0 .text shopping_wait_move__8daMyna_cFv */
void daMyna_c::shopping_wait_move() {
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
if (dComIfGs_isEventBit(dSv_event_flag_c::saveBitLabels[802])) {
field_0x92C = 17;
field_0x937 = 20;
@@ -736,7 +736,7 @@ void daMyna_c::shopping_wait_move() {
bool bVar1 = false;
s16 nowTotalPrice = dMsgObject_getMsgObjectClass()->getNowTotalPrice();
if (dMsgObject_getMsgObjectClass()->isPaymentFlag()) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
if (eventInfo.checkCommandTalk()) {
field_0x92C = 9;
@@ -751,7 +751,7 @@ void daMyna_c::shopping_wait_move() {
dMsgObject_addTotalPrice(mShopItems[i].mValueNum);
field_0x931 = i;
if (mShopItems[i].mFlowNodeNum != 0xFFFF) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
}
}
@@ -773,13 +773,13 @@ void daMyna_c::shopping_wait_move() {
cXyz stack_2c(1.0f, 1.0f, 1.0f);
if (chkPlayerInEvtArea(daMyna_evtTagActor1, stack_2c)) {
if (isEventFlag(0)) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
bVar1 = true;
field_0x933 = 1;
} else if (field_0x931 != 0xFF && mShopItems[field_0x931].mItemStatus == 2)
{
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
bVar1 = true;
field_0x933 = 1;
@@ -790,17 +790,17 @@ void daMyna_c::shopping_wait_move() {
if (daMyna_evtTagActor0 != NULL) {
cXyz stack_38(1.0f, 1.0f, 1.0f);
if (!chkPlayerInEvtArea(daMyna_evtTagActor0, stack_38) && nowTotalPrice > 0) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
bVar1 = true;
}
} else if (fopAcM_searchPlayerDistanceXZ(this) > 450.0f) {
if (isEventFlag(0)) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
bVar1 = true;
} else if (field_0x931 != 0xFF && mShopItems[field_0x931].mItemStatus == 2) {
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
bVar1 = true;
}
@@ -1060,7 +1060,7 @@ void daMyna_c::attack_wait2_init() {
/* 809481B4-80948388 002634 01D4+00 1/0 0/0 0/0 .text attack_wait2_move__8daMyna_cFv */
void daMyna_c::attack_wait2_move() {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
field_0x92C = 7;
} else {
if (current.angle.y != home.angle.y) {
@@ -1081,7 +1081,7 @@ void daMyna_c::attack_wait2_move() {
} else {
if (field_0x939 == 1) {
current.angle = home.angle;
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
fopAcM_orderSpeakEvent(this, 0, 0);
if (eventInfo.checkCommandTalk()) {
field_0x92C = 21;
@@ -1133,7 +1133,7 @@ void daMyna_c::attack_fly2_move() {
field_0x939 = 1;
}
if (chkPlayerInEvtArea(daMyna_evtTagActor0, stack_2c) && !daPy_py_c::i_checkNowWolf() &&
if (chkPlayerInEvtArea(daMyna_evtTagActor0, stack_2c) && !daPy_py_c::checkNowWolf() &&
field_0x937 != 0 && field_0x926 == 0)
{
mStatus.Move();
@@ -1311,7 +1311,7 @@ void daMyna_c::talkAnime(msg_class* param_0) {
/* 80948FAC-809490B8 00342C 010C+00 1/1 0/0 0/0 .text chkEvent__8daMyna_cFv */
int daMyna_c::chkEvent() {
int retVal = 1;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (!dComIfGp_getEvent().isOrderOK()) {
retVal = 0;
if (eventInfo.checkCommandTalk()) {
@@ -1334,7 +1334,7 @@ int daMyna_c::chkEvent() {
/* 809490B8-80949128 003538 0070+00 2/1 0/0 0/0 .text orderEvent__8daMyna_cFv */
int daMyna_c::orderEvent() {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
switch (field_0x92C) {
case 0:
case 5:
@@ -1349,7 +1349,7 @@ int daMyna_c::orderEvent() {
if (attention_info.flags == 10) {
attention_info.distances[fopAc_attn_TALK_e] = 0x8B;
attention_info.distances[fopAc_attn_SPEAK_e] = 0x8B;
eventInfo.i_onCondition(1);
eventInfo.onCondition(1);
}
}
return 1;
src/d/actor/d_a_nbomb.cpp
+2 -2
View File
@@ -616,7 +616,7 @@ int daNbomb_c::insectLineCheck() {
void daNbomb_c::setHitPolygon(BOOL param_0) {
if (!param_0) {
mInsectHitPolyInfo.SetPolyInfo(mLineChk);
current.pos = mLineChk.i_GetCross();
current.pos = mLineChk.GetCross();
}
cM3dGPla poly;
@@ -1358,7 +1358,7 @@ BOOL daNbomb_c::procInsectMove() {
}
if (var_r28 == 2) {
current.pos = mLineChk.i_GetCross();
current.pos = mLineChk.GetCross();
} else {
current.pos += field_0xbfc * speedF;
}
src/d/actor/d_a_ni.cpp
+7 -7
View File
@@ -1510,9 +1510,9 @@ static void play_camera(ni_class* i_this) {
i_this->field_0xa00 = a_this->current.pos.y;
// fallthrough
case 1:
if (!a_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!a_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(a_this, 2, 0xFFFF, 0);
a_this->eventInfo.i_onCondition(2);
a_this->eventInfo.onCondition(2);
return;
}
@@ -1673,7 +1673,7 @@ static void play_camera(ni_class* i_this) {
sp1D8.y = 0.0f;
sp1D8.z = hREG_F(10) + 50.0f;
MtxPosition(&sp1D8, &sp1E4);
sp214 = cam_line_chk.i_GetCross() - sp1E4;
sp214 = cam_line_chk.GetCross() - sp1E4;
}
if (var_r27 == 0) {
@@ -1808,7 +1808,7 @@ static void action(ni_class* i_this) {
var_r25 = true;
}
if (i_this->field_0xa50 == 1 && daPy_py_c::i_checkNowWolf() &&
if (i_this->field_0xa50 == 1 && daPy_py_c::checkNowWolf() &&
i_this->mDistToPlayer < 300.0f)
{
i_this->mAction = ACTION_MESSAGE_e;
@@ -1993,7 +1993,7 @@ static void action(ni_class* i_this) {
line_chk.Set(&a_this->current.pos, &sp148, a_this);
if (dComIfG_Bgsp().LineCross(&line_chk)) {
sp148.y = line_chk.i_GetCross().y - 10.0f;
sp148.y = line_chk.GetCross().y - 10.0f;
}
gnd_chk_spl.SetPos(&sp148);
@@ -2047,10 +2047,10 @@ static int message(ni_class* i_this) {
OS_REPORT("////////NI MSG FNO %d\n", i_this->mFlowNo);
}
if (i_this->field_0xa50 == 2 && i_this->mFlowNo != -1 && daPy_py_c::i_checkNowWolf()) {
if (i_this->field_0xa50 == 2 && i_this->mFlowNo != -1 && daPy_py_c::checkNowWolf()) {
fopAcM_OnStatus(i_this, 0);
cLib_onBit<u32>(i_this->attention_info.flags, 10);
i_this->eventInfo.i_onCondition(1);
i_this->eventInfo.onCondition(1);
} else {
fopAcM_OffStatus(i_this, 0);
cLib_offBit<u32>(i_this->attention_info.flags, 10);
src/d/actor/d_a_npc.cpp
+9 -9
View File
@@ -1662,7 +1662,7 @@ BOOL daNpcT_c::evtProc() {
evtTalk();
}
ret = TRUE;
} else if (eventInfo.i_checkCommandDemoAccrpt()
} else if (eventInfo.checkCommandDemoAccrpt()
&& dComIfGp_getEventManager().endCheck(mEvtId)) {
if (evtEndProc()) {
dComIfGp_event_reset();
@@ -1741,7 +1741,7 @@ void daNpcT_c::setFootPrtcl(cXyz* param_0, f32 param_1, f32 param_2) {
mLinChk.Set(&start, &end, this);
cross1 = dComIfG_Bgsp().LineCross(&mLinChk);
if (cross1) {
foot_l_pos.y = mLinChk.i_GetCross().y;
foot_l_pos.y = mLinChk.GetCross().y;
mFootLPolyAngle = fopAcM_getPolygonAngle(mLinChk, mCurAngle.y);
foot_l_att = dComIfG_Bgsp().GetPolyAtt0(mLinChk);
} else {
@@ -1754,7 +1754,7 @@ void daNpcT_c::setFootPrtcl(cXyz* param_0, f32 param_1, f32 param_2) {
mLinChk.Set(&start, &end, this);
cross2 = dComIfG_Bgsp().LineCross(&mLinChk);
if (cross2) {
foot_r_pos.y = mLinChk.i_GetCross().y;
foot_r_pos.y = mLinChk.GetCross().y;
mFootRPolyAngle = fopAcM_getPolygonAngle(mLinChk, mCurAngle.y);
foot_r_att = dComIfG_Bgsp().GetPolyAtt0(mLinChk);
} else {
@@ -1816,9 +1816,9 @@ void daNpcT_c::evtOrder() {
} else if ((!mTwilight || daPy_py_c::checkNowWolfEyeUp())
&& ((attention_info.flags & 8) || (attention_info.flags & 2)))
{
eventInfo.i_onCondition(dEvtCnd_CANTALK_e);
eventInfo.onCondition(dEvtCnd_CANTALK_e);
if (chkXYItems()) {
eventInfo.i_onCondition(dEvtCnd_CANTALKITEM_e);
eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
}
if (mSpeakEvent) {
fopAcM_orderSpeakEvent(this, 0, 0);
@@ -2125,7 +2125,7 @@ BOOL daNpcT_c::chkFindActor(fopAc_ac_c* i_actor, BOOL i_release, s16 i_angleY) {
/* 8014B024-8014B0C8 145964 00A4+00 1/1 0/0 0/0 .text chkWolfAction__8daNpcT_cFv */
// NONMATCHING regswap
BOOL daNpcT_c::chkWolfAction() {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
bool ret = false;
if (!daPy_getPlayerActorClass()->checkWolfWait()
&& !dComIfGp_checkPlayerStatus0(0, 0x8000000)
@@ -2145,7 +2145,7 @@ BOOL daNpcT_c::chkFindWolf(s16 i_angleY, int i_distIndex, int param_2, f32 i_bou
f32 i_boundY1, f32 i_boundY2, BOOL param_7) {
cXyz attn_pos = getAttnPos(daPy_getPlayerActorClass());
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (chkPointInArea(attn_pos, attention_info.position, i_boundXZ, i_boundY1, i_boundY2, 0)
&& chkActorInSight(daPy_getPlayerActorClass(), i_fovY, i_angleY))
{
@@ -2193,7 +2193,7 @@ cXyz daNpcT_c::getAttnPos(fopAc_ac_c* i_actor) {
cXyz attn_pos = i_actor->attention_info.position;
if (fopAcM_GetName(i_actor) == PROC_ALINK) {
attn_pos.y -= daPy_py_c::getAttentionOffsetY();
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
attn_pos = i_actor->current.pos;
attn_pos.y = i_actor->attention_info.position.y;
}
@@ -4502,7 +4502,7 @@ void daNpcF_c::orderEvent(int i_speak, char* i_evtName, u16 param_2, u16 i_prior
fopAcM_orderOtherEventId(this, mEventIdx, i_mapToolID, param_2, i_priority, i_flag);
} else if (!mTwilight || daPy_py_c::checkNowWolfEyeUp()) {
if ((attention_info.flags & 8) || (attention_info.flags & 2)) {
eventInfo.i_onCondition(dEvtCnd_CANTALK_e);
eventInfo.onCondition(dEvtCnd_CANTALK_e);
if (i_speak) {
fopAcM_orderSpeakEvent(this, 0, 0);
}
src/d/actor/d_a_npc_ashB.cpp
+3 -3
View File
@@ -847,7 +847,7 @@ bool daNpcAshB_c::wait(void* param_0) {
}
}
if (!daNpcF_chkEvtBit(0x14f) && field_0xded == 0 && !daPy_py_c::i_checkNowWolf()) {
if (!daNpcF_chkEvtBit(0x14f) && field_0xded == 0 && !daPy_py_c::checkNowWolf()) {
f32 res = pow(600.0f, 2.0f);
if (fopAcM_searchPlayerDistanceXZ2(this) <= res) {
daNpcF_offTmpBit(0xb);
@@ -890,7 +890,7 @@ bool daNpcAshB_c::wait(void* param_0) {
orderEvent(field_0xdec,l_evtNames[mOrderEvtNo*1],-1, 40, -1, 1);
if (daNpcF_chkEvtBit(0x14f)) {
eventInfo.i_onCondition(0x20);
eventInfo.onCondition(0x20);
}
}
@@ -1193,7 +1193,7 @@ static bool daNpcAshB_IsDelete(void* param_0) {
/* 80960A60-80960AE8 002D00 0088+00 1/0 0/0 0/0 .text setParam__11daNpcAshB_cFv */
void daNpcAshB_c::setParam() {
attention_info.flags = daPy_py_c::i_checkNowWolf() ? 0 : 10;
attention_info.flags = daPy_py_c::checkNowWolf() ? 0 : 10;
attention_info.distances[0] = getDistTableIdx(daNpcAshB_Param_c::m.mTalkDistIdx,daNpcAshB_Param_c::m.mTalkAngleIdx);
attention_info.distances[1] = attention_info.distances[0];
attention_info.distances[3] = getDistTableIdx(daNpcAshB_Param_c::m.mSpeakDistIdx,daNpcAshB_Param_c::m.mSpeakAngleIdx);
src/d/actor/d_a_npc_cd2.cpp
+1 -1
View File
@@ -1940,7 +1940,7 @@ bool daNpcCd2_c::checkFearSituation() {
bool rv;
bool bVar5;
rv = false;
bVar5 = ((!field_0xac6 && daPy_py_c::i_checkNowWolf()) && dVar10 < 200.0f);
bVar5 = ((!field_0xac6 && daPy_py_c::checkNowWolf()) && dVar10 < 200.0f);
if (bVar5) {
f32 maxDist = pow(500.0f, 2.0f);
if (fopAcM_searchPlayerDistanceXZ2(this) < maxDist) {
src/d/actor/d_a_npc_hanjo.cpp
+2 -2
View File
@@ -2313,7 +2313,7 @@ int daNpc_Hanjo_c::wait(void* param_0) {
case TYPE_1:
break;
case TYPE_2:
if (daPy_py_c::i_checkNowWolf() && mCyl2.ChkCoHit()) {
if (daPy_py_c::checkNowWolf() && mCyl2.ChkCoHit()) {
if (!daPy_getPlayerActorClass()->checkPlayerFly() ||
daPy_getPlayerActorClass()->checkAutoJump() ||
daPy_getPlayerActorClass()->checkWolfTriggerJump())
@@ -2514,7 +2514,7 @@ int daNpc_Hanjo_c::takayose(void* param_0) {
}
}
}
if (daPy_py_c::i_checkNowWolf() && mCyl2.ChkCoHit() != NULL) {
if (daPy_py_c::checkNowWolf() && mCyl2.ChkCoHit() != NULL) {
if (!daPy_getPlayerActorClass()->checkPlayerFly() ||
daPy_getPlayerActorClass()->checkAutoJump() ||
daPy_getPlayerActorClass()->checkWolfTriggerJump())
src/d/actor/d_a_npc_ne.cpp
+20 -20
View File
@@ -260,7 +260,7 @@ static int water_check(npc_ne_class* i_this, f32 param_1) {
vec.z = i_this->current.pos.z;
lin_chk.Set(&i_this->current.pos, &vec, i_this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec.y = lin_chk.i_GetCross().y - 10.0f;
vec.y = lin_chk.GetCross().y - 10.0f;
}
gnd_chk_spl.SetPos(&vec);
i_this->mWaterY = dComIfG_Bgsp().GroundCross(&gnd_chk_spl);
@@ -294,13 +294,13 @@ static s16 climb_angle_get(npc_ne_class* i_this) {
vec2 += i_this->current.pos;
lin_chk.Set(&vec1, &vec2, i_this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
i_this->mClimbPos = lin_chk.i_GetCross();
i_this->mClimbPos = lin_chk.GetCross();
vec3.z = 20.0f;
MtxPosition(&vec3, &vec2);
vec2 += i_this->current.pos;
lin_chk.Set(&vec1, &vec2, i_this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec2 = lin_chk.i_GetCross();
vec2 = lin_chk.GetCross();
vec3 = vec2 - i_this->mClimbPos;
return -cM_atan2s(vec3.y, JMAFastSqrt(vec3.x * vec3.x + vec3.z * vec3.z));
}
@@ -1794,8 +1794,8 @@ static s16 wall_angle_get(npc_ne_class* i_this) {
vec3[i] += vec2;
lin_chk.Set(&vec2, &vec3[i], _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
i_this->mClimbPos = lin_chk.i_GetCross();
vec3[i] = lin_chk.i_GetCross();
i_this->mClimbPos = lin_chk.GetCross();
vec3[i] = lin_chk.GetCross();
} else {
return 1;
}
@@ -1830,7 +1830,7 @@ static void search_ground_1(npc_ne_class* i_this) {
vec2 += vec1;
lin_chk.Set(&vec1, &vec2, _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
vec2 = lin_chk.i_GetCross();
vec2 = lin_chk.GetCross();
vec3.set(0.0f, var_y, var_z);
MtxPosition(&vec3, &vec1);
vec1 += vec2;
@@ -1838,8 +1838,8 @@ static void search_ground_1(npc_ne_class* i_this) {
vec2.y -= var_y + 20.0f;
lin_chk.Set(&vec1, &vec2, _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
pos[i] = lin_chk.i_GetCross();
vec1 = lin_chk.i_GetCross();
pos[i] = lin_chk.GetCross();
vec1 = lin_chk.GetCross();
vec1.y += 5.0f;
vec3.set(0.0f, 0.0f, 200.0f);
MtxPosition(&vec3, &vec2);
@@ -1890,7 +1890,7 @@ static BOOL search_ground_2(npc_ne_class* i_this, s16 i_wallAngle) {
vec2.y -= 200.0f;
lin_chk.Set(&vec1, &vec2, _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
i_this->mTargetPos = lin_chk.i_GetCross();
i_this->mTargetPos = lin_chk.GetCross();
return true;
} else {
return false;
@@ -2251,7 +2251,7 @@ static BOOL npc_ne_carry(npc_ne_class* i_this) {
pos.y += 2.0f;
lin_chk.Set(&player->eyePos, &pos, _this);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
_this->current.pos = lin_chk.i_GetCross();
_this->current.pos = lin_chk.GetCross();
}
return ret;
@@ -2433,7 +2433,7 @@ static void action(npc_ne_class* i_this) {
}
if (i_this->mResName != "Npc_net") {
if (i_this->mMessageState == 1 && daPy_py_c::i_checkNowWolf()
if (i_this->mMessageState == 1 && daPy_py_c::checkNowWolf()
&& i_this->mDistToTarget < 300.0f) {
i_this->mAction = npc_ne_class::ACT_MESSAGE;
i_this->mMode = 0;
@@ -2644,7 +2644,7 @@ static void action(npc_ne_class* i_this) {
vec1 = i_this->mLookTarget - i_this->current.pos;
} else {
vec1 = player->eyePos - i_this->current.pos;
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
vec1.y += i_this->mBaseScale.z * -40.0f;
}
}
@@ -2756,9 +2756,9 @@ static void demo_camera(npc_ne_class* i_this) {
break;
case 1:
if (!_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(_this, 2, 0xffff, 0);
_this->eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
@@ -2820,9 +2820,9 @@ static void demo_camera(npc_ne_class* i_this) {
break;
case 10:
if (!_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(_this, 2, 0xffff, 0);
_this->eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
_this->eventInfo.onCondition(dEvtCnd_CANDEMO_e);
return;
}
@@ -2911,9 +2911,9 @@ static void demo_camera(npc_ne_class* i_this) {
vec.z = 120.0f;
MtxPosition(&vec, &i_this->mCameraEye2);
i_this->mCameraEye2 += player->current.pos;
player->i_changeDemoParam2(2);
player->changeDemoParam2(2);
} else if (i_this->mDemoCounter == 120) {
player->i_changeDemoParam2(0);
player->changeDemoParam2(0);
}
}
}
@@ -3004,14 +3004,14 @@ static int message(npc_ne_class* i_this) {
i_this->mIsTalking = 1;
}
if (i_this->mMessageState == 2 && i_this->mFlowID != -1 && daPy_py_c::i_checkNowWolf() &&
if (i_this->mMessageState == 2 && i_this->mFlowID != -1 && daPy_py_c::checkNowWolf() &&
!fopAcM_otherBgCheck(daPy_getLinkPlayerActorClass(), i_this)) {
fopAcM_OnStatus(i_this, 0);
cLib_onBit<u32>(i_this->attention_info.flags, 0xa);
if (i_this->mResName == "Npc_net") {
cLib_onBit<u32>(i_this->attention_info.flags, 0xc00000);
}
i_this->eventInfo.i_onCondition(dEvtCnd_CANTALK_e);
i_this->eventInfo.onCondition(dEvtCnd_CANTALK_e);
} else {
fopAcM_OffStatus(i_this, 0);
cLib_offBit<u32>(i_this->attention_info.flags, 0xc0000a);
src/d/actor/d_a_npc_sq.cpp
+2 -2
View File
@@ -139,9 +139,9 @@ static void demo_camera(npc_sq_class* i_this) {
switch (i_this->mDemoMode) {
case 1:
if (!_this->eventInfo.i_checkCommandDemoAccrpt()) {
if (!_this->eventInfo.checkCommandDemoAccrpt()) {
fopAcM_orderPotentialEvent(_this, 2, 0xffff, 0);
_this->eventInfo.i_onCondition(2);
_this->eventInfo.onCondition(2);
return;
}
player_camera->mCamera.Stop();
src/d/actor/d_a_npc_the.cpp
+2 -2
View File
@@ -1388,7 +1388,7 @@ BOOL daNpcThe_c::main() {
eventInfo.setArchiveName(l_resNames[l_evtGetParamList[mOrderEvtNo]]);
}
if (!strcmp(dComIfGp_getStartStageName(), "R_SP116")) {
eventInfo.i_onCondition(0x20);
eventInfo.onCondition(0x20);
}
orderEvent(field_0xe1c, l_evtNames[mOrderEvtNo], 0xffff, 0x28, 0xff, 1);
}
@@ -1494,7 +1494,7 @@ BOOL daNpcThe_c::doEvent() {
}
ret = true;
}
if (eventInfo.i_checkCommandDemoAccrpt() && mEventIdx != -1
if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1
&& event_manager.endCheck(mEventIdx)) {
dComIfGp_event_reset();
mOrderEvtNo = 0;
src/d/actor/d_a_npc_zra.cpp
+4 -4
View File
@@ -990,7 +990,7 @@ void daNpc_zrA_c::setParam() {
selectAction();
if (!mTwilight && daPy_py_c::i_checkNowWolf()) {
if (!mTwilight && daPy_py_c::checkNowWolf()) {
attn_flags = 0;
}
@@ -1067,7 +1067,7 @@ BOOL daNpc_zrA_c::main() {
orderEvent(mOrderSpeakEvt, l_evtNames[l_evtGetParamList[mOrderEvtNo].fileIdx],
0xffff, 4, 0xff, 2);
if (!mTwilight && mType == TYPE_WAIT && !field_0x1550) {
eventInfo.i_onCondition(dEvtCnd_CANTALKITEM_e);
eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
}
}
@@ -2163,7 +2163,7 @@ BOOL daNpc_zrA_c::doEvent() {
if (dComIfGp_event_runCheck() != false) {
dEvent_manager_c& event_manager = dComIfGp_getEventManager();
if (eventInfo.checkCommandTalk() || eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) {
mOrderNewEvt = false;
}
@@ -2237,7 +2237,7 @@ BOOL daNpc_zrA_c::doEvent() {
ret = true;
}
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
if (mEventIdx != -1 && event_manager.endCheck(mEventIdx)) {
switch (mOrderEvtNo) {
case EVT_TALK_SWIM:
src/d/actor/d_a_npc_zrc.cpp
+6 -6
View File
@@ -436,7 +436,7 @@ void daNpc_zrC_c::setParam() {
u32 attn_flags = 10;
selectAction();
if (!mTwilight && daPy_py_c::i_checkNowWolf()) {
if (!mTwilight && daPy_py_c::checkNowWolf()) {
attn_flags = 0;
}
@@ -506,7 +506,7 @@ BOOL daNpc_zrC_c::main() {
0xffff, 0x28, 0xff, 1);
if (mType == 2) {
eventInfo.i_onCondition(dEvtCnd_CANTALKITEM_e);
eventInfo.onCondition(dEvtCnd_CANTALKITEM_e);
}
}
@@ -1169,7 +1169,7 @@ BOOL daNpc_zrC_c::doEvent() {
if (dComIfGp_event_runCheck() != FALSE) {
dEvent_manager_c& event_mgr = dComIfGp_getEventManager();
if ((eventInfo.checkCommandTalk() || eventInfo.i_checkCommandDemoAccrpt()) && !mSpeakEvent)
if ((eventInfo.checkCommandTalk() || eventInfo.checkCommandDemoAccrpt()) && !mSpeakEvent)
{
mOrderNewEvt = false;
}
@@ -1212,7 +1212,7 @@ BOOL daNpc_zrC_c::doEvent() {
ret = TRUE;
}
if (eventInfo.i_checkCommandDemoAccrpt() && mEventIdx != -1
if (eventInfo.checkCommandDemoAccrpt() && mEventIdx != -1
&& event_mgr.endCheck(mEventIdx)) {
dComIfGp_event_reset();
mOrderEvtNo = EVT_NONE;
@@ -1422,7 +1422,7 @@ BOOL daNpc_zrC_c::waitSick(void* param_0) {
// fallthrough
case 2:
if (daPy_py_c::i_checkNowWolf() && daPy_py_c::checkNowWolfEyeUp()) {
if (daPy_py_c::checkNowWolf() && daPy_py_c::checkNowWolfEyeUp()) {
mCreatureSound.startCreatureVoiceLevel(Z2SE_ZRC_V_SLEEPING, -1);
}
break;
@@ -1454,7 +1454,7 @@ BOOL daNpc_zrC_c::waitPray(void* param_0) {
// fallthrough
case 2:
if (!daNpcF_chkEvtBit(0x1df) && field_0xe30 && !daPy_py_c::i_checkNowWolf()
if (!daNpcF_chkEvtBit(0x1df) && field_0xe30 && !daPy_py_c::checkNowWolf()
&& player_dist <= daNpc_zrC_Param_c::m.field_0x6c
&& !daPy_getPlayerActorClass()->checkPlayerFly()
&& daPy_getPlayerActorClass()->checkSwimUp() && !dComIfGp_checkPlayerStatus0(0, 0x100))
src/d/actor/d_a_npc_zrz.cpp
+1 -1
View File
@@ -630,7 +630,7 @@ void daNpc_zrZ_c::setParam() {
u32 attn_flags = 10;
selectAction();
if (!mTwilight && daPy_py_c::i_checkNowWolf()) {
if (!mTwilight && daPy_py_c::checkNowWolf()) {
attn_flags = 0;
}
src/d/actor/d_a_obj_ari.cpp
+8 -8
View File
@@ -191,7 +191,7 @@ void daObjARI_c::WallWalk() {
cXyz zero(0.0f, 0.0f, 0.0f);
cXyz normal_yz(0.0f, normal->y, normal->z);
f32 normal_len_yz = zero.abs(normal_yz);
mTargetPos = lin_chk1.i_GetCross();
mTargetPos = lin_chk1.GetCross();
mDownAngleY = normal_ang_y;
mWallAngle.z = -cM_atan2s(normal->x, normal_len_yz);
mWallAngle.x = cM_atan2s(normal->z, normal->y);
@@ -205,7 +205,7 @@ void daObjARI_c::WallWalk() {
cXyz zero(0.0f, 0.0f, 0.0f);
cXyz normal_yz(0.0f, normal->y, normal->z);
f32 normal_len_yz = zero.abs(normal_yz);
mTargetPos = lin_chk2.i_GetCross();
mTargetPos = lin_chk2.GetCross();
mDownAngleY = normal_ang_y;
mWallAngle.z = -cM_atan2s(normal->x, normal_len_yz);
mWallAngle.x = cM_atan2s(normal->z, normal->y);
@@ -269,7 +269,7 @@ void daObjARI_c::checkGround() {
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
current.pos = lin_chk.i_GetCross();
current.pos = lin_chk.GetCross();
const cXyz* normal = plane.GetNP();
cXyz zero(0.0f, 0.0f, 0.0f);
cXyz normal_yz(0.0f, normal->y, normal->z);
@@ -351,7 +351,7 @@ void daObjARI_c::BoomChk() {
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
old.pos = lin_chk.i_GetCross();
old.pos = lin_chk.GetCross();
current.pos = old.pos;
mAction = 0;
mMode = 0;
@@ -466,7 +466,7 @@ int daObjARI_c::Execute() {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
const cXyz* normal = plane.GetNP();
current.pos = lin_chk.i_GetCross();
current.pos = lin_chk.GetCross();
mTargetPos = current.pos;
old.pos = current.pos;
cXyz zero(0.0f, 0.0f, 0.0f);
@@ -485,7 +485,7 @@ int daObjARI_c::Execute() {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
const cXyz* normal = plane.GetNP();
current.pos = lin_chk.i_GetCross();
current.pos = lin_chk.GetCross();
mTargetPos = current.pos;
old.pos = current.pos;
cXyz zero(0.0f, 0.0f, 0.0f);
@@ -690,7 +690,7 @@ cPhs__Step daObjARI_c::create() {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
const cXyz* normal = plane.GetNP();
current.pos = lin_chk.i_GetCross();
current.pos = lin_chk.GetCross();
cXyz zero(0.0f, 0.0f, 0.0f);
cXyz normalYZ(0.0f, normal->y, normal->z);
mWallAngle.z = mWallAlignAngle.z = -cM_atan2s(normal->x, zero.abs(normalYZ));
@@ -711,7 +711,7 @@ cPhs__Step daObjARI_c::create() {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
const cXyz* normal = plane.GetNP();
current.pos = lin_chk.i_GetCross();
current.pos = lin_chk.GetCross();
cXyz zero(0.0f, 0.0f, 0.0f);
cXyz normalYZ(0.0f, normal->y, normal->z);
mWallAngle.z = mWallAlignAngle.z = -cM_atan2s(normal->x, zero.abs(normalYZ));
src/d/actor/d_a_obj_avalanche.cpp
+4 -4
View File
@@ -155,7 +155,7 @@ int daObjAvalanche_c::Execute(Mtx** param_1) {
*/
int daObjAvalanche_c::checkCollapse() {
daPy_py_c* player = (daPy_py_c*)dComIfGp_getPlayer(0);
if (!daPy_py_c::i_checkNowWolf()) {
if (!daPy_py_c::checkNowWolf()) {
return 0;
}
if (!player->checkWolfAttackReverse() && !player->checkFrontRollCrash()) {
@@ -208,13 +208,13 @@ void daObjAvalanche_c::actionWait() {
if (checkCollapse()) {
setAction(ACTION_ORDER_EVENT);
fopAcM_orderOtherEventId(this, mEventIdx, mMapToolId, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
/* 80BA773C-80BA7804 0008DC 00C8+00 1/0 0/0 0/0 .text actionOrderEvent__16daObjAvalanche_cFv */
void daObjAvalanche_c::actionOrderEvent() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(ACTION_EVENT);
mStaffId = dComIfGp_evmng_getMyStaffId(l_staffName, 0, 0);
if (mpBgW != NULL && mpBgW->ChkUsed()) {
@@ -223,7 +223,7 @@ void daObjAvalanche_c::actionOrderEvent() {
demoProc();
} else {
fopAcM_orderOtherEventId(this, mEventIdx, mMapToolId, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
src/d/actor/d_a_obj_bmWindow.cpp
+1 -1
View File
@@ -193,7 +193,7 @@ void daBmWindow_c::modeWait() {
}
if (player->checkAutoJump()) {
if (checkActorInRectangle(player, &cStack_2c, &cStack_38)) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
if (field_0xede == 0) {
cXyz soundPos(current.pos);
soundPos.z -= 200.0f;
src/d/actor/d_a_obj_bmshutter.cpp
+2 -2
View File
@@ -188,7 +188,7 @@ void daObjBmSh_c::actionWait() {
if (checkSw()) {
setAction(daObjBmSh_Action_ORDER_EVENT_e);
fopAcM_orderOtherEventId(this, mEventIdx, mEvent, 0xffff, 0, 1);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
}
}
@@ -199,7 +199,7 @@ void daObjBmSh_c::actionOrderEvent() {
setAction(daObjBmSh_Action_EVENT_e);
} else {
fopAcM_orderOtherEventId(this, mEventIdx, mEvent, 0xffff, 0, 1);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
}
}
src/d/actor/d_a_obj_bosswarp.cpp
+12 -12
View File
@@ -470,19 +470,19 @@ void daObjBossWarp_c::event_proc_call() {
void daObjBossWarp_c::actionWait() {
setAction(ACT_ORDER_EVENT);
fopAcM_orderOtherEventId(this, mBossClearEventId, mBossClearMapToolId, 0xffff, 3, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
/* 8057A54C-8057A610 000F8C 00C4+00 1/0 0/0 0/0 .text actionOrderEvent__15daObjBossWarp_cFv */
void daObjBossWarp_c::actionOrderEvent() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
dComIfGp_event_setTalkPartner(fopAcM_SearchByName(PROC_OBJ_YSTONE));
setAction(ACT_EVENT);
mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0);
demoProc();
} else {
fopAcM_orderOtherEventId(this, mBossClearEventId, mBossClearMapToolId, 0xffff, 3, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
@@ -502,19 +502,19 @@ void daObjBossWarp_c::actionWaitWarp() {
if (checkDistance()) {
setAction(ACT_ORDER_CHK_EVENT);
fopAcM_orderOtherEventId(this, mWarpCheckEventId, 0xff, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
/* 8057A6E0-8057A778 001120 0098+00 1/0 0/0 0/0 .text actionOrderWarpEvent__15daObjBossWarp_cFv */
void daObjBossWarp_c::actionOrderWarpEvent() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(ACT_WARP_EVENT);
mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0);
demoProc();
} else {
fopAcM_orderOtherEventId(this, mBossWarpInEventId, mBossWarpInMapToolId, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
@@ -533,7 +533,7 @@ void daObjBossWarp_c::actionDead() {
/* 8057A7C8-8057A8B4 001208 00EC+00 1/0 0/0 0/0 .text actionOrderChkEvent__15daObjBossWarp_cFv */
void daObjBossWarp_c::actionOrderChkEvent() {
daMidna_c* midna = daPy_py_c::getMidnaActor();
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(ACT_CHK_EVENT);
mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0);
attention_info.position = midna->attention_info.position;
@@ -542,7 +542,7 @@ void daObjBossWarp_c::actionOrderChkEvent() {
demoProc();
} else {
fopAcM_orderOtherEventId(this, mWarpCheckEventId, 0xff, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
@@ -554,11 +554,11 @@ void daObjBossWarp_c::actionChkEvent() {
if (mWarpChoice == 0) {
setAction(ACT_ORDER_WARP_EVENT);
fopAcM_orderOtherEventId(this, mBossWarpInEventId, mBossWarpInMapToolId, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
} else if (mWarpChoice == 1) {
setAction(ACT_ORDER_CANCEL_EVENT);
fopAcM_orderOtherEventId(this, mWarpCancelEventId, 0xff, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
} else {
demoProc();
@@ -568,13 +568,13 @@ void daObjBossWarp_c::actionChkEvent() {
/* 8057A994-8057AA2C 0013D4 0098+00 1/0 0/0 0/0 .text actionOrderCancelEvent__15daObjBossWarp_cFv
*/
void daObjBossWarp_c::actionOrderCancelEvent() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(ACT_CANCEL_EVENT);
mStaffId = dComIfGp_evmng_getMyStaffId("WARPHOLE", NULL, 0);
demoProc();
} else {
fopAcM_orderOtherEventId(this, mWarpCancelEventId, 0xff, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
src/d/actor/d_a_obj_carry.cpp
+2 -2
View File
@@ -2602,7 +2602,7 @@ int daObjCarry_c::mode_proc_carry() {
if (0.0f != fopAcM_GetSpeedF(this)) {
if (current.angle.x == 0) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
speedF = data().m_wolfThrowInitSpeedXZ;
speed.y = data().m_wolfThrowInitSpeedY;
} else {
@@ -2610,7 +2610,7 @@ int daObjCarry_c::mode_proc_carry() {
speed.y = data().m_throwInitSpeedY;
}
} else {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
speedF = data().m_wolfThrowInitSpeedXZ;
} else {
speedF = data().m_throwInitSpeedXZ;
src/d/actor/d_a_obj_cdoor.cpp
+3 -3
View File
@@ -283,18 +283,18 @@ void daObjCdoor_c::actionWait() {
if (mMapToolID != 0xff) {
setAction(ACT_ORDER_EVENT);
fopAcM_orderOtherEventId(this, mEventID, mMapToolID, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
/* 80BC7B34-80BC7B9C 000DF4 0068+00 1/0 0/0 0/0 .text actionOrderEvent__12daObjCdoor_cFv
*/
void daObjCdoor_c::actionOrderEvent() {
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
setAction(ACT_EVENT);
} else {
fopAcM_orderOtherEventId(this, mEventID, mMapToolID, 0xffff, 0, 1);
eventInfo.i_onCondition(2);
eventInfo.onCondition(2);
}
}
src/d/actor/d_a_obj_chest.cpp
+1 -1
View File
@@ -176,7 +176,7 @@ void daObjChest_c::actionWait() {
fopAcM_seStart(this, Z2SE_OBJ_TANSU_YURE, 0);
}
if (!fopAcM_isSwitch(this, getSwNo()) && player->i_checkNowWolf()) {
if (!fopAcM_isSwitch(this, getSwNo()) && player->checkNowWolf()) {
if (player->checkWolfAttackReverse() || player->checkFrontRollCrash()) {
for (int i = 0; i < 2; i++) {
cXyz multiply[2] = {
src/d/actor/d_a_obj_cho.cpp
+2 -2
View File
@@ -134,7 +134,7 @@ void daObjCHO_c::WallCheck() {
lin_chk.SetObj();
lin_chk.Set(&old.pos, &current.pos, NULL);
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
current.pos = lin_chk.i_GetCross();
current.pos = lin_chk.GetCross();
mTargetAngleY += 0x100;
}
}
@@ -358,7 +358,7 @@ void daObjCHO_c::BoomChk() {
if (dComIfG_Bgsp().LineCross(&lin_chk)) {
cM3dGPla plane;
dComIfG_Bgsp().GetTriPla(lin_chk, &plane);
old.pos = lin_chk.i_GetCross();
old.pos = lin_chk.GetCross();
current.pos = old.pos;
mAction = ACT_MOVE;
mMode = 0;
src/d/actor/d_a_obj_cwall.cpp
+2 -2
View File
@@ -568,7 +568,7 @@ void daObjCwall_c::chain_control2() {
cXyz acStack_98;
cXyz cStack_a4;
if (field_0xe90 != 0) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
mDoMtx_stack_c::copy(player->getWolfMouthMatrix());
mDoMtx_stack_c::multVecZero(&acStack_98);
cXyz cStack_b0(0.0f, 0.0f, 60.0f);
@@ -892,7 +892,7 @@ BOOL daObjCwall_c::checkPullNow() {
mDoMtx_stack_c::multVec(&local_2c, &local_2c);
cXyz local_38;
cXyz local_44;
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
local_38 = l_check_min_wolf;
local_44 = l_check_max_wolf;
} else {
src/d/actor/d_a_obj_digholl.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ static int daObjDigholl_Delete(daObjDigholl_c* i_this) {
/* 80BDC7D8-80BDCAEC 000238 0314+00 1/1 0/0 0/0 .text execute__14daObjDigholl_cFv */
int daObjDigholl_c::execute() {
daPy_py_c* player = daPy_getLinkPlayerActorClass();
if (player->i_checkNowWolf() &&
if (player->checkNowWolf() &&
(field_0x56a == 0xff || fopAcM_isSwitch(this, field_0x56a)) &&
(f32)fabsf(current.pos.y - player->current.pos.y) < 40.0f)
{
src/d/actor/d_a_obj_digplace.cpp
+1 -1
View File
@@ -139,7 +139,7 @@ int daObjDigpl_c::execute() {
}
}
if (daPy_py_c::i_checkNowWolf() && mDigFlg == 0) {
if (daPy_py_c::checkNowWolf() && mDigFlg == 0) {
if (field_0x56b == 0) {
int seen_angle = fopAcM_seenActorAngleY(player_p, this);
f32 dist_to_player = fopAcM_searchPlayerDistanceXZ2(this);
src/d/actor/d_a_obj_digsnow.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ int daObjDigSnow_c::create1st() {
/* 80BDCE84-80BDCF00 0002A4 007C+00 1/0 0/0 0/0 .text Execute__14daObjDigSnow_cFPPA3_A4_f
*/
int daObjDigSnow_c::Execute(Mtx** i_mtx) {
if (daPy_py_c::i_checkNowWolf()) {
if (daPy_py_c::checkNowWolf()) {
attention_info.flags = 0x80;
} else {
attention_info.flags = 0;
src/d/actor/d_a_obj_drop.cpp
+4 -4
View File
@@ -503,7 +503,7 @@ int daObjDrop_c::actionCompleteWait() {
int daObjDrop_c::actionOrderCompleteDemo() {
camera_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
pcamera->mCamera.SetTrimTypeForce(1);
setDemoMode(DEMOMODE_COMPLETE_DEMO_e);
mFadeoutTimer = KREG_S(8) + 135;
@@ -511,7 +511,7 @@ int daObjDrop_c::actionOrderCompleteDemo() {
dropGet();
} else {
fopAcM_orderPotentialEvent(this, 2, 0, 0);
eventInfo.i_onCondition(dEvtCnd_CANDEMO_e);
eventInfo.onCondition(dEvtCnd_CANDEMO_e);
}
return 1;
@@ -522,7 +522,7 @@ int daObjDrop_c::actionCompleateDemo() {
camera_class* pcamera = dComIfGp_getCamera(dComIfGp_getPlayerCameraID(0));
pcamera->mCamera.SetTrimTypeForce(1);
if (eventInfo.i_checkCommandDemoAccrpt()) {
if (eventInfo.checkCommandDemoAccrpt()) {
int timer = cLib_calcTimer<u8>(&mFadeoutTimer);
if (timer == 0) {
u8 need_num = dComIfGp_getNeedLightDropNum();
@@ -556,7 +556,7 @@ int daObjDrop_c::actionWaitCompleteGetDemo() {
dComIfGs_onSaveSwitch(13);
} else {
fopAcM_orderItemEvent(this, 0, 0);
eventInfo.i_onCondition(dEvtCnd_CANGETITEM_e);
eventInfo.onCondition(dEvtCnd_CANGETITEM_e);
}
return 1;
src/d/actor/d_a_obj_fchain.cpp
+1 -1
View File
@@ -148,7 +148,7 @@ int daObjFchain_c::execute() {
}
cXyz* pcVar12 = field_0x694;
cXyz* local_150 = field_0x79c;
u32 isWolf = daPy_py_c::i_checkNowWolf();
u32 isWolf = daPy_py_c::checkNowWolf();
daPy_py_c* player = daPy_getLinkPlayerActorClass();
for (int i = 0; i < 22; i++) {
local_54 = (*pcVar12 - *local_148) + *local_150;

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