Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add buttons for tag team, bottom border, unbreak smoothing
authornemo
Wed, 31 Aug 2011 15:50:39 -0400
changeset 5719 0ed1f543f301
parent 5718 e74de0528ef4
child 5720 a962d0823f49
child 5721 04f6ac4b2c0e
Add buttons for tag team, bottom border, unbreak smoothing
QTfrontend/hedgewars.qrc file | annotate | diff | comparison | revisions
QTfrontend/pagescheme.cpp file | annotate | diff | comparison | revisions
QTfrontend/res/btnBottomBorder.png file | annotate | diff | comparison | revisions
QTfrontend/res/btnTagTeam.png file | annotate | diff | comparison | revisions
hedgewars/uLand.pas file | annotate | diff | comparison | revisions 
--- 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>
--- 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);
 
Binary file QTfrontend/res/btnBottomBorder.png has changed
Binary file QTfrontend/res/btnTagTeam.png has changed
--- 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
sheepy-clone