Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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 a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Minecraft.Client/Timer.cpp
View File

@@ -40,10 +40,10 @@ void Timer::advanceTime()
accumMs += passedMs;
if (accumMs > 1000)
{
const int64_t msSysTime = static_cast<int64_t>(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<double>(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<int64_t>(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<float>(passedTime + (passedSeconds * timeScale * ticksPerSecond));
passedTime = (float)( passedTime + (passedSeconds * timeScale * ticksPerSecond));
ticks = static_cast<int>(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<double>(MAX_TICKS_PER_UPDATE) / static_cast<double>(ticksPerSecond);
double passedSeconds = (double) MAX_TICKS_PER_UPDATE / (double) ticksPerSecond;
passedTime = static_cast<float>(passedTime + (passedSeconds * timeScale * ticksPerSecond));
ticks = static_cast<int>(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<double>(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<float>(passedTime + (passedSeconds * timeScale * ticksPerSecond));
passedTime = (float)(passedTime + (passedSeconds * timeScale * ticksPerSecond));
ticks = static_cast<int>(0);
ticks = (int) 0;
if (ticks > MAX_TICKS_PER_UPDATE) ticks = MAX_TICKS_PER_UPDATE;
passedTime -= ticks;