Author: euschn
Date: Mon Jun 22 16:07:16 2009
New Revision: 36352
URL: http://svn.gna.org/viewcvs/wesnoth?rev=36352&view=rev
Log:
removed gamestatus member from classes attack_prediction_displayer,
battle_prediction_pane, mouse_handler and menu_handler
Modified:
trunk/src/attack_prediction_display.cpp
trunk/src/attack_prediction_display.hpp
trunk/src/menu_events.cpp
trunk/src/menu_events.hpp
trunk/src/mouse_events.cpp
trunk/src/mouse_events.hpp
trunk/src/play_controller.cpp
Modified: trunk/src/attack_prediction_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/attack_prediction_display.cpp?rev=36352&r1=36351&r2=36352&view=diff
==============================================================================
--- trunk/src/attack_prediction_display.cpp (original)
+++ trunk/src/attack_prediction_display.cpp Mon Jun 22 16:07:16 2009
@@ -46,7 +46,7 @@
battle_prediction_pane::battle_prediction_pane(display &disp,
const battle_context& bc, const gamemap& map, const
std::vector<team>& teams, const unit_map& units,
- const gamestatus& status, const tod_manager& tod_mng, const
map_location& attacker_loc,
+ const tod_manager& tod_mng, const map_location& attacker_loc,
const map_location& defender_loc) :
gui::preview_pane(disp.video()),
disp_(disp),
@@ -54,7 +54,6 @@
map_(map),
teams_(teams),
units_(units),
- status_(status),
tod_manager_(tod_mng),
attacker_loc_(attacker_loc),
defender_loc_(defender_loc),
@@ -547,7 +546,7 @@
const size_t index = size_t(selection);
if(index < bc_vector_.size()) {
- battle_prediction_pane battle_pane(disp_, bc_vector_[index],
map_, teams_, units_, status_, tod_manager_,
+ battle_prediction_pane battle_pane(disp_, bc_vector_[index],
map_, teams_, units_, tod_manager_,
attacker_loc_, defender_loc_);
std::vector<gui::preview_pane*> preview_panes;
preview_panes.push_back(&battle_pane);
Modified: trunk/src/attack_prediction_display.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/attack_prediction_display.hpp?rev=36352&r1=36351&r2=36352&view=diff
==============================================================================
--- trunk/src/attack_prediction_display.hpp (original)
+++ trunk/src/attack_prediction_display.hpp Mon Jun 22 16:07:16 2009
@@ -31,7 +31,7 @@
// Lengthy constructor.
battle_prediction_pane(display &disp, const battle_context& bc, const
gamemap& map,
const std::vector<team>&
teams, const unit_map& units,
- const gamestatus& status,
const tod_manager& tod_mng,
+ const tod_manager& tod_mng,
const map_location&
attacker_loc, const map_location& defender_loc);
// This method is called to draw the dialog contents.
@@ -49,7 +49,6 @@
const gamemap& map_;
const std::vector<team>& teams_;
const unit_map& units_;
- const gamestatus& status_;
const tod_manager& tod_manager_;
const map_location& attacker_loc_;
const map_location& defender_loc_;
@@ -132,9 +131,9 @@
public:
attack_prediction_displayer(display& disp, const
std::vector<battle_context>& bc_vector, const gamemap& map,
const
std::vector<team>& teams, const unit_map& units,
- const gamestatus&
status, const tod_manager& tod_mng,
+ const tod_manager&
tod_mng,
const
map_location& attacker_loc, const map_location& defender_loc)
- : disp_(disp), bc_vector_(bc_vector), map_(map),
teams_(teams), units_(units), status_(status), tod_manager_(tod_mng),
+ : disp_(disp), bc_vector_(bc_vector), map_(map),
teams_(teams), units_(units), tod_manager_(tod_mng),
attacker_loc_(attacker_loc),
defender_loc_(defender_loc) {}
// This method is called when the button is pressed.
RESULT button_pressed(int selection);
@@ -145,7 +144,6 @@
const gamemap& map_;
const std::vector<team>& teams_;
const unit_map& units_;
- const gamestatus& status_;
const tod_manager& tod_manager_;
const map_location& attacker_loc_;
const map_location& defender_loc_;
Modified: trunk/src/menu_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.cpp?rev=36352&r1=36351&r2=36352&view=diff
==============================================================================
--- trunk/src/menu_events.cpp (original)
+++ trunk/src/menu_events.cpp Mon Jun 22 16:07:16 2009
@@ -112,7 +112,7 @@
menu_handler::menu_handler(game_display* gui, unit_map& units,
std::vector<team>& teams,
const config& level, const gamemap& map,
- const config& game_config, const gamestatus& status,
const tod_manager& tod_mng, game_state& gamestate,
+ const config& game_config, const tod_manager& tod_mng,
game_state& gamestate,
undo_list& undo_stack, undo_list& redo_stack) :
gui_(gui),
units_(units),
@@ -120,7 +120,6 @@
level_(level),
map_(map),
game_config_(game_config),
- status_(status),
tod_manager_(tod_mng),
gamestate_(gamestate),
undo_stack_(undo_stack),
Modified: trunk/src/menu_events.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/menu_events.hpp?rev=36352&r1=36351&r2=36352&view=diff
==============================================================================
--- trunk/src/menu_events.hpp (original)
+++ trunk/src/menu_events.hpp Mon Jun 22 16:07:16 2009
@@ -58,7 +58,7 @@
public:
menu_handler(game_display* gui, unit_map& units, std::vector<team>&
teams,
const config& level, const gamemap& map,
- const config& game_config, const gamestatus& status, const
tod_manager& tod_mng, game_state& gamestate,
+ const config& game_config, const tod_manager& tod_mng,
game_state& gamestate,
undo_list& undo_stack, undo_list& redo_stack);
virtual ~menu_handler();
@@ -143,7 +143,6 @@
const config& level_;
const gamemap& map_;
const config& game_config_;
- const gamestatus& status_;
const tod_manager& tod_manager_;
game_state& gamestate_;
Modified: trunk/src/mouse_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.cpp?rev=36352&r1=36351&r2=36352&view=diff
==============================================================================
--- trunk/src/mouse_events.cpp (original)
+++ trunk/src/mouse_events.cpp Mon Jun 22 16:07:16 2009
@@ -36,14 +36,13 @@
mouse_handler::mouse_handler(game_display* gui, std::vector<team>& teams,
- unit_map& units, gamemap& map, gamestatus& status, tod_manager&
tod_mng,
+ unit_map& units, gamemap& map, tod_manager& tod_mng,
undo_list& undo_stack, undo_list& redo_stack) :
mouse_handler_base(),
map_(map),
gui_(gui),
teams_(teams),
units_(units),
- status_(status),
tod_manager_(tod_mng),
undo_stack_(undo_stack),
redo_stack_(redo_stack),
@@ -636,7 +635,7 @@
gui().highlight_hex(map_location());
gui().draw(true,true);
- attack_prediction_displayer ap_displayer(gui(), bc_vector, map_,
teams_, units_, status_, tod_manager_, attacker_loc, defender_loc);
+ attack_prediction_displayer ap_displayer(gui(), bc_vector, map_,
teams_, units_, tod_manager_, attacker_loc, defender_loc);
std::vector<gui::dialog_button_info> buttons;
buttons.push_back(gui::dialog_button_info(&ap_displayer, _("Damage
Calculations")));
Modified: trunk/src/mouse_events.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/mouse_events.hpp?rev=36352&r1=36351&r2=36352&view=diff
==============================================================================
--- trunk/src/mouse_events.hpp (original)
+++ trunk/src/mouse_events.hpp Mon Jun 22 16:07:16 2009
@@ -33,7 +33,7 @@
class mouse_handler : public mouse_handler_base {
public:
mouse_handler(game_display* gui, std::vector<team>& teams, unit_map&
units, gamemap& map,
- gamestatus& status, tod_manager& tod_mng, undo_list&
undo_stack, undo_list& redo_stack);
+ tod_manager& tod_mng, undo_list& undo_stack, undo_list&
redo_stack);
~mouse_handler();
static mouse_handler* get_singleton() { return singleton_ ;}
void set_side(int side_number);
@@ -94,7 +94,6 @@
game_display* gui_;
std::vector<team>& teams_;
unit_map& units_;
- gamestatus& status_;
tod_manager& tod_manager_;
undo_list& undo_stack_;
undo_list& redo_stack_;
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=36352&r1=36351&r2=36352&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Mon Jun 22 16:07:16 2009
@@ -50,8 +50,8 @@
halo_manager_(),
labels_manager_(),
help_manager_(&game_config, &map_),
- mouse_handler_(NULL, teams_, units_, map_, status_, tod_manager_,
undo_stack_, redo_stack_),
- menu_handler_(NULL, units_, teams_, level, map_, game_config, status_,
tod_manager_, state_of_game, undo_stack_, redo_stack_),
+ mouse_handler_(NULL, teams_, units_, map_, tod_manager_, undo_stack_,
redo_stack_),
+ menu_handler_(NULL, units_, teams_, level, map_, game_config,
tod_manager_, state_of_game, undo_stack_, redo_stack_),
soundsources_manager_(),
tod_manager_(level, num_turns, &state_of_game),
gui_(),
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
