iOS: v. 1.2.0 - beta

build/iOS/MultiCraft/MultiCraft/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
-	<string>44</string>
+	<string>45</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

build/iOS/MultiCraft/MultiCraft/ioswrap.m

@@ -118,7 +118,7 @@ void ioswrap_assets()
 			goto extract;
 #endif
 		uint32_t v_disk = read_version(destpath);
-		if(v_runtime <= v_disk) {
+		if(v_runtime = v_disk) {
 			NSLog(@"%s: skipping update (%d)", assets[i].name, v_disk);
 			continue;
 		}

build/iOS/assets.sh

@@ -12,7 +12,7 @@ for dir in builtin textures; do
 	cp -r ../../$dir $DEST/$dir
 done
 mkdir -p $DEST/fonts
-cp ../../fonts/retrovillenc.ttf $DEST/fonts/ # no PNG fonts because freetype
+cp ../../fonts/Retron2000.ttf $DEST/fonts/ # no PNG fonts because freetype
 mkdir -p $DEST/games
 cp -r ../../games/default $DEST/games/default
 pushd ../../po

src/client/inputhandler.cpp

@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "mainmenumanager.h"
 
 #ifdef __IOS__
+#include "porting_ios.h"
 extern void external_pause_game();
 #endif
 
@@ -64,9 +65,16 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
 
 #ifdef __IOS__
 	if (event.EventType == irr::EET_APPLICATION_EVENT) {
-		if (event.ApplicationEvent.EventType == irr::EAET_WILL_PAUSE)
+		if (event.ApplicationEvent.EventType == irr::EAET_WILL_PAUSE) {
 			external_pause_game();
-
+		#ifdef ADS
+			ads_set_paused(true);
+		#endif
+		}
+		#ifdef ADS
+		if (event.ApplicationEvent.EventType == irr::EAET_DID_RESUME)
+			ads_set_paused(false);
+		#endif
 		return true;
 	}
 #endif

src/config.h

@@ -27,9 +27,9 @@
     #define PROJECT_NAME_C "MultiCraft"
     #define STATIC_SHAREDIR ""
     #define VERSION_MAJOR 1
-    #define VERSION_MINOR 1
-    #define VERSION_PATCH 10
-    #define VERSION_STRING "1.1.10"
+    #define VERSION_MINOR 2
+    #define VERSION_PATCH 0
+	#define VERSION_STRING "1.2.0"
     #ifdef NDEBUG
         #define BUILD_TYPE "Release"
     #else

src/defaultsettings.cpp

@@ -392,6 +392,7 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("abm_interval", "2.0");
 	settings->setDefault("client_unload_unused_data_timeout", "60");
 	settings->setDefault("curl_verify_cert", "false");
+	settings->setDefault("gui_scaling_filter_txr2img", "false");
 	settings->setDefault("mapgens_available", "v7p, v6, flat");
 #endif
 
@@ -409,7 +410,6 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("client_mapblock_limit", "250");
 	settings->setDefault("enable_3d_clouds", "false");
 	settings->setDefault("cloud_radius", "6");
-	settings->setDefault("gui_scaling_filter_txr2img", "false");
 	// set font_path
 	settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf");
 	settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf");
@@ -446,7 +446,6 @@ void set_default_settings(Settings *settings)
 #ifdef __IOS__
 	settings->setDefault("emergequeue_limit_diskonly", "16");
 	settings->setDefault("emergequeue_limit_generate", "16");
-	settings->setDefault("gui_scaling_filter_txr2img", "false");
 	// set font_path
 	settings->setDefault("mono_font_path", g_settings->get("font_path"));
 	settings->setDefault("fallback_font_path", g_settings->get("font_path"));
@@ -474,7 +473,6 @@ void set_default_settings(Settings *settings)
 	} else {
 		// iPad
 		settings->setDefault("hud_scaling", "0.8");
-		settings->setDefault("gui_scaling", "1.1");
 	}
 
 	// Move the HUD up for the iPhone X-series and new iPad Pro

src/game.cpp

@@ -2188,7 +2188,7 @@ bool Game::connectToServer(const std::string &playername,
 
 			wait_time += dtime;
 			// Only time out if we aren't waiting for the server we started
-			if ((*address != "") && (wait_time > 10)) {
+			if ((*address != "") && (wait_time > 15)) {
 				bool sent_old_init = g_settings->getFlag("send_pre_v25_init");
 				// If no pre v25 init was sent, and no answer was received,
 				// but the low level connection could be established
@@ -4620,6 +4620,7 @@ void Game::pauseGame()
 	if (g_menumgr.pausesGame())
 		return;
 	showPauseMenu();
+	runData.pause_game_timer = 0;
 }
 
 void Game::customStatustext(const std::wstring &text, float time)