Merge pull request #82 into master

source/client/app/Minecraft.cpp

@@ -971,6 +971,9 @@ float Minecraft::getBestScaleForThisScreenSize(int width, int height)
 	}
 	else
 	{
+	    if (height > 1600)
+		    return 1.0f / 4.0f;
+
 		if (height > 1000)
 			return 1.0f / 3.0f;
 

source/client/player/input/TouchAreaModel.cpp

@@ -6,6 +6,8 @@
 	SPDX-License-Identifier: BSD-1-Clause
  ********************************************************************/
 
+#include <cstddef>
+
 #include "TouchAreaModel.hpp"
 
 TouchAreaModel::~TouchAreaModel()

source/client/sound/SoundData.cpp

@@ -15,4 +15,6 @@
 // Check the readme for a guide on how to extract game sounds from the
 // mcpe01_canada.apk file.
 // --------------------------------------------------------------------
+#ifndef MISSING_SOUND_DATA
 #include "../../sound_data/sounds.h"
+#endif

source/client/sound/SoundEngine.cpp

@@ -23,6 +23,7 @@ void SoundEngine::init(Options* options)
 	// TODO: Who's the genius who decided it'd be better to check a name string rather than an enum?
 	m_pOptions = options;
 
+#ifndef MISSING_SOUND_DATA
 	m_repository.add("step.cloth", SA_cloth1);
 	m_repository.add("step.cloth", SA_cloth2);
 	m_repository.add("step.cloth", SA_cloth3);
@@ -56,6 +57,7 @@ void SoundEngine::init(Options* options)
 	m_repository.add("random.splash",  SA_splash);
 	m_repository.add("random.explode", SA_explode);
 	m_repository.add("random.click",   SA_click);
+#endif
 }
 
 void SoundEngine::play(const std::string& name)