X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Foptions.cpp;h=7eabb8e2d288d2554c8fc254511ac775bba34a91;hb=d06a1e1ab34e5ecb4bb7011d44298a0b5e6162be;hp=89e1fd109be155a3172aa488afc2619bf89d42fe;hpb=621c5c938d70ba0d155e0eda91a708db0a52c0dc;p=r2c2.git

diff --git a/source/engineer/options.cpp b/source/engineer/options.cpp
index 89e1fd1..7eabb8e 100644
--- a/source/engineer/options.cpp
+++ b/source/engineer/options.cpp
@@ -13,7 +13,8 @@ Options::Options(int argc, char **argv):
 	fullscreen(false),
 	debug(false),
 	network(false),
-	simulate(false)
+	simulate(false),
+	sim_speed(1.0f)
 {
 	string res;
 
@@ -23,8 +24,10 @@ Options::Options(int argc, char **argv):
 	getopt.add_option('g', "debug",       debug,       GetOpt::NO_ARG);
 	getopt.add_option('d', "driver",      driver,      GetOpt::REQUIRED_ARG);
 	getopt.add_option('s', "simulate",    simulate,    GetOpt::NO_ARG);
+	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_argument("layout", layout_fn, GetOpt::REQUIRED_ARG);
 	getopt(argc, argv);
 
 	if(!res.empty())
@@ -38,12 +41,6 @@ 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";
 }