mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-01-04 06:20:34 +00:00
Code Issues Releases Wiki Activity

racing:: removed OO dialog since it caused errors on some systems

Browse Source
This commit is contained in:
Zeno Rogue 2019-01-14 22:58:35 +01:00
parent 370de4c735
commit a783e19f6a
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
racing.cpp
View File

@ -9,6 +9,8 @@ namespace hr {
namespace racing { namespace racing {
void set_race_configurer();
bool guiding = false; bool guiding = false;
bool on; bool on;
@ -932,13 +934,13 @@ void race_projection() {
dialog::display(); dialog::display();
} }
struct race_configurer {
int playercfg; int playercfg;
bool editing_track; bool editing_track;
string new_track; string new_track;
race_configurer() { editing_track = false; new_track = track_code; playercfg = multi::players; } /* struct race_configurer { */
void set_race_configurer() { editing_track = false; new_track = track_code; playercfg = multi::players; }
static string random_track_name() { static string random_track_name() {
string s = ""; string s = "";
@ -959,7 +961,7 @@ struct race_configurer {
return ""; return "";
} }
void operator() () { void raceconfigurer() {
gamescreen(1); gamescreen(1);
@ -969,12 +971,14 @@ struct race_configurer {
dialog::addInfo(XLAT("Racing available only in unbounded worlds."), 0xFF0000); dialog::addInfo(XLAT("Racing available only in unbounded worlds."), 0xFF0000);
else { else {
dialog::addItem(XLAT("select the track and start!"), 's'); dialog::addItem(XLAT("select the track and start!"), 's');
dialog::add_action([this] () { dialog::add_action([/*this*/] () {
dynamicval<bool> so(shmup::on, true);
dynamicval<bool> ro(racing::on, true);
if(race_ghosts[make_pair(new_track, modecode())].empty()) if(race_ghosts[make_pair(new_track, modecode())].empty())
read_ghosts(new_track, modecode()); read_ghosts(new_track, modecode());
else else
println(hlog, "known ghosts: ", isize(race_ghosts[make_pair(new_track, modecode())])); println(hlog, "known ghosts: ", isize(race_ghosts[make_pair(new_track, modecode())]));
pushScreen([this] () { track_chooser(new_track); }); pushScreen([/*this*/] () { track_chooser(new_track); });
}); });
} }
@ -987,7 +991,7 @@ struct race_configurer {
dialog::add_action([] () { guiding = !guiding; }); dialog::add_action([] () { guiding = !guiding; });
dialog::addItem(shmup::player_count_name(playercfg), 'n'); dialog::addItem(shmup::player_count_name(playercfg), 'n');
dialog::add_action([this] () { dialog::add_action([/*this*/] () {
playercfg = playercfg == 1 ? 2 : 1; playercfg = playercfg == 1 ? 2 : 1;
}); });
@ -1007,14 +1011,14 @@ struct race_configurer {
dialog::addBreak(100); dialog::addBreak(100);
dialog::addSelItem("track seed", editing_track ? dialog::view_edited_string() : new_track, '/'); dialog::addSelItem("track seed", editing_track ? dialog::view_edited_string() : new_track, '/');
dialog::add_action([this] () { dialog::add_action([/*this*/] () {
editing_track = !editing_track; editing_track = !editing_track;
if(editing_track) dialog::start_editing(new_track); if(editing_track) dialog::start_editing(new_track);
}); });
dialog::addItem("play the official seed", 'o'); dialog::addItem("play the official seed", 'o');
dialog::add_action([this] () { new_track = "OFFICIAL"; }); dialog::add_action([/*this*/] () { new_track = "OFFICIAL"; });
dialog::addItem("play a random seed", 'r'); dialog::addItem("play a random seed", 'r');
dialog::add_action([this] () { new_track = random_track_name(); }); dialog::add_action([/*this*/] () { new_track = random_track_name(); });
dialog::addBreak(100); dialog::addBreak(100);
@ -1038,7 +1042,7 @@ struct race_configurer {
dialog::addBack(); dialog::addBack();
dialog::display(); dialog::display();
keyhandler = [this] (int sym, int uni) { keyhandler = [/*this*/] (int sym, int uni) {
if(editing_track) { if(editing_track) {
if(sym == SDLK_RETURN) sym = uni = '/'; if(sym == SDLK_RETURN) sym = uni = '/';
if(dialog::handle_edit_string(sym, uni, racecheck)) return; if(dialog::handle_edit_string(sym, uni, racecheck)) return;
@ -1048,15 +1052,17 @@ struct race_configurer {
}; };
} }
}; /* }; */
void configure_race() { void configure_race() {
pushScreen(race_configurer()); set_race_configurer();
pushScreen(raceconfigurer);
} }
auto hooks1 = auto hooks1 =
addHook(hooks_o_key, 90, [] { addHook(hooks_o_key, 90, [] {
if(racing::on) return named_dialog(XLAT("racing menu"), race_configurer()); if(racing::on) return named_dialog(XLAT("racing menu"), raceconfigurer);
else return named_functionality(); else return named_functionality();
}); });