backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-07-24 12:57:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into refactor/untangle-assets-mess
Some checks failed
Build Linux Release / build-linux (push) Has been cancelled
Details

Browse source
This commit is contained in:
Tropical 2026-03-09 01:20:45 -05:00
parent e571795e99 cbac41b152
commit 4be19958ea
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -484,7 +484,7 @@ float C_4JInput::GetJoypadStick_RX(int /*iPad*/, bool /*bCheckMenuDisplay*/) {
float C_4JInput::GetJoypadStick_RY(int /*iPad*/, bool /*bCheckMenuDisplay*/) { float C_4JInput::GetJoypadStick_RY(int /*iPad*/, bool /*bCheckMenuDisplay*/) {
if (!s_mouseLocked) return 0.0f; if (!s_mouseLocked) return 0.0f;
float raw = s_frameRelY * MOUSE_SCALE; float raw = -s_frameRelY * MOUSE_SCALE;
float absRaw = fabsf(raw); float absRaw = fabsf(raw);
if (absRaw > 1.0f) absRaw = 1.0f; if (absRaw > 1.0f) absRaw = 1.0f;
if (absRaw < 0.0001f) return 0.0f; if (absRaw < 0.0001f) return 0.0f;

6
Minecraft.Client/Platform/Common/Consoles_App.cpp
View file

@ -630,7 +630,11 @@ void CMinecraftApp::InitGameSettings()
C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i); C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
// 4J-PB - don't cause an options write to happen here // 4J-PB - don't cause an options write to happen here
SetDefaultOptions(pProfileSettings,i,false); SetDefaultOptions(pProfileSettings,i,false);
#else
// Linux (and any other platform): profile data is zero-initialised, so explicitly apply defaults
C_4JProfile::PROFILESETTINGS *pProfileSettings=ProfileManager.GetDashboardProfileSettings(i);
memset(pProfileSettings,0,sizeof(C_4JProfile::PROFILESETTINGS));
SetDefaultOptions(pProfileSettings,i);
#endif #endif
} }
} }

2
Minecraft.Client/Rendering/EntityRenderers/ItemInHandRenderer.cpp
View file

@ -311,6 +311,8 @@ void ItemInHandRenderer::renderItem3D(Tesselator *t, float u0, float v0, float u
void ItemInHandRenderer::render(float a) void ItemInHandRenderer::render(float a)
{ {
if (!mc->player || !mc->level) return;
float h = oHeight + (height - oHeight) * a; float h = oHeight + (height - oHeight) * a;
std::shared_ptr<Player> player = mc->player; std::shared_ptr<Player> player = mc->player;