BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Minor pause/escape menu improvements (#5751)

Browse Source 
- Split movement keys into separate entries.
- Increase buffer size due to the above change.
- Change capitalisation.
- Remove code-style violating white spaces.
This commit is contained in:
red-001 2017-05-13 07:50:19 +01:00 committed by Loïc Blot
parent f286c54908
commit 98327a59c4
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/game.cpp
View File

@ -4524,7 +4524,10 @@ void Game::showPauseMenu()
); );
#else #else
static const std::string control_text_template = strgettext("Controls:\n" static const std::string control_text_template = strgettext("Controls:\n"
"- %s%s%s%s: move\n" "- %s: move forwards\n"
"- %s: move backwards\n"
"- %s: move left\n"
"- %s: move right\n"
"- %s: jump/climb\n" "- %s: jump/climb\n"
"- %s: sneak/go down\n" "- %s: sneak/go down\n"
"- %s: drop item\n" "- %s: drop item\n"
@ -4536,19 +4539,19 @@ void Game::showPauseMenu()
"- %s: chat\n" "- %s: chat\n"
); );
char control_text_buf[500]; char control_text_buf[600];
snprintf(control_text_buf, ARRLEN(control_text_buf), control_text_template.c_str(), snprintf(control_text_buf, ARRLEN(control_text_buf), control_text_template.c_str(),
GET_KEY_NAME(keymap_forward), GET_KEY_NAME(keymap_forward),
GET_KEY_NAME(keymap_left), GET_KEY_NAME(keymap_backward),
GET_KEY_NAME(keymap_backward), GET_KEY_NAME(keymap_left),
GET_KEY_NAME(keymap_right), GET_KEY_NAME(keymap_right),
GET_KEY_NAME(keymap_jump), GET_KEY_NAME(keymap_jump),
GET_KEY_NAME(keymap_sneak), GET_KEY_NAME(keymap_sneak),
GET_KEY_NAME(keymap_drop), GET_KEY_NAME(keymap_drop),
GET_KEY_NAME(keymap_inventory), GET_KEY_NAME(keymap_inventory),
GET_KEY_NAME(keymap_chat) GET_KEY_NAME(keymap_chat)
); );
#endif #endif
@ -4565,7 +4568,7 @@ void Game::showPauseMenu()
os << "button_exit[4," << (ypos++) << ";3,0.5;btn_change_password;" os << "button_exit[4," << (ypos++) << ";3,0.5;btn_change_password;"
<< strgettext("Change Password") << "]"; << strgettext("Change Password") << "]";
} else { } else {
os << "field[4.95,0;5,1.5;;" << strgettext("Game Paused") << ";]"; os << "field[4.95,0;5,1.5;;" << strgettext("Game paused") << ";]";
} }
#ifndef __ANDROID__ #ifndef __ANDROID__
@ -4603,7 +4606,7 @@ void Game::showPauseMenu()
const std::string &creative = g_settings->getBool("creative_mode") ? on : off; const std::string &creative = g_settings->getBool("creative_mode") ? on : off;
const std::string &announced = g_settings->getBool("server_announce") ? on : off; const std::string &announced = g_settings->getBool("server_announce") ? on : off;
os << strgettext("- Damage: ") << damage << "\n" os << strgettext("- Damage: ") << damage << "\n"
<< strgettext("- Creative mode: ") << creative << "\n"; << strgettext("- Creative Mode: ") << creative << "\n";
if (!simple_singleplayer_mode) { if (!simple_singleplayer_mode) {
const std::string &pvp = g_settings->getBool("enable_pvp") ? on : off; const std::string &pvp = g_settings->getBool("enable_pvp") ? on : off;
os << strgettext("- PvP: ") << pvp << "\n" os << strgettext("- PvP: ") << pvp << "\n"