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

Merge branch 'smartcmd:main' into main

Browse source
This commit is contained in:
Cath0deGayTube 2026-03-12 00:58:10 -07:00 committed by GitHub
parent 08b875cf23 bb8ffee0d3
commit 68c022a7a0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Minecraft.Client/Common/Audio/SoundEngine.cpp
View file

@ -260,9 +260,9 @@ void SoundEngine::updateMiniAudio()
continue; continue;
} }
float finalVolume = s->info.volume * m_MasterEffectsVolume; float finalVolume = s->info.volume * m_MasterEffectsVolume * SFX_VOLUME_MULTIPLIER;
if (finalVolume > 1.0f) if (finalVolume > SFX_MAX_GAIN)
finalVolume = 1.0f; finalVolume = SFX_MAX_GAIN;
ma_sound_set_volume(&s->sound, finalVolume); ma_sound_set_volume(&s->sound, finalVolume);
ma_sound_set_pitch(&s->sound, s->info.pitch); ma_sound_set_pitch(&s->sound, s->info.pitch);
@ -557,10 +557,13 @@ void SoundEngine::play(int iSound, float x, float y, float z, float volume, floa
} }
ma_sound_set_spatialization_enabled(&s->sound, MA_TRUE); ma_sound_set_spatialization_enabled(&s->sound, MA_TRUE);
ma_sound_set_min_distance(&s->sound, SFX_3D_MIN_DISTANCE);
ma_sound_set_max_distance(&s->sound, SFX_3D_MAX_DISTANCE);
ma_sound_set_rolloff(&s->sound, SFX_3D_ROLLOFF);
float finalVolume = volume * m_MasterEffectsVolume; float finalVolume = volume * m_MasterEffectsVolume * SFX_VOLUME_MULTIPLIER;
if (finalVolume > 1.0f) if (finalVolume > SFX_MAX_GAIN)
finalVolume = 1.0f; finalVolume = SFX_MAX_GAIN;
ma_sound_set_volume(&s->sound, finalVolume); ma_sound_set_volume(&s->sound, finalVolume);
ma_sound_set_pitch(&s->sound, pitch); ma_sound_set_pitch(&s->sound, pitch);

6
Minecraft.Client/Common/Audio/SoundEngine.h
View file

@ -6,6 +6,12 @@ using namespace std;
#include "miniaudio.h" #include "miniaudio.h"
constexpr float SFX_3D_MIN_DISTANCE = 1.0f;
constexpr float SFX_3D_MAX_DISTANCE = 16.0f;
constexpr float SFX_3D_ROLLOFF = 0.5f;
constexpr float SFX_VOLUME_MULTIPLIER = 1.5f;
constexpr float SFX_MAX_GAIN = 1.5f;
enum eMUSICFILES enum eMUSICFILES
{ {
eStream_Overworld_Calm1 = 0, eStream_Overworld_Calm1 = 0,

6
Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp
View file

@ -1298,10 +1298,8 @@ void IUIScene_AbstractContainerMenu::onMouseTick()
} }
} }
vPointerPos.x = floor(vPointerPos.x); vPointerPos.x = static_cast<float>(floor(vPointerPos.x + 0.5f));
vPointerPos.x += ( static_cast<int>(vPointerPos.x)%2); vPointerPos.y = static_cast<float>(floor(vPointerPos.y + 0.5f));
vPointerPos.y = floor(vPointerPos.y);
vPointerPos.y += ( static_cast<int>(vPointerPos.y)%2);
m_pointerPos = vPointerPos; m_pointerPos = vPointerPos;
adjustPointerForSafeZone(); adjustPointerForSafeZone();