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

d_timer work

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-01-14 21:08:10 -08:00
parent 5ab99df86e
commit a81fa8d29b
3 changed files with 118 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+20
View File
@@ -437,9 +437,13 @@ public:
u8 getIkadaShipId() { return mIkadaShipId; }
u8 getIkadaShipBeforeRoomId() { return mIkadaShipBeforeRoomId; }
void setTimerPtr(dTimer_c* timer) { mTimerInfo.mTimerPtr = timer; }
dTimer_c* getTimerPtr() { return mTimerInfo.mTimerPtr; }
void setTimerMode(s32 mode) { mTimerInfo.mTimerMode = mode; }
s32 getTimerMode() { return mTimerInfo.mTimerMode; }
void setTimerNowTimeMs(s32 ms) { mTimerInfo.mTimerNowTimeMs = ms; }
s32 getTimerNowTimeMs() { return mTimerInfo.mTimerNowTimeMs; }
void setTimerLimitTimeMs(s32 ms) { mTimerInfo.mTimerLimitTimeMs = ms; }
s32 getTimerLimitTimeMs() { return mTimerInfo.mTimerLimitTimeMs; }
s16 getItemMagicCount() { return mItemMagicCount; }
@@ -3086,6 +3090,22 @@ inline u32 dComIfG_getTimerRestTimeMs() {
return g_dComIfG_gameInfo.play.getTimerLimitTimeMs() - g_dComIfG_gameInfo.play.getTimerNowTimeMs();
}
inline void dComIfG_setTimerPtr(dTimer_c* timer) {
g_dComIfG_gameInfo.play.setTimerPtr(timer);
}
inline void dComIfG_setTimerMode(int ms) {
g_dComIfG_gameInfo.play.setTimerMode(ms);
}
inline void dComIfG_setTimerNowTimeMs(int ms) {
g_dComIfG_gameInfo.play.setTimerNowTimeMs(ms);
}
inline void dComIfG_setTimerLimitTimeMs(int ms) {
g_dComIfG_gameInfo.play.setTimerLimitTimeMs(ms);
}
int dComIfG_changeOpeningScene(scene_class* i_scene, s16 i_procName);
#endif /* D_COM_D_COM_INF_GAME_H */
include/d/d_timer.h
+24 -13
View File
@@ -4,6 +4,7 @@
#include "f_op/f_op_msg_mng.h"
#include "d/d_drawlist.h"
#include "SSystem/SComponent/c_phase.h"
#include "dolphin/os/OSTime.h"
class J2DPane;
class JKRArchive;
@@ -50,7 +51,7 @@ public:
/* 0x224 */ J2DPane* field_0x224;
/* 0x228 */ J2DPane* field_0x228;
/* 0x22C */ J2DPicture* field_0x22c;
/* 0x230 */ u32 field_0x230;
/* 0x230 */ s32 mRupeeNum;
/* 0x234 */ s8 field_0x234;
/* 0x235 */ u8 field_0x235;
/* 0x236 */ u8 field_0x236;
@@ -64,26 +65,36 @@ public:
BOOL _draw();
BOOL _delete();
void RestTimeCheck(int);
void deleteCheck();
BOOL deleteCheck();
void SetSE();
void start();
void start(s16);
void stock_start();
void stock_start(s16);
bool start();
bool start(s16);
bool stock_start();
bool stock_start(s16);
void stop(u8);
void restart(u8);
void end(int);
void deleteRequest();
void getTimeMs();
void getLimitTimeMs();
void getRestTimeMs();
bool deleteRequest();
s32 getTimeMs();
s32 getLimitTimeMs();
s32 getRestTimeMs();
/* 0x0FC */ dDlst_TimerScrnDraw_c* mpScrnDraw;
/* 0x100 */ void* iconTex;
/* 0x104 */ request_of_phase_process_class mPhs;
/* 0x10C */ u8 field_0x10C[0x154 - 0x10C];
/* 0x154 */ u32 mType;
/* 0x158 */ u8 field_0x158[0x170 - 0x158];
/* 0x10C */ u32 field_0x10c;
/* 0x110 */ OSTime mStartTime;
/* 0x118 */ OSTime mTime;
/* 0x120 */ OSTime field_0x120;
/* 0x128 */ u8 field_0x128[0x140 - 0x128];
/* 0x140 */ OSTime mLimitTime;
/* 0x148 */ u8 field_0x148[0x154 - 0x148];
/* 0x154 */ s32 mTimerMode;
/* 0x158 */ u8 field_0x158[0x160 - 0x158];
/* 0x160 */ s16 field_0x160;
/* 0x162 */ s16 field_0x162;
/* 0x164 */ u8 mState;
/* 0x168 */ u32 field_0x168[2];
/* 0x170 */ JKRSolidHeap* mpSolidHeap;
/* 0x174 */ u32 field_0x174;
};