Author: alink
Date: Thu May 29 18:41:20 2008
New Revision: 26912
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26912&view=rev
Log:
Revert r26808 (about unhiding discovered unit until their next turn)
Risk of OOS, need to be done in one global shot instead of progressively.
But keep the part about preferring existent alert message.
Modified:
trunk/src/actions.cpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=26912&r1=26911&r2=26912&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Thu May 29 18:41:20 2008
@@ -2153,23 +2153,19 @@
if(adjacent[i] == ui->first)
continue;
- const unit_map::iterator it = units.find(adjacent[i]);
+ const unit_map::const_iterator it =
units.find(adjacent[i]);
if(it != units.end() &&
team.is_enemy(it->second.side()) &&
it->second.invisible(it->first,units,teams)) {
discovered_unit = true;
should_clear_stack = true;
moves_left = 0;
- it->second.set_state("hidden","no");
-
+ unit_ability_list hides =
it->second.get_abilities("hides",it->first);
+
+
std::vector<std::pair<config*,gamemap::location> >::const_iterator hide_it =
hides.cfgs.begin();
// we only use the first valid alert message
- if (ambushed_string.empty()) {
- unit_ability_list hides =
it->second.get_abilities("hides",it->first);
-
-
for(std::vector<std::pair<config*,gamemap::location> >::const_iterator hide_it
= hides.cfgs.begin();
- hide_it !=
hides.cfgs.end(); ++hide_it) {
- ambushed_string
=(*hide_it->first)["alert"];
- }
+ for(;hide_it != hides.cfgs.end() &&
!ambushed_string.empty(); ++hide_it) {
+ ambushed_string =
(*hide_it->first)["alert"];
}
}
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
