diff --git a/rogueviz/ascending-descending.cpp b/rogueviz/ascending-descending.cpp index 2e35116c..c82ea919 100644 --- a/rogueviz/ascending-descending.cpp +++ b/rogueviz/ascending-descending.cpp @@ -216,7 +216,7 @@ bool draw_ply() { void show() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("Ascending & Descending"), 0xFFFFFFFF, 150, 0); dialog::addSelItem("advance", fts(advance), 'a'); diff --git a/rogueviz/dpgen.cpp b/rogueviz/dpgen.cpp index 3fd0bb28..9a97e14b 100644 --- a/rogueviz/dpgen.cpp +++ b/rogueviz/dpgen.cpp @@ -199,7 +199,8 @@ bool hide_random = false; int last_seed = 0; EX void show_menu() { - gamescreen(1); + cmode = sm::DARKEN; + gamescreen(); dialog::init(XLAT("dual geometry puzzles")); dialog::addHelp(XLAT("move both characters to marked squares at once!")); dialog::addBreak(100); diff --git a/rogueviz/fifteen.cpp b/rogueviz/fifteen.cpp index 6e167481..f7f16294 100644 --- a/rogueviz/fifteen.cpp +++ b/rogueviz/fifteen.cpp @@ -164,7 +164,7 @@ void edit_fifteen() { auto ss = mapstream::save_start(); ss->item = itGold; - gamescreen(0); + gamescreen(); ss->item = itNone; dialog::init("Fifteen Puzzle", iinf[itPalace].color, 150, 100); diff --git a/rogueviz/flocking.cpp b/rogueviz/flocking.cpp index afa0efb5..384138b5 100644 --- a/rogueviz/flocking.cpp +++ b/rogueviz/flocking.cpp @@ -388,7 +388,7 @@ namespace flocking { void show() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("flocking"), iinf[itPalace].color, 150, 0); dialog::addSelItem("initial speed", fts(ini_speed), 'i'); diff --git a/rogueviz/functions.cpp b/rogueviz/functions.cpp index b4b8b665..4d07c66b 100644 --- a/rogueviz/functions.cpp +++ b/rogueviz/functions.cpp @@ -87,7 +87,7 @@ int editwhich = -1; void show_graph() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("graph")); for(int i=0; ixcenter - xc - x0) / siz; int y = (mousey - cd->ycenter - yc - y0) / siz; diff --git a/rogueviz/nilrider/nilrider.cpp b/rogueviz/nilrider/nilrider.cpp index 278d1099..39c1fd09 100644 --- a/rogueviz/nilrider/nilrider.cpp +++ b/rogueviz/nilrider/nilrider.cpp @@ -184,7 +184,7 @@ void run() { cmode |= sm::SHOWCURSOR; if(aimspeed_mouse_x == 0 && aimspeed_mouse_y == 0) cmode |= sm::SHOWCURSOR; - gamescreen(0); + gamescreen(); if(planning_mode && !view_replay) { curlev->draw_planning_screen(); if(!holdmouse) { diff --git a/rogueviz/notknot.cpp b/rogueviz/notknot.cpp index f5f158e9..fac3e6ff 100644 --- a/rogueviz/notknot.cpp +++ b/rogueviz/notknot.cpp @@ -1271,13 +1271,13 @@ void launch_solv() { void show() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("notknot"), 0xFFFFFFFF, 150, 0); dialog::addItem("available scenes", 'a'); dialog::add_action_push([] { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("notknot scenes"), 0xFFFFFFFF, 150, 0); diff --git a/rogueviz/objmodels.cpp b/rogueviz/objmodels.cpp index 77eb3de0..753fce4d 100644 --- a/rogueviz/objmodels.cpp +++ b/rogueviz/objmodels.cpp @@ -314,7 +314,7 @@ void add_model_settings() { auto cf = addHook(hooks_configfile, 100, [] { param_f(prec, "obj_prec") ->editable(1, 100, 1, "3D model precision", "higher-precision models take more time to load and to render.", 'p') - ->set_sets([] { dialog::numberdark = dialog::DONT_SHOW; }) + ->set_sets([] { cmode = sm::NOSCR; }) ; param_b(shift_to_ctr, "shift_to_ctr"); }); diff --git a/rogueviz/pentagonal.cpp b/rogueviz/pentagonal.cpp index 52699cde..0219685a 100644 --- a/rogueviz/pentagonal.cpp +++ b/rogueviz/pentagonal.cpp @@ -290,7 +290,7 @@ void rugframe() { void show() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init("Pentagonal Exploration"); auto add_key = [] (char c, int a, int b) { dialog::addBoolItem(lalign(0, "based on {",a,",",b,"}"), global_v == a && global_w == b, c); diff --git a/rogueviz/planets.cpp b/rogueviz/planets.cpp index d99d4f3f..ddf20f9c 100644 --- a/rogueviz/planets.cpp +++ b/rogueviz/planets.cpp @@ -433,7 +433,7 @@ EX void compare() { void choose_projection() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("choose projection"), 0xFFFFFFFF, 150, 0); dynamicval di(index); for(int i=0; i<8; i++) { @@ -450,7 +450,7 @@ void choose_projection() { void choose_planet(texture::texture_data *& t) { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("choose the planet"), 0xFFFFFFFF, 150, 0); for(auto opt: {&earth, &moon, &sun, &mars, &neptune}) { dialog::addSelItem(pname[opt], its(radius[opt]) + " km", key[opt]); @@ -462,7 +462,7 @@ void choose_planet(texture::texture_data *& t) { void show() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("projections between planets"), 0xFFFFFFFF, 150, 0); add_edit(alpha); add_edit(latit); diff --git a/rogueviz/platformer.cpp b/rogueviz/platformer.cpp index 8f2dbcb6..2ad0c33c 100644 --- a/rogueviz/platformer.cpp +++ b/rogueviz/platformer.cpp @@ -694,7 +694,7 @@ void run() { sprite_vertices.tvertices.clear(); if(map_on) { render_room(current_room); - gamescreen(0); + gamescreen(); } else { draw_room(); diff --git a/rogueviz/playing-with-impossibility.cpp b/rogueviz/playing-with-impossibility.cpp index b063d9cc..65005a3d 100644 --- a/rogueviz/playing-with-impossibility.cpp +++ b/rogueviz/playing-with-impossibility.cpp @@ -608,7 +608,8 @@ slide dmv_slides[] = { empty_screen(mode); show_picture(mode, "rogueviz/nil/penrose-triangle.png"); add_stat(mode, [] { - gamescreen(2); + cmode |= sm::DARKEN; + gamescreen(); dialog::init(); dialog::addBreak(400); dialog::addTitle("playing with impossibility", dialog::dialogcolor, 150); diff --git a/rogueviz/presentation.cpp b/rogueviz/presentation.cpp index 894db91b..4f53394b 100644 --- a/rogueviz/presentation.cpp +++ b/rogueviz/presentation.cpp @@ -323,7 +323,8 @@ void show_animation(presmode mode, string s, int sx, int sy, int frames, int fps } void choose_presentation() { - gamescreen(2); + cmode = sm::NOSCR; + gamescreen(); getcstat = ' '; diff --git a/rogueviz/random-walk.cpp b/rogueviz/random-walk.cpp index e4b4c983..7636eb95 100644 --- a/rogueviz/random-walk.cpp +++ b/rogueviz/random-walk.cpp @@ -111,7 +111,7 @@ int args() { void show() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("random walk"), 0xFFFFFFFF, 150, 0); dialog::addSelItem("step size", fts(step_size), 'd'); diff --git a/rogueviz/rogueviz.cpp b/rogueviz/rogueviz.cpp index f6f9dccb..8af44dfb 100644 --- a/rogueviz/rogueviz.cpp +++ b/rogueviz/rogueviz.cpp @@ -1062,7 +1062,7 @@ int readArgs() { void configure_edge_display() { cmode = sm::SIDE | sm::MAYDARK | sm::DIALOG_STRICT_X; static int mode = 0; - gamescreen(0); + gamescreen(); dialog::init(XLAT("rogueviz edges")); for(int i=0; i& v, string title, string desc, reaction_t t) void show() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("snowballs"), 0xFFFFFFFF, 150, 0); dialog::addSelItem("lambda", fts(snow_lambda), 'l'); diff --git a/rogueviz/som/kohonen.cpp b/rogueviz/som/kohonen.cpp index 42424423..7b9dc6f0 100644 --- a/rogueviz/som/kohonen.cpp +++ b/rogueviz/som/kohonen.cpp @@ -1041,8 +1041,8 @@ namespace levelline { void show() { if(levellines.size() == 0) create(); - gamescreen(0); cmode = sm::SIDE | sm::MAYDARK; + gamescreen(); dialog::init("level lines"); char nx = 'a'; for(auto &l : levellines) { diff --git a/rogueviz/staircase.cpp b/rogueviz/staircase.cpp index 8e2e5b52..96b15a3f 100644 --- a/rogueviz/staircase.cpp +++ b/rogueviz/staircase.cpp @@ -191,7 +191,7 @@ void make_staircase() { void showMenu() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("Spiral Staircase"), iinf[itPalace].color, 150, 0); add_edit(scurvature); diff --git a/rogueviz/sumotron.cpp b/rogueviz/sumotron.cpp index 53247493..37bd2ead 100644 --- a/rogueviz/sumotron.cpp +++ b/rogueviz/sumotron.cpp @@ -49,7 +49,7 @@ void sumotron_puzzle() { cmode = 0; if(dialog_shown) cmode = sm::SIDE | sm::DIALOG_STRICT_X | sm::MAYDARK; dynamicval dp(mapeditor::drawplayer, false); - gamescreen(0); + gamescreen(); initquickqueue(); for(auto p: value) { diff --git a/rogueviz/sunflower.cpp b/rogueviz/sunflower.cpp index b4a0f435..80ca7f06 100644 --- a/rogueviz/sunflower.cpp +++ b/rogueviz/sunflower.cpp @@ -244,7 +244,7 @@ int readArgs() { void show() { cmode = sm::SIDE | sm::MAYDARK; - gamescreen(0); + gamescreen(); dialog::init(XLAT("sunflower spirals"), 0xFFFFFFFF, 150, 0); dialog::addSelItem("density", fts(zdensity), 'd');