# HG changeset patch
# User Stepan777 <stepik-777@mail.ru>
# Date 1340662550 -14400
# Node ID 135e4fb3b09531c0573dc04a6e1fd482ed48d427
# Parent  835bb2852579c899074a44fa7dac0edb86c8da26# Parent  390d76b29ed0e6300630c297beef3fd480c6d423
merge

diff -r 835bb2852579 -r 135e4fb3b095 QTfrontend/ui/widget/about.cpp
--- a/QTfrontend/ui/widget/about.cpp	Tue Jun 26 02:14:35 2012 +0400
+++ b/QTfrontend/ui/widget/about.cpp	Tue Jun 26 02:15:50 2012 +0400
@@ -128,7 +128,7 @@
             "Greek: &lt;<a href=\"mailto:talos_kriti@yahoo.gr\">talos_kriti@yahoo.gr</a>&gt;<br>"
             "Italian: Luca Bonora &lt;<a href=\"mailto:bonora.luca@gmail.com\">bonora.luca@gmail.com</a>&gt;, Marco Bresciani<br>"
             "Japanese: ADAM Etienne &lt;<a href=\"mailto:etienne.adam@gmail.com\">etienne.adam@gmail.com</a>&gt;<br>"
-            "Korean: Anthony Bellew &lt;<a href=\"mailto:webmaster@anthonybellew.com\">webmaster@anthonybellew.com</a>&gt;<br>"
+            "Korean: Anthony Bellew &lt;<a href=\"mailto:anthonyreflected@gmail.com\">anthonyreflected@gmail.com</a>&gt;<br>"
             "Lithuanian: Lukas Urbonas &lt;<a href=\"mailto:lukasu08@gmail.com\">lukasu08@gmail.com</a>&gt;<br>"
             "Polish: Maciej Mroziński &lt;<a href=\"mailto:mynick2@o2.pl\">mynick2@o2.pl</a>&gt;, Wojciech Latkowski &lt;<a href=\"mailto:magik17l@gmail.com\">magik17l@gmail.com</a>&gt;, Piotr Mitana, Maciej Górny<br>"
             "Portuguese: Fábio Canário &lt;<a href=\"mailto:inufabie@gmail.com\">inufabie@gmail.com</a>&gt;<br>"
diff -r 835bb2852579 -r 135e4fb3b095 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Tue Jun 26 02:14:35 2012 +0400
+++ b/hedgewars/GSHandlers.inc	Tue Jun 26 02:15:50 2012 +0400
@@ -2139,7 +2139,11 @@
                 else sparkles^.Tint:= $FAB22CFF
                 end;
             end;
-        if Gear^.Timer < 1000 then exit;
+        if Gear^.Timer < 1000 then 
+            begin
+            AllInactive:= false;
+            exit
+            end
         end;
 
     if (Gear^.Damage > 0) or exBoom then
@@ -4753,7 +4757,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepFlamethrowerWork(Gear: PGear);
 var 
-    HHGear: PGear;
+    HHGear, flame: PGear;
     rx, ry, speed: hwFloat;
     i, gX, gY: LongInt;
 begin
@@ -4791,14 +4795,18 @@
             ry := rndSign(getRandomf * _0_1);
             speed := _0_5 * (_10 / Gear^.Tag);
     
-            AddGear(gx, gy, gtFlame, gstTmpFlag,
+            flame:= AddGear(gx, gy, gtFlame, gstTmpFlag,
                     SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
                     AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
+            flame^.CollisionMask:= $FF7F;
             
             if (Gear^.Health mod 30) = 0 then
-                AddGear(gx, gy, gtFlame, 0,
+                begin
+                flame:= AddGear(gx, gy, gtFlame, 0,
                         SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx,
                         AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
+                flame^.CollisionMask:= $FF7F;
+                end
             end;
         Gear^.Timer:= Gear^.Tag
         end;
@@ -4834,7 +4842,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepLandGunWork(Gear: PGear);
 var 
-    HHGear: PGear;
+    HHGear, land: PGear;
     rx, ry, speed: hwFloat;
     i, gX, gY: LongInt;
 begin
@@ -4871,9 +4879,10 @@
         ry := rndSign(getRandomf * _0_1);
         speed := (_3 / Gear^.Tag);
 
-        AddGear(gx, gy, gtFlake, gstTmpFlag, 
+        land:= AddGear(gx, gy, gtFlake, gstTmpFlag, 
                 SignAs(AngleSin(HHGear^.Angle) * speed, HHGear^.dX) + rx, 
                 AngleCos(HHGear^.Angle) * ( - speed) + ry, 0);
+        land^.CollisionMask:= $FF7F;
             
         Gear^.Timer:= Gear^.Tag
         end;
diff -r 835bb2852579 -r 135e4fb3b095 hedgewars/uAIMisc.pas
--- a/hedgewars/uAIMisc.pas	Tue Jun 26 02:14:35 2012 +0400
+++ b/hedgewars/uAIMisc.pas	Tue Jun 26 02:15:50 2012 +0400
@@ -534,17 +534,17 @@
 
 for i:= 0 to Pred(Targets.Count) do
     with Targets.ar[i] do
-        begin
          // hammer hit radius is 8, shift is 10
         if abs(Point.x - x) + abs(Point.y - y) < 18 then
+            begin
             r:= trunc(sqrt(sqr(Point.x - x)+sqr(Point.y - y)));
 
-        if r <= 18 then
-            if Score > 0 then 
-                inc(rate, Score div 3)
-            else 
-                inc(rate, Score div 3 * friendlyfactor div 100)
-        end;
+            if r <= 18 then
+                if Score > 0 then 
+                    inc(rate, Score div 3)
+                else
+                    inc(rate, Score div 3 * friendlyfactor div 100)
+            end;
 RateHammer:= rate * 1024;
 end;
 
diff -r 835bb2852579 -r 135e4fb3b095 hedgewars/uLandPainted.pas
--- a/hedgewars/uLandPainted.pas	Tue Jun 26 02:14:35 2012 +0400
+++ b/hedgewars/uLandPainted.pas	Tue Jun 26 02:15:50 2012 +0400
@@ -57,10 +57,10 @@
         rec:= prec^;
         rec.X:= SDLNet_Read16(@rec.X);
         rec.Y:= SDLNet_Read16(@rec.Y);
-        if rec.X < -323 then rec.X:= -323;
-        if rec.X > LAND_WIDTH+323 then rec.X:= LAND_WIDTH+323;
-        if rec.Y < -323 then rec.Y:= -323;
-        if rec.Y > LAND_HEIGHT+323 then rec.Y:= LAND_HEIGHT+323;
+        if rec.X < -318 then rec.X:= -318;
+        if rec.X > LAND_WIDTH+318 then rec.X:= LAND_WIDTH+318;
+        if rec.Y < -318 then rec.Y:= -318;
+        if rec.Y > LAND_HEIGHT+318 then rec.Y:= LAND_HEIGHT+318;
 
         new(pe);
         if pointsListLast = nil then