X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Foptions.cpp;h=0108ba5925e44d376d3244cc2418133e3e20578b;hb=abed4a255060d5a233ec0ac2dd60af9132e29201;hp=bdac3619356bbc6b3a1c9558a4bce74b66f6cf65;hpb=eb8b919a1a224c0d6f206d1d29a9b4b8c3a0cac8;p=r2c2.git

diff --git a/source/engineer/options.cpp b/source/engineer/options.cpp
index bdac361..0108ba5 100644
--- a/source/engineer/options.cpp
+++ b/source/engineer/options.cpp
@@ -27,6 +27,8 @@ Options::Options(int argc, char **argv):
 	getopt.add_option(     "sim-speed",   sim_speed,   GetOpt::REQUIRED_ARG);
 	getopt.add_option('n', "network",     network,     GetOpt::NO_ARG);
 	getopt.add_option(     "state",       state_fn,    GetOpt::REQUIRED_ARG);
+	getopt.add_option(     "uistate",     uistate_fn,  GetOpt::REQUIRED_ARG);
+	getopt.add_argument("layout", layout_fn, GetOpt::REQUIRED_ARG);
 	getopt(argc, argv);
 
 	if(!res.empty())
@@ -40,12 +42,9 @@ Options::Options(int argc, char **argv):
 			throw usage_error("Invalid resolution");
 	}
 
-	const vector<string> &args = getopt.get_args();
-	if(args.empty())
-		throw usage_error("No layout given");
-
-	layout_fn = args[0];
-
 	if(state_fn.empty())
 		state_fn = FS::basepart(layout_fn)+".state";
+
+	if(uistate_fn.empty())
+		uistate_fn = FS::basepart(layout_fn)+".uistate";
 }