From 9d049c1549175301d2aa5c8e22bcddb13876f997 Mon Sep 17 00:00:00 2001 From: Pheenoh Date: Thu, 22 Dec 2022 13:49:29 -0700 Subject: [PATCH] dTime_c::stock_start attempt again --- src/d/d_timer.cpp | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/src/d/d_timer.cpp b/src/d/d_timer.cpp index 1d52d160ada..fa61c2035e8 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; }