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

src/client/Minecraft.cpp

@@ -23,6 +23,8 @@
 #include "../world/level/storage/LevelStorageSource.h"
 #include "../world/level/storage/LevelStorage.h"
 #include "player/input/KeyboardInput.h"
+#include "player/input/ControllerTurnInput.h"
+#include "player/input/XperiaPlayInput.h"
 #include "world/level/chunk/ChunkSource.h"
 
 #ifndef STANDALONE_SERVER

src/client/Option.cpp

@@ -1,5 +1,8 @@
 #include "Option.h"
 #include <sstream>
+#include <cstdio>
+
+Option::~Option() {}
 
 bool Option::parse_bool_like(const std::string& value, bool& out) {
     if (value == "true" || value == "YES") {
@@ -23,7 +26,7 @@ bool OptionFloat::parse(const std::string& value) {
         return true;
     }
 
-    return std::sscanf(value.c_str(), "%f", &m_value) == 1;
+    return sscanf(value.c_str(), "%f", &m_value) == 1;
 }
 bool OptionInt::parse(const std::string& value) {
     bool b;
@@ -32,7 +35,7 @@ bool OptionInt::parse(const std::string& value) {
         return true;
     }
 
-    return std::sscanf(value.c_str(), "%d", &m_value) == 1;
+    return sscanf(value.c_str(), "%d", &m_value) == 1;
 }
 bool OptionBool::parse(const std::string& value) {
     if (value == "0") {

src/client/Option.h

@@ -21,7 +21,7 @@ template<> struct is_min_max_option<float> : std::true_type {};
 class Option {
 public:
     Option(const std::string& key) : m_key("options." + key) {}
-    virtual ~Option() = default;
+    virtual ~Option();
 
     const std::string& getStringId() { return m_key; }
 

src/client/gui/Gui.cpp

@@ -27,6 +27,7 @@
 #include "../../platform/time.h"
 #include <cmath>
 #include <algorithm>
+#include <sstream>
 
 float Gui::InvGuiScale = 1.0f / 3.0f;
 float Gui::GuiScale = 1.0f / Gui::InvGuiScale;
@@ -841,7 +842,9 @@ void Gui::renderPlayerList(Font* font, int screenWidth, int screenHeight) {
 	}
 
 	// player count title
-	std::string titleText = "Players (" + std::to_string(playerNames.size()) + ")";
+	std::ostringstream titleStream;
+	titleStream << "Players (" << playerNames.size() << ")";
+	std::string titleText = titleStream.str();
 	float titleWidth = font->width(titleText);
 
 	if (titleWidth > maxNameWidth)

src/client/player/LocalPlayer.cpp

@@ -350,8 +350,8 @@ void LocalPlayer::calculateFlight(float xa, float ya, float za) {
     za = za * flySpeed;
 
 #ifdef ANDROID
-    if (Keyboard::isKeyDown(103)) ya = .2f * minecraft->options.flySpeed;
-    if (Keyboard::isKeyDown(102)) ya = -.2f * minecraft->options.flySpeed;
+    if (Keyboard::isKeyDown(103)) ya = .2f * flySpeed;
+    if (Keyboard::isKeyDown(102)) ya = -.2f * flySpeed;
 #else
     if (Keyboard::isKeyDown(Keyboard::KEY_E)) ya = .2f * flySpeed;
     if (Keyboard::isKeyDown(Keyboard::KEY_Q)) ya = -.2f * flySpeed;

src/client/player/input/XperiaPlayInput.h

@@ -4,6 +4,8 @@
 //package net.minecraft.client.player;
 
 #include "KeyboardInput.h"
+#include "platform/input/Controller.h"
+#include "world/entity/player/Player.h"
 
 // @note: This is just copy-pasted from KeyboardInput right now.
 class XperiaPlayInput: public KeyboardInput

src/client/renderer/GameRenderer.cpp

@@ -655,7 +655,7 @@ void GameRenderer::pick(float a) {
     float range = mc->gameMode->getPickRange();
     bool isPicking = true;
 #ifndef PLATFORM_DESKTOP
-    bool freeform = mc->useTouchscreen()  && !mc->options.isJoyTouchArea;
+    bool freeform = mc->useTouchscreen()  && !mc->options.getBooleanValue(OPTIONS_IS_JOY_TOUCH_AREA);
 #else 
     bool freeform = false;
 #endif

src/main_android.h

@@ -25,7 +25,7 @@
 #include "platform/input/Mouse.h"
 #include "platform/input/Multitouch.h"
 
-#include "EGLConfigPrinter.h"
+#include "EglConfigPrinter.h"
 
 const int BroadcastPort = 9991;
 

src/main_android_java.h

@@ -23,7 +23,7 @@
 #include "platform/input/Mouse.h"
 #include "platform/input/Controller.h"
 
-#include "EGLConfigPrinter.h"
+#include "EglConfigPrinter.h"
 
 const int BroadcastPort = 9991;