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

work on various inlines, JASSeqCtrl OK

Browse Source
This commit is contained in:
LagoLunatic
2024-07-17 11:51:58 -04:00
parent 4e2faca54b
commit bad4ac23e9
15 changed files with 101 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_obj_timer.cpp
+17 -17
View File
@@ -1,7 +1,7 @@
//
// Generated by dtk
// Translation Unit: d_a_obj_timer.cpp
//
/**
* d_a_obj_timer.cpp
* Object - Timer
*/
#include "d/actor/d_a_obj_timer.h"
#include "d/d_procname.h"
@@ -35,7 +35,7 @@ bool daObjTimer::Act_c::_delete() {
/* 0000011C-0000012C .text mode_wait_init__Q210daObjTimer5Act_cFv */
void daObjTimer::Act_c::mode_wait_init() {
m294 = 0;
mTimer = 0;
mMode = Mode_WAIT_e;
}
@@ -48,24 +48,24 @@ void daObjTimer::Act_c::mode_wait() {
/* 00000188-000001CC .text mode_count_init__Q210daObjTimer5Act_cFv */
void daObjTimer::Act_c::mode_count_init() {
m294 = 15 * prm_get_time();
mTimer = 15 * prm_get_time();
mMode = Mode_COUNT_e;
}
/* 000001CC-00000304 .text mode_count__Q210daObjTimer5Act_cFv */
void daObjTimer::Act_c::mode_count() {
if (m298) return;
if (mIsStop) return;
m294 -= 1;
if (m294 % 30 == 0) {
s32 time = m294 / 30;
if (time <= 20) {
mTimer -= 1;
if (mTimer % 30 == 0) {
s32 secondsLeft = mTimer / 30;
if (secondsLeft <= 20) {
u32 soundId;
if (time > 10) {
if (secondsLeft > 10) {
soundId = JA_SE_SYS_EV_TIMER_20;
} else if (time > 5) {
} else if (secondsLeft > 5) {
soundId = JA_SE_SYS_EV_TIMER_10;
} else if (time > 0) {
} else if (secondsLeft > 0) {
soundId = JA_SE_SYS_EV_TIMER_5;
} else {
soundId = JA_SE_SYS_EV_TIMER_0;
@@ -75,7 +75,7 @@ void daObjTimer::Act_c::mode_count() {
}
}
if (m294 <= 0 || !fopAcM_isSwitch(this, prm_get_swSave())) {
if (mTimer <= 0 || !fopAcM_isSwitch(this, prm_get_swSave())) {
fopAcM_offSwitch(this, prm_get_swSave());
mode_wait_init();
}
@@ -110,12 +110,12 @@ BOOL Mthd_Execute(void* i_this) {
}
/* 000003FC-00000404 .text Mthd_Draw__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@FPv */
BOOL Mthd_Draw(void*) {
BOOL Mthd_Draw(void* i_this) {
return TRUE;
}
/* 00000404-0000040C .text Mthd_IsDelete__Q210daObjTimer27@unnamed@d_a_obj_timer_cpp@FPv */
BOOL Mthd_IsDelete(void*) {
BOOL Mthd_IsDelete(void* i_this) {
return TRUE;
}