Android+iOS: Disable show Irrlicht errors. Disable flying in survival. Android - optimization GUI dimension.

build/android/Makefile

@@ -405,10 +405,10 @@ irrlicht_download :
 		mv irrlicht-${IRRLICHT_COMMIT} irrlicht;                               			\
 		cd irrlicht;                                                           			\
 		mkdir -p lib/Android;                                                  			\
-		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-touchcount.patch   || exit 1;\
+		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-touchcount.patch   || exit 1;			\
-		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-back_button.patch  || exit 1;\
+		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-back_button.patch  || exit 1;			\
-		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-texturehack.patch  || exit 1;\
+		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-texturehack.patch  || exit 1;			\
-		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-optimization.patch || exit 1;\
+		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-optimization.patch || exit 1;			\
 		patch -p1 < ${ANDR_ROOT}/patches/irrlicht-native_activity.patch || exit 1; 	\
 	fi
 
@@ -669,14 +669,12 @@ apk: local.properties $(IRRLICHT_LIB) $(CURL_LIB) $(LEVELDB_LIB) $(LUAJIT_LIB) \
 	if [ ! -e ${APP_ROOT}/jniLibs ]; then																					\
 		ln -s ${ANDR_ROOT}/libs ${APP_ROOT}/jniLibs || exit 1;											\
 	fi;																																						\
-	export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" &&\
+	export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" &&		\
 	export BUILD_TYPE_C=$$(echo "$${BUILD_TYPE}" | sed 's/./\U&/') &&							\
 #	gradle assemble$$BUILD_TYPE_C &&																							\
 	echo "APK stored at: build/outputs/apk/MultiCraft-$$BUILD_TYPE.apk" &&				\
 	echo "You can install it with \`make install_$$BUILD_TYPE\`"
 
-# These Intentionally doesn't depend on their respective build steps,
-# because it takes a while to verify that everything's up-to-date.
 install_debug:
 	${ANDROID_SDK}/platform-tools/adb install -r build/outputs/apk/MultiCraft-debug.apk
 
@@ -710,7 +708,7 @@ $(ANDR_ROOT)/jni/src/android_version_githash.h : prep_srcdir
 	echo "#ifndef ANDROID_MT_VERSION_GITHASH_H";																	\
 	echo "#define ANDROID_MT_VERSION_GITHASH_H";																	\
 	export GITHASH=$$(git rev-parse --short=8 HEAD);															\
-	export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}";\
+	export VERSION_STR="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}";			\
 	echo "#define VERSION_GITHASH \"$$VERSION_STR-$$GITHASH-Android\"";						\
 	echo "#endif";																																\
 	} > "$${VERSION_FILE_NEW}";																										\
@@ -731,7 +729,7 @@ $(ANDR_ROOT)/jni/src/android_version.h : prep_srcdir
 	echo "#define VERSION_MAJOR ${VERSION_MAJOR}";																\
 	echo "#define VERSION_MINOR ${VERSION_MINOR}";																\
 	echo "#define VERSION_PATCH ${VERSION_PATCH}";																\
-	echo "#define VERSION_STRING STR(VERSION_MAJOR) \".\" STR(VERSION_MINOR)\
+	echo "#define VERSION_STRING STR(VERSION_MAJOR) \".\" STR(VERSION_MINOR)			\
 	\".\" STR(VERSION_PATCH)";																										\
 	echo "#endif";																																\
 	} > $${VERSION_FILE_NEW};																											\

build/android/patches/irrlicht-optimization.patch

@@ -9,7 +9,7 @@
 +LOCAL_CFLAGS   += -march=armv7-a -mfloat-abi=softfp -mfpu=vfpv3-d16 -mthumb
 +endif
 +ifeq ($(TARGET_ABI),x86)
-+LOCAL_CFLAGS   += -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32 -funroll-loops -fno-stack-protector
++LOCAL_CFLAGS   += -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32 -funroll-loops
 +endif
 +LOCAL_CFLAGS		+= -Ofast -fdata-sections -ffunction-sections -fvisibility=hidden -flto
 +LOCAL_CXXFLAGS := $(LOCAL_CFLAGS)

src/client/inputhandler.cpp

@@ -114,9 +114,11 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 				LL_NONE,    // ELL_NONE
 		};
 		assert(event.LogEvent.Level < ARRLEN(irr_loglev_conv));
+		#if !defined(__ANDROID__) && !defined(__IOS__)
 			g_logger.log(irr_loglev_conv[event.LogEvent.Level],
 					std::string("Irrlicht: ") +
 							(const char *)event.LogEvent.Text);
+		#endif
 		return true;
 	}
 	/* always return false in order to continue processing events */

src/defaultsettings.cpp

@@ -178,6 +178,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("ambient_occlusion_gamma", "2.2");
 	settings->setDefault("enable_shaders", "true");
 	settings->setDefault("enable_particles", "true");
+	settings->setDefault("screen_dpi", "72");
 
 	settings->setDefault("enable_minimap", "true");
 	settings->setDefault("minimap_shape_round", "true");
@@ -263,8 +264,8 @@ void set_default_settings(Settings *settings)
 	// Network
 	settings->setDefault("enable_ipv6", "true");
 	settings->setDefault("ipv6_server", "false");
-	settings->setDefault("workaround_window_size","5");
+	settings->setDefault("workaround_window_size", "5");
-	settings->setDefault("max_packets_per_iteration","1024");
+	settings->setDefault("max_packets_per_iteration", "1024");
 	settings->setDefault("port", "30000");
 	settings->setDefault("strict_protocol_version_checking", "false");
 	settings->setDefault("player_transfer_distance", "0");
