Remove touch target setting

Crosshair is for all touch screen GUI (not necessarily Android).
Rename variable: m_android_use_crosshair -> m_touch_use_crosshair

builtin/mainmenu/tab_settings.lua

@@ -300,10 +300,6 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
  core.show_keys_menu()
  return true
  end
- if fields["cb_touchscreen_target"] then
- core.settings:set("touchtarget", fields["cb_touchscreen_target"])
- return true
- end
 
  --Note dropdowns have to be handled LAST!
  local ddhandled = false

builtin/settingtypes.txt

@@ -117,7 +117,7 @@ mouse_sensitivity (Mouse sensitivity) float 0.2 0.001 10.0
 # The length in pixels it takes for touch screen interaction to start.
 touchscreen_threshold (Touch screen threshold) int 20 0 100
 
-# (Android) Use crosshair to select object instead of whole screen.
+# Use crosshair to select object instead of whole screen.
 # If enabled, a crosshair will be shown and will be used for selecting object.
 touch_use_crosshair (Use crosshair for touch screen) bool false
 

src/client/game.cpp

@@ -916,8 +916,7 @@ class Game {
 
 #ifdef HAVE_TOUCHSCREENGUI
  bool m_cache_hold_aux1;
- bool m_android_touchtarget;
- bool m_android_use_crosshair;
+ bool m_touch_use_crosshair;
 #endif
 #ifdef __ANDROID__
  bool m_android_chat_open;
@@ -1050,8 +1049,7 @@ bool Game::startup(bool *kill,
  m_first_loop_after_window_activation = true;
 
 #ifdef HAVE_TOUCHSCREENGUI
- m_android_touchtarget = g_settings->getBool("touchtarget");
- m_android_use_crosshair = g_settings->getBool("touch_use_crosshair");
+ m_touch_use_crosshair = g_settings->getBool("touch_use_crosshair");
 #endif
 
  g_client_translations->clear();
@@ -2982,7 +2980,7 @@ void Game::updateCamera(f32 dtime)
 
 #ifdef HAVE_TOUCHSCREENGUI
  if (g_touchscreengui)
- g_touchscreengui->setUseCrosshair(m_android_use_crosshair ||
+ g_touchscreengui->setUseCrosshair(m_touch_use_crosshair ||
  camera->getCameraMode() == CAMERA_MODE_THIRD);
 #endif
 
@@ -3095,7 +3093,7 @@ void Game::processPlayerInteraction(f32 dtime, bool show_hud)
  shootline.end = shootline.start + camera_direction * BS * d;
 
 #ifdef HAVE_TOUCHSCREENGUI
- if (m_android_touchtarget && g_touchscreengui && !m_android_use_crosshair &&
+ if (g_touchscreengui && !m_touch_use_crosshair &&
  camera->getCameraMode() == CAMERA_MODE_FIRST) {
  shootline = g_touchscreengui->getShootline();
  // Scale shootline to the acual distance the player can reach
@@ -3982,7 +3980,7 @@ void Game::updateFrame(ProfilerGraph *graph, RunStats *stats, f32 dtime,
  (player->hud_flags & HUD_FLAG_CROSSHAIR_VISIBLE) &&
  (camera->getCameraMode() != CAMERA_MODE_THIRD_FRONT));
 #ifdef HAVE_TOUCHSCREENGUI
- if (!m_android_use_crosshair && camera->getCameraMode() == CAMERA_MODE_FIRST)
+ if (!m_touch_use_crosshair && camera->getCameraMode() == CAMERA_MODE_FIRST)
  draw_crosshair = false;
 #endif
  m_rendering_engine->draw_scene(skycolor, m_game_ui->m_flags.show_hud,

src/defaultsettings.cpp

@@ -465,7 +465,6 @@ void set_default_settings()
 #endif
 
 #ifdef HAVE_TOUCHSCREENGUI
- settings->setDefault("touchtarget", "true");
  settings->setDefault("touchscreen_threshold","20");
  settings->setDefault("touch_use_crosshair", "false");
  settings->setDefault("fixed_virtual_joystick", "false");

src/gui/touchscreengui.h

@@ -29,7 +29,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "client/tile.h"
 #include "client/game.h"
-#include "client/camera.h"
 
 using namespace irr;
 using namespace irr::core;