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

Just rename a variable

Browse Source 
(last_highlighted_hex_ instead of last_empty_hex_) and remove unneeded
initialization of variables (locations are initialized when
constructed)
This commit is contained in:
Ali El Gariani 2007-07-31 22:48:04 +00:00
parent 3103165c54
commit e635a5a51d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mouse_events.cpp
View File

@ -682,8 +682,6 @@ undo_stack_(undo_stack), redo_stack_(redo_stack), game_state_(game_state)
dragging_started_ = false;
drag_from_x_ = 0;
drag_from_y_ = 0;
last_hex_ = gamemap::location();
last_empty_hex_ = gamemap::location();
enemy_paths_ = false;
path_turns_ = 0;
undo_ = false;
@ -747,7 +745,7 @@ void mouse_handler::mouse_motion(int x, int y, const bool browse)
// the selected hex is always the best attack origin
if (new_hex == selected_hex_) {
last_empty_hex_ = new_hex;
last_highlighted_hex_ = new_hex;
}
if(new_hex != last_hex_) {
@ -767,7 +765,7 @@ void mouse_handler::mouse_motion(int x, int y, const bool browse)
// we consider any hex without enemy as a possible attack origin,
// we will search later the nearest empty hex
if (mouseover_unit == units_.end() || !current_team().is_enemy(mouseover_unit->second.side())) {
last_empty_hex_ = new_hex;
last_highlighted_hex_ = new_hex;
}
gamemap::location attack_from = current_unit_attacks_from(new_hex);
@ -894,7 +892,7 @@ gamemap::location mouse_handler::current_unit_attacks_from(const gamemap::locati
return gamemap::location();
}
const gamemap::location::DIRECTION preferred = loc.get_relative_dir(last_empty_hex_);
const gamemap::location::DIRECTION preferred = loc.get_relative_dir(last_highlighted_hex_);
const gamemap::location::DIRECTION second_preferred = loc.get_relative_dir(selected_hex_);
int best_rating = 100;//smaller is better

3
src/mouse_events.hpp
View File

@ -101,7 +101,8 @@ private:
int drag_from_y_;
gamemap::location last_hex_;
gamemap::location last_empty_hex_;
// last highlighted hex without any enemy
gamemap::location last_highlighted_hex_;
gamemap::location selected_hex_;
gamemap::location next_unit_;
paths::route current_route_;