summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/android/src/org/minetest/minetest/MinetestAssetCopy.java2
-rw-r--r--src/localplayer.cpp5
2 files changed, 5 insertions, 2 deletions
diff --git a/build/android/src/org/minetest/minetest/MinetestAssetCopy.java b/build/android/src/org/minetest/minetest/MinetestAssetCopy.java
index 62f61ad62..45dc6373a 100644
--- a/build/android/src/org/minetest/minetest/MinetestAssetCopy.java
+++ b/build/android/src/org/minetest/minetest/MinetestAssetCopy.java
@@ -261,8 +261,6 @@ public class MinetestAssetCopy extends Activity
textPaint.getTextBounds(todisplay, 0, todisplay.length(), bounds);
while (bounds.width() > getResources().getDisplayMetrics().widthPixels * 0.7) {
- Log.e("MinetestAssetCopy", todisplay + ": " +
- bounds.width() + " > " + (getResources().getDisplayMetrics().widthPixels * 0.7));
if (todisplay.length() < 2) {
break;
}
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index b36bef4d9..8570dd2f0 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -205,8 +205,13 @@ void LocalPlayer::move(f32 dtime, Environment *env, f32 pos_max_d,
}
}
+ // this shouldn't be hardcoded but transmitted from server
float player_stepheight = touching_ground ? (BS*0.6) : (BS*0.2);
+#ifdef __ANDROID__
+ player_stepheight += 0.5;
+#endif
+
v3f accel_f = v3f(0,0,0);
collisionMoveResult result = collisionMoveSimple(env, m_gamedef,