--- a/hedgewars/uUtils.pas Thu May 12 16:20:17 2016 +0200
+++ b/hedgewars/uUtils.pas Thu May 12 16:56:23 2016 +0200
@@ -536,22 +536,18 @@
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 *)
+ 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*)
+ GetLaunchY:= 0
end;
function CheckNoTeamOrHH: boolean;
--- a/hedgewars/uVariables.pas Thu May 12 16:20:17 2016 +0200
+++ b/hedgewars/uVariables.pas Thu May 12 16:56:23 2016 +0200
@@ -895,7 +895,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //20;
- ejectY: -6),
+ ejectY: 0), //-6;
// Bee
(NameId: sidBee;
@@ -948,7 +948,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //26;
- ejectY: -6),
+ ejectY: 0), //-6;
// PickHammer
(NameId: sidPickHammer;
@@ -1084,7 +1084,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //23;
- ejectY: -6),
+ ejectY: 0), //-6;
// Dynamite
(NameId: sidDynamite;
@@ -1408,7 +1408,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //20;
- ejectY: -6),
+ ejectY: 0), //-6;
// Kamikaze
(NameId: sidKamikaze;
@@ -1595,7 +1595,7 @@
PosCount: 1;
PosSprite: sprDrill;
ejectX: 0; //20;
- ejectY: -6),
+ ejectY: 0), //-6;
// Ballgun
(NameId: sidBallgun;
@@ -1621,7 +1621,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //20;
- ejectY: -3),
+ ejectY: 0), //-3;
// RC-Plane
(NameId: sidRCPlane;
@@ -1850,7 +1850,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //40;
- ejectY: -5),
+ ejectY: 0), //-5;
// Jetpack ("Flying Saucer")
(NameId: sidJetpack;
@@ -1960,8 +1960,8 @@
SkipTurns: 0;
PosCount: 1;
PosSprite: sprWater;
- ejectX: -5; //29;
- ejectY: -7),
+ ejectX: 0; //-5, 29;
+ ejectY: 0), //-7
// Piano
(NameId: sidPiano;
@@ -2068,7 +2068,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //20;
- ejectY: -3),
+ ejectY: 0), //-3;
// Sticky Mine
(NameId: sidSMine;
@@ -2282,7 +2282,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //20;
- ejectY: -3),
+ ejectY: 0), //-3;
// Freezer
(NameId: sidIceGun;
NameTex: nil;
@@ -2307,7 +2307,7 @@
PosCount: 1;
PosSprite: sprWater;
ejectX: 0; //20;
- ejectY: -3),
+ ejectY: 0), //-3;
// Knife
(NameId: sidKnife;
NameTex: nil;