Author: zaroth
Date: Sat Jun 11 13:15:28 2011
New Revision: 49834
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49834&view=rev
Log:
Removed test_mode_ class variable
Modified:
trunk/src/game_controller.cpp
trunk/src/game_controller.hpp
Modified: trunk/src/game_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller.cpp?rev=49834&r1=49833&r2=49834&view=diff
==============================================================================
--- trunk/src/game_controller.cpp (original)
+++ trunk/src/game_controller.cpp Sat Jun 11 13:15:28 2011
@@ -78,7 +78,6 @@
resize_monitor_(),
paths_manager_(),
test_scenario_("test"),
- test_mode_(false),
screenshot_map_(),
screenshot_filename_(),
game_config_(),
@@ -245,7 +244,6 @@
game_config::small_gui = true;
if (cmdline_opts_.test)
{
- test_mode_ = true;
if (!cmdline_opts_.test->empty())
test_scenario_ = *cmdline_opts_.test;
}
@@ -285,13 +283,13 @@
if (cmdline_opts_.multiplayer)
cache_.add_define("MULTIPLAYER");
- if (test_mode_)
+ if (cmdline_opts_.test)
cache_.add_define("TEST");
if (jump_to_editor_)
cache_.add_define("EDITOR");
- if (!cmdline_opts_.multiplayer && !test_mode_ && !jump_to_editor_)
+ if (!cmdline_opts_.multiplayer && !cmdline_opts_.test &&
!jump_to_editor_)
cache_.add_define("TITLE_SCREEN");
load_game_cfg(force);
@@ -315,7 +313,7 @@
{
static bool first_time = true;
- if(test_mode_ == false) {
+ if(!cmdline_opts_.test) {
return true;
}
if(!first_time)
@@ -335,7 +333,6 @@
try {
play_game(disp(),state_,game_config());
} catch (game::load_game_exception &) {
- test_mode_ = false;
return true;
}
Modified: trunk/src/game_controller.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_controller.hpp?rev=49834&r1=49833&r2=49834&view=diff
==============================================================================
--- trunk/src/game_controller.hpp (original)
+++ trunk/src/game_controller.hpp Sat Jun 11 13:15:28 2011
@@ -107,7 +107,6 @@
std::string test_scenario_;
- bool test_mode_;
std::string screenshot_map_, screenshot_filename_;
config game_config_;
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
