Author: zaroth
Date: Sat Jun 11 00:26:56 2011
New Revision: 49832
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49832&view=rev
Log:
Moved init_video() up to the game_controller_abstract
Modified:
trunk/src/game_controller.cpp
trunk/src/game_controller.hpp
trunk/src/game_controller_abstract.cpp
trunk/src/game_controller_abstract.hpp
trunk/src/game_controller_new.cpp
trunk/src/game_controller_new.hpp
Modified: trunk/src/game_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller.cpp?rev=49832&r1=49831&r2=49832&view=diff
==============================================================================
--- trunk/src/game_controller.cpp (original)
+++ trunk/src/game_controller.cpp Sat Jun 11 00:26:56 2011
@@ -277,65 +277,6 @@
}
}
-bool game_controller::init_video()
-{
- if(cmdline_opts_.nogui) {
- if( !(cmdline_opts_.multiplayer || cmdline_opts_.screenshot) ) {
- std::cerr << "--nogui flag is only valid with
--multiplayer flag or --screenshot flag\n";
- return false;
- }
- video_.make_fake();
- game_config::no_delay = true;
- return true;
- }
-
-#if !(defined(__APPLE__))
- surface icon(image::get_image("game-icon.png", image::UNSCALED));
- if(icon != NULL) {
- ///must be called after SDL_Init() and before setting video mode
- ::SDL_WM_SetIcon(icon,NULL);
- }
-#endif
-
- std::pair<int,int> resolution;
- int bpp = 0;
- int video_flags = 0;
-
- 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) {
- bpp = 32;
- }
-
- if(!found_matching) {
- std::cerr << "Video mode " << resolution.first << 'x'
- << resolution.second << 'x' << bpp
- << " is not supported.\n";
-
- if ((video_flags & FULL_SCREEN)) {
- std::cerr << "Try running the program with the
--windowed option "
- << "using a " << bpp << "bpp setting for your
display adapter.\n";
- } else {
- std::cerr << "Try running the program with the
--fullscreen option.\n";
- }
-
- return false;
- }
-
- std::cerr << "setting mode to " << resolution.first << "x" <<
resolution.second << "x" << bpp << "\n";
- const int res =
video_.setMode(resolution.first,resolution.second,bpp,video_flags);
- video_.setBpp(bpp);
- if(res == 0) {
- std::cerr << "required video mode, " << resolution.first << "x"
- << resolution.second << "x" << bpp << " is not
supported\n";
- return false;
- }
-
- return true;
-}
-
bool game_controller::init_config(const bool force)
{
cache_.clear_defines();
Modified: trunk/src/game_controller.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller.hpp?rev=49832&r1=49831&r2=49832&view=diff
==============================================================================
--- trunk/src/game_controller.hpp (original)
+++ trunk/src/game_controller.hpp Sat Jun 11 00:26:56 2011
@@ -50,7 +50,6 @@
~game_controller();
bool init_config() { return init_config(false); }
- bool init_video();
bool init_language();
bool play_test();
bool play_multiplayer_mode();
Modified: trunk/src/game_controller_abstract.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_abstract.cpp?rev=49832&r1=49831&r2=49832&view=diff
==============================================================================
--- trunk/src/game_controller_abstract.cpp (original)
+++ trunk/src/game_controller_abstract.cpp Sat Jun 11 00:26:56 2011
@@ -16,6 +16,9 @@
#include "game_controller_abstract.hpp"
#include "game_display.hpp"
+#include "preferences_display.hpp"
+
+#include <iostream>
game_controller_abstract::game_controller_abstract(const commandline_options
&cmdline_opts) :
cmdline_opts_(cmdline_opts),
@@ -35,3 +38,62 @@
}
return *disp_.get();
}
+
+bool game_controller_abstract::init_video()
+{
+ if(cmdline_opts_.nogui) {
+ if( !(cmdline_opts_.multiplayer || cmdline_opts_.screenshot) ) {
+ std::cerr << "--nogui flag is only valid with
--multiplayer flag or --screenshot flag\n";
+ return false;
+ }
+ video_.make_fake();
+ game_config::no_delay = true;
+ return true;
+ }
+
+#if !(defined(__APPLE__))
+ surface icon(image::get_image("game-icon.png", image::UNSCALED));
+ if(icon != NULL) {
+ ///must be called after SDL_Init() and before setting video mode
+ ::SDL_WM_SetIcon(icon,NULL);
+ }
+#endif
+
+ std::pair<int,int> resolution;
+ int bpp = 0;
+ int video_flags = 0;
+
+ 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) {
+ bpp = 32;
+ }
+
+ if(!found_matching) {
+ std::cerr << "Video mode " << resolution.first << 'x'
+ << resolution.second << 'x' << bpp
+ << " is not supported.\n";
+
+ if ((video_flags & FULL_SCREEN)) {
+ std::cerr << "Try running the program with the
--windowed option "
+ << "using a " << bpp << "bpp setting for your
display adapter.\n";
+ } else {
+ std::cerr << "Try running the program with the
--fullscreen option.\n";
+ }
+
+ return false;
+ }
+
+ std::cerr << "setting mode to " << resolution.first << "x" <<
resolution.second << "x" << bpp << "\n";
+ const int res =
video_.setMode(resolution.first,resolution.second,bpp,video_flags);
+ video_.setBpp(bpp);
+ if(res == 0) {
+ std::cerr << "required video mode, " << resolution.first << "x"
+ << resolution.second << "x" << bpp << " is not
supported\n";
+ return false;
+ }
+
+ return true;
+}
Modified: trunk/src/game_controller_abstract.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_abstract.hpp?rev=49832&r1=49831&r2=49832&view=diff
==============================================================================
--- trunk/src/game_controller_abstract.hpp (original)
+++ trunk/src/game_controller_abstract.hpp Sat Jun 11 00:26:56 2011
@@ -31,7 +31,7 @@
game_display& disp();
- virtual bool init_video() = 0;
+ bool init_video();
virtual bool init_config() = 0;
virtual bool init_language() = 0;
virtual bool play_test() = 0;
Modified: trunk/src/game_controller_new.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_new.cpp?rev=49832&r1=49831&r2=49832&view=diff
==============================================================================
--- trunk/src/game_controller_new.cpp (original)
+++ trunk/src/game_controller_new.cpp Sat Jun 11 00:26:56 2011
@@ -30,11 +30,6 @@
}
bool game_controller_new::init_config()
-{
- return true;
-}
-
-bool game_controller_new::init_video()
{
return true;
}
Modified: trunk/src/game_controller_new.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_new.hpp?rev=49832&r1=49831&r2=49832&view=diff
==============================================================================
--- trunk/src/game_controller_new.hpp (original)
+++ trunk/src/game_controller_new.hpp Sat Jun 11 00:26:56 2011
@@ -26,7 +26,6 @@
~game_controller_new();
bool init_config();
- bool init_video();
bool init_language();
bool play_test();
bool play_multiplayer_mode();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
