merge diff branch

build/android/Makefile

@@ -77,14 +77,14 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)/timestamp
 IRRLICHT_TIMESTAMP_INT = $(ANDR_ROOT)/deps/irrlicht_timestamp
 IRRLICHT_URL_HTTP = https://github.com/zaki/irrlicht/archive/$(IRRLICHT_COMMIT).zip
 
-CURL_VERSION = 7.62.0
+CURL_VERSION = 7.64.0
 CURL_DIR = $(ANDR_ROOT)/deps/curl
 CURL_LIB = $(CURL_DIR)/lib/.libs/libcurl.a
 CURL_TIMESTAMP = $(CURL_DIR)/timestamp
 CURL_TIMESTAMP_INT = $(ANDR_ROOT)/deps/curl_timestamp
 CURL_URL_HTTP = http://dl.uxnr.de/mirror/curl/curl-${CURL_VERSION}.tar.bz2
 
-FREETYPE_VERSION = 2.9.1
+FREETYPE_VERSION = 2.10.0
 FREETYPE_DIR = $(ANDR_ROOT)/deps/freetype
 FREETYPE_LIB = $(FREETYPE_DIR)/objs/.libs/libfreetype.a
 FREETYPE_TIMESTAMP = $(FREETYPE_DIR)/timestamp

src/porting_android.cpp

@@ -68,10 +68,10 @@ void android_main(android_app *app)
 /* TODO this doesn't work as expected, no idea why but there's a workaround   */
 /* for it right now */
 extern "C" {
-	JNIEXPORT void JNICALL Java_mobi_MultiCraft_GameActivity_putMessageBoxResult(
+	JNIEXPORT void JNICALL Java_com_multicraft_game_GameActivity_putMessageBoxResult(
 			JNIEnv *env, jclass j_this, jstring text)
 	{
-		errorstream << "Java_mobi_MultiCraft_GameActivity_putMessageBoxResult got: "
+		errorstream << "Java_com_multicraft_game_GameActivity_putMessageBoxResult got: "
 				<< std::string((const char*)env->GetStringChars(text,0))
 				<< std::endl;
 	}
@@ -125,7 +125,7 @@ void initAndroid()
 		exit(-1);
 	}
 
-	nativeActivity = findClass("mobi/MultiCraft/GameActivity");
+	nativeActivity = findClass("com/multicraft/game/GameActivity");
 	if (nativeActivity == 0) {
 		errorstream <<
 			"porting::initAndroid unable to find java native activity class" <<
@@ -206,7 +206,7 @@ void initializePathsAndroid()
 			cls_File, mt_getAbsPath, "getCacheDir");
 	path_storage = getAndroidPath(cls_Env, NULL, cls_File, mt_getAbsPath,
 			"getExternalStorageDirectory");
-	path_user    = path_storage + DIR_DELIM + "Android/data/mobi.MultiCraft/files";
+	path_user    = path_storage + DIR_DELIM + "Android/data/com.multicraft.game/files";
 	path_share   = path_user;
 	path_locale  = path_user + DIR_DELIM + "locale";
 }

src/porting_ios.cpp

@@ -1,3 +1,24 @@
+/*
+MultiCraft
+
+Copyright (C) 2014-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua
+Copyright (C) 2016-2019 sfan5
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 3.0 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #include <string>
 
 #include "porting.h"

src/porting_ios.h

@@ -1,3 +1,24 @@
+/*
+MultiCraft
+
+Copyright (C) 2014-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua
+Copyright (C) 2016-2019 sfan5
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 3.0 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #ifndef __PORTING__IOS_H__
 #define __PORTING__IOS_H__
 

src/touchscreengui.cpp

@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2014 sapier
+Copyright (C) 2014-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -347,15 +348,12 @@ void TouchScreenGUI::init(ISimpleTextureSource* tsrc)
 #endif*/
 
 
-
-
 #ifdef __IOS__
 // iOS bar
 	/* init pause button */
 	initButton(escape_id,
 		rect<s32>(m_screensize.X / 2 - (button_size * 0.75), 0,
-				m_screensize.X / 2,
+							m_screensize.X / 2, (button_size * 0.75)),
-				(button_size * 0.75)),
 		L"Exit", false, SLOW_BUTTON_REPEAT);
 
 	/* init rangeselect button */

src/touchscreengui.h

@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2014 sapier
+Copyright (C) 2014-2019 Maksim Gamarnik [MoNTE48] MoNTE48@mail.ua
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by