hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:51724c98a74f
+:ea509b70e03d
 begin
 iterator^.Elasticity:= iterator^.X;
 iterator^.Friction  := iterator^.Y;
 end;
-// This jiggles gears, to ensure a portal connection just placed under a gear takes effect.
-iterator:= GearsList;
-while iterator <> nil do
-begin
-if (iterator^.Kind <> gtPortal) and ((iterator^.Hedgehog <> CurrentHedgehog)
-or ((iterator^.Message and gmAllStoppable) = 0)) then
-begin
-iterator^.Active:= true;
-if iterator^.dY.QWordValue = _0.QWordValue then
-iterator^.dY.isNegative:= false;
-iterator^.State:= iterator^.State or gstMoving;
-DeleteCI(iterator);
-//inc(iterator^.dY.QWordValue,10);
-end;
-iterator:= iterator^.NextGear
-end;
 if Gear^.Health > 1 then
 dec(Gear^.Health);
 end;
 end;
 if (CurWeapon <> nil) and (CurAmmoType = amPortalGun) then
 CurWeapon^.Timer := CurWeapon^.Timer or 2;
 iterator := GearsList;
 while iterator <> nil do
 begin
 if (iterator^.Kind = gtPortal) then
 if (iterator <> newPortal) and (iterator^.Timer > 0) and (iterator^.Hedgehog = CurrentHedgehog) then
 begin
 if ((iterator^.Tag and 2) = (newPortal^.Tag and 2)) then
 begin
 iterator^.Health := newPortal^.Health;
 end;
 end;
 iterator^.PortalCounter:= 0;
 iterator := iterator^.NextGear
 end;
+if newPortal^.LinkedGear <> nil then
+begin
+// This jiggles gears, to ensure a portal connection just placed under a gear takes effect.
+iterator:= GearsList;
+while iterator <> nil do
+begin
+if not (iterator^.Kind in [gtPortal, gtAirAttack]) and ((iterator^.Hedgehog <> CurrentHedgehog)
+or ((iterator^.Message and gmAllStoppable) = 0)) then
+begin
+iterator^.Active:= true;
+if iterator^.dY.QWordValue = _0.QWordValue then
+iterator^.dY.isNegative:= false;
+iterator^.State:= iterator^.State or gstMoving;
+DeleteCI(iterator);
+//inc(iterator^.dY.QWordValue,10);
+end;
+iterator:= iterator^.NextGear
+end
+end
 end;
 newPortal^.State := newPortal^.State and (not gstCollision);
 newPortal^.State := newPortal^.State or gstMoving;
 newPortal^.doStep := @doStepMovingPortal;
 end;

changeset 7581	ea509b70e03d
parent 7564	651d56a6e568
child 7589	63d937a764e2