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 e17455cb22 - Show all commits

@ -4524,19 +4524,16 @@ void Game::showPauseMenu()
<< "\n" << "\n"
<< strgettext("Game info:") << "\n"; << strgettext("Game info:") << "\n";
const std::string &address = client->getAddressName(); const std::string &address = client->getAddressName();
static const std::string mode = strgettext("- Mode: "); os << strgettext("- Mode: ");
if (!simple_singleplayer_mode) { if (!simple_singleplayer_mode) {
Address serverAddress = client->getServerAddress(); if (address.empty())
if (!address.empty()) { os << strgettext("Hosting server");
os << mode << strgettext("Remote server") << "\n" else
<< strgettext("- Address: ") << address; os << strgettext("Remote server");
} else { } else {
os << mode << strgettext("Hosting server"); os << strgettext("Singleplayer");
}
os << "\n" << strgettext("- Port: ") << serverAddress.getPort() << "\n";
} else {
os << mode << strgettext("Singleplayer") << "\n";
} }
os << "\n";
if (simple_singleplayer_mode || address.empty()) { if (simple_singleplayer_mode || address.empty()) {
static const std::string on = strgettext("On"); static const std::string on = strgettext("On");
static const std::string off = strgettext("Off"); static const std::string off = strgettext("Off");