Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2025-01-03 11:57:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

TouchControls: Fix setUseCrosshair not being called (#15100)

Browse Source
This commit is contained in:
grorp 2024-09-04 15:18:45 +02:00 committed by GitHub
parent 08de047033
commit 8349846333
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/client/game.cpp
View File

@ -1510,10 +1510,6 @@ bool Game::createClient(const GameStartData &start_data)
client->getScript()->on_camera_ready(camera); client->getScript()->on_camera_ready(camera);
client->setCamera(camera); client->setCamera(camera);
if (g_touchcontrols) {
g_touchcontrols->setUseCrosshair(!isTouchCrosshairDisabled());
}
/* Clouds /* Clouds
*/ */
if (m_cache_enable_clouds) if (m_cache_enable_clouds)
@ -1578,8 +1574,10 @@ bool Game::initGui()
gui_chat_console = new GUIChatConsole(guienv, guienv->getRootGUIElement(), gui_chat_console = new GUIChatConsole(guienv, guienv->getRootGUIElement(),
-1, chat_backend, client, &g_menumgr); -1, chat_backend, client, &g_menumgr);
if (g_settings->getBool("touch_controls")) if (g_settings->getBool("touch_controls")) {
g_touchcontrols = new TouchControls(device, texture_src); g_touchcontrols = new TouchControls(device, texture_src);
g_touchcontrols->setUseCrosshair(!isTouchCrosshairDisabled());
}
return true; return true;
} }