Author: brunowolff
Date: Wed Mar 19 17:37:13 2008
New Revision: 24844
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24844&view=rev
Log:
Silence gcc 4.3 warnings by adding parens around && clauses near ||.
Modified:
trunk/src/ai.cpp
Modified: trunk/src/ai.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ai.cpp?rev=24844&r1=24843&r2=24844&view=diff
==============================================================================
--- trunk/src/ai.cpp (original)
+++ trunk/src/ai.cpp Wed Mar 19 17:37:13 2008
@@ -706,9 +706,9 @@
// If we are looking for the movement of enemies, then this
unit must be an enemy unit.
// If we are looking for movement of our own units, it must be
on our side.
// If we are assuming full movement, then it may be a unit on
our side, or allied.
- if(enemy && current_team().is_enemy(un_it->second.side()) ==
false ||
- !enemy && !assume_full_movement && un_it->second.side() !=
info_.team_num ||
- !enemy && assume_full_movement &&
current_team().is_enemy(un_it->second.side())) {
+ if((enemy && current_team().is_enemy(un_it->second.side()) ==
false) ||
+ (!enemy && !assume_full_movement && un_it->second.side() !=
info_.team_num) ||
+ (!enemy && assume_full_movement &&
current_team().is_enemy(un_it->second.side()))) {
continue;
}
// Discount incapacitated units
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
