mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-23 13:07:16 +00:00
Code Issues Releases Wiki Activity

made background screen darkening consistent and optional

Browse Source
This commit is contained in:
Zeno Rogue 2022-07-05 11:51:06 +02:00
parent b3a394c266
commit 75f58766a2
39 changed files with 170 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arbitrile.cpp
View File

@ -936,7 +936,7 @@ string primes(int i) {
void connection_debugger() { void connection_debugger() {
cmode = sm::SIDE | sm::DIALOG_STRICT_X; cmode = sm::SIDE | sm::DIALOG_STRICT_X;
gamescreen(0); gamescreen();
auto& last = debug_polys.back(); auto& last = debug_polys.back();
@ -1331,7 +1331,7 @@ EX void sliders_changed(bool need_restart, bool need_start) {
EX void set_sliders() { EX void set_sliders() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init(XLAT("tessellation sliders")); dialog::init(XLAT("tessellation sliders"));
dialog::addHelp(current.comment); dialog::addHelp(current.comment);
char ch = 'A'; char ch = 'A';

2
archimedean.cpp
View File

@ -1323,7 +1323,7 @@ EX void show() {
} }
} }
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("Archimedean tilings")); dialog::init(XLAT("Archimedean tilings"));
if(symbol_editing) { if(symbol_editing) {

2
asonov.cpp
View File

@ -226,7 +226,7 @@ EX void prepare_config() {
EX void show_config() { EX void show_config() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init(XLAT("Solv quotient spaces")); dialog::init(XLAT("Solv quotient spaces"));
dialog::addSelItem(XLAT("%1 period", "X/Y"), its(period_xy_edit), 'x'); dialog::addSelItem(XLAT("%1 period", "X/Y"), its(period_xy_edit), 'x');

56
config.cpp
View File

@ -738,6 +738,10 @@ EX void initConfig() {
param_enum(vid.graphglyph, "graphglyph", "graphical items/kills", 1) param_enum(vid.graphglyph, "graphglyph", "graphical items/kills", 1)
-> editable({{"letters", ""}, {"auto", ""}, {"images", ""}}, "inventory/kill mode", 'd'); -> editable({{"letters", ""}, {"auto", ""}, {"images", ""}}, "inventory/kill mode", 'd');
param_i(menu_darkening, "menu_darkening", 2)
-> editable(0, 8, 1, "menu map darkening", "A larger number means darker game map in the background. Set to 8 to disable the background.", 'd')
-> set_sets([] { dialog::bound_low(0); dialog::bound_up(8); dialog::dialogflags |= sm::DARKEN; });
addsaver(vid.flasheffects, "flasheffects", 1); addsaver(vid.flasheffects, "flasheffects", 1);
param_f(vid.binary_width, "bwidth", "binary-tiling-width", 1); param_f(vid.binary_width, "bwidth", "binary-tiling-width", 1);
@ -1355,7 +1359,7 @@ EX void edit_sightrange() {
#if CAP_RUG #if CAP_RUG
USING_NATIVE_GEOMETRY_IN_RUG; USING_NATIVE_GEOMETRY_IN_RUG;
#endif #endif
gamescreen(0); gamescreen();
dialog::init("sight range settings"); dialog::init("sight range settings");
add_edit(vid.use_smart_range); add_edit(vid.use_smart_range);
if(vid.use_smart_range) if(vid.use_smart_range)
@ -1476,7 +1480,7 @@ EX void menuitem_sightrange(char c IS('c')) {
EX void sets_sfx_volume() { EX void sets_sfx_volume() {
#if CAP_AUDIO #if CAP_AUDIO
dialog::numberdark = dialog::DONT_SHOW; dialog::dialogflags = sm::NOSCR;
#if ISANDROID #if ISANDROID
dialog::reaction = [] () { dialog::reaction = [] () {
settingsChanged = true; settingsChanged = true;
@ -1489,7 +1493,7 @@ EX void sets_sfx_volume() {
EX void sets_music_volume() { EX void sets_music_volume() {
#if CAP_AUDIO #if CAP_AUDIO
dialog::numberdark = dialog::DONT_SHOW; dialog::dialogflags = sm::NOSCR;
dialog::reaction = [] () { dialog::reaction = [] () {
#if CAP_SDLAUDIO #if CAP_SDLAUDIO
Mix_VolumeMusic(musicvolume); Mix_VolumeMusic(musicvolume);
@ -1510,7 +1514,7 @@ EX void sets_music_volume() {
EX void showSpecialEffects() { EX void showSpecialEffects() {
cmode = vid.xres > vid.yres * 1.4 ? sm::SIDE : sm::MAYDARK; cmode = vid.xres > vid.yres * 1.4 ? sm::SIDE : sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("extra graphical effects")); dialog::init(XLAT("extra graphical effects"));
dialog::addBoolItem_action(XLAT("particles on attack"), (vid.particles), 'p'); dialog::addBoolItem_action(XLAT("particles on attack"), (vid.particles), 'p');
@ -1526,7 +1530,7 @@ EX void showSpecialEffects() {
EX void show_vector_settings() { EX void show_vector_settings() {
cmode = vid.xres > vid.yres * 1.4 ? sm::SIDE : sm::MAYDARK; cmode = vid.xres > vid.yres * 1.4 ? sm::SIDE : sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("vector settings")); dialog::init(XLAT("vector settings"));
dialog::addSelItem(XLAT("line width"), fts(vid.linewidth), 'w'); dialog::addSelItem(XLAT("line width"), fts(vid.linewidth), 'w');
@ -1575,7 +1579,7 @@ EX void show_vector_settings() {
EX void showGraphConfig() { EX void showGraphConfig() {
cmode = vid.xres > vid.yres * 1.4 ? sm::SIDE : sm::MAYDARK; cmode = vid.xres > vid.yres * 1.4 ? sm::SIDE : sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("graphics configuration")); dialog::init(XLAT("graphics configuration"));
@ -1755,7 +1759,8 @@ EX void edit_whatever(char type, int index) {
} }
EX void configureOther() { EX void configureOther() {
gamescreen(3); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("other settings")); dialog::init(XLAT("other settings"));
@ -1793,7 +1798,8 @@ EX void configureOther() {
} }
EX void configureInterface() { EX void configureInterface() {
gamescreen(3); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("interface")); dialog::init(XLAT("interface"));
#if CAP_TRANS #if CAP_TRANS
@ -1839,6 +1845,8 @@ EX void configureInterface() {
}; };
}); });
add_edit(menu_darkening);
dialog::addBreak(50); dialog::addBreak(50);
dialog::addBack(); dialog::addBack();
@ -1847,7 +1855,8 @@ EX void configureInterface() {
#if CAP_SDLJOY #if CAP_SDLJOY
EX void showJoyConfig() { EX void showJoyConfig() {
gamescreen(4); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("joystick configuration")); dialog::init(XLAT("joystick configuration"));
@ -2018,7 +2027,7 @@ bool supported_ods() {
EX void showStereo() { EX void showStereo() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("stereo vision config")); dialog::init(XLAT("stereo vision config"));
add_edit(vid.stereo_mode); add_edit(vid.stereo_mode);
@ -2137,7 +2146,7 @@ EX void edit_levellines(char c) {
EX void show3D() { EX void show3D() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("3D configuration")); dialog::init(XLAT("3D configuration"));
if(GDIM == 2) { if(GDIM == 2) {
@ -2479,7 +2488,8 @@ EX void showCustomizeChar() {
cc_footphase += hypot(mousex - lmousex, mousey - lmousey); cc_footphase += hypot(mousex - lmousex, mousey - lmousey);
lmousex = mousex; lmousey = mousey; lmousex = mousex; lmousey = mousey;
gamescreen(4); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("Customize character")); dialog::init(XLAT("Customize character"));
if(shmup::on || multi::players) multi::cpid = multi::cpid_edit % multi::players; if(shmup::on || multi::players) multi::cpid = multi::cpid_edit % multi::players;
@ -2562,7 +2572,7 @@ EX void refresh_canvas() {
EX void edit_color_table(colortable& ct, const reaction_t& r IS(reaction_t()), bool has_bit IS(false)) { EX void edit_color_table(colortable& ct, const reaction_t& r IS(reaction_t()), bool has_bit IS(false)) {
cmode = sm::SIDE; cmode = sm::SIDE;
gamescreen(0); gamescreen();
dialog::init(XLAT("colors & aura")); dialog::init(XLAT("colors & aura"));
for(int i=0; i<isize(ct); i++) { for(int i=0; i<isize(ct); i++) {
@ -2587,7 +2597,7 @@ EX void edit_color_table(colortable& ct, const reaction_t& r IS(reaction_t()), b
EX void show_color_dialog() { EX void show_color_dialog() {
cmode = sm::SIDE | sm::DIALOG_STRICT_X; cmode = sm::SIDE | sm::DIALOG_STRICT_X;
getcstat = '-'; getcstat = '-';
gamescreen(0); gamescreen();
dialog::init(XLAT("colors & aura")); dialog::init(XLAT("colors & aura"));
dialog::addColorItem(XLAT("background"), backcolor << 8, 'b'); dialog::addColorItem(XLAT("background"), backcolor << 8, 'b');
@ -2731,7 +2741,8 @@ EX void resetConfigMenu() {
#if CAP_TRANS #if CAP_TRANS
EX void selectLanguageScreen() { EX void selectLanguageScreen() {
gamescreen(4); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init("select language"); // intentionally not translated dialog::init("select language"); // intentionally not translated
int v = vid.language; int v = vid.language;
@ -2789,7 +2800,8 @@ EX void selectLanguageScreen() {
#endif #endif
EX void configureMouse() { EX void configureMouse() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("mouse & touchscreen")); dialog::init(XLAT("mouse & touchscreen"));
dialog::addBoolItem_action(XLAT("reverse pointer control"), (vid.revcontrol), 'r'); dialog::addBoolItem_action(XLAT("reverse pointer control"), (vid.revcontrol), 'r');
@ -2869,7 +2881,8 @@ template<class T> void add_edit(T& val) {
#endif #endif
EX void find_setting() { EX void find_setting() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("find a setting")); dialog::init(XLAT("find a setting"));
if(dialog::infix != "") mouseovers = dialog::infix; if(dialog::infix != "") mouseovers = dialog::infix;
@ -2903,7 +2916,8 @@ EX void find_setting() {
} }
EX void edit_all_settings() { EX void edit_all_settings() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("recently changed settings")); dialog::init(XLAT("recently changed settings"));
for(auto &fs: params) fs.second->check_change(); for(auto &fs: params) fs.second->check_change();
@ -2925,7 +2939,8 @@ void list_setting::show_edit_option(char key) {
dialog::addSelItem(XLAT(menu_item_name), XLAT(opt), key); dialog::addSelItem(XLAT(menu_item_name), XLAT(opt), key);
dialog::add_action_push([this] { dialog::add_action_push([this] {
add_to_changed(this); add_to_changed(this);
gamescreen(2); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT(menu_item_name)); dialog::init(XLAT(menu_item_name));
dialog::addBreak(100); dialog::addBreak(100);
int q = isize(options); int q = isize(options);
@ -2945,7 +2960,8 @@ void list_setting::show_edit_option(char key) {
} }
EX void showSettings() { EX void showSettings() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("settings")); dialog::init(XLAT("settings"));
dialog::addItem(XLAT("interface"), 'i'); dialog::addItem(XLAT("interface"), 'i');

2
control.cpp
View File

@ -1405,7 +1405,7 @@ void delayed_reset() {
EX void show() { EX void show() {
#if CAP_ORIENTATION #if CAP_ORIENTATION
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("scrolling by device rotation")); dialog::init(XLAT("scrolling by device rotation"));

5
crystal.cpp
View File

@ -1443,7 +1443,8 @@ string make_help() {
} }
EX void crystal_knight_help() { EX void crystal_knight_help() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(); dialog::init();
dialog::addHelp(XLAT( dialog::addHelp(XLAT(
@ -1467,7 +1468,7 @@ EX void crystal_knight_help() {
EX void show() { EX void show() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("dimensional crystal")); dialog::init(XLAT("dimensional crystal"));
for(int i=5; i<=14; i++) { for(int i=5; i<=14; i++) {
string s; string s;

5
debug.cpp
View File

@ -293,7 +293,7 @@ struct debugScreen {
void operator () () { void operator () () {
cmode = sm::SIDE | sm::DIALOG_STRICT_X; cmode = sm::SIDE | sm::DIALOG_STRICT_X;
gamescreen(0); gamescreen();
getcstat = '-'; getcstat = '-';
dialog::init(show_debug_data ? XLAT("debug values") : XLAT("internal details")); dialog::init(show_debug_data ? XLAT("debug values") : XLAT("internal details"));
@ -468,7 +468,8 @@ EX void push_debug_screen() {
/** show the cheat menu */ /** show the cheat menu */
EX void showCheatMenu() { EX void showCheatMenu() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init("cheat menu"); dialog::init("cheat menu");
for(auto& ch: cheats) { for(auto& ch: cheats) {
dialog::addItem(XLAT(ch.desc), ch.key); dialog::addItem(XLAT(ch.desc), ch.key);

17
dialogs.cpp
View File

@ -683,7 +683,7 @@ EX namespace dialog {
EX void drawColorDialog() { EX void drawColorDialog() {
cmode = sm::NUMBER | dialogflags; cmode = sm::NUMBER | dialogflags;
if(cmode & sm::SIDE) gamescreen(0); if(cmode & sm::SIDE) gamescreen();
else emptyscreen(); else emptyscreen();
dcenter = vid.xres/2; dcenter = vid.xres/2;
@ -827,8 +827,6 @@ EX namespace dialog {
}; };
} }
EX int numberdark;
EX void formula_keyboard(bool lr) { EX void formula_keyboard(bool lr) {
addKeyboardItem("1234567890"); addKeyboardItem("1234567890");
addKeyboardItem("=+-*/^()\x3"); addKeyboardItem("=+-*/^()\x3");
@ -891,9 +889,7 @@ EX namespace dialog {
EX void drawNumberDialog() { EX void drawNumberDialog() {
cmode = sm::NUMBER | dialogflags; cmode = sm::NUMBER | dialogflags;
if(numberdark < DONT_SHOW) gamescreen();
gamescreen(numberdark);
else emptyscreen();
init(ne.title); init(ne.title);
addInfo(ne.s); addInfo(ne.s);
if(ne.intval && ne.sc.direct == &identity_f) if(ne.intval && ne.sc.direct == &identity_f)
@ -1057,7 +1053,6 @@ EX namespace dialog {
reaction = reaction_t(); reaction = reaction_t();
reaction_final = reaction_t(); reaction_final = reaction_t();
extra_options = reaction_t(); extra_options = reaction_t();
numberdark = 0;
ne.animatable = true; ne.animatable = true;
#if CAP_ANIMATIONS #if CAP_ANIMATIONS
anims::get_parameter_animation(x, ne.s); anims::get_parameter_animation(x, ne.s);
@ -1297,9 +1292,7 @@ EX namespace dialog {
EX void string_edit_dialog() { EX void string_edit_dialog() {
cmode = sm::NUMBER | dialogflags; cmode = sm::NUMBER | dialogflags;
if(numberdark < DONT_SHOW) gamescreen();
gamescreen(numberdark);
else emptyscreen();
init(ne.title); init(ne.title);
addInfo(view_edited_string()); addInfo(view_edited_string());
addBreak(100); addBreak(100);
@ -1336,11 +1329,11 @@ EX namespace dialog {
pushScreen(string_edit_dialog); pushScreen(string_edit_dialog);
reaction = reaction_t(); reaction = reaction_t();
extra_options = reaction_t(); extra_options = reaction_t();
numberdark = 0;
} }
EX void confirm_dialog(const string& text, const reaction_t& act) { EX void confirm_dialog(const string& text, const reaction_t& act) {
gamescreen(1); cmode = sm::DARKEN;
gamescreen();
dialog::addBreak(250); dialog::addBreak(250);
dialog::init(XLAT("WARNING"), 0xFF0000, 150, 100); dialog::init(XLAT("WARNING"), 0xFF0000, 150, 100);
dialog::addHelp(text); dialog::addHelp(text);

2
euclid.cpp
View File

@ -882,7 +882,7 @@ EX namespace euc {
auto& T_edit = eu_edit.user_axes; auto& T_edit = eu_edit.user_axes;
auto& twisted_edit = eu_edit.twisted; auto& twisted_edit = eu_edit.twisted;
cmode = sm::SIDE | sm::MAYDARK | sm::TORUSCONFIG; cmode = sm::SIDE | sm::MAYDARK | sm::TORUSCONFIG;
gamescreen(1); gamescreen();
dialog::init(XLAT("Euclidean quotient spaces")); dialog::init(XLAT("Euclidean quotient spaces"));
for(int y=0; y<dim+1; y++) for(int y=0; y<dim+1; y++)

2
expansion.cpp
View File

@ -631,7 +631,7 @@ void celldrawer::do_viewdist() {
EX void viewdist_configure_dialog() { EX void viewdist_configure_dialog() {
dialog::init(""); dialog::init("");
cmode |= sm::SIDE | sm::MAYDARK | sm::EXPANSION; cmode |= sm::SIDE | sm::MAYDARK | sm::EXPANSION;
gamescreen(0); gamescreen();
dialog::addSelItem(XLAT("which distance"), XLAT(dfnames[distance_from]), 'c'); dialog::addSelItem(XLAT("which distance"), XLAT(dfnames[distance_from]), 'c');
dialog::add_action([] () { distance_from = mod_allowed() ? eDistanceFrom((distance_from + 1) % 3) : eDistanceFrom(2 - distance_from); }); dialog::add_action([] () { distance_from = mod_allowed() ? eDistanceFrom((distance_from + 1) % 3) : eDistanceFrom(2 - distance_from); });

19
geom-exp.cpp
View File

@ -40,7 +40,8 @@ string euchelp =
#if CAP_FIELD #if CAP_FIELD
void showQuotientConfig() { void showQuotientConfig() {
using namespace fieldpattern; using namespace fieldpattern;
gamescreen(2); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("field quotient")); dialog::init(XLAT("field quotient"));
fgeomextra& gxcur = fgeomextras[current_extra]; fgeomextra& gxcur = fgeomextras[current_extra];
for(int i=0; i<isize(fgeomextras); i++) { for(int i=0; i<isize(fgeomextras); i++) {
@ -102,7 +103,8 @@ void showQuotientConfig() {
auto& cfp = currfp; auto& cfp = currfp;
auto triplets = cfp.find_triplets(); auto triplets = cfp.find_triplets();
pushScreen([triplets] { pushScreen([triplets] {
gamescreen(2); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("alternate manifolds")); dialog::init(XLAT("alternate manifolds"));
int id = 0; int id = 0;
for(auto t: triplets) { for(auto t: triplets) {
@ -153,7 +155,7 @@ string validclasses[4] = {" (X)", " (½)", "", " (!)"};
EX void ge_land_selection() { EX void ge_land_selection() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
if(cheater) for(int i=0; i<landtypes; i++) landvisited[i] = true; if(cheater) for(int i=0; i<landtypes; i++) landvisited[i] = true;
@ -275,7 +277,7 @@ EX vector<geometry_filter*> available_filters = { &gf_hyperbolic, &gf_spherical,
void ge_select_filter() { void ge_select_filter() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(2); gamescreen();
dialog::init(XLAT("geometries")); dialog::init(XLAT("geometries"));
@ -365,7 +367,7 @@ bool same_tiling(eGeometry g2) {
void ge_select_tiling() { void ge_select_tiling() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
if(!current_filter) { popScreen(); return; } if(!current_filter) { popScreen(); return; }
dialog::init(); dialog::init();
@ -447,7 +449,8 @@ EX string dim_name() {
EX void showQuotientConfig3() { EX void showQuotientConfig3() {
using namespace fieldpattern; using namespace fieldpattern;
gamescreen(2); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("field quotient")); dialog::init(XLAT("field quotient"));
auto& ds = discoveries[cginf.tiling_name]; auto& ds = discoveries[cginf.tiling_name];
@ -546,7 +549,7 @@ EX string geometry_name() {
EX void select_quotient_screen() { EX void select_quotient_screen() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("quotient spaces in ") + ginf[geometry].tiling_name); dialog::init(XLAT("quotient spaces in ") + ginf[geometry].tiling_name);
char key = 'a'; char key = 'a';
@ -932,7 +935,7 @@ EX void showEuclideanMenu() {
// for(int i=2; i<lt; i++) landvisited[i] = true; // for(int i=2; i<lt; i++) landvisited[i] = true;
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("experiment with geometry")); dialog::init(XLAT("experiment with geometry"));

2
goldberg.cpp
View File

@ -806,7 +806,7 @@ EX namespace gp {
void show() { void show() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("variations")); dialog::init(XLAT("variations"));
int min_quality_chess = 0; int min_quality_chess = 0;

35
graph.cpp
View File

@ -5323,14 +5323,21 @@ extern bool wclick;
EX bool just_refreshing; EX bool just_refreshing;
EX void gamescreen(int _darken) { EX int menu_darkening = 2;
EX void gamescreen() {
if(cmode & sm::NOSCR) {
emptyscreen();
return;
}
if(just_refreshing) return; if(just_refreshing) return;
if(subscreens::split([=] () { if(subscreens::split([=] () {
calcparam(); calcparam();
compute_graphical_distance(); compute_graphical_distance();
gamescreen(_darken); gamescreen();
})) { })) {
if(racing::on) return; if(racing::on) return;
// create the gmatrix // create the gmatrix
@ -5348,7 +5355,7 @@ EX void gamescreen(int _darken) {
if(dual::split([=] () { if(dual::split([=] () {
vid.xres = gx; vid.xres = gx;
vid.yres = gy; vid.yres = gy;
dual::in_subscreen([=] () { gamescreen(_darken); }); dual::in_subscreen([=] () { gamescreen(); });
})) { })) {
calcparam(); calcparam();
return; return;
@ -5356,12 +5363,20 @@ EX void gamescreen(int _darken) {
calcparam(); calcparam();
if((cmode & sm::MAYDARK) && !current_display->sidescreen && !inHighQual) { darken = 0;
_darken += 2;
}
darken = _darken; if(!inHighQual && !vrhr::active()) {
if(vrhr::active()) darken = 0; if((cmode & sm::MAYDARK) && !current_display->sidescreen)
darken += menu_darkening;
else if(cmode & sm::DARKEN)
darken += menu_darkening;
}
if(vid.highlightmode == (hiliteclick ? 0 : 2))
darken++;
if(darken >= 8) {
emptyscreen();
return;
}
if(history::includeHistory) history::restore(); if(history::includeHistory) history::restore();
@ -5434,7 +5449,7 @@ EX void normalscreen() {
if(GDIM == 3 || !outofmap(mouseh.h)) getcstat = '-'; if(GDIM == 3 || !outofmap(mouseh.h)) getcstat = '-';
cmode = sm::NORMAL | sm::DOTOUR | sm::CENTER; cmode = sm::NORMAL | sm::DOTOUR | sm::CENTER;
if(viewdists && show_distance_lists) cmode |= sm::SIDE | sm::MAYDARK; if(viewdists && show_distance_lists) cmode |= sm::SIDE | sm::MAYDARK;
gamescreen((vid.highlightmode == (hiliteclick ? 0 : 2)) ? 1 : 0); drawStats(); gamescreen(); drawStats();
if(nomenukey || ISMOBILE) if(nomenukey || ISMOBILE)
; ;
#if CAP_TOUR #if CAP_TOUR
@ -5491,6 +5506,8 @@ namespace sm {
static const int VR_MENU = (1<<18); // always show the menu in VR static const int VR_MENU = (1<<18); // always show the menu in VR
static const int SHOWCURSOR = (1<<19); // despite MAP/DRAW always show the cursor, no panning static const int SHOWCURSOR = (1<<19); // despite MAP/DRAW always show the cursor, no panning
static const int PANNING = (1<<20); // smooth scrolling works static const int PANNING = (1<<20); // smooth scrolling works
static const int DARKEN = (1<<21); // darken the game background
static const int NOSCR = (1<<22); // do not show the game background
} }
#endif #endif

4
help.cpp
View File

@ -1072,14 +1072,14 @@ EX void describeMouseover() {
} }
EX void showHelp() { EX void showHelp() {
cmode = sm::HELP | sm::DOTOUR; cmode = sm::HELP | sm::DOTOUR | sm::DARKEN;
getcstat = SDLK_ESCAPE; getcstat = SDLK_ESCAPE;
if(help == "HELPFUN") { if(help == "HELPFUN") {
help_delegate(); help_delegate();
return; return;
} }
gamescreen(2); gamescreen();
string help2; string help2;
if(help[0] == '@') { if(help[0] == '@') {
int iv = help.find("\t"); int iv = help.find("\t");

4
history.cpp
View File

@ -190,7 +190,7 @@ EX namespace history {
int lastprogress; int lastprogress;
EX void progress_screen() { EX void progress_screen() {
gamescreen(0); gamescreen();
mouseovers = ""; mouseovers = "";
} }
@ -570,7 +570,7 @@ EX namespace history {
EX void history_menu() { EX void history_menu() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("history mode")); dialog::init(XLAT("history mode"));

3
hyperweb.cpp
View File

@ -136,7 +136,8 @@ void toggleanim(bool v) {
} }
void showDemo() { void showDemo() {
gamescreen(2); cmode = sm::DARKEN;
gamescreen();
getcstat = ' '; getcstat = ' ';

3
intra.cpp
View File

@ -644,7 +644,8 @@ void erase_unconnected(cellwalker cw) {
int edit_spin; int edit_spin;
EX void show_portals() { EX void show_portals() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("manage portals")); dialog::init(XLAT("manage portals"));

4
inventory.cpp
View File

@ -490,10 +490,10 @@ EX namespace inv {
if(remaining[itOrbSword]) items[itOrbSword]++; if(remaining[itOrbSword]) items[itOrbSword]++;
if(remaining[itOrbSword2]) items[itOrbSword2]++; if(remaining[itOrbSword2]) items[itOrbSword2]++;
gamescreen(2); cmode = sm::CENTER | sm::DARKEN;
gamescreen();
if(remaining[itOrbSword]) items[itOrbSword]--; if(remaining[itOrbSword]) items[itOrbSword]--;
if(remaining[itOrbSword2]) items[itOrbSword2]--; if(remaining[itOrbSword2]) items[itOrbSword2]--;
cmode = sm::CENTER;
orbcoord.clear(); orbcoord.clear();
for(int y=-3; y<=3; y++) for(int x=-5; x<=5; x++) if(x+y<=6 && x+y >= -6 && (x||y)) for(int y=-3; y<=3; y++) for(int x=-5; x<=5; x++) if(x+y<=6 && x+y >= -6 && (x||y))

2
irregular.cpp
View File

@ -868,7 +868,7 @@ bool too_small_euclidean() {
void show_gridmaker() { void show_gridmaker() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("irregular grid")); dialog::init(XLAT("irregular grid"));
dialog::addSelItem(XLAT("density"), fts(density), 'd'); dialog::addSelItem(XLAT("density"), fts(density), 'd');
dialog::add_action([] { dialog::add_action([] {

6
mapeditor.cpp
View File

@ -1361,7 +1361,7 @@ EX namespace mapeditor {
EX void showMapEditor() { EX void showMapEditor() {
cmode = sm::MAP | sm::PANNING; cmode = sm::MAP | sm::PANNING;
gamescreen(0); gamescreen();
int fs = editor_fsize(); int fs = editor_fsize();
@ -2042,7 +2042,7 @@ EX namespace mapeditor {
EX void showDrawEditor() { EX void showDrawEditor() {
#if CAP_POLY #if CAP_POLY
cmode = sm::DRAW | sm::PANNING; cmode = sm::DRAW | sm::PANNING;
gamescreen(0); gamescreen();
drawGrid(); drawGrid();
if(callhandlers(false, hooks_prestats)) return; if(callhandlers(false, hooks_prestats)) return;
@ -3159,7 +3159,7 @@ EX namespace mapeditor {
EX void map_settings() { EX void map_settings() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init(XLAT("Map settings")); dialog::init(XLAT("Map settings"));

14
menus.cpp
View File

@ -221,7 +221,7 @@ EX const char *hlmodes[3] = {"press Alt", "highlight", "super-highlight"};
EX void showGraphQuickKeys() { EX void showGraphQuickKeys() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("quick options")); dialog::init(XLAT("quick options"));
@ -309,7 +309,7 @@ EX void switch_casual() {
EX void showCreative() { EX void showCreative() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(3); gamescreen();
dialog::init(XLAT("creative mode")); dialog::init(XLAT("creative mode"));
#if CAP_EDIT #if CAP_EDIT
@ -382,7 +382,8 @@ EX void showCreative() {
} }
EX void show_chaos() { EX void show_chaos() {
gamescreen(3); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("land structure")); dialog::init(XLAT("land structure"));
chaosUnlocked = chaosUnlocked || autocheat; chaosUnlocked = chaosUnlocked || autocheat;
@ -439,7 +440,8 @@ EX void show_chaos() {
} }
EX void mode_higlights() { EX void mode_higlights() {
gamescreen(3); cmode = sm::NOSCR;
gamescreen();
dialog::init(XLAT("highlights & achievements")); dialog::init(XLAT("highlights & achievements"));
dialog::addBigItem(XLATN("Space Rocks"), 'r'); dialog::addBigItem(XLATN("Space Rocks"), 'r');
@ -623,7 +625,8 @@ EX void menuitem_land_structure(char key) {
} }
EX void showChangeMode() { EX void showChangeMode() {
gamescreen(3); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("special modes")); dialog::init(XLAT("special modes"));
dialog::addBoolItem(XLAT("experiment with geometry"), geometry || CHANGED_VARIATION || viewdists, 'e'); dialog::addBoolItem(XLAT("experiment with geometry"), geometry || CHANGED_VARIATION || viewdists, 'e');
@ -752,6 +755,7 @@ EX void showStartMenu() {
getcstat = ' '; getcstat = ' ';
#if CAP_STARTANIM #if CAP_STARTANIM
cmode = sm::DARKEN;
startanims::display(); startanims::display();
#endif #endif

8
models.cpp
View File

@ -361,7 +361,7 @@ EX namespace models {
EX void model_list() { EX void model_list() {
cmode = sm::SIDE | sm::MAYDARK | sm::CENTER; cmode = sm::SIDE | sm::MAYDARK | sm::CENTER;
gamescreen(0); gamescreen();
dialog::init(XLAT("models & projections")); dialog::init(XLAT("models & projections"));
#if CAP_RUG #if CAP_RUG
USING_NATIVE_GEOMETRY_IN_RUG; USING_NATIVE_GEOMETRY_IN_RUG;
@ -417,7 +417,7 @@ EX namespace models {
EX void model_menu() { EX void model_menu() {
cmode = sm::SIDE | sm::MAYDARK | sm::CENTER; cmode = sm::SIDE | sm::MAYDARK | sm::CENTER;
gamescreen(0); gamescreen();
#if CAP_RUG #if CAP_RUG
USING_NATIVE_GEOMETRY_IN_RUG; USING_NATIVE_GEOMETRY_IN_RUG;
#endif #endif
@ -704,8 +704,8 @@ EX namespace models {
} }
EX void quick_model() { EX void quick_model() {
cmode = sm::CENTER; cmode = sm::CENTER | sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init("models & projections"); dialog::init("models & projections");
if(GDIM == 2 && !euclid) { if(GDIM == 2 && !euclid) {

7
multi.cpp
View File

@ -393,8 +393,8 @@ struct shmup_configurer {
void operator()() { void operator()() {
#if CAP_SDL #if CAP_SDL
cmode = sm::SHMUPCONFIG; cmode = sm::SHMUPCONFIG | sm::SIDE | sm::DARKEN;
gamescreen(3); gamescreen();
dialog::init(XLAT("keyboard & joysticks")); dialog::init(XLAT("keyboard & joysticks"));
bool haveconfig = shmup::on || players > 1 || multi::alwaysuse; bool haveconfig = shmup::on || players > 1 || multi::alwaysuse;
@ -503,7 +503,8 @@ EX void configure() {
} }
EX void showConfigureMultiplayer() { EX void showConfigureMultiplayer() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init("multiplayer"); dialog::init("multiplayer");
for(int i=1; i <= MAXPLAYER; i++) { for(int i=1; i <= MAXPLAYER; i++) {

2
netgen.cpp
View File

@ -699,7 +699,7 @@ EX namespace netgen {
void show() { void show() {
cmode = sm::SIDE; cmode = sm::SIDE;
gamescreen(0); gamescreen();
if(true) { if(true) {
initquickqueue(); initquickqueue();
for(int i=0; i<CELLS; i++) { for(int i=0; i<CELLS; i++) {

4
nonisotropic.cpp
View File

@ -1000,7 +1000,7 @@ EX void prepare_niltorus3() {
EX void show_niltorus3() { EX void show_niltorus3() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init(XLAT("Nil quotient spaces")); dialog::init(XLAT("Nil quotient spaces"));
for(int a=0; a<3; a++) { for(int a=0; a<3; a++) {
string title = XLAT("%1 period", s0+char('X'+a)); string title = XLAT("%1 period", s0+char('X'+a));
@ -1662,7 +1662,7 @@ EX namespace product {
EX void show_config() { EX void show_config() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init(XLAT("quotient product spaces")); dialog::init(XLAT("quotient product spaces"));
dialog::addSelItem(XLAT("%1 period", "Z"), its(hybrid::csteps), 'z'); dialog::addSelItem(XLAT("%1 period", "Z"), its(hybrid::csteps), 'z');
dialog::add_action(hybrid::configure_period); dialog::add_action(hybrid::configure_period);

8
pattern2.cpp
View File

@ -1969,7 +1969,7 @@ EX namespace patterns {
void showPrePatternP(bool instant) { void showPrePatternP(bool instant) {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init("predesigned patterns"); dialog::init("predesigned patterns");
dialog::addItem(WDIM == 3 ? XLAT("empty") : XLAT("single color"), 'g'); dialog::addItem(WDIM == 3 ? XLAT("empty") : XLAT("single color"), 'g');
@ -2178,7 +2178,7 @@ EX namespace patterns {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
{ {
dynamicval<bool> dc(displaycodes, whichPattern); dynamicval<bool> dc(displaycodes, whichPattern);
gamescreen(0); gamescreen();
} }
dialog::init(); dialog::init();
@ -2466,7 +2466,7 @@ EX namespace patterns {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
{ {
dynamicval<bool> dc(displaycodes, true); dynamicval<bool> dc(displaycodes, true);
gamescreen(0); gamescreen();
} }
dialog::init(); dialog::init();
for(int i=0; i<isize(cpatterns); i++) { for(int i=0; i<isize(cpatterns); i++) {
@ -2986,7 +2986,7 @@ EX namespace linepatterns {
EX void showMenu() { EX void showMenu() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("line patterns")); dialog::init(XLAT("line patterns"));

3
pcmove.cpp
View File

@ -1291,7 +1291,8 @@ EX bool warningprotection(const string& s) {
if(items[itWarning]) return false; if(items[itWarning]) return false;
warning_shown = true; warning_shown = true;
pushScreen([s] () { pushScreen([s] () {
gamescreen(1); cmode = sm::DARKEN;
gamescreen();
dialog::addBreak(250); dialog::addBreak(250);
dialog::init(XLAT("WARNING"), 0xFF0000, 150, 100); dialog::init(XLAT("WARNING"), 0xFF0000, 150, 100);
dialog::addBreak(500); dialog::addBreak(500);

4
quit.cpp
View File

@ -315,8 +315,8 @@ eLand nextHyperstone() {
EX void showGameMenu() { EX void showGameMenu() {
cmode = sm::DOTOUR | sm::MISSION | sm::CENTER; cmode = sm::DOTOUR | sm::MISSION | sm::CENTER | sm::MAYDARK | sm::SIDE;
gamescreen(1); drawStats(); gamescreen(); drawStats();
getcstat = SDLK_ESCAPE; getcstat = SDLK_ESCAPE;
dialog::init( dialog::init(

12
racing.cpp
View File

@ -918,8 +918,8 @@ EX void load_official_track() {
} }
void track_chooser(bool official) { void track_chooser(bool official) {
cmode = 0; cmode = sm::NOSCR;
gamescreen(2); gamescreen();
dialog::init(XLAT(official ? "Official tracks" : "Generate a racing track")); dialog::init(XLAT(official ? "Official tracks" : "Generate a racing track"));
map<char, eLand> landmap; map<char, eLand> landmap;
@ -959,7 +959,7 @@ void track_chooser(bool official) {
void race_projection() { void race_projection() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init(XLAT("racing projections")); dialog::init(XLAT("racing projections"));
@ -1065,7 +1065,8 @@ void race_projection() {
#if MAXMDIM >= 4 #if MAXMDIM >= 4
EX void thurston_racing() { EX void thurston_racing() {
gamescreen(1); cmode = sm::NOSCR;
gamescreen();
dialog::init(XLAT("racing in Thurston geometries")); dialog::init(XLAT("racing in Thurston geometries"));
dialog::addBreak(100); dialog::addBreak(100);
@ -1119,7 +1120,8 @@ void race_projection() {
void raceconfigurer() { void raceconfigurer() {
gamescreen(1); cmode = sm::SIDE | sm::MAYDARK;
gamescreen();
dialog::init(XLAT("Racing")); dialog::init(XLAT("Racing"));

4
raycaster.cpp
View File

@ -2745,7 +2745,7 @@ EX void random_fog() {
EX void menu() { EX void menu() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("volumetric raycasting")); dialog::init(XLAT("volumetric raycasting"));
if(!cheater) { if(!cheater) {
@ -2797,7 +2797,7 @@ EX }
EX void configure() { EX void configure() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("raycasting configuration")); dialog::init(XLAT("raycasting configuration"));
dialog::addBoolItem(XLAT("available in current geometry"), available(), 0); dialog::addBoolItem(XLAT("available in current geometry"), available(), 0);

2
reg3.cpp
View File

@ -2507,7 +2507,7 @@ int target_subcube_count;
EX void edit_variation() { EX void edit_variation() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("variations")); dialog::init(XLAT("variations"));
dialog::addBoolItem(XLAT("pure"), target_variation == eVariation::pure, 'p'); dialog::addBoolItem(XLAT("pure"), target_variation == eVariation::pure, 'p');

4
rug.cpp
View File

@ -1511,7 +1511,7 @@ ld old_distance;
EX void rug_geometry_choice() { EX void rug_geometry_choice() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100); dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100);
USING_NATIVE_GEOMETRY; USING_NATIVE_GEOMETRY;
@ -1540,7 +1540,7 @@ EX void rug_geometry_choice() {
EX void show() { EX void show() {
cmode = sm::SIDE | sm::MAYDARK | sm::PANNING; cmode = sm::SIDE | sm::MAYDARK | sm::PANNING;
gamescreen(0); gamescreen();
dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100); dialog::init(XLAT("hypersian rug mode"), iinf[itPalace].color, 150, 100);
dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u'); dialog::addBoolItem(XLAT("enable the Hypersian Rug mode"), rug::rugged, 'u');

2
rulegen.cpp
View File

@ -2437,7 +2437,7 @@ EX void verify_parsed_treestates(arb::arbi_tiling& c) {
EX void show() { EX void show() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init(XLAT("strict tree maps")); dialog::init(XLAT("strict tree maps"));
dialog::addHelp(XLAT( dialog::addHelp(XLAT(

2
savemem.cpp
View File

@ -231,7 +231,7 @@ EX void memory_for_lib() {
} }
EX void show_memory_menu() { EX void show_memory_menu() {
gamescreen(0); gamescreen();
dialog::init(XLAT("memory")); dialog::init(XLAT("memory"));
dialog::addHelp(XLAT( dialog::addHelp(XLAT(

32
screenshot.cpp
View File

@ -670,7 +670,7 @@ EX int shot_aa = 1;
EX void default_screenshot_content() { EX void default_screenshot_content() {
gamescreen(0); gamescreen();
if(caption != "") if(caption != "")
displayfr(vid.xres/2, vid.fsize+vid.fsize/4, 3, vid.fsize*2, caption, forecolor, 8); displayfr(vid.xres/2, vid.fsize+vid.fsize/4, 3, vid.fsize*2, caption, forecolor, 8);
@ -934,7 +934,7 @@ EX string format_extension() {
EX void choose_screenshot_format() { EX void choose_screenshot_format() {
cmode = sm::SIDE; cmode = sm::SIDE;
gamescreen(0); gamescreen();
dialog::init(XLAT("screenshots"), iinf[itPalace].color, 150, 100); dialog::init(XLAT("screenshots"), iinf[itPalace].color, 150, 100);
#if CAP_PNG #if CAP_PNG
dialog::addItem(XLAT("PNG"), 'p'); dialog::addItem(XLAT("PNG"), 'p');
@ -954,7 +954,7 @@ EX void choose_screenshot_format() {
EX void menu() { EX void menu() {
cmode = sm::SIDE; cmode = sm::SIDE;
gamescreen(0); gamescreen();
if(format == screenshot_format::svg && !CAP_SVG) if(format == screenshot_format::svg && !CAP_SVG)
format = screenshot_format::png; format = screenshot_format::png;
if(format == screenshot_format::png && !CAP_PNG) if(format == screenshot_format::png && !CAP_PNG)
@ -1530,7 +1530,7 @@ EX void rug_angle_options() {
EX void show() { EX void show() {
cmode = sm::SIDE; needs_highqual = false; cmode = sm::SIDE; needs_highqual = false;
animation_lcm = 1; animation_lcm = 1;
gamescreen(0); gamescreen();
animation_period = 2 * M_PI * animation_lcm / animation_factor; animation_period = 2 * M_PI * animation_lcm / animation_factor;
dialog::init(XLAT("animations"), iinf[itPalace].color, 150, 100); dialog::init(XLAT("animations"), iinf[itPalace].color, 150, 100);
dialog::addSelItem(XLAT("period"), fts(period)+ " ms", 'p'); dialog::addSelItem(XLAT("period"), fts(period)+ " ms", 'p');
@ -1905,7 +1905,7 @@ void explorable(reaction_t ee) {
void no_init() { } void no_init() { }
startanim null_animation { "", no_init, [] { gamescreen(2); }}; startanim null_animation { "", no_init, [] { gamescreen(); }};
#if CAP_STARTANIM #if CAP_STARTANIM
startanim joukowsky { "Joukowsky transform", no_init, [] { startanim joukowsky { "Joukowsky transform", no_init, [] {
@ -1915,7 +1915,7 @@ startanim joukowsky { "Joukowsky transform", no_init, [] {
dynamicval<ld> ds(pconf.scale, 1/4.); dynamicval<ld> ds(pconf.scale, 1/4.);
models::configure(); models::configure();
dynamicval<color_t> dc(ringcolor, 0); dynamicval<color_t> dc(ringcolor, 0);
gamescreen(2); gamescreen();
explorable([] { pmodel = mdJoukowskyInverted; pushScreen(models::model_menu); }); explorable([] { pmodel = mdJoukowskyInverted; pushScreen(models::model_menu); });
}}; }};
@ -1924,7 +1924,7 @@ startanim bandspin { "spinning in the band model", no_init, [] {
dynamicval<ld> dt(pconf.model_orientation, ticks / 25.); dynamicval<ld> dt(pconf.model_orientation, ticks / 25.);
dynamicval<int> dv(vid.use_smart_range, 2); dynamicval<int> dv(vid.use_smart_range, 2);
models::configure(); models::configure();
gamescreen(2); gamescreen();
explorable([] { pmodel = mdJoukowskyInverted; pushScreen(models::model_menu); }); explorable([] { pmodel = mdJoukowskyInverted; pushScreen(models::model_menu); });
}}; }};
@ -1937,7 +1937,7 @@ startanim perspective { "projection distance", no_init, [] {
dynamicval<ld> da(pconf.alpha, x); dynamicval<ld> da(pconf.alpha, x);
dynamicval<ld> ds(pconf.scale, (1+x)/2); dynamicval<ld> ds(pconf.scale, (1+x)/2);
calcparam(); calcparam();
gamescreen(2); gamescreen();
explorable(projectionDialog); explorable(projectionDialog);
}}; }};
@ -1953,7 +1953,7 @@ startanim rug { "Hypersian Rug", [] {
dynamicval<bool> b(rug::rugged, true); dynamicval<bool> b(rug::rugged, true);
rug::physics(); rug::physics();
dynamicval<transmatrix> t(rug::rugView, cspin(1, 2, ticks / 3000.) * rug::rugView); dynamicval<transmatrix> t(rug::rugView, cspin(1, 2, ticks / 3000.) * rug::rugView);
gamescreen(2); gamescreen();
if(!rug::rugged) current = &null_animation; if(!rug::rugged) current = &null_animation;
explorable([] { rug::rugged = true; pushScreen(rug::show); }); explorable([] { rug::rugged = true; pushScreen(rug::show); });
#endif #endif
@ -1965,7 +1965,7 @@ startanim spin_around { "spinning around", no_init, [] {
ld alpha = 2 * M_PI * ticks / 10000.; ld alpha = 2 * M_PI * ticks / 10000.;
ld circle_radius = acosh(2.); ld circle_radius = acosh(2.);
dynamicval<transmatrix> dv(View, spin(-cos_auto(circle_radius)*alpha) * xpush(circle_radius) * spin(alpha) * View); dynamicval<transmatrix> dv(View, spin(-cos_auto(circle_radius)*alpha) * xpush(circle_radius) * spin(alpha) * View);
gamescreen(2); gamescreen();
}}; }};
#endif #endif
@ -1995,7 +1995,7 @@ startanim row_of_ghosts { "row of ghosts", no_init, [] {
} }
}); });
dynamicval<bool> rd(mapeditor::drawplayer, false); dynamicval<bool> rd(mapeditor::drawplayer, false);
gamescreen(2); gamescreen();
}}; }};
startanim army_of_ghosts { "army of ghosts", no_init, [] { startanim army_of_ghosts { "army of ghosts", no_init, [] {
@ -2020,7 +2020,7 @@ startanim army_of_ghosts { "army of ghosts", no_init, [] {
} }
} }
}); });
gamescreen(2); gamescreen();
}}; }};
startanim ghost_spiral { "ghost spiral", no_init, [] { startanim ghost_spiral { "ghost spiral", no_init, [] {
@ -2030,7 +2030,7 @@ startanim ghost_spiral { "ghost spiral", no_init, [] {
draw_ghost(spin(t * i * 2 * M_PI) * xpush(asinh(15. / i)) * spin(M_PI/2), 1); draw_ghost(spin(t * i * 2 * M_PI) * xpush(asinh(15. / i)) * spin(M_PI/2), 1);
} }
}); });
gamescreen(2); gamescreen();
}}; }};
startanim fib_ghosts { "Fibonacci ghosts", no_init, [] { startanim fib_ghosts { "Fibonacci ghosts", no_init, [] {
@ -2047,14 +2047,14 @@ startanim fib_ghosts { "Fibonacci ghosts", no_init, [] {
draw_ghost(T, i); draw_ghost(T, i);
} }
}); });
gamescreen(2); gamescreen();
}}; }};
startanim fpp { "first-person perspective", no_init, [] { startanim fpp { "first-person perspective", no_init, [] {
if(MAXMDIM == 3) { current = &null_animation; return; } if(MAXMDIM == 3) { current = &null_animation; return; }
geom3::switch_fpp(); geom3::switch_fpp();
View = cspin(0, 2, ticks / 5000.) * View; View = cspin(0, 2, ticks / 5000.) * View;
gamescreen(2); gamescreen();
View = cspin(0, 2, -ticks / 5000.) * View; View = cspin(0, 2, -ticks / 5000.) * View;
geom3::switch_fpp(); geom3::switch_fpp();
}}; }};
@ -2066,7 +2066,7 @@ startanim fpp { "first-person perspective", no_init, [] {
EX startanim *current = &null_animation; EX startanim *current = &null_animation;
EX void pick() { EX void pick() {
if(((gold() > 0 || tkills() > 0) && canmove) || geometry != gNormal || ISWEB || ISMOBILE || vid.always3 || pmodel || rug::rugged || vid.wallmode < 2 || vid.monmode < 2 || glhr::noshaders || !vid.usingGL) { if(((gold() > 0 || tkills() > 0) && canmove) || geometry != gNormal || ISWEB || ISMOBILE || vid.always3 || pmodel || rug::rugged || vid.wallmode < 2 || vid.monmode < 2 || glhr::noshaders || !vid.usingGL || !enabled) {
current = &null_animation; current = &null_animation;
return; return;
} }

2
surface.cpp
View File

@ -676,7 +676,7 @@ transmatrix coverage_matrix;
EX void show_surfaces() { EX void show_surfaces() {
cmode = sm::SIDE; cmode = sm::SIDE;
gamescreen(0); gamescreen();
dialog::init(XLAT("constant curvature surfaces"), iinf[itPalace].color, 150, 0); dialog::init(XLAT("constant curvature surfaces"), iinf[itPalace].color, 150, 0);
bool b = rug::rugged || coverage_style; bool b = rug::rugged || coverage_style;

4
textures.cpp
View File

@ -1168,7 +1168,7 @@ bool texture_config::load() {
void showMagicMenu() { void showMagicMenu() {
cmode = sm::SIDE | sm::MAYDARK | sm::DIALOG_STRICT_X; cmode = sm::SIDE | sm::MAYDARK | sm::DIALOG_STRICT_X;
gamescreen(0); gamescreen();
dialog::init(XLAT("texture auto-adjustment")); dialog::init(XLAT("texture auto-adjustment"));
@ -1270,7 +1270,7 @@ EX void start_editor() {
EX void showMenu() { EX void showMenu() {
cmode = sm::SIDE | sm::MAYDARK | sm::DIALOG_STRICT_X; cmode = sm::SIDE | sm::MAYDARK | sm::DIALOG_STRICT_X;
gamescreen(0); gamescreen();
if(config.tstate == tsAdjusting) { if(config.tstate == tsAdjusting) {
ptds.clear(); ptds.clear();
config.mark_triangles(); config.mark_triangles();

4
vr.cpp
View File

@ -1153,7 +1153,7 @@ EX void render() {
EX void show_vr_demos() { EX void show_vr_demos() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("VR demos")); dialog::init(XLAT("VR demos"));
dialog::addInfo(XLAT("warning: these will restart your game!")); dialog::addInfo(XLAT("warning: these will restart your game!"));
@ -1325,7 +1325,7 @@ EX void reference_button() {
EX void show_vr_settings() { EX void show_vr_settings() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(0); gamescreen();
dialog::init(XLAT("VR settings")); dialog::init(XLAT("VR settings"));
dialog::addItem(XLAT("VR demos"), 'D'); dialog::addItem(XLAT("VR demos"), 'D');

2
wfcgen.cpp
View File

@ -241,7 +241,7 @@ void use_probs() {
EX void wfc_menu() { EX void wfc_menu() {
cmode = sm::SIDE | sm::MAYDARK; cmode = sm::SIDE | sm::MAYDARK;
gamescreen(1); gamescreen();
dialog::init(XLAT("Wave Function Collapse")); dialog::init(XLAT("Wave Function Collapse"));
dialog::addSelItem(XLAT("import the current map"), XLAT("rules: %1", its(isize(probs))), 'i'); dialog::addSelItem(XLAT("import the current map"), XLAT("rules: %1", its(isize(probs))), 'i');