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

Fix bug #9314: Search by name shows hidden units

Browse source 
Optimize a little by skipping earlier fogged/shrouded hex
This commit is contained in:
Ali El Gariani 2007-06-12 21:29:04 +00:00
parent c45516d1a0
commit 217f7ab5f9
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/menu_events.cpp
View file

@ -1741,27 +1741,33 @@ namespace events{
loc.y = (loc.y + 1) % map_.y();
//Search label
const terrain_label* label = gui_->labels().get_label(loc);
if(label) {
if(std::search(label->text().begin(), label->text().end(),
last_search_.begin(), last_search_.end(),
chars_equal_insensitive) != label->text().end()) {
found = !gui_->shrouded(loc);
if (!gui_->shrouded(loc)) {
const terrain_label* label = gui_->labels().get_label(loc);
if(label) {
if(std::search(label->text().begin(), label->text().end(),
last_search_.begin(), last_search_.end(),
chars_equal_insensitive) != label->text().end()) {
found = true;
}
}
}
//Search unit name
unit_map::const_iterator ui = units_.find(loc);
if(ui != units_.end()) {
const std::string name = ui->second.description();
if(std::search(name.begin(), name.end(),
last_search_.begin(), last_search_.end(),
chars_equal_insensitive) != name.end()) {
found = !gui_->fogged(loc);
if (!gui_->fogged(loc)) {
unit_map::const_iterator ui = units_.find(loc);
if(ui != units_.end()) {
const std::string name = ui->second.description();
if(std::search(name.begin(), name.end(),
last_search_.begin(), last_search_.end(),
chars_equal_insensitive) != name.end()) {
found = true;
}
}
}
if(loc == start)
break;
}
if(found) {
last_search_hit_ = loc;
gui_->scroll_to_tile(loc,display::ONSCREEN,false);