Author: zaroth
Date: Fri Jun 10 23:48:15 2011
New Revision: 49829
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49829&view=rev
Log:
moved responsibility for holding commandline_options to
game_controller_abstract
Modified:
trunk/src/game.cpp
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.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game.cpp?rev=49829&r1=49828&r2=49829&view=diff
==============================================================================
--- trunk/src/game.cpp (original)
+++ trunk/src/game.cpp Fri Jun 10 23:48:15 2011
@@ -417,9 +417,9 @@
recorder.set_seed(rand());
boost::shared_ptr<game_controller_abstract> game;
if (game_config::new_syntax)
- game = boost::shared_ptr<game_controller_abstract>(new
game_controller_new());
+ game = boost::shared_ptr<game_controller_abstract>(new
game_controller_new(cmdline_opts));
else
- game = boost::shared_ptr<game_controller_abstract>(new
game_controller(argv[0],cmdline_opts));
+ game = boost::shared_ptr<game_controller_abstract>(new
game_controller(cmdline_opts,argv[0]));
const int start_ticks = SDL_GetTicks();
init_locale();
Modified: trunk/src/game_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller.cpp?rev=49829&r1=49828&r2=49829&view=diff
==============================================================================
--- trunk/src/game_controller.cpp (original)
+++ trunk/src/game_controller.cpp Fri Jun 10 23:48:15 2011
@@ -66,8 +66,8 @@
return a["rank"].to_int(1000) < b["rank"].to_int(1000);
}
-game_controller::game_controller(const char *appname, const
commandline_options& cmdline_opts) :
- cmdline_opts_(cmdline_opts),
+game_controller::game_controller(const commandline_options& cmdline_opts,
const char *appname) :
+ game_controller_abstract(cmdline_opts),
thread_manager(),
font_manager_(),
prefs_manager_(),
Modified: trunk/src/game_controller.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller.hpp?rev=49829&r1=49828&r2=49829&view=diff
==============================================================================
--- trunk/src/game_controller.hpp (original)
+++ trunk/src/game_controller.hpp Fri Jun 10 23:48:15 2011
@@ -46,7 +46,7 @@
class game_controller : public game_controller_abstract
{
public:
- game_controller(const char* appname, const commandline_options&
cmdline_opts);
+ game_controller(const commandline_options& cmdline_opts, const char*
appname);
~game_controller();
bool init_config() { return init_config(false); }
@@ -94,8 +94,6 @@
editor::EXIT_STATUS start_editor(const std::string& filename);
- const commandline_options& cmdline_opts_;
-
//this should get destroyed *after* the video, since we want
//to clean up threads after the display disappears.
const threading::manager thread_manager;
Modified: trunk/src/game_controller_abstract.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_abstract.cpp?rev=49829&r1=49828&r2=49829&view=diff
==============================================================================
--- trunk/src/game_controller_abstract.cpp (original)
+++ trunk/src/game_controller_abstract.cpp Fri Jun 10 23:48:15 2011
@@ -17,7 +17,8 @@
#include "game_display.hpp"
-game_controller_abstract::game_controller_abstract() :
+game_controller_abstract::game_controller_abstract(const commandline_options
&cmdline_opts) :
+ cmdline_opts_(cmdline_opts),
disp_(NULL),
video_()
{
Modified: trunk/src/game_controller_abstract.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_abstract.hpp?rev=49829&r1=49828&r2=49829&view=diff
==============================================================================
--- trunk/src/game_controller_abstract.hpp (original)
+++ trunk/src/game_controller_abstract.hpp Fri Jun 10 23:48:15 2011
@@ -14,6 +14,7 @@
*/
#ifndef GAME_CONTROLLER_ABSTRACT_H_INCLUDED
#define GAME_CONTROLLER_ABSTRACT_H_INCLUDED
+#include "commandline_options.hpp"
#include "editor/editor_main.hpp"
#include "scoped_resource.hpp"
#include "video.hpp"
@@ -25,7 +26,7 @@
class game_controller_abstract
{
public:
- game_controller_abstract();
+ game_controller_abstract(const commandline_options &cmdline_opts);
virtual ~game_controller_abstract() {}
game_display& disp();
@@ -63,6 +64,8 @@
virtual const config& game_config() const = 0;
protected:
+ const commandline_options& cmdline_opts_;
+
util::scoped_ptr<game_display> disp_;
CVideo video_;
Modified: trunk/src/game_controller_new.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_new.cpp?rev=49829&r1=49828&r2=49829&view=diff
==============================================================================
--- trunk/src/game_controller_new.cpp (original)
+++ trunk/src/game_controller_new.cpp Fri Jun 10 23:48:15 2011
@@ -18,7 +18,8 @@
#include <iostream>
-game_controller_new::game_controller_new() :
+game_controller_new::game_controller_new(const commandline_options&
cmdline_opts) :
+ game_controller_abstract(cmdline_opts),
main_config_()
{
}
Modified: trunk/src/game_controller_new.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller_new.hpp?rev=49829&r1=49828&r2=49829&view=diff
==============================================================================
--- trunk/src/game_controller_new.hpp (original)
+++ trunk/src/game_controller_new.hpp Fri Jun 10 23:48:15 2011
@@ -22,7 +22,7 @@
class game_controller_new : public game_controller_abstract
{
public:
- game_controller_new();
+ game_controller_new(const commandline_options& cmdline_opts);
~game_controller_new();
bool init_config();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
