Merge remote-tracking branch 'origin/UISoundsFix'

Minecraft.Client/Common/Audio/SoundEngine.cpp

@@ -270,10 +270,7 @@ void SoundEngine::updateMiniAudio()
         ma_sound_set_volume(&s->sound, finalVolume);
 		printf("Sound volume set to %f\n", finalVolume);
 
-        if (!s->info.bUseSoundsPitchVal)
+        ma_sound_set_pitch(&s->sound, s->info.pitch);
-        {
-            ma_sound_set_pitch(&s->sound, s->info.pitch);
-        }
 
         if (s->info.bIs3D)
         {

Minecraft.Client/Common/UI/IUIScene_AbstractContainerMenu.cpp

@@ -1377,22 +1377,14 @@ bool IUIScene_AbstractContainerMenu::handleKeyDown(int iPad, int iAction, bool b
 					quickKeyHeld = TRUE;
 					if (IsSectionSlotList(m_eCurrSection))
 					{
-						int currentIndex = getCurrentIndex(m_eCurrSection) - getSectionStartOffset(m_eCurrSection);
+						ui.PlayUISFX(eSFX_Press);
-
-						bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
-						if (bSlotHasItem)
-							ui.PlayUISFX(eSFX_Press);
 					}
 				}
 			}
 			else {
 				if (IsSectionSlotList(m_eCurrSection))
 				{
-					int currentIndex = getCurrentIndex(m_eCurrSection) - getSectionStartOffset(m_eCurrSection);
+					ui.PlayUISFX(eSFX_Press);
-
-					bool bSlotHasItem = !isSlotEmpty(m_eCurrSection, currentIndex);
-					if (bSlotHasItem)
-						ui.PlayUISFX(eSFX_Press);
 				}
 				//
 			}

Minecraft.Client/Common/UI/UIController.cpp

@@ -2342,7 +2342,13 @@ void UIController::PlayUISFX(ESoundEffect eSound)
 	if (time - m_lastUiSfx < 10) { return; }
 	m_lastUiSfx = time;
 
-	Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,1.0f);
+	float pitch = 1.0f;
+	if (eSound == eSFX_Focus)
+	{
+		pitch += (m_randomDistribution(m_randomGenerator) - 0.5f) / 10;
+	}
+
+	Minecraft::GetInstance()->soundEngine->playUI(eSound,1.0f,pitch);
 }
 
 void UIController::DisplayGamertag(unsigned int iPad, bool show)

Minecraft.Client/Common/UI/UIController.h

@@ -3,6 +3,7 @@ using namespace std;
 #include "IUIController.h"
 #include "UIEnums.h"
 #include "UIGroup.h"
+#include <random>
 
 class UIAbstractBitmapFont;
 class UIBitmapFont;
@@ -63,6 +64,9 @@ private:
 	UITTFFont *m_mcTTFFont;
 	UIBitmapFont *m_moj7, *m_moj11;
 
+	std::mt19937 m_randomGenerator;
+	std::uniform_real_distribution<float> m_randomDistribution;
+
 public:
 	void setCleanupOnReload();
 	void updateCurrentFont();

Minecraft.World/Recipes.cpp

@@ -236,7 +236,7 @@ Recipes::Recipes()
 		L"## ", //
 		L"###", //
 
-		L'#', Tile::cobblestone,
+		L'#', Tile::stoneBrick,
 		L'S');
 
 	addShapedRecipy(new ItemInstance(Tile::stairs_netherBricks, 4), //