hedgewars: comparison hedgewars/uGearsHandlersMess.pas

equal deleted inserted replaced

-:b27bac2260e3
+:9bb85e43e492
 var oX, oY: hwFloat;
 fromX, fromY, toX, toY, dX, dY, bLength, stepLength: real;
 VGear: PVisualGear;
 i, steps: LongWord;
 begin
+if CurrentHedgehog^.Gear = nil then
+begin
+DeleteGear(Bullet);
+exit
+end;
 if Bullet^.PortalCounter = 0 then
 begin
 ox:= CurrentHedgehog^.Gear^.X + Int2hwFloat(GetLaunchX(CurrentHedgehog^.CurAmmoType, hwSign(CurrentHedgehog^.Gear^.dX), CurrentHedgehog^.Gear^.Angle));
 oy:= CurrentHedgehog^.Gear^.Y + Int2hwFloat(GetLaunchY(CurrentHedgehog^.CurAmmoType, CurrentHedgehog^.Gear^.Angle));
 end
 hedgehog: PHedgehog;
 State: Longword;
 switchDir: Longword;
 oldUid: Longword;
 begin
+if CurrentHedgehog^.Gear = nil then
+begin
+DeleteGear(Gear);
+exit
+end;
 AllInactive := false;
 if ((Gear^.Message and (not (gmSwitch or gmPrecise))) <> 0) or (TurnTimeLeft = 0) then
 begin
 hedgehog := Gear^.Hedgehog;
 HHGear: PGear;
 begin
 gear^.State :=  gear^.State or gstAnimation and (not gstTmpFlag);
 Gear^.doStep := @doStepBirdyAppear;
-if CurrentHedgehog = nil then
+if CurrentHedgehog^.Gear = nil then
 begin
 DeleteGear(Gear);
 exit
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doPortalColorSwitch();
 var CurWeapon: PAmmo;
 begin
-if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil) and ((CurrentHedgehog^.Gear^.State and gstHHDriven) <> 0) and ((CurrentHedgehog^.Gear^.Message and gmSwitch) <> 0) then
+if (CurrentHedgehog^.Gear <> nil) and ((CurrentHedgehog^.Gear^.State and gstHHDriven) <> 0) and ((CurrentHedgehog^.Gear^.Message and gmSwitch) <> 0) then
 with CurrentHedgehog^ do
 if (CurAmmoType = amPortalGun) then
 begin
 PlaySound(sndPortalSwitch);
 CurrentHedgehog^.Gear^.Message := CurrentHedgehog^.Gear^.Message and (not gmSwitch);
 iterator^.Angle:= DxDy2AttackAngle(iterator^.dX, iterator^.dY);
 iterator^.Angle:= 2048-iterator^.Angle;
 if iterator^.dX.isNegative then iterator^.Angle:= 4096-iterator^.Angle;
 end;
-if (CurrentHedgehog <> nil) and (CurrentHedgehog^.Gear <> nil)
+if (CurrentHedgehog^.Gear <> nil)
 and (iterator = CurrentHedgehog^.Gear)
 and (CurAmmoGear <> nil)
 and (CurAmmoGear^.Kind = gtRope)
 and (CurAmmoGear^.Elasticity <> _0) then
 CurAmmoGear^.PortalCounter:= 1;
 var
 iterator: PGear;
 s: hwFloat;
 CurWeapon: PAmmo;
 begin
+if CurrentHedgehog^.Gear = nil then
+begin
+DeleteGear(newPortal);
+exit
+end;
 s:= Distance (newPortal^.dX, newPortal^.dY);
 // Adds the hog speed (only that part in/directly against shot direction)
 // to the shot speed (which we triple previously btw)
 // (This is done my projecting the hog movement vector onto the shot movement vector and then adding the resulting length
 newPortal^.LinkedGear := nil;
 PlaySound(sndPortalShot);
