mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-12 19:52:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some roomno related inlines

Browse Source
This commit is contained in:
LagoLunatic
2023-11-02 05:31:02 -04:00
parent c7d703712d
commit f3055e96e8
11 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+2 -2
View File
@@ -1085,7 +1085,7 @@ inline void dComIfGs_offSwitch(int i_no, int i_roomNo) {
g_dComIfG_gameInfo.save.offSwitch(i_no, i_roomNo);
}
inline BOOL dComIfGs_isSwitch(s32 i_no, s32 i_roomNo) {
inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo) {
return g_dComIfG_gameInfo.save.isSwitch(i_no, i_roomNo);
}
@@ -1442,7 +1442,7 @@ inline s32 dComIfGp_roomControl_getTimePass() {
return g_dComIfG_gameInfo.play.getRoomControl()->GetTimePass();
}
inline s32 dComIfGp_roomControl_getStayNo() {
inline int dComIfGp_roomControl_getStayNo() {
return dStage_roomControl_c::getStayNo();
}
include/f_op/f_op_actor.h
-1
View File
@@ -261,7 +261,6 @@ public:
const cXyz& getPosition() const { return current.pos; }
cXyz* getPositionP() { return &current.pos; }
const csXyz& getAngle() const { return current.angle; }
int getRoomNo() const { return current.roomNo; }
}; // Size: 0x290
STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x290);
include/f_op/f_op_actor_mng.h
+1 -1
View File
@@ -285,7 +285,7 @@ inline f32 fopAcM_getCullSizeSphereR(fopAc_ac_c* i_actor) {
inline void dComIfGs_onSwitch(int i_no, int i_roomNo);
inline void dComIfGs_offSwitch(int i_no, int i_roomNo);
inline BOOL dComIfGs_isSwitch(s32 i_no, s32 i_roomNo);
inline BOOL dComIfGs_isSwitch(int i_no, int i_roomNo);
inline void dComIfGs_offActor(int i_no, int i_roomNo);
inline void fopAcM_onSwitch(fopAc_ac_c* pActor, int sw) {