Author: zaroth
Date: Thu Jun 9 11:52:52 2011
New Revision: 49812
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49812&view=rev
Log:
Added fullscreen, smallgui, windowed options to commandline_options
Modified:
trunk/src/commandline_options.cpp
trunk/src/game_controller.cpp
trunk/src/tests/test_commandline_options.cpp
Modified: trunk/src/commandline_options.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/commandline_options.cpp?rev=49812&r1=49811&r2=49812&view=diff
==============================================================================
--- trunk/src/commandline_options.cpp (original)
+++ trunk/src/commandline_options.cpp Thu Jun 9 11:52:52 2011
@@ -130,8 +130,11 @@
display_opts.add_options()
("bpp", po::value<int>(), "sets BitsPerPixel value. Example:
--bpp 32")
("fps", "displays the number of frames per second the game is
currently running at, in a corner of the screen.")
+ ("fullscreen,f", "runs the game in full screen mode.")
("max-fps", po::value<int>(), "the maximum fps the game tries
to run at. Values should be between 1 and 1000, the default is 50.")
+ ("new-widgets", "there is a new WIP widget toolkit this switch
enables the new toolkit (VERY EXPERIMENTAL don't file bug reports since most
are known). Parts of the library are deemed stable and will work without this
switch.")
("resolution,r", po::value<std::string>(), "sets the screen
resolution. <arg> should have format XxY. Example: --resolution 800x600")
+ ("windowed,w", "runs the game in windowed mode.")
;
po::options_description logging_opts("Logging options");
@@ -160,7 +163,7 @@
hidden_.add_options()
("new-storyscreens", "")
- ("new-widgets", "")
+ ("smallgui", "")
;
visible_.add(general_opts).add(display_opts).add(logging_opts).add(multiplayer_opts).add(preprocessor_opts);
@@ -184,6 +187,8 @@
debug = true;
if (vm.count("fps"))
fps = true;
+ if (vm.count("fullscreen"))
+ fullscreen = true;
if (vm.count("gunzip"))
gunzip = vm["gunzip"].as<std::string>();
if (vm.count("gzip"))
@@ -240,10 +245,14 @@
screenshot_map_file =
vm["screenshot"].as<two_strings>().get<0>();
screenshot_output_file =
vm["screenshot"].as<two_strings>().get<1>();
}
+ if (vm.count("smallgui"))
+ smallgui = true;
if (vm.count("validcache"))
validcache = true;
if (vm.count("version"))
version = true;
+ if (vm.count("windowed"))
+ windowed = true;
if (vm.count("with-replay"))
with_replay = true;
}
Modified: trunk/src/game_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller.cpp?rev=49812&r1=49811&r2=49812&view=diff
==============================================================================
--- trunk/src/game_controller.cpp (original)
+++ trunk/src/game_controller.cpp Thu Jun 9 11:52:52 2011
@@ -129,6 +129,8 @@
}
if (cmdline_opts_.fps)
preferences::set_show_fps(true);
+ if (cmdline_opts_.fullscreen)
+ preferences::set_fullscreen(true);
if (cmdline_opts_.load)
game::load_game_exception::game = *cmdline_opts_.load;
if (cmdline_opts_.max_fps) {
@@ -178,8 +180,12 @@
preferences::disable_preferences_save();
force_bpp_ = 32;
}
+ if (cmdline_opts_.smallgui)
+ game_config::small_gui = true;
if (cmdline_opts_.validcache)
cache_.set_force_valid_cache(true);
+ if (cmdline_opts_.windowed)
+ preferences::set_fullscreen(false);
if (cmdline_opts_.with_replay)
game::load_game_exception::show_replay = true;
@@ -188,17 +194,7 @@
if(val.empty()) {
continue;
}
- else if(val == "--smallgui") {
- game_config::small_gui = true;
- } else if(val == "--config-dir" || val == "--data-dir") {
- if (argc_ <= ++arg_)
- break;
- } else if(val == "--windowed" || val == "-w") {
- preferences::set_fullscreen(false);
- } else if(val == "--fullscreen" || val == "-f") {
- preferences::set_fullscreen(true);
-
- } else if(val.find("--campaign") == 0 || val.find("-c") == 0) {
+ else if(val.find("--campaign") == 0 || val.find("-c") == 0) {
// campaign starting template:
// -c[[<difficulty>] <id_campaign> [<id_scenario>]]
// --campaign[[<difficulty>] <id_campaign>
[<id_scenario>]]
Modified: trunk/src/tests/test_commandline_options.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tests/test_commandline_options.cpp?rev=49812&r1=49811&r2=49812&view=diff
==============================================================================
--- trunk/src/tests/test_commandline_options.cpp (original)
+++ trunk/src/tests/test_commandline_options.cpp Thu Jun 9 11:52:52 2011
@@ -183,6 +183,7 @@
"--data-dir=datadirfoo",
"--debug",
"--fps",
+ "--fullscreen",
"--gunzip=gunzipfoo.gz",
"--gzip=gzipfoo",
"--help",
@@ -207,8 +208,10 @@
"--resolution=800x600",
"--rng-seed=1234",
"--screenshot", "mapfoo", "outssfoo",
+ "--smallgui",
"--validcache",
"--version",
+ "--windowed",
"--with-replay"
};
const int argc = sizeof(argv)/sizeof(const char *);
@@ -229,7 +232,7 @@
#endif
BOOST_CHECK(!co.editor);
BOOST_CHECK(co.fps);
- BOOST_CHECK(!co.fullscreen);
+ BOOST_CHECK(co.fullscreen);
BOOST_CHECK(co.gunzip && *co.gunzip == "gunzipfoo.gz");
BOOST_CHECK(co.gzip && *co.gzip == "gzipfoo");
BOOST_CHECK(co.help);
@@ -284,11 +287,11 @@
BOOST_CHECK(!co.server);
BOOST_CHECK(co.screenshot && co.screenshot_map_file &&
co.screenshot_output_file);
BOOST_CHECK(*co.screenshot_map_file == "mapfoo" &&
*co.screenshot_output_file == "outssfoo");
- BOOST_CHECK(!co.smallgui);
+ BOOST_CHECK(co.smallgui);
BOOST_CHECK(!co.test);
BOOST_CHECK(co.validcache);
BOOST_CHECK(co.version);
- BOOST_CHECK(!co.windowed);
+ BOOST_CHECK(co.windowed);
BOOST_CHECK(co.with_replay);
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