@@ -388,10 +389,11 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("abm_interval", "2.0");
 	settings->setDefault("cloud_radius", "6");
 	settings->setDefault("client_unload_unused_data_timeout", "60");
+	settings->setDefault("curl_verify_cert", "false");
 #endif
 
 #ifdef __ANDROID__
-	settings->setDefault("viewing_range", "30");
+	settings->setDefault("viewing_range", "35");
 	settings->setDefault("smooth_lighting", "false");
 	settings->setDefault("selectionbox_width", "6");
 	settings->setDefault("emergequeue_limit_diskonly", "8");
@@ -402,28 +404,23 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf");
 	settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf");
 
-	settings->setDefault("curl_verify_cert","false");
+	// check screen size
-	
-	//For other devices
-	settings->setDefault("gui_scaling", "1.2");
-	
-	// check for screen
 	float x_inches = ((double) porting::getDisplaySize().X /
 					  (160 * porting::getDisplayDensity()));
-	if (x_inches < 5) {
+	if (x_inches <= 3.7) {
-		// all phones
-		settings->setDefault("hud_scaling", "0.6");
-		settings->setDefault("mouse_sensitivity", "0.15");
-	}
-	if (x_inches < 3.7) {
 		// small 4" phones
 		settings->setDefault("hud_scaling", "0.5");
 		settings->setDefault("gui_scaling", "1.0");
-		settings->setDefault("mouse_sensitivity", "0.2");
+		settings->setDefault("mouse_sensitivity", "0.25");
-	}
+	} else if (x_inches > 3.7 && x_inches < 5) {
-	if (x_inches > 5) {
+		// all phones
+		settings->setDefault("hud_scaling", "0.6");
+		settings->setDefault("gui_scaling", "1.2");
+		settings->setDefault("mouse_sensitivity", "0.15");
+	} else if (x_inches >= 5) {
 		// tablets
 		settings->setDefault("hud_scaling", "0.85");
+		settings->setDefault("gui_scaling", "1.2");
 		settings->setDefault("mouse_sensitivity", "0.2");
 	}
 
@@ -434,8 +431,6 @@ void set_default_settings(Settings *settings)
 	if (!lang[0])
 		errorstream << "Language auto-detection failed!" << std::endl;
 	settings->setDefault("language", lang);
-#else
-	settings->setDefault("screen_dpi", "72");
 #endif
 
 #ifdef __IOS__
@@ -445,47 +440,44 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("mono_font_path", porting::getDataPath("fonts" DIR_DELIM "retrovillenc.ttf"));
 	settings->setDefault("fallback_font_path", porting::getDataPath("fonts" DIR_DELIM "retrovillenc.ttf"));
 
-	// For iPad =)
+	// iPad
 	settings->setDefault("hud_scaling", "0.8");
 	settings->setDefault("gui_scaling", "1.1");
 	settings->setDefault("mouse_sensitivity", "0.2");
-	// 3.5" (old iPhone's)
+
 	if ([SDVersion deviceSize] == Screen3Dot5inch) {
-		settings->setDefault("viewing_range", "30");
+		// 3.5" (old iPhone's)
+		settings->setDefault("viewing_range", "25");
 		settings->setDefault("hud_scaling", "0.5");
 		settings->setDefault("gui_scaling", "1.0");
 		settings->setDefault("mouse_sensitivity", "0.2");
 		settings->setDefault("enable_3d_clouds", "false");
 		settings->setDefault("smooth_lighting", "false");
-	};
+	} else if ([SDVersion deviceSize] == Screen4inch) {
 	// 4" (iPhone 5)
-	if ([SDVersion deviceSize] == Screen4inch) {
 		settings->setDefault("hud_scaling", "0.5");
 		settings->setDefault("gui_scaling", "1.2");
 		settings->setDefault("mouse_sensitivity", "0.23");
 		settings->setDefault("enable_3d_clouds", "false");
 		settings->setDefault("smooth_lighting", "false");
-	};
+	} else if ([SDVersion deviceSize] == Screen4Dot7inch) {
 		// 4.7" (iPhone)
-	if ([SDVersion deviceSize] == Screen4Dot7inch) {
 		settings->setDefault("hud_scaling", "0.6");
 		settings->setDefault("gui_scaling", "1.2");
 		settings->setDefault("mouse_sensitivity", "0.25");
-	};
+	} else if ([SDVersion deviceSize] == Screen5Dot5inch) {
 		// 5.5" (iPhone Plus)
-	if ([SDVersion deviceSize] == Screen5Dot5inch) {
 		settings->setDefault("hud_scaling", "0.7");
 		settings->setDefault("gui_scaling", "1.3");
 		settings->setDefault("mouse_sensitivity", "0.3");
-	};
+	} else if ([SDVersion deviceSize] == Screen5Dot8inch) {
 		// 5.8" (iPhone X)
-	if ([SDVersion deviceSize] == Screen5Dot8inch) {
 		settings->setDefault("viewing_range", "75");
 		settings->setDefault("hud_scaling", "0.7");
 		settings->setDefault("gui_scaling", "1.3");
 		settings->setDefault("mouse_sensitivity", "0.3");
 		settings->setDefault("hud_move_upwards", "15");
-	};
+	}
 
 	// Auto-detect language on iOS
 	char lang[3] = {0};

src/game.cpp

@@ -2795,7 +2795,10 @@ void Game::toggleFreeMove()
 
 void Game::toggleFreeMoveAlt()
 {
+	bool free_move = !g_settings->getBool("free_move");
+	bool creative = !g_settings->getBool("creative_mode");
 	if (m_cache_doubletap_jump && runData.jump_timer < 0.15f)
+		if (!free_move || !creative)
 		toggleFreeMove();
 
 	runData.reset_jump_timer = true;