# HG changeset patch
# User nemo
# Date 1289751025 18000
# Node ID 636122c968ce2b56520cba964d3d1750b48c9ef7
# Parent  f7d0a292d3c98901df91d693228a0ab1188c4920
2 of the fixes for 0.9.14.1 - still need to fix the frontend desync and config-dir

diff -r f7d0a292d3c9 -r 636122c968ce hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Sun Nov 14 11:06:55 2010 -0500
+++ b/hedgewars/GSHandlers.inc	Sun Nov 14 11:10:25 2010 -0500
@@ -4239,7 +4239,7 @@
 
     if ((Gear^.Message and gmAttack) <> 0) and (hh^.Gear^.Health > 0) and (TurnTimeLeft > 0) then 
         begin
-        if Length(graves) >= Gear^.Tag then Gear^.Tag:= 0;
+        if Length(graves) <= Gear^.Tag then Gear^.Tag:= 0;
         dec(hh^.Gear^.Health);
         if (hh^.Gear^.Health = 0) and (hh^.Gear^.Damage = 0) then
             hh^.Gear^.Damage:= 1;
diff -r f7d0a292d3c9 -r 636122c968ce hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Sun Nov 14 11:06:55 2010 -0500
+++ b/hedgewars/uConsts.pas	Sun Nov 14 11:10:25 2010 -0500
@@ -1063,8 +1063,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0; //20;
-            ejectY: -6),
+            ejectX: 0;
+            ejectY: 0),
 
 // Bee
             (NameId: sidBee;
@@ -1086,7 +1086,7 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0; //16;
+            ejectX: 0;
             ejectY: 0),
 
 // Shotgun
@@ -1109,8 +1109,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0; //26;
-            ejectY: -6),
+            ejectX: 0;
+            ejectY: 0),
 
 // PickHammer
             (NameId: sidPickHammer;
@@ -1228,8 +1228,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0; //23;
-            ejectY: -6),
+            ejectX: 0;
+            ejectY: 0),
 
 // Dynamite
             (NameId: sidDynamite;
@@ -1531,8 +1531,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0; //20;
-            ejectY: -6),
+            ejectX: 0;
+            ejectY: 0),
 
 // Kamikaze
             (NameId: sidKamikaze;
@@ -1696,8 +1696,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprDrill;
-            ejectX: 0; //20;
-            ejectY: -6),
+            ejectX: 0;
+            ejectY: 0),
 
 // Ballgun
             (NameId: sidBallgun;
@@ -1719,8 +1719,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0; //20;
-            ejectY: -3),
+            ejectX: 0;
+            ejectY: 0),
 
 // RC-Plane
             (NameId: sidRCPlane;
@@ -1935,8 +1935,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0; //40;
-            ejectY: -5),
+            ejectX: 0;
+            ejectY: 0),
 
 // Jetpack ("Flying Saucer")
             (NameId: sidJetpack;
@@ -2038,8 +2038,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: -5; //29;
-            ejectY: -7),
+            ejectX: 0;
+            ejectY: 0),
 
 // Piano
             (NameId: sidPiano;
@@ -2134,8 +2134,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0; //20;
-            ejectY: -3),
+            ejectX: 0;
+            ejectY: 0),
 
 // Sticky Mine
             (NameId: sidSMine;