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

fix some inlines

Browse Source
This commit is contained in:
LagoLunatic
2024-01-22 21:43:19 -05:00
parent 26e2692b9d
commit bb16350a79
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+20 -1
View File
@@ -398,6 +398,10 @@ public:
void setPlayer(int idx, fopAc_ac_c* player) { mpPlayer[idx] = (daPy_py_c*)player; }
void setPlayerPtr(int idx, fopAc_ac_c* playerPtr) { mpPlayerPtr[idx] = playerPtr; }
s8 getPlayerCameraID(int idx) { return mCurCamera[idx]; }
void setPlayerInfo(int idx, fopAc_ac_c* player, int cam) {
mpPlayer[idx] = (daPy_py_c*)player;
mCurCamera[idx] = cam;
}
int getItemRupeeCount() { return mItemRupeeCount; }
void setItemRupeeCount(s32 count) { mItemRupeeCount += count; }
@@ -468,6 +472,9 @@ public:
void setItemBeastNumCount(int i_idx, s16 num) { mItemBeastNumCounts[i_idx] += num; }
void setItemTimeCount(s32 time) { mAirMeter = time; }
void setItemTimeMax(s32 time) { field_0x4928 = time; }
u8 checkMesgCancelButton() { return mMesgCancelButton; }
void setPlayerStatus(int param_0, int i, u32 flag) { mPlayerStatus[param_0][i] |= flag; }
@@ -499,6 +506,7 @@ public:
mCameraInfo[idx].mDlstWindowIdx = dlst_window_idx;
mCameraInfo[idx].mCamIdx = cam_idx;
mCameraInfo[idx].field_0x06 = p5;
setCameraAttentionStatus(0, 0);
}
void setCameraAttentionStatus(int idx, u32 stts) {
mCameraInfo[idx].mCameraAttentionStatus = stts;
@@ -1817,6 +1825,10 @@ inline void dComIfGp_setPlayer(int idx, fopAc_ac_c* player) {
g_dComIfG_gameInfo.play.setPlayer(idx, player);
}
inline void dComIfGp_setPlayerInfo(int idx, fopAc_ac_c* player, int cam) {
g_dComIfG_gameInfo.play.setPlayerInfo(idx, player, cam);
}
inline void dComIfGp_setPlayerPtr(int idx, fopAc_ac_c* player) {
g_dComIfG_gameInfo.play.setPlayerPtr(idx, player);
}
@@ -2207,6 +2219,14 @@ inline void dComIfGp_setItemKeyNumCount(s16 num) {
g_dComIfG_gameInfo.play.setItemKeyNumCount(num);
}
inline void dComIfGp_setItemTimeCount(s32 time) {
g_dComIfG_gameInfo.play.setItemTimeCount(time);
}
inline void dComIfGp_setItemTimeMax(s32 time) {
g_dComIfG_gameInfo.play.setItemTimeMax(time);
}
inline void dComIfGp_setMessageCountNumber(s16 num) {
g_dComIfG_gameInfo.play.setMessageCountNumber(num);
}
@@ -2367,7 +2387,6 @@ inline void dComIfGp_plusMiniGameRupee(s16 count) {
inline void dComIfGp_setCameraInfo(int idx, camera_class* camera, int dlst, int cam, int p5) {
g_dComIfG_gameInfo.play.setCameraInfo(idx, camera, dlst, cam, p5);
g_dComIfG_gameInfo.play.setCameraAttentionStatus(0, 0);
}
inline s32 dComIfGp_getWindowNum() { return g_dComIfG_gameInfo.play.getWindowNum(); }
inline void dComIfGp_setWindowNum(u8 num) { g_dComIfG_gameInfo.play.setWindowNum(num); }
src/d/d_s_play.cpp
+3 -4
View File
@@ -1092,8 +1092,8 @@ BOOL dScnPly_Delete(dScnPly_ply_c* i_this) {
dComIfGp_removeWood();
dComIfGp_removeFlower();
g_dComIfG_gameInfo.play.mAirMeter = 0; // TODO inline
g_dComIfG_gameInfo.play.field_0x4928 = 0; // TODO inline
dComIfGp_setItemTimeCount(0);
dComIfGp_setItemTimeMax(0);
g_msgDHIO.field_0x06 = 0;
g_msgDHIO.field_0x10 = -1;
@@ -1301,8 +1301,7 @@ s32 phase_4(dScnPly_ply_c* i_this) {
dComIfGp_createDemo();
daSea_Init();
dSnap_Create();
dComIfGp_setPlayer(0, NULL);
g_dComIfG_gameInfo.play.mCurCamera[0] = 0; // dComIfGp_setPlayerInfo?
dComIfGp_setPlayerInfo(0, NULL, 0);
for (s32 i = 0; i < 3; i++)
dComIfGp_setPlayerPtr(i, NULL);
dComIfGp_setWindowNum(1);