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

Cleanup player struct

Browse Source
This commit is contained in:
LagoLunatic
2025-06-09 23:29:34 -04:00
parent 6404bc4765
commit e7d0df1e50
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+12 -10
View File
@@ -356,18 +356,19 @@ public:
void setGameoverStatus(u8 stts) { mGameoverStatus = stts; }
fopAc_ac_c* getPlayer(int idx) { return mPlayerInfo[idx].mpPlayer; }
void setPlayer(int idx, fopAc_ac_c* player) { mPlayerInfo[idx].mpPlayer = player; }
s8 getPlayerCameraID(int idx) { return mPlayerInfo[idx].mCameraID; }
void setPlayerInfo(int idx, fopAc_ac_c* player, int cam) {
mPlayerInfo[idx].mpPlayer = player;
mPlayerInfo[idx].mCameraID = cam;
}
fopAc_ac_c* getPlayerPtr(int idx) { return (fopAc_ac_c*)mpPlayerPtr[idx]; }
fopAc_ac_c* getPlayer(int idx) { return (fopAc_ac_c*)mpPlayer[idx * 2]; }
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]; }
int getCameraPlayer1ID(int i) { return mCameraInfo[i].mCamP1Id; }
int getCameraPlayer2ID(int i) { return mCameraInfo[i].mCamP2Id; }
int getCameraWinID(int i) { return mCameraInfo[i].mDlstWindowIdx; }
void setPlayerInfo(int idx, fopAc_ac_c* player, int cam) {
mpPlayer[idx] = (daPy_py_c*)player;
mCurCamera[idx] = cam;
}
int getItemTimer() { return mItemTimer; }
void resetItemTimer(s16 timer) {
@@ -737,9 +738,10 @@ public:
/* 0x4842 */ u16 mStatus;
/* 0x4844 */ dDlst_window_c mDlstWindow[1];
/* 0x4870 */ dComIfG_camera_info_class mCameraInfo[1];
/* 0x48A4 */ daPy_py_c* mpPlayer[1];
/* 0x48A8 */ s8 mCurCamera[1];
/* 0x48A9 */ u8 field_0x48A9[0x48AC - 0x48A9];
/* 0x48A4 */ struct {
/* 0x0 */ fopAc_ac_c* mpPlayer;
/* 0x4 */ s8 mCameraID;
} mPlayerInfo[1];
/* 0x48AC */ fopAc_ac_c* mpPlayerPtr[3]; // 0: Link, 1: Partner, 2: Ship
/* 0x48B8 */ f32 field_0x48b8;
/* 0x48BC */ f32 mItemLifeCount;