From 087b7e7abfe81dd7f0fdcdea36ac9f245950df1a Mon Sep 17 00:00:00 2001 From: Loki Rautio Date: Sat, 7 Mar 2026 21:12:22 -0600 Subject: Revert "Project modernization (#630)" This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817. --- Minecraft.Client/Timer.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'Minecraft.Client/Timer.cpp') diff --git a/Minecraft.Client/Timer.cpp b/Minecraft.Client/Timer.cpp index 3ef51eb7..636904b7 100644 --- a/Minecraft.Client/Timer.cpp +++ b/Minecraft.Client/Timer.cpp @@ -40,10 +40,10 @@ void Timer::advanceTime() accumMs += passedMs; if (accumMs > 1000) { - const int64_t msSysTime = static_cast(now * 1000.0); - const int64_t passedMsSysTime = msSysTime - lastMsSysTime; + int64_t msSysTime = (int64_t)(now * 1000.0); + int64_t passedMsSysTime = msSysTime - lastMsSysTime; - const double adjustTimeT = accumMs / static_cast(passedMsSysTime); + double adjustTimeT = accumMs / (double) passedMsSysTime; adjustTime += (adjustTimeT - adjustTime) * 0.2f; lastMsSysTime = msSysTime; @@ -51,7 +51,7 @@ void Timer::advanceTime() } if (accumMs < 0) { - lastMsSysTime = static_cast(now * 1000.0); + lastMsSysTime = (int64_t)(now * 1000.0); } } lastMs = nowMs; @@ -62,9 +62,9 @@ void Timer::advanceTime() if (passedSeconds < 0) passedSeconds = 0; if (passedSeconds > 1) passedSeconds = 1; - passedTime = static_cast(passedTime + (passedSeconds * timeScale * ticksPerSecond)); + passedTime = (float)( passedTime + (passedSeconds * timeScale * ticksPerSecond)); - ticks = static_cast(passedTime); + ticks = (int) passedTime; passedTime -= ticks; if (ticks > MAX_TICKS_PER_UPDATE) ticks = MAX_TICKS_PER_UPDATE; @@ -75,10 +75,10 @@ void Timer::advanceTime() void Timer::advanceTimeQuickly() { - double passedSeconds = static_cast(MAX_TICKS_PER_UPDATE) / static_cast(ticksPerSecond); + double passedSeconds = (double) MAX_TICKS_PER_UPDATE / (double) ticksPerSecond; - passedTime = static_cast(passedTime + (passedSeconds * timeScale * ticksPerSecond)); - ticks = static_cast(passedTime); + passedTime = (float)(passedTime + (passedSeconds * timeScale * ticksPerSecond)); + ticks = (int) passedTime; passedTime -= ticks; a = passedTime; @@ -110,7 +110,7 @@ void Timer::skipTime() { int64_t passedMsSysTime = msSysTime - lastMsSysTime; - double adjustTimeT = accumMs / static_cast(passedMsSysTime); + double adjustTimeT = accumMs / (double) passedMsSysTime; adjustTime += (adjustTimeT - adjustTime) * 0.2f; lastMsSysTime = msSysTime; @@ -130,9 +130,9 @@ void Timer::skipTime() if (passedSeconds < 0) passedSeconds = 0; if (passedSeconds > 1) passedSeconds = 1; - passedTime = static_cast(passedTime + (passedSeconds * timeScale * ticksPerSecond)); + passedTime = (float)(passedTime + (passedSeconds * timeScale * ticksPerSecond)); - ticks = static_cast(0); + ticks = (int) 0; if (ticks > MAX_TICKS_PER_UPDATE) ticks = MAX_TICKS_PER_UPDATE; passedTime -= ticks; -- cgit v1.2.3