diff options
| author | KodexKy <kodexky@gmail.com> | 2014-11-03 16:55:37 -0430 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2014-11-25 13:28:51 +1000 |
| commit | 5413ed11955a5b8a09625b2df1c28fb18c99c296 (patch) | |
| tree | 98078fd7cf6d99268ec9148d7e2a69f582808dbd /src | |
| parent | 9878e8de4fdf232ebb77b396766c339786c01218 (diff) | |
| download | hax-minetest-server-5413ed11955a5b8a09625b2df1c28fb18c99c296.tar.gz hax-minetest-server-5413ed11955a5b8a09625b2df1c28fb18c99c296.zip | |
Fixes for Android build errors. Enable sensor landscape rotation.
Fix typo in Android Makefile ndk path.
Fix touchscreen parts of game.cpp to work after Zeno's refactor.
Fix isdigit and isspace overload conflict with Android Irrlicht in string.h
Enable sensor landscape rotation in Android Manifiest.
Add mapgen v5 to Android build.
Fix Makefile not checking leveldb.
Signed-off-by: Craig Robbins <kde.psych@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/game.cpp | 6 | ||||
| -rw-r--r-- | src/util/string.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/game.cpp b/src/game.cpp index 2c969b931..4518c1612 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -2061,7 +2061,7 @@ bool Game::initGui(std::wstring *error_message) #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui) - g_touchscreengui->init(tsrc, porting::getDisplayDensity()); + g_touchscreengui->init(texture_src, porting::getDisplayDensity()); #endif @@ -2852,8 +2852,8 @@ void Game::updateCameraDirection(CameraOrientation *cam, #ifdef HAVE_TOUCHSCREENGUI if (g_touchscreengui) { - camera_yaw = g_touchscreengui->getYaw(); - camera_pitch = g_touchscreengui->getPitch(); + cam->camera_yaw = g_touchscreengui->getYaw(); + cam->camera_pitch = g_touchscreengui->getPitch(); } else { #endif s32 dx = input->getMousePos().X - (driver->getScreenSize().Width / 2); diff --git a/src/util/string.h b/src/util/string.h index f4337062e..52ef8c164 100644 --- a/src/util/string.h +++ b/src/util/string.h @@ -212,11 +212,11 @@ inline std::string trim(const std::string &s) { size_t front = 0; - while (isspace(s[front])) + while (std::isspace(s[front])) ++front; size_t back = s.size(); - while (back > front && isspace(s[back-1])) + while (back > front && std::isspace(s[back-1])) --back; return s.substr(front, back - front); @@ -481,7 +481,7 @@ inline std::string unescape_string(std::string &s) inline bool is_number(const std::string &tocheck) { for (size_t i = 0; i < tocheck.size(); i++) - if (!isdigit(tocheck[i])) + if (!std::isdigit(tocheck[i])) return false; return !tocheck.empty(); |