Author: brunowolff
Date: Wed Mar 19 18:54:45 2008
New Revision: 24872
URL: http://svn.gna.org/viewcvs/wesnoth?rev=24872&view=rev
Log:
Silence gcc 4.3 warnings by adding parens around && clauses near ||.
Modified:
trunk/src/unit_display.cpp
Modified: trunk/src/unit_display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_display.cpp?rev=24872&r1=24871&r2=24872&view=diff
==============================================================================
--- trunk/src/unit_display.cpp (original)
+++ trunk/src/unit_display.cpp Wed Mar 19 18:54:45 2008
@@ -40,7 +40,7 @@
static void teleport_unit_between( const gamemap::location& a, const
gamemap::location& b, unit& temp_unit)
{
game_display* disp = game_display::get_singleton();
- if(!disp || disp->video().update_locked() || disp->fogged(a) &&
disp->fogged(b)) {
+ if(!disp || disp->video().update_locked() || (disp->fogged(a) &&
disp->fogged(b))) {
return;
}
disp->scroll_to_tiles(a,b,game_display::ONSCREEN,true);
@@ -68,7 +68,7 @@
static void move_unit_between(const gamemap::location& a, const
gamemap::location& b, unit& temp_unit)
{
game_display* disp = game_display::get_singleton();
- if(!disp || disp->video().update_locked() || disp->fogged(a) &&
disp->fogged(b)) {
+ if(!disp || disp->video().update_locked() || (disp->fogged(a) &&
disp->fogged(b))) {
return;
}
@@ -210,7 +210,7 @@
if(!disp || preferences::show_combat() == false) return;
unit_map& units = disp->get_units();
disp->select_hex(gamemap::location::null_location);
- const bool hide = disp->video().update_locked() || disp->fogged(a) &&
disp->fogged(b);
+ const bool hide = disp->video().update_locked() || (disp->fogged(a) &&
disp->fogged(b));
if(!hide) {
// scroll such that there is at least half a hex spacing around
fighters
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
