summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPheenoh <pheenoh@gmail.com>2022-12-22 13:49:29 -0700
committerPheenoh <pheenoh@gmail.com>2022-12-22 13:49:29 -0700
commit9d049c1549175301d2aa5c8e22bcddb13876f997 (patch)
tree78acaaaba8ef695368dba18f65cdf7143567d3f5 /src
parent07c9f3234b8a6573e2feec10d65c30f115cc0859 (diff)
dTime_c::stock_start attempt again
Diffstat (limited to 'src')
-rw-r--r--src/d/d_timer.cpp18
1 files changed, 1 insertions, 17 deletions
diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp
index 1d52d160ad..fa61c2035e 100644
--- a/src/d/d_timer.cpp
+++ b/src/d/d_timer.cpp
@@ -205,7 +205,6 @@ asm void dTimer_c::_execute() {
/* 8025D33C-8025D3BC 257C7C 0080+00 1/1 0/0 0/0 .text _draw__8dTimer_cFv */
-#ifndef NONMATCHING
int dTimer_c::_draw() {
int ret;
@@ -220,16 +219,6 @@ int dTimer_c::_draw() {
return ret;
}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm void dTimer_c::_draw() {
- nofralloc
-#include "asm/d/d_timer/_draw__8dTimer_cFv.s"
-}
-#pragma pop
-#endif
/* 8025D3BC-8025D524 257CFC 0168+00 1/1 0/0 0/0 .text _delete__8dTimer_cFv */
#pragma push
@@ -275,12 +264,7 @@ bool dTimer_c::stock_start() {
mTime1 = current_time;
mTime2 = current_time;
- int timer_ms = dComIfG_getTimerNowTimeMs();
- OSTime time1 = mTime1;
- u32 timer_clock_ms = OS_TIMER_CLOCK / 1000;
-
- mTime1 = time1 - timer_clock_ms * timer_ms;
-
+ mTime1 -= OS_TIMER_CLOCK_MS * dComIfG_getTimerNowTimeMs();
}
return mDeleteCheck == 5;
}