mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-12 13:34:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various inline cleanup

Browse Source
This commit is contained in:
LagoLunatic
2025-06-19 19:03:11 -04:00
parent b295d48d1d
commit efc33c5fc4
24 changed files with 341 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_obj_movebox.h
+8 -1
View File
@@ -186,7 +186,14 @@ namespace daObjMovebox {
inline void mode_proc_call();
void chk_walk(cXyz*) { /* TODO */ }
void set_rollCrash() { mbRollCrash = TRUE; }
void set_rollCrash() {
if (
mType == daObjMovebox::Act_c::TYPE_BREAKABLE_WOODEN_CRATE ||
mType == daObjMovebox::Act_c::TYPE_GOLDEN_CRATE
) {
mbRollCrash = TRUE;
}
}
void prmZ_init();
void prmX_init();
include/d/actor/d_a_player_main.h
+4 -4
View File
@@ -296,10 +296,10 @@ public:
static void setMorfFrame(u8 frame) { m_morf_frame = frame; }
// TODO:
static void getNowOffsetXP() {}
static void getNowOffsetYP() {}
static void setNowOffsetX(f32) {}
static void setNowOffsetY(f32) {}
void getNowOffsetXP() {}
void getNowOffsetYP() {}
void setNowOffsetX(f32 x) { mEyePos.x = x; }
void setNowOffsetY(f32 y) { mEyePos.y = y; }
public:
/* 0x6C */ cXy mEyePosOld;
include/d/actor/d_a_salvage.h
+7 -1
View File
@@ -10,7 +10,13 @@ class daSalvage_c : public fopAc_ac_c {
public:
static int getSalvageId() { return mSalvageId; }
void setSalvageId(int) {}
static BOOL isValidSalvageId() { return mSalvageId != -1 ? TRUE : FALSE; }
static BOOL isValidSalvageId() {
if (mSalvageId != -1) {
return TRUE;
} else {
return FALSE;
}
}
void getSalvageKind() {}
void checkRegist(int) {}
include/d/d_attention.h
+3 -3
View File
@@ -92,7 +92,7 @@ public:
bool request(fopAc_ac_c*, f32, f32, f32, s16, int);
bool requestF(fopAc_ac_c*, s16, int);
fpc_ProcID getLookTarget() { return mLookTargetID; }
fopAc_ac_c* getLookTarget() { return convPId(mLookTargetID); }
private:
/* 0x0 */ fpc_ProcID mRequestActorID;
@@ -226,8 +226,8 @@ public:
u8 getCatchChgItem() { return mCatch.getChangeItem(); }
fopAc_ac_c* getCatghTarget() { return mCatch.getCatghTarget(); }
fopAc_ac_c* getLookTarget() { return mLook[0].convPId(mLook[0].getLookTarget()); }
fopAc_ac_c* getLook2Target() { return mLook[1].convPId(mLook[1].getLookTarget()); }
fopAc_ac_c* getLookTarget() { return mLook[0].getLookTarget(); }
fopAc_ac_c* getLook2Target() { return mLook[1].getLookTarget(); }
fopAc_ac_c* getZHintTarget() { return mHint.getZHintTarget(); }
int ZHintRequest(fopAc_ac_c* param_1, int param_2) {
include/d/d_com_inf_game.h
+4 -8
View File
@@ -2176,10 +2176,6 @@ inline stage_envr_info_class* dComIfGp_getStageEnvrInfo() {
return g_dComIfG_gameInfo.play.getStage().getEnvrInfo();
}
inline dStage_EventInfo_c* dComIfGp_getStageEventInfo() {
return g_dComIfG_gameInfo.play.getStage().getEventInfo();
}
inline stage_palet_info_class* dComIfGp_getStagePaletteInfo() {
return g_dComIfG_gameInfo.play.getStage().getPaletInfo();
}
@@ -3136,15 +3132,15 @@ inline bool dComIfGp_event_chkTalkXY() {
return g_dComIfG_gameInfo.play.getEvent().chkTalkXY();
}
inline void dComIfGp_event_onEventFlag(s16 flag) {
inline void dComIfGp_event_onEventFlag(u16 flag) {
g_dComIfG_gameInfo.play.getEvent().onEventFlag(flag);
}
inline void dComIfGp_event_offEventFlag(s16 flag) {
inline void dComIfGp_event_offEventFlag(u16 flag) {
g_dComIfG_gameInfo.play.getEvent().offEventFlag(flag);
}
inline u16 dComIfGp_event_chkEventFlag(s16 flag) {
inline u16 dComIfGp_event_chkEventFlag(u16 flag) {
return g_dComIfG_gameInfo.play.getEvent().chkEventFlag(flag);
}
@@ -3937,7 +3933,7 @@ inline s32 dComIfGp_particle_checkAtrCodeEffect(int code) { return g_dComIfG_gam
* === ATTENTION ===
*/
inline dAttention_c& dComIfGp_getAttention() {
inline dAttention_c& dComIfGp_getAttention() {
return g_dComIfG_gameInfo.play.getAttention();
}
include/d/d_map.h
+32 -31
View File
@@ -75,38 +75,39 @@ public:
void roomDrawRoomEnlargementSize(int, int, int, int, f32, f32, f32, f32, u8);
void roomDrawRoomRealSize(int, int, int, int, f32, f32, f32, f32, f32, f32, u8);
inline void clrUseRoom() {}
inline void setUseRoom() {}
inline void checkUseRoom() {}
inline void getEnableFlg() {}
inline void getStageMapInfoPE() {}
inline void getStageMapInfoCmPDot() {}
inline void getStageMapInfoMap0_X0() {}
inline void getStageMapInfoMap0_X1() {}
inline void getStageMapInfoMap0_Z0() {}
inline void getStageMapInfoMap0_Z1() {}
inline void getStageMapInfoMap0_XC() {}
inline void getStageMapInfoMap0_ZC() {}
inline void getStageMapInfoMap1_X0() {}
inline void getStageMapInfoMap1_X1() {}
inline void getStageMapInfoMap1_Z0() {}
inline void getStageMapInfoMap1_Z1() {}
inline void getStageMapInfoMap1_ZC() {}
inline void getStageMapInfoMap1_XC() {}
inline void getStageMapInfoAlpha() {}
inline void getMapDtP() {}
inline void getNowDspFloorNo() {}
inline void getMapDtSize() {}
inline void getMap0ScaleX() {}
inline void getMap0ScaleZ() {}
inline void getMap1ScaleX() {}
inline void getMap1ScaleZ() {}
inline void getMap1Width() {}
inline void getMap1Height() {}
void clrUseRoom() {}
void setUseRoom() {}
void checkUseRoom() {}
void getEnableFlg() {}
void getStageMapInfoPE() {}
void getStageMapInfoCmPDot() {}
void getStageMapInfoMap0_X0() {}
void getStageMapInfoMap0_X1() {}
void getStageMapInfoMap0_Z0() {}
void getStageMapInfoMap0_Z1() {}
void getStageMapInfoMap0_XC() {}
void getStageMapInfoMap0_ZC() {}
void getStageMapInfoMap1_X0() {}
void getStageMapInfoMap1_X1() {}
void getStageMapInfoMap1_Z0() {}
void getStageMapInfoMap1_Z1() {}
void getStageMapInfoMap1_ZC() {}
void getStageMapInfoMap1_XC() {}
void getStageMapInfoAlpha() {}
void getMapDtP() {}
void getNowDspFloorNo() {}
void getMapDtSize() {}
void getMap0ScaleX() {}
void getMap0ScaleZ() {}
void getMap1ScaleX() {}
void getMap1ScaleZ() {}
void getMap1Width() {}
void getMap1Height() {}
void setArgNo(int) {}
inline u8 getRoomNo() { return m_no; }
inline stage_map_info_class* getStageMapInfoP() { JUT_ASSERT(0x467, mStageMapInfoP != NULL); return mStageMapInfoP; }
inline dMap_RoomInfo_c* getNextRoomInfoP() { return m_next; }
u8 getRoomNo() { return m_no; }
stage_map_info_class* getStageMapInfoP() { JUT_ASSERT(0x467, mStageMapInfoP != NULL); return mStageMapInfoP; }
dMap_RoomInfo_c* getNextRoomInfoP() { return m_next; }
/* 0x00 */ u8 m_exist;
/* 0x01 */ u8 field_0x1;