From d31f8dfcb86fa84cc30409e961245129f2a503ef Mon Sep 17 00:00:00 2001
From: Maksim Gamarnik <MoNTE48@mail.ua>
Date: Sun, 6 Dec 2015 14:27:27 +0200
Subject: [PATCH] SNOWCRAFT + Fix build

---
 src/config.h                    |  4 ++--
 src/defaultsettings.cpp         |  4 ++--
 src/drawscene.cpp               | 12 ++++++------
 src/game.cpp                    |  9 +++++----
 src/script/cpp_api/s_player.cpp |  3 ---
 5 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/config.h b/src/config.h
index 46032cc3f..263d41abf 100644
--- a/src/config.h
+++ b/src/config.h
@@ -13,8 +13,8 @@
 #if defined USE_CMAKE_CONFIG_H
 	#include "cmake_config.h"
 #elif defined (__ANDROID__) || defined (ANDROID)
-	#define PROJECT_NAME "MultiCraft"
-	#define PROJECT_NAME_C "MultiCraft"
+	#define PROJECT_NAME "SnowCraft"
+	#define PROJECT_NAME_C "SnowCraft"
 	#define STATIC_SHAREDIR ""
 	#include "android_version.h"
 	#ifdef NDEBUG
diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp
index a0a1a321a..c474d3809 100644
--- a/src/defaultsettings.cpp
+++ b/src/defaultsettings.cpp
@@ -308,8 +308,8 @@ void set_default_settings(Settings *settings)
 	settings->setDefault("liquid_update", "1.0");
 
 	//mapgen stuff
-	//settings->setDefault("mg_name", "v7");
-	settings->setDefault("mg_name", "v6");
+	settings->setDefault("mg_name", "v7");
+	//settings->setDefault("mg_name", "v6");
 	settings->setDefault("water_level", "1");
 	settings->setDefault("chunksize", "5");
 	settings->setDefault("mg_flags", "dungeons");
diff --git a/src/drawscene.cpp b/src/drawscene.cpp
index 895daa9fa..f50ea8f0c 100644
--- a/src/drawscene.cpp
+++ b/src/drawscene.cpp
@@ -431,12 +431,12 @@ void draw_scene(video::IVideoDriver *driver, scene::ISceneManager *smgr,
 	bool draw_crosshair = ((player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) &&
 			(camera.getCameraMode() != CAMERA_MODE_THIRD_FRONT));
 
-#ifdef HAVE_TOUCHSCREENGUI
-	try {
-		draw_crosshair = !g_settings->getBool("touchtarget");
-	}
-	catch(SettingNotFoundException) {}
-#endif
+//#ifdef HAVE_TOUCHSCREENGUI
+//	try {
+//		draw_crosshair = !g_settings->getBool("touchtarget");
+//	}
+//	catch(SettingNotFoundException) {}
+//#endif
 
 	std::string draw_mode = g_settings->get("3d_mode");
 
diff --git a/src/game.cpp b/src/game.cpp
index 05e15af00..8aac70bd4 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1141,12 +1141,12 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
 			<< strgettext("Sound Volume") << "]";
 	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;"
 			<< strgettext("Change Keys")  << "]";
-#endif
 	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;"
 			<< strgettext("Exit to Menu") << "]";
-//#endif
+#endif
 	os		<< "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;"
-			<< strgettext("Exit to OS")   << "]"
+			<< strgettext("Exit")   << "]"
+#ifndef __ANDROID__			
 			<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]"
 			<< "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n"
 			<< g_build_info << "\n"
@@ -2636,6 +2636,7 @@ void Game::processKeyboardInput(VolatileRunFlags *flags,
 
 	if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_DROP])) {
 		dropSelectedItem();
+	// Add WoW-style autorun by toggling continuous forward.
 	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_AUTORUN])) {
 		toggleAutorun(statustext_time);
 	} else if (input->wasKeyDown(keycache.key[KeyCache::KEYMAP_ID_INVENTORY])) {
@@ -4477,4 +4478,4 @@ void the_game(bool *kill,
 		error_message = e.what() + strgettext("\nCheck debug.txt for details.");
 		errorstream << "ModError: " << error_message << std::endl;
 	}
-}
+}
\ No newline at end of file
diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp
index c711fb257..88fa7df2d 100644
--- a/src/script/cpp_api/s_player.cpp
+++ b/src/script/cpp_api/s_player.cpp
@@ -194,6 +194,3 @@ ScriptApiPlayer::~ScriptApiPlayer()
 {
 }
 
-ScriptApiPlayer::~ScriptApiPlayer()
-{
-}