Skip to content

Some changes #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Vimd0 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Some changes #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6aa4612
Some changes
Vimd0 Jan 19, 2026
5504114
fix android building
Vimd0 Jan 19, 2026
d38af1f
fix android
Vimd0 Jan 19, 2026
5017a52
more parity
Vimd0 Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions platforms/xenon/projects/Minecraft.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\RenameMPLevelScreen.hpp" />
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\SavingWorldScreen.hpp" />
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\SelectWorldScreen.hpp" />
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\StartMenuScreen.hpp" />
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\TitleScreen.hpp" />
<ClInclude Include="$(MC_ROOT)\source\client\model\Cube.hpp" />
<ClInclude Include="$(MC_ROOT)\source\client\model\HumanoidModel.hpp" />
<ClInclude Include="$(MC_ROOT)\source\client\model\Model.hpp" />
Expand Down Expand Up @@ -702,7 +702,7 @@
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\RenameMPLevelScreen.cpp" />
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\SavingWorldScreen.cpp" />
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\SelectWorldScreen.cpp" />
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\StartMenuScreen.cpp" />
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\TitleScreen.cpp" />
<ClCompile Include="$(MC_ROOT)\source\client\model\Cube.cpp" />
<ClCompile Include="$(MC_ROOT)\source\client\model\HumanoidModel.cpp" />
<ClCompile Include="$(MC_ROOT)\source\client\model\Model.cpp" />
Expand Down
4 changes: 2 additions & 2 deletions platforms/xenon/projects/Minecraft.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\SelectWorldScreen.hpp">
<Filter>source\client\gui\screens</Filter>
</ClInclude>
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\StartMenuScreen.hpp">
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\TitleScreen.hpp">
<Filter>source\client\gui\screens</Filter>
</ClInclude>
<ClInclude Include="$(MC_ROOT)\source\client\gui\screens\ChatScreen.hpp">
Expand Down Expand Up @@ -1547,7 +1547,7 @@
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\SelectWorldScreen.cpp">
<Filter>source\client\gui\screens</Filter>
</ClCompile>
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\StartMenuScreen.cpp">
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\TitleScreen.cpp">
<Filter>source\client\gui\screens</Filter>
</ClCompile>
<ClCompile Include="$(MC_ROOT)\source\client\gui\screens\ChatScreen.cpp">
Expand Down
2 changes: 1 addition & 1 deletion source/client/model/PigModel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
9 changes: 6 additions & 3 deletions source/client/player/input/TouchscreenInput_TestFps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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
Expand Down
36 changes: 16 additions & 20 deletions source/client/sound/SoundEngine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
Expand All @@ -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");
Expand Down
11 changes: 8 additions & 3 deletions source/world/entity/Mob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down
Loading