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

Remove option to manually set bpp from command line

Browse source 
# Conflicts:
#	src/game_launcher.cpp
This commit is contained in:
Charles Dang 2015-12-29 01:38:57 +11:00
parent 4eb9e09e73
commit c15e2403f7
3 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/commandline_options.cpp
View file

@ -66,7 +66,6 @@ bad_commandline_tuple::bad_commandline_tuple(const std::string& str,
}
commandline_options::commandline_options (const std::vector<std::string>& args) :
bpp(),
bunzip2(),
bzip2(),
campaign(),
@ -215,7 +214,6 @@ commandline_options::commandline_options (const std::vector<std::string>& args)
po::options_description display_opts("Display options");
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.")
@ -298,8 +296,6 @@ commandline_options::commandline_options (const std::vector<std::string>& args)
multiplayer_ai_config = parse_to_uint_string_tuples_(vm["ai-config"].as<std::vector<std::string> >());
if (vm.count("algorithm"))
multiplayer_algorithm = parse_to_uint_string_tuples_(vm["algorithm"].as<std::vector<std::string> >());
if (vm.count("bpp"))
bpp = vm["bpp"].as<int>();
if (vm.count("bunzip2"))
bunzip2 = vm["bunzip2"].as<std::string>();
if (vm.count("bzip2"))

2
src/commandline_options.hpp
View file

@ -47,8 +47,6 @@ public:
config to_config() const; /* Used by lua scrips. Not all of the options need to be exposed here, just those exposed to lua */
/// BitsPerPixel specified by --bpp option.
boost::optional<int> bpp;
/// Non-empty if --bunzip2 was given on the command line. Uncompresses a .bz2 file and exits.
boost::optional<std::string> bunzip2;
/// Non-empty if --bzip2 was given on the command line. Compresses a file to .bz2 and exits.

4
src/game_launcher.cpp
View file

@ -411,9 +411,7 @@ bool game_launcher::init_video()
bool found_matching = preferences::detect_video_settings(video_, resolution, bpp, video_flags);
if (cmdline_opts_.bpp) {
bpp = *cmdline_opts_.bpp;
} else if (cmdline_opts_.screenshot) {
if (cmdline_opts_.screenshot) {
bpp = 32;
}