Fix Android node selection distance (#6187)

2 files changed, 17 insertions, 0 deletions

diff --git a/src/game.cpp b/src/game.cpp
index 68acc81b7..facc68aea 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -3550,6 +3550,9 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud, bool show_debug)
 
 	if ((g_settings->getBool("touchtarget")) && (g_touchscreengui)) {
 		shootline = g_touchscreengui->getShootline();
+		// Scale shootline to the acual distance the player can reach
+		shootline.end = shootline.start
+			+ shootline.getVector().normalize() * BS * d;
 		shootline.start += intToFloat(camera_offset, BS);
 		shootline.end += intToFloat(camera_offset, BS);
 	}
diff --git a/src/touchscreengui.h b/src/touchscreengui.h
index f4f1766c9..1f680ccb2 100644
--- a/src/touchscreengui.h
+++ b/src/touchscreengui.h
@@ -156,6 +156,14 @@ public:
 
 	double getPitch() { return m_camera_pitch; }
 
+	/*!
+	 * Returns a line which describes what the player is pointing at.
+	 * The starting point and looking direction are significant,
+	 * the line should be scaled to match its length to the actual distance
+	 * the player can reach.
+	 * The line starts at the camera and ends on the camera's far plane.
+	 * The coordinates do not contain the camera offset.
+	 */
 	line3d<f32> getShootline() { return m_shootline; }
 
 	void step(float dtime);
@@ -180,6 +188,12 @@ private:
 	double m_camera_yaw_change;
 	double m_camera_pitch;
 
+	/*!
+	 * A line starting at the camera and pointing towards the
+	 * selected object.
+	 * The line ends on the camera's far plane.
+	 * The coordinates do not contain the camera offset.
+	 */
 	line3d<f32> m_shootline;
 
 	rect<s32> m_control_pad_rect;