Wuzzy/BlockColor-Engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "New pause menu design (#103)"

Browse Source 
This reverts commit 17b459784012701354f7502324347f17aa0f16cd.
This commit is contained in:
MoNTE48 2018-04-17 20:18:16 +02:00
parent 17be791fea
commit 95f73cebd3
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/game.cpp
View File

@ -4715,34 +4715,29 @@ void Game::showPauseMenu()
os << FORMSPEC_VERSION_STRING << SIZE_TAG os << FORMSPEC_VERSION_STRING << SIZE_TAG
<< "bgcolor[#00000060;true]" << "bgcolor[#00000060;true]"
<< "image_button_exit[4," << (ypos++) << ";3,1;pause_menu_btn.png;btn_continue;" << "button_exit[4," << (ypos++) << ";3,0.5;btn_continue;"
<< strgettext("Continue") << "]"; << strgettext("Continue") << "]";
if (!simple_singleplayer_mode) {
#if !defined(__ANDROID__) && !defined(__IOS__) #if !defined(__ANDROID__) && !defined(__IOS__)
os << "image_button_exit[4," << (ypos++) if (!simple_singleplayer_mode) {
<< ";3,1;pause_menu_btn.png;btn_change_password;" os << "button_exit[4," << (ypos++) << ";3,0.5;btn_change_password;"
<< strgettext("Change Password") << "]"; << strgettext("Change Password") << "]";
#endif
} else { } else {
os << "field[4.65,0;3,1.0;;" << strgettext("Game paused") << ";]"; os << "field[4.5,0;3,1.0;;" << strgettext("Game paused") << ";]";
} }
#endif
#if !defined(__ANDROID__) && !defined(__IOS__) #if !defined(__ANDROID__) && !defined(__IOS__)
os << "image_button_exit[4," << (ypos++) os << "button_exit[4," << (ypos++) << ";3,0.5;btn_sound;"
<< ";3,1;pause_menu_btn.png;btn_sound;"
<< strgettext("Sound Volume") << "]"; << strgettext("Sound Volume") << "]";
os << "image_button_exit[4," << (ypos++) os << "button_exit[4," << (ypos++) << ";3,0.5;btn_key_config;"
<< ";3,1;pause_menu_btn.png;btn_key_config;"
<< strgettext("Change Keys") << "]"; << strgettext("Change Keys") << "]";
#endif #endif
os << "image_button_exit[4," << (ypos++) os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_menu;"
<< ";3,1;pause_menu_btn.png;btn_exit_menu;"
<< strgettext("Save and Exit") << "]" << strgettext("Save and Exit") << "]"
#ifndef __IOS__ #ifndef __IOS__
; // LoL ; // LoL
os << "image_button_exit[4," << (ypos++) os << "button_exit[4," << (ypos++) << ";3,0.5;btn_exit_os;"
<< ";3,1;pause_menu_btn.png;btn_exit_os;"
<< strgettext("Close game") << "]" << strgettext("Close game") << "]"
#endif #endif
/* << "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";] /* << "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]