Author: zaroth
Date: Sat Jun 11 00:34:54 2011
New Revision: 49833
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49833&view=rev
Log:
Moved init_language() 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=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- trunk/src/game_controller.cpp (original)
+++ trunk/src/game_controller.cpp Sat Jun 11 00:34:54 2011
@@ -311,24 +311,6 @@
return true;
}
-bool game_controller::init_language()
-{
- if(!::load_language_list())
- return false;
-
- ::set_language(get_locale());
-
- if(!cmdline_opts_.nogui) {
- std::string wm_title_string = _("The Battle for Wesnoth");
- wm_title_string += " - " + game_config::revision;
- SDL_WM_SetCaption(wm_title_string.c_str(), NULL);
- }
-
- hotkey::load_descriptions();
-
- return true;
-}
-
bool game_controller::play_test()
{
static bool first_time = true;
Modified: trunk/src/game_controller.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller.hpp?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- trunk/src/game_controller.hpp (original)
+++ trunk/src/game_controller.hpp Sat Jun 11 00:34:54 2011
@@ -50,7 +50,6 @@
~game_controller();
bool init_config() { return init_config(false); }
- bool init_language();
bool play_test();
bool play_multiplayer_mode();
bool play_screenshot_mode();
Modified: trunk/src/game_controller_abstract.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_abstract.cpp?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- trunk/src/game_controller_abstract.cpp (original)
+++ trunk/src/game_controller_abstract.cpp Sat Jun 11 00:34:54 2011
@@ -16,6 +16,9 @@
#include "game_controller_abstract.hpp"
#include "game_display.hpp"
+#include "gettext.hpp"
+#include "hotkeys.hpp"
+#include "language.hpp"
#include "preferences_display.hpp"
#include <iostream>
@@ -37,6 +40,24 @@
disp_.assign(game_display::create_dummy_display(video_));
}
return *disp_.get();
+}
+
+bool game_controller_abstract::init_language()
+{
+ if(!::load_language_list())
+ return false;
+
+ ::set_language(get_locale());
+
+ if(!cmdline_opts_.nogui) {
+ std::string wm_title_string = _("The Battle for Wesnoth");
+ wm_title_string += " - " + game_config::revision;
+ SDL_WM_SetCaption(wm_title_string.c_str(), NULL);
+ }
+
+ hotkey::load_descriptions();
+
+ return true;
}
bool game_controller_abstract::init_video()
Modified: trunk/src/game_controller_abstract.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_abstract.hpp?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- trunk/src/game_controller_abstract.hpp (original)
+++ trunk/src/game_controller_abstract.hpp Sat Jun 11 00:34:54 2011
@@ -33,7 +33,7 @@
bool init_video();
virtual bool init_config() = 0;
- virtual bool init_language() = 0;
+ bool init_language();
virtual bool play_test() = 0;
virtual bool play_multiplayer_mode() = 0;
virtual bool play_screenshot_mode() = 0;
Modified: trunk/src/game_controller_new.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_new.cpp?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- trunk/src/game_controller_new.cpp (original)
+++ trunk/src/game_controller_new.cpp Sat Jun 11 00:34:54 2011
@@ -30,11 +30,6 @@
}
bool game_controller_new::init_config()
-{
- return true;
-}
-
-bool game_controller_new::init_language()
{
return true;
}
Modified: trunk/src/game_controller_new.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_new.hpp?rev=49833&r1=49832&r2=49833&view=diff
==============================================================================
--- trunk/src/game_controller_new.hpp (original)
+++ trunk/src/game_controller_new.hpp Sat Jun 11 00:34:54 2011
@@ -26,7 +26,6 @@
~game_controller_new();
bool init_config();
- bool init_language();
bool play_test();
bool play_multiplayer_mode();
bool play_screenshot_mode();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
