Consistent title bar + render information in mainmenu (#10764)

2 files changed, 16 insertions, 8 deletions

diff --git a/src/client/game.cpp b/src/client/game.cpp
index 31c782c51..334f1da67 100644
--- a/src/client/game.cpp
+++ b/src/client/game.cpp
@@ -1390,9 +1390,21 @@ bool Game::createClient(const GameStartData &start_data)
 	std::wstring str = utf8_to_wide(PROJECT_NAME_C);
 	str += L" ";
 	str += utf8_to_wide(g_version_hash);
+	{
+		const wchar_t *text = nullptr;
+		if (simple_singleplayer_mode)
+			text = wgettext("Singleplayer");
+		else
+			text = wgettext("Multiplayer");
+		str += L" [";
+		str += text;
+		str += L"]";
+		delete text;
+	}
 	str += L" [";
 	str += driver->getName();
 	str += L"]";
+
 	device->setWindowCaption(str.c_str());
 
 	LocalPlayer *player = client->getEnv().getLocalPlayer();
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index ba7f708a4..6826ece05 100644
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -856,14 +856,6 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L)
 	lua_pushnumber(L,RenderingEngine::getDisplayDensity());
 	lua_settable(L, top);
 
-	lua_pushstring(L,"display_width");
-	lua_pushnumber(L,RenderingEngine::getDisplaySize().X);
-	lua_settable(L, top);
-
-	lua_pushstring(L,"display_height");
-	lua_pushnumber(L,RenderingEngine::getDisplaySize().Y);
-	lua_settable(L, top);
-
 	const v2u32 &window_size = RenderingEngine::get_instance()->getWindowSize();
 	lua_pushstring(L,"window_width");
 	lua_pushnumber(L, window_size.X);
@@ -872,6 +864,10 @@ int ModApiMainMenu::l_get_screen_info(lua_State *L)
 	lua_pushstring(L,"window_height");
 	lua_pushnumber(L, window_size.Y);
 	lua_settable(L, top);
+
+	lua_pushstring(L, "render_info");
+	lua_pushstring(L, wide_to_utf8(RenderingEngine::get_video_driver()->getName()).c_str());
+	lua_settable(L, top);
 	return 1;
 }