-if CurrentHedgehog <> nil then
+	with CurrentHedgehog^ do
-with CurrentHedgehog^ do
+		begin
-begin
+		CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
-CurWeapon:= GetCurAmmoEntry(CurrentHedgehog^);
+		// let's save the HH's dX's direction so we can decide where the "top" of the portal hole
-// 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;
-newPortal^.Elasticity.isNegative := CurrentHedgehog^.Gear^.dX.isNegative;
+		// when doing a backjump the dx is the opposite of the facing direction
-// when doing a backjump the dx is the opposite of the facing direction
+		if ((Gear^.State and gstHHHJump) <> 0) and (Effects[heArtillery] = 0) then
-if ((Gear^.State and gstHHHJump) <> 0) and (Effects[heArtillery] = 0) then
+			newPortal^.Elasticity.isNegative := not newPortal^.Elasticity.isNegative;
-newPortal^.Elasticity.isNegative := not newPortal^.Elasticity.isNegative;
+		// make portal gun look unloaded
-// make portal gun look unloaded
+		if (CurWeapon <> nil) and (CurAmmoType = amPortalGun) then
-if (CurWeapon <> nil) and (CurAmmoType = amPortalGun) then
+			CurWeapon^.Timer := CurWeapon^.Timer or 2;
-CurWeapon^.Timer := CurWeapon^.Timer or 2;
+		iterator := GearsList;
-iterator := GearsList;
+		while iterator <> nil do
-while iterator <> nil do
+			begin
-begin
+			if (iterator^.Kind = gtPortal) then
-if (iterator^.Kind = gtPortal) then
+				if (iterator <> newPortal) and (iterator^.Timer > 0) and (iterator^.Hedgehog = CurrentHedgehog) then
-if (iterator <> newPortal) and (iterator^.Timer > 0) and (iterator^.Hedgehog = CurrentHedgehog) then
+					begin
-begin
+					if ((iterator^.Tag and 2) = (newPortal^.Tag and 2)) then
-if ((iterator^.Tag and 2) = (newPortal^.Tag and 2)) then
+						begin
-begin
+						iterator^.Timer:= 0;
-iterator^.Timer:= 0;
+						end
-end
+					else
-else
+						begin
-begin
+						// link portals with each other
-// link portals with each other
+						newPortal^.LinkedGear := iterator;
-newPortal^.LinkedGear := iterator;
+						iterator^.LinkedGear := newPortal;
-iterator^.LinkedGear := newPortal;
+						iterator^.Health := newPortal^.Health;
-iterator^.Health := newPortal^.Health;
+						end;
-end;
+					end;
-end;
+			iterator^.PortalCounter:= 0;
-iterator^.PortalCounter:= 0;
+			iterator := iterator^.NextGear
-iterator := iterator^.NextGear
+			end;
-end;
+		if newPortal^.LinkedGear <> nil then
-if newPortal^.LinkedGear <> nil then
+			begin
-begin
+			// This jiggles gears, to ensure a portal connection just placed under a gear takes effect.
-// This jiggles gears, to ensure a portal connection just placed under a gear takes effect.
+			iterator:= GearsList;
-iterator:= GearsList;
+			while iterator <> nil do
-while iterator <> nil do
+				begin
-begin
+				if not (iterator^.Kind in [gtPortal, gtAirAttack, gtKnife, gtSMine]) and ((iterator^.Hedgehog <> CurrentHedgehog)
-if not (iterator^.Kind in [gtPortal, gtAirAttack, gtKnife, gtSMine]) and ((iterator^.Hedgehog <> CurrentHedgehog)
+				or ((iterator^.Message and gmAllStoppable) = 0)) then
-or ((iterator^.Message and gmAllStoppable) = 0)) then
+						begin
-begin
+						iterator^.Active:= true;
-iterator^.Active:= true;
+						if iterator^.dY.QWordValue = 0 then
-if iterator^.dY.QWordValue = 0 then
+							iterator^.dY.isNegative:= false;
-iterator^.dY.isNegative:= false;
+						iterator^.State:= iterator^.State or gstMoving;
-iterator^.State:= iterator^.State or gstMoving;
+						DeleteCI(iterator);
-DeleteCI(iterator);
+					//inc(iterator^.dY.QWordValue,10);
-//inc(iterator^.dY.QWordValue,10);
+						end;
-end;
+				iterator:= iterator^.NextGear
-iterator:= iterator^.NextGear
+				end
-end
+			end
-end
+		end;
-end;
 newPortal^.State := newPortal^.State and (not gstCollision);
 newPortal^.State := newPortal^.State or gstMoving;
 newPortal^.doStep := @doStepMovingPortal;
 end;

changeset 15851	9bb85e43e492
parent 15847	2839b68a3732
child 15898	046182f1080b