Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: Fix build. Change progress bar size, android tune

Browse Source
This commit is contained in:
Maksim Gamarnik 2016-10-18 01:15:14 +03:00
parent 7ced0e5b81
commit 7d466a9e4b
8 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/android/patches/irrlicht-CEGL.patch
View File

@ -1,5 +1,5 @@
--- irrlicht/source/Irrlicht/CEGLManager.cpp.orig 2015-08-29 15:43:09.000000000 +0300
+++ irrlicht/source/Irrlicht/CEGLManager.cpp 2016-09-20 01:09:05.259201198 +0300
+++ irrlicht/source/Irrlicht/CEGLManager.cpp 2016-10-17 23:43:12.963361978 +0300
@@ -9,6 +9,10 @@
#include "irrString.h"
#include "os.h"

4
src/defaultsettings.cpp
View File

@ -118,7 +118,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("noclip", "false");
settings->setDefault("continuous_forward", "false");
settings->setDefault("cinematic", "false");
settings->setDefault("camera_smoothing", "0.1");
settings->setDefault("camera_smoothing", "0");
settings->setDefault("cinematic_camera_smoothing", "0.7");
settings->setDefault("fast_move", "false");
settings->setDefault("invert_mouse", "false");
@ -361,7 +361,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("gui_scaling_filter_txr2img", "false");
settings->setDefault("max_simultaneous_block_sends_per_client", "5");
settings->setDefault("abm_interval", "2.0");
settings->setDefault("selectionbox_width", "7");
settings->setDefault("selectionbox_width", "6");
settings->setDefault("cloud_radius", "6");
settings->setDefault("client_unload_unused_data_timeout", "120");

4
src/drawscene.cpp
View File

@ -511,9 +511,9 @@ void draw_load_screen(const std::wstring &text, IrrlichtDevice* device,
v2s32 barsize(
// 342 is (approximately) 256/0.75 to keep bar on same size as
// before with default settings
342 * porting::getDisplayDensity() *
342 * 1.2 * porting::getDisplayDensity() *
g_settings->getFloat("gui_scaling"),
g_fontengine->getTextHeight() * 2);
g_fontengine->getTextHeight() * 3);
core::rect<s32> barrect(center - barsize / 2, center + barsize / 2);
driver->draw2DRectangle(video::SColor(255, 255, 255, 255),barrect, NULL); // border

2
src/game.cpp
View File

@ -2090,7 +2090,7 @@ bool Game::autoMigrateSingleplayerWorld(const std::string map_dir)
new_db->beginSave();
for (std::vector<v3s16>::const_iterator it = blocks.begin(); it != blocks.end(); ++it) {
std::string data;
old_db->loadBlock(*it, &data);
data = old_db->loadBlock(*it);
if (!data.empty())
new_db->saveBlock(*it, data);
else

8
src/gmp/mini-gmp.c
View File

@ -13,14 +13,6 @@ it under the terms of either:
Software Foundation; either version 3 of the License, or (at your
option) any later version.
or
* the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any
later version.
or both in parallel, as here.
The GNU MP Library 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 General Public License

8
src/gmp/mini-gmp.h
View File

@ -11,14 +11,6 @@ it under the terms of either:
Software Foundation; either version 3 of the License, or (at your
option) any later version.
or
* the GNU General Public License as published by the Free Software
Foundation; either version 2 of the License, or (at your option) any
later version.
or both in parallel, as here.
The GNU MP Library 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 General Public License

10
src/hud.cpp
View File

@ -103,7 +103,7 @@ Hud::Hud(video::IVideoDriver *driver, scene::ISceneManager* smgr,
if (mode == "box") {
m_use_selection_mesh = false;
m_selection_material.Thickness =
rangelim(g_settings->getS16("selectionbox_width"), 1, 7);
rangelim(g_settings->getS16("selectionbox_width"), 1, 6);
} else if (mode == "halo") {
m_use_selection_mesh = true;
m_selection_material.setTexture(0, tsrc->getTextureForMesh("halo.png"));
@ -485,10 +485,10 @@ void Hud::drawCrosshair()
0, crosshair_argb, true);
} else {
#ifdef __ANDROID__
driver->draw2DLine(m_displaycenter - v2s32(40, 0),
m_displaycenter + v2s32(40, 0), crosshair_argb);
driver->draw2DLine(m_displaycenter - v2s32(0, 40),
m_displaycenter + v2s32(0, 40), crosshair_argb);
driver->draw2DLine(m_displaycenter - v2s32(35, 0),
m_displaycenter + v2s32(35, 0), crosshair_argb);
driver->draw2DLine(m_displaycenter - v2s32(0, 35),
m_displaycenter + v2s32(0, 35), crosshair_argb);
#else
driver->draw2DLine(m_displaycenter - v2s32(10, 0),
m_displaycenter + v2s32(10, 0), crosshair_argb);

2
src/touchscreengui.h
View File

@ -62,7 +62,7 @@ typedef enum {
after_last_element_id
} touch_gui_button_id;
#define MIN_DIG_TIME_MS 300
#define MIN_DIG_TIME_MS 500
#define MAX_TOUCH_COUNT 64
#define BUTTON_REPEAT_DELAY 0.2f