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

arb:: loading tes options is now optional

Browse Source
This commit is contained in:
Zeno Rogue 2021-10-17 09:40:28 +02:00
parent 839ca440ea
commit 1e504d98ae
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arbitrile.cpp
View File

@ -999,7 +999,6 @@ EX void run(string fname) {
try { try {
load(fname); load(fname);
ginf[gArbitrary].tiling_name = current.name; ginf[gArbitrary].tiling_name = current.name;
arg::run_arguments(current.options);
} }
catch(hr_polygon_error& poly) { catch(hr_polygon_error& poly) {
set_geometry(g); set_geometry(g);
@ -1301,6 +1300,9 @@ int readArgs() {
shift(); shift();
run(args()); run(args());
} }
else if(argis("-tes-opt")) {
arg::run_arguments(current.options);
}
else if(argis("-arb-legacy")) { else if(argis("-arb-legacy")) {
legacy = true; legacy = true;
} }
@ -1352,6 +1354,8 @@ EX void choose() {
dialog::openFileDialog(tes, XLAT("open a tiling"), ".tes", dialog::openFileDialog(tes, XLAT("open a tiling"), ".tes",
[] () { [] () {
run(tes); run(tes);
if(!current.options.empty())
dialog::push_confirm_dialog([] { arg::run_arguments(current.options); start_game(); }, "load the settings defined in this file?");
return true; return true;
}); });
} }