master #6

Merged
BRNSystems merged 85 commits from Mirrorlandia_minetest/minetest:master into master 2024-01-09 17:53:52 +01:00
Showing only changes of commit 46c930cf70 - Show all commits

@ -1489,12 +1489,6 @@ bool Game::createClient(const GameStartData &start_data)
return false; return false;
bool could_connect, connect_aborted; bool could_connect, connect_aborted;
#ifdef HAVE_TOUCHSCREENGUI
if (g_touchscreengui) {
g_touchscreengui->init(texture_src);
g_touchscreengui->hide();
}
#endif
if (!connectToServer(start_data, &could_connect, &connect_aborted)) if (!connectToServer(start_data, &could_connect, &connect_aborted))
return false; return false;
@ -1603,10 +1597,8 @@ bool Game::initGui()
-1, chat_backend, client, &g_menumgr); -1, chat_backend, client, &g_menumgr);
#ifdef HAVE_TOUCHSCREENGUI #ifdef HAVE_TOUCHSCREENGUI
if (g_touchscreengui) if (g_touchscreengui)
g_touchscreengui->show(); g_touchscreengui->init(texture_src);
#endif #endif
return true; return true;