mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-29 19:40:35 +00:00
Code Issues Releases Wiki Activity

more intuitive mode switching in expansion screen

Browse Source
This commit is contained in:
Zeno Rogue 2018-09-23 14:25:42 +02:00
parent ddba5f0faa
commit 0da01ca11a
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
expansion.cpp
View File

@ -485,18 +485,12 @@ void viewdist_configure_dialog() {
dialog::addBoolItem("use analyzer", use_analyzer, 'a'); dialog::addBoolItem("use analyzer", use_analyzer, 'a');
dialog::add_action([] () { use_analyzer = !use_analyzer; }); dialog::add_action([] () { use_analyzer = !use_analyzer; });
dialog::addBoolItem("show distance lists", show_distance_lists, 'l');
dialog::add_action([] () { show_distance_lists = !show_distance_lists; });
dialog::addSelItem("display distances from", its(first_distance), 'd'); dialog::addSelItem("display distances from", its(first_distance), 'd');
dialog::add_action([] () { dialog::add_action([] () {
scrolling_distances = false; scrolling_distances = false;
dialog::editNumber(first_distance, 0, 3000, 0, 1, "display distances from", ""); dialog::editNumber(first_distance, 0, 3000, 0, 1, "display distances from", "");
}); });
dialog::addItem("disable", 'x');
dialog::add_action([] () { viewdists = false; });
int id = 0; int id = 0;
for(auto& lp: linepatterns::patterns) { for(auto& lp: linepatterns::patterns) {
using namespace linepatterns; using namespace linepatterns;
@ -514,12 +508,17 @@ void viewdist_configure_dialog() {
else else
dialog::addBreak(100); dialog::addBreak(100);
if(distance_from)
dialog::addInfo("numbers show the descendants of current player position");
else
dialog::addBreak(100); dialog::addBreak(100);
dialog::addBack(); dialog::addItem("disable", 'x');
dialog::add_action([] () { viewdists = false; popScreen(); });
dialog::addItem("move the player", 'm');
dialog::add_action([] () { show_distance_lists = false; popScreenAll(); });
dialog::addItem(distance_from ? "show number of descendants by distance" : "show number of cells by distance", 'l');
dialog::add_action([] () { show_distance_lists = true; popScreenAll(); });
dialog::display(); dialog::display();
} }

2
geom-exp.cpp
View File

@ -452,7 +452,7 @@ void showEuclideanMenu() {
gp::configure(); gp::configure();
} }
else if(uni == '2' || sym == SDLK_F1) gotoHelp(euchelp); else if(uni == '2' || sym == SDLK_F1) gotoHelp(euchelp);
else if(uni == '3' && !viewdists) { enable_viewdists(); popScreenAll(); } else if(uni == '3' && !viewdists) { enable_viewdists(); pushScreen(viewdist_configure_dialog); }
else if(uni == '3' && viewdists) { viewdists = false; } else if(uni == '3' && viewdists) { viewdists = false; }
else if(uni == '1' && !euclid) { else if(uni == '1' && !euclid) {
if(sphere) { if(sphere) {