# HG changeset patch
# User unc0rr
# Date 1277747399 -14400
# Node ID 8cdf8f57780012dabc04f00215cf6290073add05
# Parent  f5d28402ca1d1a478a29c8dd3e962ba33d1b020b# Parent  85bd667955f24dd19cdd31e0c5395c4bf10c32cf
merge

diff -r f5d28402ca1d -r 8cdf8f577800 hedgewars/GSHandlers.inc
--- a/hedgewars/GSHandlers.inc	Mon Jun 28 21:43:19 2010 +0400
+++ b/hedgewars/GSHandlers.inc	Mon Jun 28 21:49:59 2010 +0400
@@ -3183,7 +3183,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 procedure doPortalColorSwitch();
-var 
+var
     flags: LongWord;
 begin
     if (CurrentHedgehog <> nil)
@@ -3295,7 +3295,7 @@
                 oy:= iterator^.Y + Int2hwFloat(iterator^.Radius);
             end;
 
-            if (hwRound(Distance(Gear^.X-ox,Gear^.Y-oy)) > Gear^.Radius) then
+            if (hwRound(Distance(Gear^.X-ox,Gear^.Y-oy)) > Gear^.Radius + 1 ) then
                 continue;
         end;
 
@@ -3322,31 +3322,31 @@
         ox := (iterator^.X - Gear^.X);
         oy := (iterator^.Y - Gear^.Y);
         poffs:= (Gear^.dX * ox + Gear^.dY * oy);
-        // create a normal of the portal vector
-        nx := - Gear^.dY;
+        // create a normal of the portal vector, but ...
+        nx := Gear^.dY;
         ny := Gear^.dX;
-        // pick the normal vector that's pointing skywards
-        if (not ny.isNegative) then
-            begin
-            nx.isNegative := not nx.isNegative;
+        // ... decide where the top is based on the hog's direction when firing the portal
+        if Gear^.Elasticity.isNegative then
+            nx.isNegative := not nx.isNegative
+        else
             ny.isNegative := not ny.isNegative;
-            end;
+
         // now let's find out how much speed the gear has in the
         // direction of that normal
         nspeed:= (nx * iterator^.dX + ny * iterator^.dY);
         noffs:= (nx * ox + ny * oy);
 
         // now let's project those back to the connected portal's vectors
-        nx := - conPortal^.dY;
+        nx := conPortal^.dY;
         ny := conPortal^.dX;
-        if ny.isNegative then
-            begin
-            nx.isNegative := not nx.isNegative;
+        if conPortal^.Elasticity.isNegative then
+            nx.isNegative := not nx.isNegative
+        else
             ny.isNegative := not ny.isNegative;
-            end;
+
 //AddFileLog('poffs:'+cstr(poffs)+' noffs:'+cstr(noffs)+' pspeed:'+cstr(pspeed)+' nspeed:'+cstr(nspeed));
-        iterator^.dX := -pspeed * conPortal^.dX - nspeed * nx;
-        iterator^.dY := -pspeed * conPortal^.dY - nspeed * ny;
+        iterator^.dX := -pspeed * conPortal^.dX + nspeed * nx;
+        iterator^.dY := -pspeed * conPortal^.dY + nspeed * ny;
         if iterator^.Kind = gtCake then
             poffs := poffs * _0_5;
         iterator^.X := conPortal^.X + poffs * conPortal^.dX + noffs * nx;
@@ -3475,6 +3475,12 @@
     if CurrentHedgehog <> nil then
         With CurrentHedgehog^ do
         begin
+            // let's save the HH's dX's direction so we can decide where the "top" of the portal hole
+            newPortal^.Elasticity.isNegative := CurrentHedgehog^.Gear^.dX.isNegative;
+            // when doing a backjump the dx is the opposite of the facing direction
+            if ((Gear^.State and gstHHHJump) <> 0) and not cArtillery then
+                newPortal^.Elasticity.isNegative := not newPortal^.Elasticity.isNegative;
+
             // make portal gun look unloaded
             Ammo^[CurSlot, CurAmmo].Timer := Ammo^[CurSlot, CurAmmo].Timer or 2;
 
diff -r f5d28402ca1d -r 8cdf8f577800 hedgewars/uGears.pas
--- a/hedgewars/uGears.pas	Mon Jun 28 21:43:19 2010 +0400
+++ b/hedgewars/uGears.pas	Mon Jun 28 21:49:59 2010 +0400
@@ -95,6 +95,8 @@
 procedure RemoveGearFromList(Gear: PGear);
 function  ModifyDamage(dmg: Longword; Gear: PGear): Longword;
 procedure FindPlace(var Gear: PGear; withFall: boolean; Left, Right: LongInt);
+function GetLaunchX(at: TAmmoType; dir: LongInt; angle: LongInt): LongInt;
+function GetLaunchY(at: TAmmoType; angle: LongInt): LongInt;
 
 implementation
 uses uWorld, uMisc, uStore, uConsole, uSound, uTeams, uRandom, uCollisions, uLand, uIO, uLandGraphics,
diff -r f5d28402ca1d -r 8cdf8f577800 hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Mon Jun 28 21:43:19 2010 +0400
+++ b/hedgewars/uWorld.pas	Mon Jun 28 21:49:59 2010 +0400
@@ -612,8 +612,8 @@
                 tdy:= - Cos(Gear^.Angle * Pi / cMaxAngle);
                 for i:= (Gear^.Power * 24) div cPowerDivisor downto 0 do
                     DrawSprite(sprPower,
-                            hwRound(Gear^.X) + round(WorldDx + tdx * (24 + i * 2)) - 16,
-                            hwRound(Gear^.Y) + round(WorldDy + tdy * (24 + i * 2)) - 12,
+                            hwRound(Gear^.X) + GetLaunchX(Ammo^[CurSlot, CurAmmo].AmmoType, hwSign(Gear^.dX), Gear^.Angle) + round(WorldDx + tdx * (24 + i * 2)) - 16,
+                            hwRound(Gear^.Y) + GetLaunchY(Ammo^[CurSlot, CurAmmo].AmmoType, Gear^.Angle) + round(WorldDy + tdy * (24 + i * 2)) - 16,
                             i)
                 end
         end;