From 821e159b05be62c71471fa6d07c307dfbe27107f Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Tue, 24 May 2011 01:07:57 +0000 Subject: [PATCH] && not and ..... --- source/shared_lib/sources/map/map_preview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/shared_lib/sources/map/map_preview.cpp b/source/shared_lib/sources/map/map_preview.cpp index 409af5c9e..bb2c7851a 100644 --- a/source/shared_lib/sources/map/map_preview.cpp +++ b/source/shared_lib/sources/map/map_preview.cpp @@ -403,7 +403,7 @@ void MapPreview::copyXY(int x, int y, int sx, int sy) { // swap a cell in the map with another, used by rotate etc void MapPreview::swapXY(int x, int y, int sx, int sy) { - if(inside(x, y) and inside(sx, sy)){ + if(inside(x, y) && inside(sx, sy)){ float tmpHeight= cells[x][y].height; cells[x][y].height= cells[sx][sy].height; cells[sx][sy].height= tmpHeight;