Skip to content

Commit f71091b

Browse files
Wuzzy2sfan5
authored andcommittedDec 13, 2021
Remove creative/damage info in Esc/Pause menu
1 parent 76aa610 commit f71091b

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed
 

‎src/client/game.cpp

+10-8
Original file line numberDiff line numberDiff line change
@@ -4283,16 +4283,18 @@ void Game::showPauseMenu()
42834283
if (simple_singleplayer_mode || address.empty()) {
42844284
static const std::string on = strgettext("On");
42854285
static const std::string off = strgettext("Off");
4286-
const std::string &damage = g_settings->getBool("enable_damage") ? on : off;
4287-
const std::string &creative = g_settings->getBool("creative_mode") ? on : off;
4286+
// Note: Status of enable_damage and creative_mode settings is intentionally
4287+
// NOT shown here because the game might roll its own damage system and/or do
4288+
// a per-player Creative Mode, in which case writing it here would mislead.
4289+
bool damage = g_settings->getBool("enable_damage");
42884290
const std::string &announced = g_settings->getBool("server_announce") ? on : off;
4289-
os << strgettext("- Damage: ") << damage << "\n"
4290-
<< strgettext("- Creative Mode: ") << creative << "\n";
42914291
if (!simple_singleplayer_mode) {
4292-
const std::string &pvp = g_settings->getBool("enable_pvp") ? on : off;
4293-
//~ PvP = Player versus Player
4294-
os << strgettext("- PvP: ") << pvp << "\n"
4295-
<< strgettext("- Public: ") << announced << "\n";
4292+
if (damage) {
4293+
const std::string &pvp = g_settings->getBool("enable_pvp") ? on : off;
4294+
//~ PvP = Player versus Player
4295+
os << strgettext("- PvP: ") << pvp << "\n";
4296+
}
4297+
os << strgettext("- Public: ") << announced << "\n";
42964298
std::string server_name = g_settings->get("server_name");
42974299
str_formspec_escape(server_name);
42984300
if (announced == on && !server_name.empty())

0 commit comments

Comments
 (0)
Please sign in to comment.