hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:d85bdd5dc835
+:00aac66147c8
 end;
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doPortalColorSwitch();
 var
 flags: LongWord;
 begin
 if (CurrentHedgehog <> nil)
 and (CurrentHedgehog^.Gear <> nil)
 and ((CurrentHedgehog^.Gear^.Message and gm_Switch) <> 0) then
 begin
 ox:= iterator^.X;
 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;
 (*
 noTrap := ((not Gear^.dY.isNegative or (Gear^.dY.QWordValue = 0))
 // the gear has, also get the vector offset
 pspeed:= (Gear^.dX * iterator^.dX + Gear^.dY * iterator^.dY);
 ox := (iterator^.X - Gear^.X);
 oy := (iterator^.Y - Gear^.Y);
 poffs:= (Gear^.dX * ox + Gear^.dY * oy);
-// create a normal of the portal vector
+// create a normal of the portal vector, but ...
-nx := - Gear^.dY;
+nx := Gear^.dY;
 ny := Gear^.dX;
-// pick the normal vector that's pointing skywards
+// ... decide where the top is based on the hog's direction when firing the portal
-if (not ny.isNegative) then
+if Gear^.Elasticity.isNegative then
-begin
+nx.isNegative := not nx.isNegative
-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
+if conPortal^.Elasticity.isNegative then
-begin
+nx.isNegative := not nx.isNegative
-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^.dX := -pspeed * conPortal^.dX + nspeed * nx;
-iterator^.dY := -pspeed * conPortal^.dY - nspeed * ny;
+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;
 iterator^.Y := conPortal^.Y + poffs * conPortal^.dY + noffs * ny;
 newPortal^.IntersectGear := nil;
 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;
 // set portal to the currently chosen color
 if ((Ammo^[CurSlot, CurAmmo].Timer and 1) <> 0) then

changeset 3578	00aac66147c8
parent 3572	c968aacba708
child 3583	13818670ad9e