# HG changeset patch
# User nemo
# Date 1314820239 14400
# Node ID 0ed1f543f301c6afd2d9e7966cf1b0d505d7e6da
# Parent  e74de0528ef48d6c9b963d36d18967879002c189
Add buttons for tag team, bottom border, unbreak smoothing

diff -r e74de0528ef4 -r 0ed1f543f301 QTfrontend/hedgewars.qrc
--- a/QTfrontend/hedgewars.qrc	Wed Aug 31 15:06:03 2011 -0400
+++ b/QTfrontend/hedgewars.qrc	Wed Aug 31 15:50:39 2011 -0400
@@ -81,6 +81,7 @@
         <file>res/btnNoWind.png</file>
         <file>res/btnMoreWind.png</file>
         <file>res/btnTagTeam.png</file>
+        <file>res/btnBottomBorder.png</file>
         <file>res/iconBox.png</file>
         <file>res/iconHealth.png</file>
         <file>res/iconSuddenDeath.png</file>
diff -r e74de0528ef4 -r 0ed1f543f301 QTfrontend/pagescheme.cpp
--- a/QTfrontend/pagescheme.cpp	Wed Aug 31 15:06:03 2011 -0400
+++ b/QTfrontend/pagescheme.cpp	Wed Aug 31 15:50:39 2011 -0400
@@ -161,7 +161,7 @@
     TBW_tagteam->setToolTip("<b>" + ToggleButtonWidget::tr("Tag Team") + "</b>:<br />" + tr("Teams in each clan take successive turns sharing their turn time."));
     glGMLayout->addWidget(TBW_tagteam,4,3,1,1);
 
-    TBW_bottomborder = new ToggleButtonWidget(gbGameModes, ":/res/btnBorder.png");
+    TBW_bottomborder = new ToggleButtonWidget(gbGameModes, ":/res/btnBottomBorder.png");
     TBW_bottomborder->setToolTip("<b>" + ToggleButtonWidget::tr("Add Bottom Border") + "</b>:<br />" + tr("Add an indestructible border along the bottom"));
     glGMLayout->addWidget(TBW_bottomborder,4,4,1,1);
 
diff -r e74de0528ef4 -r 0ed1f543f301 QTfrontend/res/btnBottomBorder.png
Binary file QTfrontend/res/btnBottomBorder.png has changed
diff -r e74de0528ef4 -r 0ed1f543f301 QTfrontend/res/btnTagTeam.png
Binary file QTfrontend/res/btnTagTeam.png has changed
diff -r e74de0528ef4 -r 0ed1f543f301 hedgewars/uLand.pas
--- a/hedgewars/uLand.pas	Wed Aug 31 15:06:03 2011 -0400
+++ b/hedgewars/uLand.pas	Wed Aug 31 15:50:39 2011 -0400
@@ -1071,10 +1071,10 @@
             begin
                 if (cReducedQuality and rqBlurryLand) = 0 then
                     begin
-                    if (Land[y, x-1] = lfBasic) and (Land[y, x-1] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y, x-1]
-                    else if (Land[y, x+1] = lfBasic) and (Land[y, x+1] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y, x+1]
-                    else if (Land[y-1, x] = lfBasic) and (Land[y-1, x] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y-1, x]
-                    else if (Land[y+1, x] = lfBasic) and (Land[y+1, x] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y+1, x];
+                    if (Land[y, x-1] = lfBasic) and (LandPixels[y, x-1] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y, x-1]
+                    else if (Land[y, x+1] = lfBasic) and (LandPixels[y, x+1] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y, x+1]
+                    else if (Land[y-1, x] = lfBasic) and (LandPixels[y-1, x] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y-1, x]
+                    else if (Land[y+1, x] = lfBasic) and (LandPixels[y+1, x] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y+1, x];
                     if (((LandPixels[y,x] and AMask) shr AShift) > 10) then LandPixels[y,x]:= (LandPixels[y,x] and not AMask) or (128 shl AShift)
                     end;
                 Land[y,x]:= lfObject
@@ -1091,10 +1091,10 @@
             begin
                 if (cReducedQuality and rqBlurryLand) = 0 then
                     begin
-                    if (Land[y, x-1] = lfBasic) and (Land[y,x-1] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y, x-1]
-                    else if (Land[y, x+1] = lfBasic) and (Land[y,x+1] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y, x+1]
-                    else if (Land[y+1, x] = lfBasic) and (Land[y+1,x] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y+1, x]
-                    else if (Land[y-1, x] = lfBasic) and (Land[y-1,x] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y-1, x];
+                    if (Land[y, x-1] = lfBasic) and (LandPixels[y,x-1] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y, x-1]
+                    else if (Land[y, x+1] = lfBasic) and (LandPixels[y,x+1] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y, x+1]
+                    else if (Land[y+1, x] = lfBasic) and (LandPixels[y+1,x] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y+1, x]
+                    else if (Land[y-1, x] = lfBasic) and (LandPixels[y-1,x] and AMask <> 0) then LandPixels[y, x]:= LandPixels[y-1, x];
                     if (((LandPixels[y,x] and AMask) shr AShift) > 10) then LandPixels[y,x]:= (LandPixels[y,x] and not AMask) or (64 shl AShift)
                     end;
                 Land[y,x]:= lfObject