TouchScreenGUI dehardcoding refactor (#14472)

minetest · Apr 17, 2024 · f2b5c35 · f2b5c35
1 parent b2057a5
commit f2b5c35
Show file tree

Hide file tree

Showing 4 changed files with 491 additions and 699 deletions.
diff --git a/src/client/clientlauncher.cpp b/src/client/clientlauncher.cpp
@@ -206,10 +206,6 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
 			if (!m_rendering_engine->run() || *kill)
 				break;
 
-			if (g_settings->getBool("enable_touch")) {
-				g_touchscreengui = new TouchScreenGUI(m_rendering_engine->get_raw_device(), receiver);
-			}
-
 			the_game(
 				kill,
 				input,

diff --git a/src/client/game.cpp b/src/client/game.cpp
@@ -1555,8 +1555,8 @@ bool Game::initGui()
 	gui_chat_console = new GUIChatConsole(guienv, guienv->getRootGUIElement(),
 			-1, chat_backend, client, &g_menumgr);
 
-	if (g_touchscreengui)
-		g_touchscreengui->init(texture_src);
+	if (g_settings->getBool("enable_touch"))
+		g_touchscreengui = new TouchScreenGUI(device, texture_src);
 
 	return true;
 }