Author: brunowolff
Date: Wed Mar 19 18:40:05 2008
New Revision: 24865
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24865&view=rev
Log:
Silence gcc 4.3 warning by adding parens around && clause near ||.
Modified:
trunk/src/play_controller.cpp
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=24865&r1=24864&r2=24865&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Wed Mar 19 18:40:05 2008
@@ -379,7 +379,7 @@
// and the player should get income now.
// Healing/income happen if it's not the first turn of processing,
// or if we are loading a game, and this is not the player it started
with.
- const bool turn_refresh = status_.turn() > start_turn_ || loading_game_
&& team_index != (first_player_ - 1);
+ const bool turn_refresh = status_.turn() > start_turn_ ||
(loading_game_ && team_index != (first_player_ - 1));
if(turn_refresh) {
for(unit_map::iterator i = units_.begin(); i != units_.end();
++i) {
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
