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

Remove --new-storyscreens command line switch

Browse source 
Having a hidden switch that previously turned the_end() into a no-op is
absolutely pointless.

I've had better ideas.
This commit is contained in:
Ignacio R. Morelle 2013-09-16 04:25:02 -03:00
parent 9268f31042
commit 474651de46
6 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/commandline_options.cpp
View file

@ -85,7 +85,6 @@ commandline_options::commandline_options ( int argc, char** argv ) :
nogui(false),
nomusic(false),
nosound(false),
new_storyscreens(false),
new_widgets(false),
path(false),
preprocess(false),
@ -219,9 +218,9 @@ commandline_options::commandline_options ( int argc, char** argv ) :
("proxy-password", po::value<std::string>(), "specifies password to log in to the proxy.")
;
hidden_.add_options()
("new-storyscreens", "")
;
//hidden_.add_options()
// ("example-hidden-option", "")
// ;
visible_.add(general_opts).add(campaign_opts).add(display_opts).add(logging_opts).add(multiplayer_opts).add(preprocessor_opts).add(proxy_opts);
all_.add(visible_).add(hidden_);
@ -309,8 +308,6 @@ commandline_options::commandline_options ( int argc, char** argv ) :
max_fps = vm["max-fps"].as<int>();
if (vm.count("multiplayer"))
multiplayer = true;
if (vm.count("new-storyscreens"))
new_storyscreens = true;
if (vm.count("new-widgets"))
new_widgets = true;
if (vm.count("nocache"))

2
src/commandline_options.hpp
View file

@ -117,8 +117,6 @@ public:
bool nomusic;
/// True if --nosound was given on the command line. Disables sound.
bool nosound;
/// True if --new-storyscreens was given on the command line. Hidden option to help testing the work-in-progress new storyscreen code.
bool new_storyscreens;
/// True if --new-widgets was given on the command line. Hidden option to enable the new widget toolkit.
bool new_widgets;
/// True if --path was given on the command line. Prints the path to data directory and exits.

5
src/game_controller.cpp
View file

@ -171,11 +171,6 @@ game_controller::game_controller(const commandline_options& cmdline_opts, const
no_sound = true;
preferences::disable_preferences_save();
}
if (cmdline_opts_.new_storyscreens)
// This is a hidden option to help testing
// the work-in-progress new storyscreen code.
// Don't document.
set_new_storyscreen(true);
if (cmdline_opts_.new_widgets)
gui2::new_widgets = true;
if (cmdline_opts_.nodelay)

8
src/intro.cpp
View file

@ -32,8 +32,6 @@ static lg::log_domain log_engine("engine");
#define ERR_NG LOG_STREAM(err, log_engine)
#define LOG_NG LOG_STREAM(info, log_engine)
static bool use_shadowm_storyscreen = false;
void the_end(display &disp, std::string text, unsigned int duration)
{
//
@ -86,9 +84,3 @@ void the_end(display &disp, std::string text, unsigned int duration)
--count;
}
}
void set_new_storyscreen(bool enabled)
{
use_shadowm_storyscreen = enabled;
LOG_NG << "enabled experimental story/endscreen code\n";
}

6
src/intro.hpp
View file

@ -32,10 +32,4 @@ class display;
*/
void the_end(display &disp, std::string text, unsigned int duration);
/**
* Enables/disables the new (work in progress) story screen
* code.
*/
void set_new_storyscreen(bool enabled);
#endif /* ! INTRO_HPP_INCLUDED */

5
src/tests/test_commandline_options.cpp
View file

@ -64,7 +64,6 @@ BOOST_AUTO_TEST_CASE (test_empty_options)
BOOST_CHECK(!co.nogui);
BOOST_CHECK(!co.nomusic);
BOOST_CHECK(!co.nosound);
BOOST_CHECK(!co.new_storyscreens);
BOOST_CHECK(!co.new_widgets);
BOOST_CHECK(!co.path);
BOOST_CHECK(!co.preprocess);
@ -147,7 +146,6 @@ BOOST_AUTO_TEST_CASE (test_default_options)
BOOST_CHECK(!co.nogui);
BOOST_CHECK(!co.nomusic);
BOOST_CHECK(!co.nosound);
BOOST_CHECK(!co.new_storyscreens);
BOOST_CHECK(!co.new_widgets);
BOOST_CHECK(!co.path);
BOOST_CHECK(!co.preprocess);
@ -216,7 +214,6 @@ BOOST_AUTO_TEST_CASE (test_full_options)
"--logdomains=filterfoo",
"--max-fps=100",
"--multiplayer",
"--new-storyscreens",
"--new-widgets",
"--nocache",
"--nodelay",
@ -313,7 +310,6 @@ BOOST_AUTO_TEST_CASE (test_full_options)
BOOST_CHECK(co.nogui);
BOOST_CHECK(co.nomusic);
BOOST_CHECK(co.nosound);
BOOST_CHECK(co.new_storyscreens);
BOOST_CHECK(co.new_widgets);
BOOST_CHECK(co.path);
BOOST_CHECK(co.preprocess && co.preprocess_path && co.preprocess_target);
@ -390,7 +386,6 @@ BOOST_AUTO_TEST_CASE (test_positional_options)
BOOST_CHECK(!co.nogui);
BOOST_CHECK(!co.nomusic);
BOOST_CHECK(!co.nosound);
BOOST_CHECK(!co.new_storyscreens);
BOOST_CHECK(!co.new_widgets);
BOOST_CHECK(!co.path);
BOOST_CHECK(!co.preprocess);