1
0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-11-20 11:54:48 +00:00

arb:: loading tes options is now optional

This commit is contained in:
Zeno Rogue 2021-10-17 09:40:28 +02:00
parent 839ca440ea
commit 1e504d98ae

View File

@ -999,7 +999,6 @@ EX void run(string fname) {
try {
load(fname);
ginf[gArbitrary].tiling_name = current.name;
arg::run_arguments(current.options);
}
catch(hr_polygon_error& poly) {
set_geometry(g);
@ -1301,6 +1300,9 @@ int readArgs() {
shift();
run(args());
}
else if(argis("-tes-opt")) {
arg::run_arguments(current.options);
}
else if(argis("-arb-legacy")) {
legacy = true;
}
@ -1352,6 +1354,8 @@ EX void choose() {
dialog::openFileDialog(tes, XLAT("open a tiling"), ".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;
});
}