0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename "--repeat" to "--multiplayer-repeat".

Browse source
This commit is contained in:
flix 2013-10-07 01:52:04 +02:00
parent a3af62c136
commit 5bb392f455
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
changelog
View file

@ -118,9 +118,9 @@ Version 1.11.6+dev:
set_preferences_dir() when built with MSVC++ 2010 and a relative path
to My Documents was passed with --config-dir in the command line.
* Changed: Added -Wno-deprecated-register to strict compilation.
* Added command line option "--repeat <arg>". A game started with
--multiplayer will be repeated <arg> times. This is useful for
batch testing.
* Added command line option "--multiplayer-repeat <arg>".
A game started with --multiplayer will be repeated <arg> times.
This is useful for batch testing.
Version 1.11.6:
* Add-ons client:

6
src/commandline_options.cpp
View file

@ -195,9 +195,9 @@ commandline_options::commandline_options ( int argc, char** argv ) :
("exit-at-end", "exit Wesnoth at the end of the scenario.")
("ignore-map-settings", "do not use map settings.")
("label", po::value<std::string>(), "sets the label for AIs.") //TODO is the description precise? this option was undocumented before.
("multiplayer-repeat", po::value<unsigned int>(), "repeats a multiplayer game after it is finished <arg> times.")
("nogui", "runs the game without the GUI.")
("parm", po::value<std::vector<std::string> >()->composing(), "sets additional parameters for this side. <arg> should have format side:name:value.")
("repeat", po::value<unsigned int>(), "repeats a multiplayer game after it is finished <arg> times.")
("scenario", po::value<std::string>(), "selects a multiplayer scenario. The default scenario is \"multiplayer_The_Freelands\".")
("side", po::value<std::vector<std::string> >()->composing(), "selects a faction of the current era for this side by id. <arg> should have format side:value.")
("turns", po::value<std::string>(), "sets the number of turns. The default is \"50\".")
@ -310,6 +310,8 @@ commandline_options::commandline_options ( int argc, char** argv ) :
max_fps = vm["max-fps"].as<int>();
if (vm.count("multiplayer"))
multiplayer = true;
if (vm.count("multiplayer-repeat"))
multiplayer_repeat = vm["multiplayer-repeat"].as<unsigned int>();
if (vm.count("new-widgets"))
new_widgets = true;
if (vm.count("nocache"))
@ -348,8 +350,6 @@ commandline_options::commandline_options ( int argc, char** argv ) :
proxy_port = vm["proxy-port"].as<std::string>();
if (vm.count("proxy-user"))
proxy_user = vm["proxy-user"].as<std::string>();
if (vm.count("repeat"))
multiplayer_repeat = vm["repeat"].as<unsigned int>();
if (vm.count("resolution"))
parse_resolution_(vm["resolution"].as<std::string>());
if (vm.count("rng-seed"))

2
src/commandline_options.hpp
View file

@ -99,7 +99,7 @@ public:
boost::optional<std::string> multiplayer_label;
/// Non-empty if --parm was given on the command line. Vector of pairs (side number, parm name, parm value). Dependent on --multiplayer.
boost::optional<std::vector<boost::tuple<unsigned int, std::string, std::string> > > multiplayer_parm;
/// Repeats specified by --repeat option. Repeats a multiplayer game after it is finished. Dependent on --multiplayer.
/// Repeats specified by --multiplayer-repeat option. Repeats a multiplayer game after it is finished. Dependent on --multiplayer.
boost::optional<unsigned int> multiplayer_repeat;
/// Non-empty if --scenario was given on the command line. Dependent on --multiplayer.
boost::optional<std::string> multiplayer_scenario;