Skip to content

Commit a4cdad8

Browse files
TakaRikkaTakaRikka
authored
b_gnd equivalent (#2340)
* b_gnd equivalent * fix dEvt_info_c inlines * fix some more inlines
1 parent 4dc0cd9 commit a4cdad8

File tree

178 files changed

+4447
-5098
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+4447
-5098
lines changed

‎include/SSystem/SComponent/c_bg_s_lin_chk.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class cBgS_LinChk : public cBgS_Chk, public cBgS_PolyInfo {
3636
void SetHit() { mStts |= STTS_HIT; }
3737
u32 ChkHit() const { return mStts & STTS_HIT; }
3838
void SetCross(const cXyz& pos) { mLin.SetEnd(pos); }
39-
cXyz& i_GetCross() { return mLin.GetEnd(); }
4039
cXyz* GetCrossP() { return &mLin.GetEndP(); }
4140
cM3dGLin* GetLinP() { return &mLin; }
4241
bool ChkBackFlag() const { return mBackFlag; }

‎include/Z2AudioLib/Z2LinkMgr.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ class Z2CreatureLink : public Z2Creature, public Z2LinkSoundStarter {
1818
Z2CreatureLink();
1919
~Z2CreatureLink();
2020

21-
void setLinkState(u8);
2221
void setLinkGroupInfo(u8);
2322
void setLinkHp(s32, s32);
2423
void setLinkSwordType(s32, s32);
@@ -48,7 +47,7 @@ class Z2CreatureLink : public Z2Creature, public Z2LinkSoundStarter {
4847
u8 getLinkState() const { return mLinkState; }
4948
u8 getMoveSpeed() const { return mMoveSpeed; }
5049
bool isRiding() const { return mRiding; }
51-
void i_setLinkState(u8 i_state) { mLinkState = i_state; }
50+
void setLinkState(u8 i_state) { mLinkState = i_state; }
5251
Z2SoundObjSimple& getKantera() { return mKantera; }
5352
u8 getLinkHp() const { return mLinkHp; }
5453
u8 getMovingTime() { return mMovingTime; }

‎include/d/actor/d_a_alink.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3183,7 +3183,7 @@ class daAlink_c : public daPy_py_c {
31833183
virtual f32 getSinkShapeOffset() const;
31843184
virtual BOOL checkSinkDead() const;
31853185
virtual BOOL checkHorseStart();
3186-
virtual Z2WolfHowlMgr* getWolfHowlMgrP();
3186+
virtual Z2WolfHowlMgr* getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
31873187
virtual BOOL checkWolfHowlSuccessAnime() const;
31883188
virtual BOOL checkCopyRodTopUse();
31893189
virtual bool checkCopyRodEquip() const;
@@ -3192,7 +3192,7 @@ class daAlink_c : public daPy_py_c {
31923192
u32 checkModeFlg(u32 pFlag) const { return mModeFlg & pFlag; }
31933193
BOOL checkSmallUpperGuardAnime() const { return checkUpperAnime(0x16); }
31943194
BOOL checkFmChainGrabAnime() const { return checkUpperAnime(0x62) || checkUpperAnime(0x2A0); }
3195-
Z2WolfHowlMgr* i_getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
3195+
31963196

31973197
// this might be a fake match, but helps fix usage in many functions
31983198
#pragma optimization_level 2
@@ -3359,7 +3359,7 @@ class daAlink_c : public daPy_py_c {
33593359
var_r5 = 0;
33603360

33613361
if (mItemAcKeep.getActor() != NULL &&
3362-
mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt() != 0) {
3362+
mItemAcKeep.getActor()->eventInfo.checkCommandDemoAccrpt() != 0) {
33633363
var_r5 = 1;
33643364
}
33653365

‎include/d/actor/d_a_b_gnd.h‎

Lines changed: 112 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
*/
1919

2020
struct g_himo_s {
21-
/* 80601D40 */ ~g_himo_s();
22-
/* 80601DA0 */ g_himo_s();
23-
2421
/* 0x0 */ cXyz field_0x0[16];
2522
};
2623

@@ -32,94 +29,85 @@ class b_gnd_class : public fopEn_enemy_c {
3229

3330
/* 0x05AC */ request_of_phase_process_class mPhaseReq;
3431
/* 0x05B4 */ request_of_phase_process_class mHorsePhaseReq;
35-
/* 0x05BC */ s16 field_0x05bc;
36-
/* 0x05BE */ u8 field_0x05be;
37-
/* 0x05BF */ u8 field_0x05BF[0x05C0 - 0x05BF];
38-
/* 0x05C0 */ cXyz field_0x05c0;
39-
/* 0x05CC */ s16 field_0x05cc;
40-
/* 0x05CE */ u8 field_0x05CE[0x05D0 - 0x05CE];
32+
/* 0x05BC */ s16 mMoveMode;
33+
/* 0x05BE */ u8 field_0x5be;
34+
/* 0x05C0 */ cXyz field_0x5c0;
35+
/* 0x05CC */ s16 field_0x5cc;
4136
/* 0x05D0 */ mDoExt_McaMorfSO* mpModelMorf;
4237
/* 0x05D4 */ mDoExt_McaMorfSO* mpHorseMorf;
43-
/* 0x05D8 */ mDoExt_McaMorf* field_0x05d8;
44-
/* 0x05DC */ Z2CreatureEnemy mZ2Creature;
45-
/* 0x0680 */ Z2CreatureEnemy field_0x0680;
46-
/* 0x0724 */ mDoExt_brkAnm* field_0x0724;
47-
/* 0x0728 */ mDoExt_btkAnm* field_0x0728[6];
48-
/* 0x0740 */ u8 field_0x0740[0x0744 - 0x0740];
49-
/* 0x0744 */ mDoExt_btpAnm* field_0x0744;
50-
/* 0x0748 */ int field_0x0748;
51-
/* 0x074C */ mDoExt_btpAnm* field_0x074c;
52-
/* 0x0750 */ mDoExt_btkAnm* field_0x0750;
53-
/* 0x0754 */ u8 field_0x0754;
54-
/* 0x0755 */ u8 field_0x0755[0x0758 - 0x0755];
38+
/* 0x05D8 */ mDoExt_McaMorf* mpZeldaModel;
39+
/* 0x05DC */ Z2CreatureEnemy mGndSound;
40+
/* 0x0680 */ Z2CreatureEnemy mHorseSound;
41+
/* 0x0724 */ mDoExt_brkAnm* mpGndCoreBrk;
42+
/* 0x0728 */ mDoExt_btkAnm* mpGndEyeBtk[6];
43+
/* 0x0740 */ u8 field_0x740[0x0744 - 0x0740];
44+
/* 0x0744 */ mDoExt_btpAnm* mpGndEyeBtp;
45+
/* 0x0748 */ int mGndEyeBtkNo;
46+
/* 0x074C */ mDoExt_btpAnm* mpZeldaBtp;
47+
/* 0x0750 */ mDoExt_btkAnm* mpZeldaBtk;
48+
/* 0x0754 */ u8 mDrawZelda;
5549
/* 0x0758 */ int mAnmID;
5650
/* 0x075C */ int mHorseAnmID;
5751
/* 0x0760 */ f32 mPlaySpeed;
58-
/* 0x0764 */ u8 field_0x0764[0x0768 - 0x0764];
59-
/* 0x0768 */ J3DModel* field_0x0768;
60-
/* 0x076C */ J3DModel* field_0x076c;
61-
/* 0x0770 */ u8 field_0x0770;
62-
/* 0x0771 */ u8 field_0x0771;
63-
/* 0x0772 */ s16 field_0x0772;
64-
/* 0x0774 */ dKy_tevstr_c field_0x0774;
65-
/* 0x0AFC */ s16 field_0x0afc;
66-
/* 0x0AFE */ s16 mActionID;
67-
/* 0x0B00 */ s16 field_0x0b00;
68-
/* 0x0B02 */ u8 field_0x0B02[0x0B94 - 0x0B02];
69-
/* 0x0B94 */ J3DModel* field_0x0b94[36];
70-
/* 0x0C24 */ s16 field_0x0c24;
71-
/* 0x0C26 */ s16 field_0x0c26;
72-
/* 0x0C28 */ s16 field_0x0c28;
73-
/* 0x0C2A */ u8 field_0x0C2A[0x0C2C - 0x0C2A];
74-
/* 0x0C2C */ J3DModel* field_0x0c2c[2];
75-
/* 0x0C34 */ u8 field_0x0C34[0x0C38 - 0x0C34];
76-
/* 0x0C38 */ f32 field_0x0c38;
77-
/* 0x0C3C */ s16 field_0x0c3c;
78-
/* 0x0C3E */ u8 field_0x0C3E[0x0C40 - 0x0C3E];
52+
/* 0x0764 */ u8 field_0x764[0x0768 - 0x0764];
53+
/* 0x0768 */ J3DModel* mpSwordModel;
54+
/* 0x076C */ J3DModel* mpSheathModel;
55+
/* 0x0770 */ u8 field_0x770;
56+
/* 0x0771 */ u8 mHideSheath;
57+
/* 0x0772 */ s16 field_0x772;
58+
/* 0x0774 */ dKy_tevstr_c mSwordTevstr;
59+
/* 0x0AFC */ s16 mCounter;
60+
/* 0x0AFE */ s16 mActionMode;
61+
/* 0x0B00 */ s16 field_0xb00;
62+
/* 0x0B02 */ u8 field_0xB02[0x0B94 - 0x0B02];
63+
/* 0x0B94 */ J3DModel* mpMantShadowModel[36];
64+
/* 0x0C24 */ s16 mSwordBlurAlpha;
65+
/* 0x0C26 */ s16 mSwordBlurType;
66+
/* 0x0C28 */ s16 field_0xc28;
67+
/* 0x0C2C */ J3DModel* mpSwordBlurModel[2];
68+
/* 0x0C34 */ u8 field_0xC34[0x0C38 - 0x0C34];
69+
/* 0x0C38 */ f32 mPlayerDistXZ;
70+
/* 0x0C3C */ s16 mPlayerAngleY;
7971
/* 0x0C40 */ u32 mShadowID;
80-
/* 0x0C44 */ s16 field_0x0c44[10];
81-
/* 0x0C58 */ s16 field_0x0c58;
82-
/* 0x0C5A */ s16 field_0x0c5a;
83-
/* 0x0C5C */ s16 field_0x0c5c;
84-
/* 0x0C5D */ u8 field_0x0C5E[0x0C60 - 0x0C5E];
85-
/* 0x0C60 */ int field_0x0c60;
86-
/* 0x0C64 */ int field_0x0c64;
87-
/* 0x0C68 */ s16 field_0x0c68;
88-
/* 0x0C6A */ s16 field_0x0c6a;
89-
/* 0x0C6C */ f32 field_0x0c6c;
90-
/* 0x0C70 */ s16 field_0x0c70;
91-
/* 0x0C72 */ s16 field_0x0c72;
92-
/* 0x0C74 */ s16 field_0x0c74;
93-
/* 0x0C76 */ u8 field_0x0c76;
94-
/* 0x0C77 */ u8 field_0x0c77;
95-
/* 0x0C78 */ u8 field_0x0c78;
96-
/* 0x0C79 */ u8 field_0x0c79;
97-
/* 0x0C7A */ u8 field_0x0c7a;
98-
/* 0x0C7B */ u8 field_0x0c7b;
99-
/* 0x0C7C */ u8 field_0x0c7c;
100-
/* 0x0C7D */ u8 field_0x0c7d;
101-
/* 0x0C7E */ u8 field_0x0C7E[0x0C80 - 0x0C7E];
102-
/* 0x0C80 */ cXyz field_0x0c80;
103-
/* 0x0C8C */ s16 field_0x0c8c;
104-
/* 0x0C8E */ s16 field_0x0c8e;
105-
/* 0x0C90 */ s16 field_0x0c90;
106-
/* 0x0C92 */ s16 field_0x0c92;
107-
/* 0x0C94 */ dBgS_AcchCir mWall;
108-
/* 0x0CD4 */ dBgS_ObjAcch field_0x0cd4;
109-
/* 0x0EAC */ s16 field_0x0eac;
110-
/* 0x0EAE */ u8 field_0x0EAE[0x0EB0 - 0x0EAE];
111-
/* 0x0EB0 */ f32 field_0x0eb0;
112-
/* 0x0EB4 */ cXyz field_0x0eb4;
113-
/* 0x0EC0 */ csXyz field_0x0ec0;
114-
/* 0x0EC6 */ u8 field_0x0EC6[0x0EC8 - 0x0EC6];
115-
/* 0x0EC8 */ dCcD_Stts field_0x0ec8;
116-
/* 0x0F04 */ dCcD_Sph mHorseSpheres1[2];
117-
/* 0x1174 */ dCcD_Sph mHorseSpheres2[4];
118-
/* 0x1654 */ dCcD_Stts field_0x1654;
119-
/* 0x1690 */ dCcD_Sph field_0x1690[3];
120-
/* 0x1A38 */ dCcD_Sph field_0x1a38;
121-
/* 0x1B70 */ dCcD_Sph field_0x1b70;
122-
/* 0x1CA8 */ dCcD_Cyl field_0x1ca8;
72+
/* 0x0C44 */ s16 field_0xc44[10];
73+
/* 0x0C58 */ s16 mDamageInvulnerabilityTimer;
74+
/* 0x0C5A */ s16 field_0xc5a;
75+
/* 0x0C5C */ s16 mHorseLegRot;
76+
/* 0x0C60 */ int field_0xc60;
77+
/* 0x0C64 */ int field_0xc64;
78+
/* 0x0C68 */ s16 field_0xc68;
79+
/* 0x0C6A */ s16 field_0xc6a;
80+
/* 0x0C6C */ f32 field_0xc6c;
81+
/* 0x0C70 */ s16 field_0xc70;
82+
/* 0x0C72 */ s16 field_0xc72;
83+
/* 0x0C74 */ s16 field_0xc74;
84+
/* 0x0C76 */ u8 mGakeChkType;
85+
/* 0x0C77 */ u8 field_0xc77;
86+
/* 0x0C78 */ u8 field_0xc78;
87+
/* 0x0C79 */ u8 field_0xc79;
88+
/* 0x0C7A */ u8 field_0xc7a;
89+
/* 0x0C7B */ u8 field_0xc7b;
90+
/* 0x0C7C */ u8 field_0xc7c;
91+
/* 0x0C7D */ s8 field_0xc7d;
92+
/* 0x0C80 */ cXyz field_0xc80;
93+
/* 0x0C8C */ s16 mGndBodyRotX;
94+
/* 0x0C8E */ s16 mGndHeadRotZ;
95+
/* 0x0C90 */ s16 field_0xc90;
96+
/* 0x0C92 */ s16 field_0xc92;
97+
/* 0x0C94 */ dBgS_AcchCir mAcchCir;
98+
/* 0x0CD4 */ dBgS_ObjAcch mAcch;
99+
/* 0x0EAC */ s16 field_0xeac;
100+
/* 0x0EB0 */ f32 field_0xeb0;
101+
/* 0x0EB4 */ cXyz field_0xeb4;
102+
/* 0x0EC0 */ csXyz field_0xec0;
103+
/* 0x0EC8 */ dCcD_Stts mHorseCcStts;
104+
/* 0x0F04 */ dCcD_Sph mHorseBodySph[2];
105+
/* 0x1174 */ dCcD_Sph mHorseFootSph[4];
106+
/* 0x1654 */ dCcD_Stts mGndCcStts;
107+
/* 0x1690 */ dCcD_Sph mGndSph[3];
108+
/* 0x1A38 */ dCcD_Sph mAtSph;
109+
/* 0x1B70 */ dCcD_Sph mDefSph;
110+
/* 0x1CA8 */ dCcD_Cyl mCoCyl;
123111
/* 0x1DE4 */ dCcU_AtInfo mAtInfo;
124112
/* 0x1E08 */ u8 field_0x1e08;
125113
/* 0x1E09 */ u8 field_0x1e09;
@@ -133,61 +121,69 @@ class b_gnd_class : public fopEn_enemy_c {
133121
/* 0x1E2C */ Z2SoundObjSimple field_0x1e2c;
134122
/* 0x1E4C */ f32 field_0x1e4c;
135123
/* 0x1E50 */ csXyz field_0x1e50;
136-
/* 0x1E56 */ u8 field_0x1e56[5];
137-
/* 0x1E5B */ u8 field_0x1E5B[0x1E5C - 0x1E5B];
138-
/* 0x1E5C */ cXyz field_0x1e5c[5];
124+
/* 0x1E56 */ s8 field_0x1e56[5];
125+
/* 0x1E5C */ cXyz mLightBallPos[5];
139126
/* 0x1E98 */ cXyz field_0x1e98[5];
140127
/* 0x1ED4 */ cXyz field_0x1ed4[5];
141-
/* 0x1F10 */ Z2SoundObjSimple field_0x1f10[5];
128+
/* 0x1F10 */ Z2SoundObjSimple mLightBallSound[5];
142129
/* 0x1FB0 */ u8 mInitHIO;
143-
/* 0x1FB0 */ u8 field_0x1FB1[0x1FB4 - 0x1FB1];
144130
/* 0x1FB4 */ fpc_ProcID mMantChildID;
145131
/* 0x1FB8 */ cXyz field_0x1fb8;
146-
/* 0x1FC4 */ int field_0x1fc4;
132+
/* 0x1FC4 */ int mDrawHorse;
147133
/* 0x1FC8 */ s16 field_0x1fc8;
148-
/* 0x1FCA */ s16 field_0x1fca;
149-
/* 0x1FCC */ s16 field_0x1fcc;
150-
/* 0x1FCE */ u8 field_0x1FCE[0x1FD0 - 0x1FCE];
134+
/* 0x1FCA */ s16 mGndArmRRotX;
135+
/* 0x1FCC */ s16 mGndShoulderLRotY;
151136
/* 0x1FD0 */ f32 field_0x1fd0;
152137
/* 0x1FD4 */ s16 field_0x1fd4;
153138
/* 0x1FD6 */ s16 field_0x1fd6;
154139
/* 0x1FD8 */ cXyz field_0x1fd8[2];
155140
/* 0x1FF0 */ g_himo_s field_0x1ff0[2];
156-
/* 0x2170 */ mDoExt_3DlineMat1_c field_0x2170[2];
141+
/* 0x2170 */ mDoExt_3DlineMat1_c mHorseReins[2];
157142
/* 0x21E8 */ mDoExt_3DlineMat1_c field_0x21e8;
158143
/* 0x2224 */ dKy_tevstr_c field_0x2224;
159-
/* 0x25AC */ u32 field_0x25ac[17];
160-
/* 0x25F0 */ u8 field_0x25F0[0x2688 - 0x25F0];
144+
/* 0x25AC */ u32 field_0x25ac[2];
145+
/* 0x25B4 */ u32 field_0x25b4;
146+
/* 0x25B8 */ u32 field_0x25b8;
147+
/* 0x25BC */ u32 field_0x25bc;
148+
/* 0x25C0 */ u32 field_0x25c0;
149+
/* 0x25C4 */ u32 field_0x25c4;
150+
/* 0x25C8 */ u32 field_0x25c8;
151+
/* 0x25CC */ u32 field_0x25cc;
152+
/* 0x25D0 */ u32 field_0x25d0;
153+
/* 0x25D4 */ u32 field_0x25d4;
154+
/* 0x25D8 */ u32 field_0x25d8;
155+
/* 0x25DC */ u32 field_0x25dc;
156+
/* 0x25E0 */ u32 field_0x25e0;
157+
/* 0x25E4 */ u32 field_0x25e4[3];
158+
/* 0x25F0 */ u32 field_0x25f0[6];
159+
/* 0x2608 */ u32 field_0x2608[5][6];
160+
/* 0x2680 */ u32 field_0x2680[2];
161161
/* 0x2688 */ u32 field_0x2688;
162162
/* 0x268C */ u32 field_0x268c[3];
163163
/* 0x2698 */ u8 field_0x2698;
164164
/* 0x2699 */ u8 field_0x2699;
165165
/* 0x269C */ cXyz field_0x269c;
166166
/* 0x26A8 */ cXyz field_0x26a8[2];
167-
/* 0x26C0 */ s16 field_0x26c0;
167+
/* 0x26C0 */ s16 mGndLegRotX;
168168
/* 0x26C2 */ s16 field_0x26c2;
169-
/* 0x26C4 */ s16 field_0x26c4;
170-
/* 0x26C6 */ s16 field_0x26c6;
171-
/* 0x26C8 */ cXyz field_0x26c8;
172-
/* 0x26D4 */ cXyz field_0x26d4;
173-
/* 0x26E0 */ cXyz field_0x26e0;
174-
/* 0x26EC */ cXyz field_0x26ec;
175-
/* 0x26F8 */ cXyz field_0x26f8;
176-
/* 0x2704 */ cXyz field_0x2704;
169+
/* 0x26C4 */ s16 mDemoCamMode;
170+
/* 0x26C6 */ s16 mDemoCamTimer;
171+
/* 0x26C8 */ cXyz mDemoCamEye;
172+
/* 0x26D4 */ cXyz mDemoCamCenter;
173+
/* 0x26E0 */ cXyz mDemoCamEyeTarget;
174+
/* 0x26EC */ cXyz mDemoCamCenterTarget;
175+
/* 0x26F8 */ cXyz mDemoCamEyeSpd;
176+
/* 0x2704 */ cXyz mDemoCamCenterSpd;
177177
/* 0x2710 */ cXyz field_0x2710;
178178
/* 0x271C */ s16 field_0x271c;
179-
/* 0x271E */ u8 field_0x271E[0x2720 - 0x271E];
180179
/* ox2720 */ cXyz field_0x2720;
181180
/* 0x272C */ s16 field_0x272c;
182-
/* 0x272E */ u8 field_0x272E[0x2730 - 0x272E];
183-
/* 0x2730 */ f32 field_0x2730;
184-
/* 0x2734 */ f32 field_0x2734;
185-
/* 0x2738 */ u8 field_0x2738;
181+
/* 0x2730 */ f32 mTubazeriPushValue;
182+
/* 0x2734 */ f32 mTubazeriPushAmount;
183+
/* 0x2738 */ u8 mNoDrawTimer;
186184
/* 0x2739 */ u8 field_0x2739;
187-
/* 0x273A */ u8 field_0x273A[0x273C - 0x273A];
188-
/* 0x273C */ f32 field_0x273c;
185+
/* 0x273C */ f32 mKankyoBlend;
189186
/* 0x2740 */ u8 field_0x2740;
190-
/* 0x2741 */ u8 field_0x2741[0x2744 - 0x2741];
191187
/* 0x2744 */ dMsgFlow_c mMsgFlow;
192188
};
193189

@@ -196,10 +192,9 @@ STATIC_ASSERT(sizeof(b_gnd_class) == 0x2790);
196192
class daB_GND_HIO_c {
197193
public:
198194
/* 805F4A4C */ daB_GND_HIO_c();
199-
/* 80602230 */ ~daB_GND_HIO_c();
195+
/* 80602230 */ virtual ~daB_GND_HIO_c() {}
200196

201-
/* 0x00 */ f32 field_0x0;
202-
/* 0x04 */ s8 field_0x4;
197+
/* 0x04 */ s8 no;
203198
/* 0x08 */ f32 model_size;
204199
/* 0x0C */ f32 field_0xc;
205200
/* 0x10 */ f32 field_0x10;

‎include/d/actor/d_a_formation_mng.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ struct daFmtMng_c : public fopAc_ac_c {
185185
}
186186

187187
bool checkEmergency() {
188-
if (dKy_darkworld_check() || !daPy_py_c::i_checkNowWolf()) {
188+
if (dKy_darkworld_check() || !daPy_py_c::checkNowWolf()) {
189189
return false;
190190
}
191191
FmtMember_c* member = mMember;

‎include/d/actor/d_a_guard_mng.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class daGuardMng_c : public fopAc_ac_c {
2424
0x00000200, 0x00000201,
2525
};
2626

27-
if (!daPy_py_c::i_checkNowWolf() || field_0x573 >= mLimitNum) {
27+
if (!daPy_py_c::checkNowWolf() || field_0x573 >= mLimitNum) {
2828
return 1;
2929
} else {
3030
if (field_0x571 < mMerchantNum) {

0 commit comments

Comments
 (0)