upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-01 01:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Game Board: removed mouse_handler and menu_handler as friends

Browse Source
This commit is contained in:
Charles Dang 2021-01-03 18:54:38 +11:00
parent 627bde781e
commit c2c45aa085
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game_board.hpp
View File

@ -56,8 +56,6 @@ class game_board : public display_context
unit_map units_; unit_map units_;
//TODO: Remove these when we have refactored enough to make it possible. //TODO: Remove these when we have refactored enough to make it possible.
friend class events::mouse_handler;
friend class events::menu_handler;
friend class game_lua_kernel; friend class game_lua_kernel;
/** /**

4
src/menu_events.cpp
View File

@ -122,12 +122,12 @@ game_board& menu_handler::board() const
unit_map& menu_handler::units() unit_map& menu_handler::units()
{ {
return gamestate().board_.units_; return gamestate().board_.units();
} }
std::vector<team>& menu_handler::teams() const std::vector<team>& menu_handler::teams() const
{ {
return gamestate().board_.teams_; return gamestate().board_.teams();
} }
const gamemap& menu_handler::map() const const gamemap& menu_handler::map() const

15
src/mouse_events.cpp
View File

@ -624,7 +624,7 @@ unit_map::iterator mouse_handler::find_unit(const map_location& hex)
return it; return it;
} }
return pc_.gamestate().board_.units_.end(); return pc_.gamestate().board_.units().end();
} }
unit_map::const_iterator mouse_handler::find_unit(const map_location& hex) const unit_map::const_iterator mouse_handler::find_unit(const map_location& hex) const
@ -905,8 +905,7 @@ void mouse_handler::move_action(bool browse)
// block where we temporary move the unit // block where we temporary move the unit
{ {
temporary_unit_mover temp_mover( temporary_unit_mover temp_mover(pc_.gamestate().board_.units(), src, attack_from, itor->move_left);
pc_.gamestate().board_.units_, src, attack_from, itor->move_left);
choice = show_attack_dialog(attack_from, clicked_u->get_location()); choice = show_attack_dialog(attack_from, clicked_u->get_location());
} }
@ -1083,7 +1082,7 @@ void mouse_handler::select_hex(const map_location& hex, const bool browse, const
pathfind::paths clicked_location; pathfind::paths clicked_location;
clicked_location.destinations.insert(hex); clicked_location.destinations.insert(hex);
for(unit_map::iterator u = pc_.gamestate().board_.units_.begin(); u != pc_.gamestate().board_.units_.end(); for(unit_map::iterator u = pc_.gamestate().board_.units().begin(); u != pc_.gamestate().board_.units().end();
++u) { ++u) {
bool invisible = u->invisible(u->get_location()); bool invisible = u->invisible(u->get_location());
@ -1100,7 +1099,7 @@ void mouse_handler::select_hex(const map_location& hex, const bool browse, const
gui_->highlight_another_reach(reaching_unit_locations); gui_->highlight_another_reach(reaching_unit_locations);
} else { } else {
if(!pc_.gamestate().board_.units_.find(last_hex_)) { if(!pc_.gamestate().board_.units().find(last_hex_)) {
unselected_reach_ = gui_->unhighlight_reach(); unselected_reach_ = gui_->unhighlight_reach();
} }
@ -1247,7 +1246,7 @@ int mouse_handler::fill_weapon_choices(
for(unsigned int i = 0; i < attacker->attacks().size(); i++) { for(unsigned int i = 0; i < attacker->attacks().size(); i++) {
// skip weapons with attack_weight=0 // skip weapons with attack_weight=0
if(attacker->attacks()[i].attack_weight() > 0) { if(attacker->attacks()[i].attack_weight() > 0) {
battle_context bc(pc_.gamestate().board_.units_, attacker->get_location(), defender->get_location(), i); battle_context bc(pc_.gamestate().board_.units(), attacker->get_location(), defender->get_location(), i);
// Don't include if the attacker's weapon has at least one active "disable" special. // Don't include if the attacker's weapon has at least one active "disable" special.
if(bc.get_attacker_stats().disable) { if(bc.get_attacker_stats().disable) {
@ -1270,8 +1269,8 @@ int mouse_handler::show_attack_dialog(const map_location& attacker_loc, const ma
{ {
game_board& board = pc_.gamestate().board_; game_board& board = pc_.gamestate().board_;
unit_map::iterator attacker = board.units_.find(attacker_loc); unit_map::iterator attacker = board.units().find(attacker_loc);
unit_map::iterator defender = board.units_.find(defender_loc); unit_map::iterator defender = board.units().find(defender_loc);
if(!attacker || !defender) { if(!attacker || !defender) {
ERR_NG << "One fighter is missing, can't attack"; ERR_NG << "One fighter is missing, can't attack";