0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a bug spotted by uso:

Browse source 
"next unit" trigger the select anim+event only half the times when
there is only one unit. So, now we have a clear signal that your input
was take into account (but has no effect since there is no other unit)
Also, fuse both functions cycle and cycle_back and do some cleaning.
This commit is contained in:
Ali El Gariani 2007-12-03 22:41:34 +00:00
parent 67bb5388c0
commit 0e612a33fc
2 changed files with 31 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
src/mouse_events.cpp
View file

@ -1461,65 +1461,48 @@ void mouse_handler::show_attack_options(unit_map::const_iterator u)
bool mouse_handler::unit_in_cycle(unit_map::const_iterator it)
{
if(it->second.side() == team_num_ && unit_can_move(it->first,units_,map_,teams_) && it->second.user_end_turn() == false && !gui_->fogged(it->first)) {
bool is_enemy = current_team().is_enemy(int(gui_->viewing_team()+1));
return is_enemy == false || it->second.invisible(it->first,units_,teams_) == false;
}
if (it == units_.end())
return false;
return false;
if(it->second.side() != team_num_ || it->second.user_end_turn()
|| gui_->fogged(it->first) || !unit_can_move(it->first,units_,map_,teams_))
return false;
if (current_team().is_enemy(int(gui_->viewing_team()+1)) &&
it->second.invisible(it->first,units_,teams_))
return false;
return true;
}
#define LOCAL_VARIABLES \
unit_map::const_iterator it = units_.find(next_unit_);\
const unit_map::const_iterator itx = it;\
const unit_map::const_iterator begin = units_.begin();\
const unit_map::const_iterator end = units_.end()
void mouse_handler::cycle_units(const bool browse)
void mouse_handler::cycle_units(const bool browse, const bool reverse)
{
LOCAL_VARIABLES;
if (it == end) {
for (it = begin; it != end && !unit_in_cycle(it); ++it);
} else {
do {
++it;
if (it == end) it = begin;
} while (it != itx && !unit_in_cycle(it));
}
if (it!=itx) {
gui_->scroll_to_tile(it->first,game_display::WARP);
select_hex(it->first, browse);
} else {
next_unit_ = gamemap::location();
if (units_.begin() == units_.end()) {
return;
}
mouse_update(browse);
}
unit_map::const_iterator it = find_unit(next_unit_);
const unit_map::const_iterator itx = it;
void mouse_handler::cycle_back_units(const bool browse)
{
LOCAL_VARIABLES;
if (it == end) {
while (it != begin && !unit_in_cycle(--it));
if (!unit_in_cycle(it)) it = itx;
} else {
do {
if (it == begin) it = end;
do {
if (reverse) {
if (it == units_.begin())
it = units_.end();
--it;
} while (it != itx && !unit_in_cycle(it));
}
} else {
if (it == units_.end())
it = units_.begin();
else
++it;
}
} while (it != itx && !unit_in_cycle(it));
if (it!=itx) {
if (unit_in_cycle(it)) {
gui_->scroll_to_tile(it->first,game_display::WARP);
select_hex(it->first, browse);
} else {
next_unit_ = gamemap::location();
mouse_update(browse);
}
mouse_update(browse);
}
void mouse_handler::set_current_paths(paths new_paths) {

4
src/mouse_events.hpp
View file

@ -44,8 +44,8 @@ public:
// update the mouse with a fake mouse motion
void mouse_update(const bool browse);
void mouse_press(const SDL_MouseButtonEvent& event, const bool browse);
void cycle_units(const bool browse);
void cycle_back_units(const bool browse);
void cycle_units(const bool browse, const bool reverse = false);
void cycle_back_units(const bool browse) { cycle_units(browse, true); }
int get_path_turns() const { return path_turns_; }
paths get_current_paths() { return current_paths_; }