mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-07 22:22:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix some nonmatching functions (#2141)

Browse Source
This commit is contained in:
Caroline Madsen
2024-04-28 22:33:32 -04:00
committed by GitHub
parent 669c7d920b
commit 7339a87bd9
75 changed files with 673 additions and 6374 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_itembase_static.h
+1 -1
View File
@@ -4,6 +4,6 @@
class fopAc_ac_c;
void CheckFieldItemCreateHeap(fopAc_ac_c* actor);
int CheckFieldItemCreateHeap(fopAc_ac_c* actor);
#endif /* D_A_D_A_ITEMBASE_STATIC_H */
include/d/a/d_a_player.h
+1 -1
View File
@@ -533,8 +533,8 @@ public:
BOOL checkCopyRodThrowAfter() const { return checkNoResetFlg3(FLG3_COPY_ROD_THROW_AFTER); }
BOOL checkRide() const { return checkHorseRide() || checkBoarRide() || checkSpinnerRide() || checkCanoeRide() || checkBoardRide(); }
const cXyz& getRightHandPos() const { return mRightHandPos; }
const cXyz* getItemPos() const { return &mItemPos; }
const cXyz* getLeftHandPos() const { return &mLeftHandPos; }
const cXyz getItemPos() const { return mItemPos; }
virtual cXyz* getMidnaAtnPos() const;
virtual void setMidnaMsgNum(fopAc_ac_c*, u16);
include/d/com/d_com_inf_game.h
+32 -4
View File
@@ -1152,7 +1152,35 @@ inline void dComIfGs_onRegionBit(int i_region) {
}
inline void dComIfGs_onSvZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().onSwitch(i_swBit);
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().onSwitch(i_swBit);
}
inline void dComIfGs_offSvZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().offSwitch(i_swBit);
}
inline BOOL dComIfGs_isSvZoneSwitch(int i_zoneNo, int i_swBit) {
return g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().isSwitch(i_swBit);
}
inline void dComIfGs_onSvOneZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().onOneSwitch(i_swBit);
}
inline void dComIfGs_offSvOneZoneSwitch(int i_zoneNo, int i_swBit) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().offOneSwitch(i_swBit);
}
inline BOOL dComIfGs_isSvOneZoneSwitch(int i_zoneNo, int i_swBit) {
return g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().isOneSwitch(i_swBit);
}
inline BOOL dComIfGs_isSvZoneItem(int i_zoneNo, int i_swBit) {
return g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().isItem(i_swBit);
}
inline BOOL dComIfGs_isSvOneZoneItem(int i_zoneNo, int i_swBit) {
return g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().isOneItem(i_swBit);
}
inline s32 dComIfGs_isDungeonItemMap() {
@@ -1607,11 +1635,11 @@ inline void dComIfGs_setStartPoint(s16 i_point) {
}
inline void dComIfGs_clearRoomSwitch(int i_zoneNo) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().clearRoomSwitch();
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().clearRoomSwitch();
}
inline void dComIfGs_clearRoomItem(int i_zoneNo) {
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getZoneBit().clearRoomItem();
g_dComIfG_gameInfo.info.getZone(i_zoneNo).getBit().clearRoomItem();
}
inline void dComIfGs_removeZone(int i_zoneNo) {
@@ -3027,7 +3055,7 @@ inline s32 dComIfGp_roomControl_getStayNo() {
}
inline s32 dComIfGp_roomControl_getZoneNo(int i_roomNo) {
return dStage_roomControl_c::getZoneNo(i_roomNo);
return g_dComIfG_gameInfo.play.getRoomControl()->getZoneNo(i_roomNo);
}
inline void dComIfGp_roomControl_initZone() {
include/d/d_demo.h
-1
View File
@@ -37,7 +37,6 @@ public:
/* 0x88 */ dDemo_ambient_c* mpAmbient;
/* 0x8C */ dDemo_light_c* mpLights[8];
/* 0xAC */ dDemo_fog_c* mpFog;
/* 0xB0 */ dDemo_camera_c* mpEditorCamera;
};
class dDemo_prm_c {
include/d/d_stage.h
+1 -1
View File
@@ -797,7 +797,7 @@ public:
dStage_roomControl_c() {}
void init(void);
static int getZoneNo(int room);
static int getZoneNo(int i_roomNo) { return mStatus[i_roomNo].getZoneNo(); }
/* 80024338 */ void initZone();
/* 80024384 */ dStage_roomStatus_c* getStatusRoomDt(int);
/* 800243B0 */ static JKRExpHeap* getMemoryBlock(int);
include/d/kankyo/d_kankyo.h
+1 -1
View File
@@ -502,7 +502,7 @@ public:
/* 0x12EC */ dKy_pol_sound_struct* mResPolSound;
/* 0x12F0 */ dKy_pol_arg_struct* mResPolArg;
/* 0x12F4 */ dKy_color_data_struct* mResColorDataTbl;
/* 0x12F8 */ s8 mFogDensity;
/* 0x12F8 */ u8 mFogDensity;
/* 0x12F9 */ u8 field_0x12f9;
/* 0x12FA */ u8 mIsBlure;
/* 0x12FB */ u8 field_0x12fb;
include/d/save/d_save.h
+1 -1
View File
@@ -994,7 +994,7 @@ public:
dSv_zone_c() { mRoomNo = -1; }
void init(int i_roomNo);
dSv_zoneBit_c& getZoneBit() { return mBit; }
dSv_zoneBit_c& getBit() { return mBit; }
const dSv_zoneBit_c& getBit() const { return mBit; }
dSv_zoneActor_c& getActor() { return mActor; }
const dSv_zoneActor_c& getActor() const { return mActor; }
include/f_op/f_op_actor_mng.h
+3 -3
View File
@@ -378,7 +378,7 @@ inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
return (i_culltype >= 0 && i_culltype < 14) || i_culltype == 14;
}
inline Vec fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
inline const Vec& fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
return i_actor->cull.sphere.center;
}
@@ -399,8 +399,8 @@ inline void fopAcM_offSwitch(const fopAc_ac_c* pActor, int sw) {
return dComIfGs_offSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
}
inline BOOL fopAcM_isSwitch(const fopAc_ac_c* item, int sw) {
return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(item));
inline BOOL fopAcM_isSwitch(const fopAc_ac_c* pActor, int sw) {
return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
}
inline fopAc_ac_c* fopAcM_SearchByName(s16 proc_id) {