# HG changeset patch
# User nemo
# Date 1289751577 18000
# Node ID 8c7f9de9a978efdd0716d7da737c91a0cf4d5313
# Parent  636122c968ce2b56520cba964d3d1750b48c9ef7
disable offsets in GetLaunchX/GetLaunchY instead

diff -r 636122c968ce -r 8c7f9de9a978 QTfrontend/hwconsts.cpp.in
--- a/QTfrontend/hwconsts.cpp.in	Sun Nov 14 11:10:25 2010 -0500
+++ b/QTfrontend/hwconsts.cpp.in	Sun Nov 14 11:19:37 2010 -0500
@@ -89,7 +89,7 @@
                     new QColor( 51, 102, 217), // dark blue
                     new QColor( 62, 147,  33), // classic green
                     new QColor(162,  61, 187), // classic purple
-                    new QColor(255, 255,  0), // classic orange
+                    new QColor(255, 255,  0), // yellow
                     new QColor(115, 115, 115), // classic gray
                     new QColor(0, 255, 255),   // cyan
                     new QColor(255, 136, 136), // peach
diff -r 636122c968ce -r 8c7f9de9a978 hedgewars/uConsts.pas
--- a/hedgewars/uConsts.pas	Sun Nov 14 11:10:25 2010 -0500
+++ b/hedgewars/uConsts.pas	Sun Nov 14 11:19:37 2010 -0500
@@ -1063,8 +1063,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: 0; //20;
+            ejectY: -6),
 
 // Bee
             (NameId: sidBee;
@@ -1086,7 +1086,7 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
+            ejectX: 0; //16;
             ejectY: 0),
 
 // Shotgun
@@ -1109,8 +1109,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: 0; //26;
+            ejectY: -6),
 
 // PickHammer
             (NameId: sidPickHammer;
@@ -1228,8 +1228,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: 0; //23;
+            ejectY: -6),
 
 // Dynamite
             (NameId: sidDynamite;
@@ -1531,8 +1531,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: 0; //20;
+            ejectY: -6),
 
 // Kamikaze
             (NameId: sidKamikaze;
@@ -1696,8 +1696,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprDrill;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: 0; //20;
+            ejectY: -6),
 
 // Ballgun
             (NameId: sidBallgun;
@@ -1719,8 +1719,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: 0; //20;
+            ejectY: -3),
 
 // RC-Plane
             (NameId: sidRCPlane;
@@ -1935,8 +1935,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: 0; //40;
+            ejectY: -5),
 
 // Jetpack ("Flying Saucer")
             (NameId: sidJetpack;
@@ -2038,8 +2038,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: -5; //29;
+            ejectY: -7),
 
 // Piano
             (NameId: sidPiano;
@@ -2134,8 +2134,8 @@
             SkipTurns: 0;
             PosCount: 1;
             PosSprite: sprWater;
-            ejectX: 0;
-            ejectY: 0),
+            ejectX: 0; //20;
+            ejectY: -3),
 
 // Sticky Mine
             (NameId: sidSMine;
diff -r 636122c968ce -r 8c7f9de9a978 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Sun Nov 14 11:10:25 2010 -0500
+++ b/hedgewars/uGears.pas	Sun Nov 14 11:19:37 2010 -0500
@@ -135,18 +135,24 @@
 
 function GetLaunchX(at: TAmmoType; dir: LongInt; angle: LongInt): LongInt;
 begin
+    GetLaunchX:= 0
+(*
     if (Ammoz[at].ejectX <> 0) or (Ammoz[at].ejectY <> 0) then
         GetLaunchX:= sign(dir) * (8 + hwRound(AngleSin(angle) * Ammoz[at].ejectX) + hwRound(AngleCos(angle) * Ammoz[at].ejectY))
     else
         GetLaunchX:= 0
+*)
 end;
 
 function GetLaunchY(at: TAmmoType; angle: LongInt): LongInt;
 begin
+    GetLaunchY:= 0
+(*
     if (Ammoz[at].ejectX <> 0) or (Ammoz[at].ejectY <> 0) then
         GetLaunchY:= hwRound(AngleSin(angle) * Ammoz[at].ejectY) - hwRound(AngleCos(angle) * Ammoz[at].ejectX) - 2
     else
         GetLaunchY:= 0
+*)
 end;
 
 {$INCLUDE "GSHandlers.inc"}