# HG changeset patch
# User nemo
# Date 1314471296 14400
# Node ID 753ae5d0776c52bd7dd10a4d81b68d6ce7dbc4ba
# Parent  54b12cc39e952f50e4e649937d7f9b4b3eb9b796
implement proper blending

diff -r 54b12cc39e95 -r 753ae5d0776c hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sat Aug 27 12:52:54 2011 -0400
+++ b/hedgewars/GSHandlers.inc	Sat Aug 27 14:54:56 2011 -0400
@@ -664,7 +664,7 @@
         begin
         // we've collided with land. draw some stuff and get back into the clouds
         move:= true;
-        if (CurAmmoGear = nil) or (CurAmmoGear^.Kind <> gtRope) then
+        if (GameTicks > 20) and ((CurAmmoGear = nil) or (CurAmmoGear^.Kind <> gtRope)) then
             begin
 ////////////////////////////////// TODO - ASK UNC0RR FOR A GOOD HOME FOR THIS ////////////////////////////////////
             if not gun then
diff -r 54b12cc39e95 -r 753ae5d0776c hedgewars/uLandGraphics.pas
--- a/hedgewars/uLandGraphics.pas	Sat Aug 27 12:52:54 2011 -0400
+++ b/hedgewars/uLandGraphics.pas	Sat Aug 27 14:54:56 2011 -0400
@@ -47,24 +47,30 @@
 function addBgColor(OldColor, NewColor: LongWord): LongWord;
 // Factor ranges from 0 to 100% NewColor
 var
-    oRed, oBlue, oGreen, oAlpha, nRed, nBlue, nGreen, nAlpha: Byte;
+    oRed, oBlue, oGreen, oAlpha, nRed, nBlue, nGreen, nAlpha: LongWord;
 begin
+    oAlpha := (OldColor shr AShift) and $FF;
+    nAlpha := (NewColor shr AShift) and $FF;
+    // shortcircuit
+    if (oAlpha = 0) or (nAlpha = $FF) then
+        begin
+        addBgColor:= NewColor;
+        exit
+        end; 
     // Get colors
-    oAlpha := (OldColor shr AShift) and $FF;
     oRed   := (OldColor shr RShift) and $FF;
     oGreen := (OldColor shr GShift) and $FF;
     oBlue  := (OldColor shr BShift) and $FF;
 
-    nAlpha := (NewColor shr AShift) and $FF;
     nRed   := (NewColor shr RShift) and $FF;
     nGreen := (NewColor shr GShift) and $FF;
     nBlue  := (NewColor shr BShift) and $FF;
 
     // Mix colors
+    nRed   := min(255,((nRed*nAlpha) div 255) + ((oRed*oAlpha*(255-nAlpha)) div 65025));
+    nGreen := min(255,((nGreen*nAlpha) div 255) + ((oGreen*oAlpha*(255-nAlpha)) div 65025));
+    nBlue  := min(255,((nBlue*nAlpha) div 255) + ((oBlue*oAlpha*(255-nAlpha)) div 65025)); 
     nAlpha := min(255, oAlpha + nAlpha);
-    nRed   := ((oRed * oAlpha) + (nRed * Byte(255-oAlpha))) div 255;
-    nGreen := ((oGreen * oAlpha) + (nGreen * Byte(255-oAlpha))) div 255;
-    nBlue  := ((oBlue * oAlpha) + (nBlue * Byte(255-oAlpha))) div 255;
 
     addBgColor := (nAlpha shl AShift) or (nRed shl RShift) or (nGreen shl GShift) or (nBlue shl BShift);
 end;