backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into refactor/untangle-assets-mess

Browse source
This commit is contained in:
Tropical 2026-03-09 00:38:30 -05:00
parent 564890bfa3 e21112a146
commit dd46307e4a
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
4J.Input/4J_Input.cpp
View file

@ -468,8 +468,8 @@ float C_4JInput::GetJoypadStick_LX(int /*iPad*/, bool /*bCheckMenuDisplay*/) {
float C_4JInput::GetJoypadStick_LY(int /*iPad*/, bool /*bCheckMenuDisplay*/) { float C_4JInput::GetJoypadStick_LY(int /*iPad*/, bool /*bCheckMenuDisplay*/) {
if (!s_mouseLocked) return 0.0f; if (!s_mouseLocked) return 0.0f;
float v = 0.0f; float v = 0.0f;
if (KDown(GLFW_KEY_W)) v -= 1.0f; // W = forward = negative Y on consoles if (KDown(GLFW_KEY_W)) v += 1.0f; // W = forward = negative Y on consoles
if (KDown(GLFW_KEY_S)) v += 1.0f; if (KDown(GLFW_KEY_S)) v -= 1.0f;
return v; return v;
} }

7
Minecraft.World/Platform/System.cpp
View file

@ -101,10 +101,9 @@ __int64 System::currentTimeMillis()
#elif defined(__linux__) #elif defined(__linux__)
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
long long unix_time = tv.tv_sec; // Convert to milliseconds since unix epoch instead of windows file time
long long file_time = (unix_time + 11644473600LL) * 10000000LL + tv.tv_usec * 10; // time is expecting calculation to be between 10-30 ms.
return (int64_t)tv.tv_sec * 1000LL + tv.tv_sec / 1000;
return file_time;
#else #else
SYSTEMTIME UTCSysTime; SYSTEMTIME UTCSysTime;