Merge remote-tracking branch 'refs/remotes/origin/main'

src/AppPlatform_android.h

@@ -202,6 +202,8 @@ public:
         LOGI("initConsts: screenWidth=%d, calling getScreenHeight\n", _screenWidth);
         _screenHeight = env->CallIntMethod(instance, fHeight);
         LOGI("initConsts: screenHeight=%d, done\n", _screenHeight);
+
+        return 1;
     }
 
     void tick() {
@@ -536,7 +538,7 @@ public:
 
     static __inline bool isSquare(int n) {
         int L = n & 0xf;
-        if ((1 << L) & 0x213 == 0) return false;
+        if (((1 << L) & 0x213) == 0) return false;
 
         int t = (int) sqrt((double) n) + 0.5;
         return t*t == n;

src/client/OptionsFile.cpp

@@ -1,6 +1,7 @@
 #include "OptionsFile.h"
 #include <stdio.h>
 #include <string.h>
+#include <errno.h>
 #include <platform/log.h>
 
 OptionsFile::OptionsFile() {

src/client/gui/Gui.cpp

@@ -430,9 +430,9 @@ void Gui::onConfigChanged( const Config& c ) {
 	// Create outer feedback circle
 	//
 #ifdef ANDROID
-	const float mm = 12;
+	const float mm = 50; //20
 #else
-	const float mm = 12;
+	const float mm = 50; //20
 #endif
 	const float maxRadius = minecraft->pixelCalcUi.millimetersToPixels(mm);
 	const float radius = Mth::Min(80.0f/2, maxRadius);

src/client/player/LocalPlayer.cpp

@@ -24,12 +24,14 @@
 #include "../../platform/HttpClient.h"
 #include "../../platform/CThread.h"
 #include "../../util/StringUtils.h"
+#include "client/Options.h"
 
 #if defined(_WIN32)
 #include <direct.h>
 #else
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <errno.h>
 #endif
 
 #ifndef STANDALONE_SERVER
@@ -328,12 +330,12 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, const std::string&
 {
 	this->dimension = dimension;
 	_init();
-
 #ifndef STANDALONE_SERVER
-	printf("%s \n", name.c_str());
 
-	if (!name.empty()) {
-		this->name = name;
+	if (minecraft->options.getStringValue(OPTIONS_USERNAME).size() != 0) {
+		textureName = "mob/char.png";
+
+		this->name = minecraft->options.getStringValue(OPTIONS_USERNAME);
 		printf("test \n");
 		// Fetch user skin and cape from Mojang servers in the background (avoids blocking the main thread)
 		// TODO: Fix this memory leak

src/client/player/input/touchscreen/TouchscreenInput.cpp

@@ -126,8 +126,8 @@ void TouchscreenInput_TestFps::onConfigChanged(const Config& c) {
     
     // If too large (like playing on Tablet)
     PixelCalc& pc = _minecraft->pixelCalc;
-    if (pc.pixelsToMillimeters(Bw) > 14) {
-        Bw = Bh = pc.millimetersToPixels(14);
+    if (pc.pixelsToMillimeters(Bw) > 200) { //14
+        Bw = Bh = pc.millimetersToPixels(200); //14
     }
 	// temp data
 	float xx;

src/main_android_java.cpp

@@ -7,8 +7,7 @@
 //#include "main_android_java.h"
 #include "platform/input/Multitouch.h"
 #include <unistd.h>
-#include <sys/syscall.h>
-#define gettid() ((int)syscall(SYS_gettid))
+#include <pthread.h>
 
 // Horrible, I know. / A
 #ifndef MAIN_CLASS
@@ -145,7 +144,7 @@ Java_com_mojang_minecraftpe_GLRenderer_nativeOnSurfaceCreated(JNIEnv* env) {
 
 JNIEXPORT void JNICALL
 Java_com_mojang_minecraftpe_GLRenderer_nativeOnSurfaceChanged(JNIEnv* env, jclass cls, jint w, jint h) {
-    LOGI("@nativeOnSurfaceChanged: %p\n", pthread_self());
+    LOGI("@nativeOnSurfaceChanged: %lu\n", (unsigned long)pthread_self());
 
     if (gApp) {
         gApp->setSize(w, h);