From 6aa461269344bd769e7f6f57fb406517b70ce095 Mon Sep 17 00:00:00 2001 From: Vimd0 Date: Sun, 18 Jan 2026 22:44:44 -0500 Subject: [PATCH 1/4] Some changes --- source/client/model/PigModel.cpp | 2 +- .../player/input/TouchscreenInput_TestFps.cpp | 9 ++++-- source/client/sound/SoundEngine.cpp | 32 +++++++++---------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/source/client/model/PigModel.cpp b/source/client/model/PigModel.cpp index 3d6699dd..08877b29 100644 --- a/source/client/model/PigModel.cpp +++ b/source/client/model/PigModel.cpp @@ -11,7 +11,7 @@ PigModel::PigModel(float f) : QuadrupedModel(6, f) { m_head.texOffs(16, 16); - m_head.addBox(-2, 0, -9, 4, 3, 1, f); + //m_head.addBox(-2, 0, -9, 4, 3, 1, f); // b1.8 field_28C = 4.0f; } diff --git a/source/client/player/input/TouchscreenInput_TestFps.cpp b/source/client/player/input/TouchscreenInput_TestFps.cpp index c669c817..ee5abf14 100644 --- a/source/client/player/input/TouchscreenInput_TestFps.cpp +++ b/source/client/player/input/TouchscreenInput_TestFps.cpp @@ -91,7 +91,7 @@ void TouchscreenInput_TestFps::setScreenSize(int width, int height) int scaledHeight = ceilf(height * Gui::InvGuiScale); m_touchAreaModel.clear(); - float widthM = Mth::min(64, scaledWidth / 10); + float widthM = Mth::min(64, scaledWidth / 11); float heightM = widthM; float x1[4], y1[4], x2[4], y2[4]; @@ -244,8 +244,11 @@ void TouchscreenInput_TestFps::tick(Player* pPlayer) if (bJumpPressed) { - // Allow endless jumping while the button is held - m_bJumping = true; + // Don't allow the player to hold jump to repeatedly jump. + // Only let them jump once - have them jump again + if (!m_bJumpBeingHeld) + m_bJumping = true; + m_bJumpBeingHeld = true; } else diff --git a/source/client/sound/SoundEngine.cpp b/source/client/sound/SoundEngine.cpp index aed85852..6abe74f0 100644 --- a/source/client/sound/SoundEngine.cpp +++ b/source/client/sound/SoundEngine.cpp @@ -35,20 +35,20 @@ void SoundEngine::init(Options* options, AppPlatform* plat) this->m_pPlatform = plat; - addSound("step.grass", "sound/step/grass1.ogg"); - addSound("step.grass", "sound/step/grass2.ogg"); - addSound("step.grass", "sound/step/grass3.ogg"); - addSound("step.grass", "sound/step/grass4.ogg"); + addSound("step.grass", "newsound/step/grass1.ogg"); + addSound("step.grass", "newsound/step/grass2.ogg"); + addSound("step.grass", "newsound/step/grass3.ogg"); + addSound("step.grass", "newsound/step/grass4.ogg"); - addSound("step.stone", "sound/step/stone1.ogg"); - addSound("step.stone", "sound/step/stone2.ogg"); - addSound("step.stone", "sound/step/stone3.ogg"); - addSound("step.stone", "sound/step/stone4.ogg"); + addSound("step.stone", "newsound/step/stone1.ogg"); + addSound("step.stone", "newsound/step/stone2.ogg"); + addSound("step.stone", "newsound/step/stone3.ogg"); + addSound("step.stone", "newsound/step/stone4.ogg"); - addSound("step.gravel", "sound/step/gravel1.ogg"); - addSound("step.gravel", "sound/step/gravel2.ogg"); - addSound("step.gravel", "sound/step/gravel3.ogg"); - addSound("step.gravel", "sound/step/gravel4.ogg"); + addSound("step.gravel", "newsound/step/gravel1.ogg"); + addSound("step.gravel", "newsound/step/gravel2.ogg"); + addSound("step.gravel", "newsound/step/gravel3.ogg"); + addSound("step.gravel", "newsound/step/gravel4.ogg"); addSound("step.sand", "newsound/step/sand1.ogg"); addSound("step.sand", "newsound/step/sand2.ogg"); @@ -60,10 +60,10 @@ void SoundEngine::init(Options* options, AppPlatform* plat) addSound("step.cloth", "newsound/step/cloth3.ogg"); addSound("step.cloth", "newsound/step/cloth4.ogg"); - addSound("step.wood", "sound/step/wood1.ogg"); - addSound("step.wood", "sound/step/wood2.ogg"); - addSound("step.wood", "sound/step/wood3.ogg"); - addSound("step.wood", "sound/step/wood4.ogg"); + addSound("step.wood", "newsound/step/wood1.ogg"); + addSound("step.wood", "newsound/step/wood2.ogg"); + addSound("step.wood", "newsound/step/wood3.ogg"); + addSound("step.wood", "newsound/step/wood4.ogg"); addSound("random.glass", "newsound/random/glass1.ogg"); addSound("random.glass", "newsound/random/glass2.ogg"); From 5504114b8d84e21cc6464325268b6e8790e1a234 Mon Sep 17 00:00:00 2001 From: Vimd0 Date: Sun, 18 Jan 2026 23:06:36 -0500 Subject: [PATCH 2/4] fix android building --- platforms/xenon/projects/Minecraft.vcxproj.filters | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/xenon/projects/Minecraft.vcxproj.filters b/platforms/xenon/projects/Minecraft.vcxproj.filters index c47d7459..58c0a6ff 100644 --- a/platforms/xenon/projects/Minecraft.vcxproj.filters +++ b/platforms/xenon/projects/Minecraft.vcxproj.filters @@ -612,7 +612,7 @@ source\client\gui\screens - + source\client\gui\screens @@ -1547,7 +1547,7 @@ source\client\gui\screens - + source\client\gui\screens From d38af1f4c203cbd9639244eeae2dd3f4341b74cf Mon Sep 17 00:00:00 2001 From: Vimd0 Date: Sun, 18 Jan 2026 23:11:19 -0500 Subject: [PATCH 3/4] fix android --- platforms/xenon/projects/Minecraft.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platforms/xenon/projects/Minecraft.vcxproj b/platforms/xenon/projects/Minecraft.vcxproj index a1865741..5aa29352 100644 --- a/platforms/xenon/projects/Minecraft.vcxproj +++ b/platforms/xenon/projects/Minecraft.vcxproj @@ -345,7 +345,7 @@ - + @@ -702,7 +702,7 @@ - + From 5017a52e487c1f726aef29540bdaa00d325841c6 Mon Sep 17 00:00:00 2001 From: Vimd0 Date: Tue, 20 Jan 2026 12:43:06 -0500 Subject: [PATCH 4/4] more parity --- source/client/sound/SoundEngine.cpp | 4 ---- source/world/entity/Mob.cpp | 11 ++++++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/source/client/sound/SoundEngine.cpp b/source/client/sound/SoundEngine.cpp index 6abe74f0..e4b9e7c4 100644 --- a/source/client/sound/SoundEngine.cpp +++ b/source/client/sound/SoundEngine.cpp @@ -85,10 +85,6 @@ void SoundEngine::init(Options* options, AppPlatform* plat) addSound("random.hurt", "newsound/random/hurt.ogg"); addSound("random.fizz", "newsound/random/fizz.ogg"); - addSound("damage.fallbig", "newsound/damage/fallbig1.ogg"); - addSound("damage.fallbig", "newsound/damage/fallbig2.ogg"); - addSound("damage.fallsmall", "newsound/damage/fallsmall.ogg"); - addSound("liquid.water", "newsound/liquid/water.ogg"); addSound("ambient.weather.rain", "newsound/ambient/weather/rain1.ogg"); diff --git a/source/world/entity/Mob.cpp b/source/world/entity/Mob.cpp index 933035d7..359dcf88 100644 --- a/source/world/entity/Mob.cpp +++ b/source/world/entity/Mob.cpp @@ -394,9 +394,14 @@ void Mob::causeFallDamage(float level) hurt(nullptr, x); - //@HUH: useless call to getTile? or could this be a return value of some sort - //Entity::causeFallDamage returns nothing though, so.... - m_pLevel->getTile(TilePos(m_pos.x, m_pos.y - 0.2f, m_pos.z)); + // Currently bugged, doesn't play sound + TileID tileId = m_pLevel->getTile(TilePos(m_pos.x, m_pos.y - 0.2f - m_heightOffset, m_pos.z)); + if (tileId > 0) + { + const Tile::SoundType* pSound = Tile::tiles[tileId]->m_pSound; + + m_pLevel->playSound(this, "step." + pSound->m_name, pSound->volume * 0.5f, pSound->pitch * 0.75f); + } } }