X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fengineer%2Foptions.cpp;h=7eabb8e2d288d2554c8fc254511ac775bba34a91;hb=474a2f819c2f7c5216cba5f33fcbc36d9b6886d1;hp=bdac3619356bbc6b3a1c9558a4bce74b66f6cf65;hpb=eb8b919a1a224c0d6f206d1d29a9b4b8c3a0cac8;p=r2c2.git diff --git a/source/engineer/options.cpp b/source/engineer/options.cpp index bdac361..7eabb8e 100644 --- a/source/engineer/options.cpp +++ b/source/engineer/options.cpp @@ -27,6 +27,7 @@ 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_argument("layout", layout_fn, GetOpt::REQUIRED_ARG); getopt(argc, argv); if(!res.empty()) @@ -40,12 +41,6 @@ Options::Options(int argc, char **argv): throw usage_error("Invalid resolution"); } - const vector &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"; }