summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/JSystem/JGadget/search.h4
-rw-r--r--include/JSystem/JStudio/JStudio/functionvalue.h6
-rw-r--r--include/d/actor/d_a_alink.h177
-rw-r--r--include/d/actor/d_a_player.h8
-rw-r--r--include/d/actor/d_a_tbox.h30
-rw-r--r--include/d/d_com_inf_game.h12
-rw-r--r--include/d/d_msg_object.h2
-rw-r--r--include/m_Do/m_Do_ext.h2
8 files changed, 102 insertions, 139 deletions
diff --git a/include/JSystem/JGadget/search.h b/include/JSystem/JGadget/search.h
index e4c5c538b7..c53045668a 100644
--- a/include/JSystem/JGadget/search.h
+++ b/include/JSystem/JGadget/search.h
@@ -111,14 +111,14 @@ inline Iterator findUpperBound_binary_end(Iterator first, Iterator last, const T
}
template <typename Iterator, typename T, typename Predicate>
-Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val, Predicate p) {
+inline Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val, Predicate p) {
return current == last || p(val, *current) ?
findUpperBound_binary_end(first, current, val, p) :
findUpperBound_binary_begin(current, last, val, p);
}
template <typename Iterator, typename T>
-Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val) {
+inline Iterator findUpperBound_binary_current(Iterator first, Iterator last, Iterator current, const T& val) {
return findUpperBound_binary_current(first, last, current, val, std::less<T>());
}
diff --git a/include/JSystem/JStudio/JStudio/functionvalue.h b/include/JSystem/JStudio/JStudio/functionvalue.h
index 69309a4219..a8724f5496 100644
--- a/include/JSystem/JStudio/JStudio/functionvalue.h
+++ b/include/JSystem/JStudio/JStudio/functionvalue.h
@@ -157,7 +157,6 @@ private:
class TFunctionValue_constant : public TFunctionValue {
public:
TFunctionValue_constant();
- virtual ~TFunctionValue_constant() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -195,7 +194,6 @@ public:
const TFunctionValue_composite::TData&, f64);
TFunctionValue_composite();
- virtual ~TFunctionValue_composite() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -232,7 +230,6 @@ class TFunctionValue_transition : public TFunctionValue,
public TFunctionValueAttribute_interpolate {
public:
TFunctionValue_transition();
- virtual ~TFunctionValue_transition() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -264,7 +261,6 @@ public:
typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list&, const TIndexData_&);
TFunctionValue_list();
- virtual ~TFunctionValue_list() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -380,7 +376,6 @@ public:
typedef f64 (*update_INTERPOLATE)(const TFunctionValue_list_parameter&, f64);
TFunctionValue_list_parameter();
- virtual ~TFunctionValue_list_parameter() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
@@ -499,7 +494,6 @@ public:
};
TFunctionValue_hermite();
- virtual ~TFunctionValue_hermite() {}
virtual u32 getType() const;
virtual TFunctionValueAttributeSet getAttributeSet();
diff --git a/include/d/actor/d_a_alink.h b/include/d/actor/d_a_alink.h
index 064f8587d3..a010fcca58 100644
--- a/include/d/actor/d_a_alink.h
+++ b/include/d/actor/d_a_alink.h
@@ -6839,7 +6839,18 @@ public:
BOOL checkCutHeadProc() const { return mProcID == PROC_CUT_HEAD; }
fopAc_ac_c* getRideActor() { return mRideAcKeep.getActor(); }
- virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; }
+ virtual bool checkAcceptDungeonWarpAlink(int) { return checkAcceptWarp(); }
+ virtual daSpinner_c* getSpinnerActor() {
+ daSpinner_c* spinnerActor;
+ if (!checkSpinnerRide()) {
+ spinnerActor = NULL;
+ } else {
+ spinnerActor = (daSpinner_c*)mRideAcKeep.getActor();
+ }
+ return (daSpinner_c*)spinnerActor;
+ }
+ virtual s16 getSumouCounter() const { return mProcVar2.field_0x300c; }
+ virtual s16 checkSumouWithstand() const { return mProcVar3.field_0x300e; }
virtual void setMidnaMsgNum(fopAc_ac_c* param_0, u16 pMsgNum) {
mMidnaMsgNum = pMsgNum;
mMidnaMsg = (daTagMmsg_c*)param_0;
@@ -6847,7 +6858,6 @@ public:
virtual MtxP getModelMtx() { return mpLinkModel->getBaseTRMtx(); }
virtual MtxP getInvMtx() { return mInvMtx; }
virtual cXyz* getShadowTalkAtnPos() { return &field_0x375c; }
- virtual f32 getGroundY() { return mLinkAcch.GetGroundH(); }
virtual MtxP getLeftItemMatrix();
virtual MtxP getRightItemMatrix();
virtual MtxP getLeftHandMatrix();
@@ -6859,9 +6869,27 @@ public:
if (mHeldItemModel != NULL && checkBottleItem(mEquipItem)) {
return mHeldItemModel->getBaseTRMtx();
}
-
return NULL;
}
+
+ virtual MtxP getHeadMtx() {
+ return mpLinkModel->getAnmMtx(field_0x30b4);
+ }
+ virtual f32 getGroundY() { return mLinkAcch.GetGroundH(); }
+ virtual f32 getBaseAnimeFrameRate() const { return mUnderFrameCtrl[0].getRate(); }
+ virtual fpc_ProcID getAtnActorID() const { return mAtnActorID; }
+ virtual fpc_ProcID getItemID() const { return mItemAcKeep.getID(); }
+ virtual fpc_ProcID getGrabActorID() const {
+ if (mEquipItem == 0x102) {
+ return mItemAcKeep.getID();
+ } else {
+ return mGrabItemAcKeep.getID();
+ }
+ }
+ virtual void setForcePutPos(cXyz const& pPutPos) {
+ mForcePutPos = pPutPos;
+ onEndResetFlg1(ERFLG1_UNK_2000);
+ }
virtual BOOL checkPlayerGuard() const;
virtual u32 checkPlayerFly() const {
return checkModeFlg(MODE_SWIMMING | MODE_ROPE_WALK | MODE_VINE_CLIMB | MODE_UNK_800 |
@@ -6929,26 +6957,17 @@ public:
}
virtual BOOL checkGrassWhistle() const { return mProcID == PROC_GRASS_WHISTLE_WAIT; }
virtual BOOL checkBoarRun() const { return mProcID == PROC_BOAR_RUN; }
- virtual f32 getBaseAnimeFrameRate() const { return mUnderFrameCtrl[0].getRate(); }
+ virtual BOOL checkHorseRideNotReady() const {
+ return checkHorseRide() && mProcID != PROC_HORSE_RIDE && mProcID != PROC_HORSE_GETOFF;
+ }
+ virtual f32 getSearchBallScale() const { return mSearchBallScale; }
+ virtual int checkFastShotTime() { return mFastShotTime; }
virtual f32 getBaseAnimeFrame() const;
virtual void setAnimeFrame(f32);
virtual BOOL checkWolfLock(fopAc_ac_c*) const;
virtual bool cancelWolfLock(fopAc_ac_c*);
- virtual fpc_ProcID getAtnActorID() const { return mAtnActorID; }
- virtual fpc_ProcID getItemID() const { return mItemAcKeep.getID(); }
- virtual fpc_ProcID getGrabActorID() const {
- if (mEquipItem == 0x102) {
- return mItemAcKeep.getID();
- } else {
- return mGrabItemAcKeep.getID();
- }
- }
virtual BOOL exchangeGrabActor(fopAc_ac_c*);
virtual BOOL setForceGrab(fopAc_ac_c*, int, int);
- virtual void setForcePutPos(cXyz const& pPutPos) {
- mForcePutPos = pPutPos;
- onEndResetFlg1(ERFLG1_UNK_2000);
- }
virtual u32 checkPlayerNoDraw();
virtual void voiceStart(u32);
virtual void seStartOnlyReverb(u32);
@@ -6957,10 +6976,6 @@ public:
virtual void setGrabCollisionOffset(f32, f32, cBgS_PolyInfo*);
virtual void onFrollCrashFlg(u8, int);
virtual MtxP getModelJointMtx(u16);
- virtual MtxP getHeadMtx() {
- return mpLinkModel->getAnmMtx(field_0x30b4);
- ;
- }
virtual bool setHookshotCarryOffset(fpc_ProcID, cXyz const*);
virtual BOOL checkCutJumpCancelTurn() const {
return (mProcID == PROC_CUT_JUMP || mProcID == PROC_CUT_JUMP_LAND) && field_0x3198 != 2;
@@ -6977,9 +6992,6 @@ public:
virtual bool setThrowDamage(short, f32, f32, int, int, int);
virtual bool checkSetNpcTks(cXyz*, int, int);
virtual int setRollJump(f32, f32, short);
- virtual void playerStartCollisionSE(u32 param_0, u32 param_1) {
- mZ2Link.startCollisionSE(param_0, param_1);
- }
virtual void cancelDungeonWarpReadyNeck() {
if (mProcID != PROC_DUNGEON_WARP_READY) {
return;
@@ -7004,21 +7016,7 @@ public:
virtual u32 checkCanoeRide() const;
virtual u32 checkBoardRide() const;
virtual u32 checkSpinnerRide() const;
- virtual daSpinner_c* getSpinnerActor() {
- daSpinner_c* spinnerActor;
- if (!checkSpinnerRide()) {
- spinnerActor = NULL;
- } else {
- spinnerActor = (daSpinner_c*)mRideAcKeep.getActor();
- }
- return (daSpinner_c*)spinnerActor;
- }
- virtual BOOL checkHorseRideNotReady() const {
- return checkHorseRide() && mProcID != PROC_HORSE_RIDE && mProcID != PROC_HORSE_GETOFF;
- }
virtual bool checkArrowChargeEnd() const;
- virtual f32 getSearchBallScale() const { return mSearchBallScale; }
- virtual int checkFastShotTime() { return mFastShotTime; }
virtual bool checkNoEquipItem() const { return mEquipItem == fpcNm_ITEM_NONE; }
virtual bool checkKandelaarSwing(int) const;
virtual s16 getBoardCutTurnOffsetAngleY() const {
@@ -7028,6 +7026,31 @@ public:
return 0;
}
virtual cXyz* getMagneBootsTopVec() { return &mMagneBootsTopVec; }
+ virtual void setCargoCarry(fopAc_ac_c* p_actor) {
+ mSpecialMode = SMODE_CARGO_CARRY;
+ mCargoCarryAcKeep.setData(p_actor);
+ }
+ virtual void setGoronSideMove(fopAc_ac_c* p_actor) {
+ mSpecialMode = SMODE_GORON_THROW;
+ mCargoCarryAcKeep.setData(p_actor);
+ }
+ virtual void setSumouReady(fopAc_ac_c* p_actor) {
+ mSpecialMode = SMODE_SUMO_READY;
+ mCargoCarryAcKeep.setData(p_actor);
+ mDemo.setDemoMode(1);
+ }
+ virtual void setSumouPushBackDirection(short param_0) {
+ if (mProcID != PROC_SUMOU_MOVE) {
+ return;
+ }
+ mProcVar4.field_0x3010 = param_0;
+ }
+ virtual void setSumouLoseHeadUp() {
+ if (mProcID != PROC_SUMOU_WIN_LOSE) {
+ return;
+ }
+ mSpecialMode = SMODE_SUMO_LOSE;
+ }
virtual cXyz* getKandelaarFlamePos();
virtual bool checkUseKandelaar(int);
virtual void setDkCaught(fopAc_ac_c*);
@@ -7045,6 +7068,24 @@ public:
}
mProcVar4.field_0x3010 = angle;
}
+ virtual void setSumouGraspCancelCount(int param_0) {
+ if (mProcID != PROC_SUMOU_MOVE) {
+ return;
+ }
+ mProcVar2.field_0x300c = param_0;
+ }
+ virtual bool checkItemSwordEquip() const { return mEquipItem == 0x103; }
+ virtual f32 getSinkShapeOffset() const { return mSinkShapeOffset; }
+ virtual BOOL checkSinkDead() const { return field_0x2fbd == 0xFF; }
+ virtual BOOL checkCutJumpMode() const { return mProcID == PROC_CUT_JUMP; }
+ virtual s16 getGiantPuzzleAimAngle() const { return mProcVar2.mPuzzleAimAngle; }
+ virtual u8 getSwordChangeWaitTimer() const { return mSwordChangeWaitTimer; }
+ virtual BOOL checkMetamorphose() const {
+ return mProcID == PROC_METAMORPHOSE && mProcVar1.field_0x300a == 0;
+ }
+ virtual BOOL checkWolfDownAttackPullOut() const { return mProcID == PROC_WOLF_DOWN_AT_LAND; }
+ virtual cXyz* getMidnaAtnPos() const { return (cXyz*)&mMidnaAtnPos; }
+ virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; }
virtual void setKandelaarMtx(f32 (*)[4], int, int);
virtual bool getStickAngleFromPlayerShape(short*) const;
virtual bool checkSpinnerPathMove();
@@ -7059,44 +7100,13 @@ public:
return mProcID == PROC_CANOE_FISHING_GET && mProcVar3.field_0x300e == 1;
}
virtual u8 checkBeeChildDrink() const { return field_0x2fd3; }
+ virtual Z2WolfHowlMgr* getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
+ virtual BOOL checkWolfHowlSuccessAnime() const {
+ return checkUnderMove0BckNoArcWolf(WANM_HOWL_SUCCESS);
+ }
virtual void skipPortalObjWarp();
virtual BOOL checkTreasureRupeeReturn(int) const;
- virtual void setSumouReady(fopAc_ac_c* p_actor) {
- mSpecialMode = SMODE_SUMO_READY;
- mCargoCarryAcKeep.setData(p_actor);
- mDemo.setDemoMode(1);
- }
- virtual bool checkAcceptDungeonWarpAlink(int) { return checkAcceptWarp(); }
- virtual s16 getSumouCounter() const { return mProcVar2.field_0x300c; }
- virtual s16 checkSumouWithstand() const { return mProcVar3.field_0x300e; }
virtual void cancelGoronThrowEvent();
- virtual void setSumouGraspCancelCount(int param_0) {
- if (mProcID != PROC_SUMOU_MOVE) {
- return;
- }
- mProcVar2.field_0x300c = param_0;
- }
- virtual void setSumouPushBackDirection(short param_0) {
- if (mProcID != PROC_SUMOU_MOVE) {
- return;
- }
- mProcVar4.field_0x3010 = param_0;
- }
- virtual void setSumouLoseHeadUp() {
- if (mProcID != PROC_SUMOU_WIN_LOSE) {
- return;
- }
- mSpecialMode = SMODE_SUMO_LOSE;
- }
- virtual s16 getGiantPuzzleAimAngle() const { return mProcVar2.mPuzzleAimAngle; }
- virtual void setGoronSideMove(fopAc_ac_c* p_actor) {
- mSpecialMode = SMODE_GORON_THROW;
- mCargoCarryAcKeep.setData(p_actor);
- }
- virtual void setCargoCarry(fopAc_ac_c* p_actor) {
- mSpecialMode = SMODE_CARGO_CARRY;
- mCargoCarryAcKeep.setData(p_actor);
- }
virtual cXyz* getHookshotTopPos();
virtual bool checkHookshotReturnMode() const;
virtual bool checkHookshotShootReturnMode() const;
@@ -7124,27 +7134,16 @@ public:
virtual bool checkDragonHangRide() const {
return mProcID == PROC_BOSS_BODY_HANG && field_0x32cc != 0;
}
+ virtual void playerStartCollisionSE(u32 param_0, u32 param_1) {
+ mZ2Link.startCollisionSE(param_0, param_1);
+ }
virtual void changeDragonActor(fopAc_ac_c*);
virtual u8 getClothesChangeWaitTimer() const { return mClothesChangeWaitTimer; }
virtual u8 getShieldChangeWaitTimer() const { return mShieldChangeWaitTimer; }
- virtual u8 getSwordChangeWaitTimer() const { return mSwordChangeWaitTimer; }
- virtual BOOL checkMetamorphose() const {
- return mProcID == PROC_METAMORPHOSE && mProcVar1.field_0x300a == 0;
- }
- virtual BOOL checkWolfDownAttackPullOut() const { return mProcID == PROC_WOLF_DOWN_AT_LAND; }
virtual BOOL checkBootsOrArmorHeavy() const;
virtual fpc_ProcID getBottleOpenAppearItem() const;
- virtual bool checkItemSwordEquip() const { return mEquipItem == 0x103; }
- virtual f32 getSinkShapeOffset() const { return mSinkShapeOffset; }
- virtual BOOL checkSinkDead() const { return field_0x2fbd == 0xFF; }
virtual BOOL checkHorseStart() { return checkHorseStart(getLastSceneMode(), getStartMode()); }
- virtual Z2WolfHowlMgr* getWolfHowlMgrP() { return &mZ2WolfHowlMgr; }
- virtual BOOL checkWolfHowlSuccessAnime() const {
- return checkUnderMove0BckNoArcWolf(WANM_HOWL_SUCCESS);
- }
virtual BOOL checkCopyRodTopUse();
- virtual bool checkCopyRodEquip() const { return mEquipItem == fpcNm_ITEM_COPY_ROD; }
- virtual BOOL checkCutJumpMode() const { return mProcID == PROC_CUT_JUMP; }
static BOOL checkDebugMoveInput() {
if (mDoCPd_c::isConnect(PAD_3)) {
@@ -8271,4 +8270,8 @@ static fopAc_ac_c* daAlink_searchCanoe(fopAc_ac_c* param_0, void* param_1);
static void* daAlink_searchBoar(fopAc_ac_c* param_0, void* param_1);
static fopAc_ac_c* daAlink_searchLightBall(fopAc_ac_c* p_actor, void* param_1);
+inline daAlink_c* daAlink_getAlinkActorClass() {
+ return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR);
+}
+
#endif /* D_A_D_A_ALINK_H */
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index 2203d7af0d..37cb8ec037 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -1257,4 +1257,12 @@ public:
int daPy_addCalcShort(s16* param_0, s16 param_1, s16 param_2, s16 param_3, s16 param_4);
+inline daPy_py_c* daPy_getPlayerActorClass() {
+ return (daPy_py_c*)dComIfGp_getPlayer(0);
+}
+
+inline daPy_py_c* daPy_getLinkPlayerActorClass() {
+ return dComIfGp_getLinkPlayer();
+}
+
#endif /* D_A_D_A_PLAYER_H */
diff --git a/include/d/actor/d_a_tbox.h b/include/d/actor/d_a_tbox.h
index d6577a8493..0e8feaa653 100644
--- a/include/d/actor/d_a_tbox.h
+++ b/include/d/actor/d_a_tbox.h
@@ -5,6 +5,7 @@
#include "d/d_cc_d.h"
#include "d/d_bg_s_acch.h"
#include "d/d_bg_s_movebg_actor.h"
+#include "d/d_kankyo.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
@@ -197,33 +198,4 @@ private:
STATIC_ASSERT(sizeof(daTbox_c) == 0xA30);
-class daTbox_HIO_c : public mDoHIO_entry_c {
-public:
- daTbox_HIO_c();
- virtual ~daTbox_HIO_c() {}
-
- void genMessage(JORMContext*);
-
- /* 0x04 */ u8 mItemNo;
- /* 0x05 */ u8 mUseDebugItemNo;
- /* 0x06 */ u8 mClearSwitch;
- /* 0x07 */ u8 mDemoType;
- /* 0x08 */ u8 mDebugLightColorEnabled;
- /* 0x09 */ u8 mTimerDisplay;
- /* 0x0A */ u8 mCheckDisplay;
- /* 0x0B */ u8 mSaveOff;
- /* 0x0C */ f32 mGravity;
- /* 0x10 */ cXyz mLightOffset;
- /* 0x1C */ s16 mLightColorR;
- /* 0x1E */ s16 mLightColorG;
- /* 0x20 */ s16 mLightColorB;
- /* 0x24 */ f32 mLightPower;
- /* 0x28 */ f32 mFluctuationRate;
- /* 0x2C */ f32 mEnvColorInfluence;
- /* 0x30 */ s16 mFluctuationSpeed;
- /* 0x32 */ u8 mForPlacementCheck;
-};
-
-STATIC_ASSERT(sizeof(daTbox_HIO_c) == 0x34);
-
#endif /* D_A_TBOX_H */
diff --git a/include/d/d_com_inf_game.h b/include/d/d_com_inf_game.h
index befe038a36..88263a5cb8 100644
--- a/include/d/d_com_inf_game.h
+++ b/include/d/d_com_inf_game.h
@@ -4430,16 +4430,4 @@ inline void dComIfGd_set3DlineMatDark(mDoExt_3DlineMat_c* param_0) {
g_dComIfG_gameInfo.drawlist.set3DlineMatDark(param_0);
}
-inline daPy_py_c* daPy_getLinkPlayerActorClass() {
- return dComIfGp_getLinkPlayer();
-}
-
-inline daPy_py_c* daPy_getPlayerActorClass() {
- return (daPy_py_c*)dComIfGp_getPlayer(0);
-}
-
-inline daAlink_c* daAlink_getAlinkActorClass() {
- return (daAlink_c*)g_dComIfG_gameInfo.play.getPlayerPtr(LINK_PTR);
-}
-
#endif /* D_COM_D_COM_INF_GAME_H */
diff --git a/include/d/d_msg_object.h b/include/d/d_msg_object.h
index 7154d5d284..65c205d6da 100644
--- a/include/d/d_msg_object.h
+++ b/include/d/d_msg_object.h
@@ -744,8 +744,6 @@ public:
/* 0x35C */ dMsgObject_HowlHIO_c mHowlHIO;
};
-#ifndef DISABLE_MSG_OBJECT_EXTERN
extern dMsgObject_HIO_c g_MsgObject_HIO_c;
-#endif
#endif /* D_MSG_D_MSG_OBJECT_H */
diff --git a/include/m_Do/m_Do_ext.h b/include/m_Do/m_Do_ext.h
index 751ece4b00..73556c5075 100644
--- a/include/m_Do/m_Do_ext.h
+++ b/include/m_Do/m_Do_ext.h
@@ -174,7 +174,7 @@ public:
private:
/* 0x14 */ J3DAnmTransform* mAnm;
- /* 0x18 */ J3DMtxCalc* mpMtxCalc;
+ /* 0x18 */ J3DMtxCalcAnimation<J3DMtxCalcAnimationAdaptorDefault<J3DMtxCalcCalcTransformMaya>, J3DMtxCalcJ3DSysInitMaya>* mpMtxCalc;
}; // Size: 0x1C
STATIC_ASSERT(sizeof(mDoExt_bckAnm) == 0x1C);
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 15:32:13 +0000