sheepy-clone: comparison hedgewars/uGearsHandlersMess.pas

equal deleted inserted replaced

-:666b31c58de8
+:945bf1d4d1a4
 DeleteGear(Gear);
 AfterAttack
 end
 end
 else
-begin
+		DeleteGear(Gear);
-DeleteGear(Gear);
-end
 end;
 procedure CreateShellForGear(Gear: PGear; startFrame: Longword);
 var
 shell: PVisualGear;
 if ((Gear^.State and gstWait) <> 0)
 or (cMineDudPercent = 0)
 or (getRandom(100) > cMineDudPercent) then
 begin
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound);
-DeleteGear(Gear)
+DeleteGear(Gear);
+					exit   // redundant but we've had too many delete gear bugs
 end
 else
 begin
 vg:= AddVisualGear(hwRound(Gear^.X) - 4  + Random(8), hwRound(Gear^.Y) - 4 - Random(4), vgtSmoke);
 if vg <> nil then
 // Remove land created by frozen air mine sprite pixel-perfectly
 EraseLand(
 hwRound(Gear^.X) - SpritesData[sprFrozenAirMine].Width div 2,
 hwRound(Gear^.Y) - SpritesData[sprFrozenAirMine].Height div 2,
 sprFrozenAirMine, 0, 0, false, false, false, false);
-DeleteGear(Gear)
+DeleteGear(Gear);
+			exit
 end;
 doStepFallingGear(Gear);
 exit
 end;
 isUnderwater:= CheckCoordInWater(hwRound(Gear^.X), hwRound(Gear^.Y) + Gear^.Radius);
 begin
 x := hwRound(Gear^.X);
 y := hwRound(Gear^.Y);
 hog:= Gear^.Hedgehog;
-DeleteGear(Gear);
-// <-- delete gear!
 if k = gtCase then
 begin
 doMakeExplosion(x, y, Gear^.Boom, hog, EXPLAutoSound);
 for i:= 0 to 63 do
 AddGear(x, y, gtFlame, 0, _0, _0, 0);
 end
 else if k = gtTarget then
 uStats.TargetHit()
 else if k = gtExplosives then
-begin
+			begin
-doMakeExplosion(x, y, Gear^.Boom, hog, EXPLAutoSound);
+			doMakeExplosion(x, y, Gear^.Boom, hog, EXPLAutoSound);
-for i:= 0 to 31 do
+			for i:= 0 to 31 do
-begin
+				begin
-dX := AngleCos(i * 64) * _0_5 * (getrandomf + _1);
+				dX := AngleCos(i * 64) * _0_5 * (getrandomf + _1);
-dY := AngleSin(i * 64) * _0_5 * (getrandomf + _1);
+				dY := AngleSin(i * 64) * _0_5 * (getrandomf + _1);
-AddGear(x, y, gtFlame, 0, dX, dY, 0);
+				AddGear(x, y, gtFlame, 0, dX, dY, 0);
-AddGear(x, y, gtFlame, gstTmpFlag, -dX, -dY, 0);
+				AddGear(x, y, gtFlame, gstTmpFlag, -dX, -dY, 0);
-end
+				end
-end;
+			end;
-exit
+DeleteGear(Gear);
+		exit
 end;
 if k = gtExplosives then
 begin
 //if V > _0_03 then Gear^.State:= Gear^.State or gstAnimation;
 else
 for i:= Random(3) downto 0 do
 AddVisualGear(gX - 3 + Random(6), gY - 2, vgtSmoke);
 DeleteGear(Gear)
-end;
+end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepFirePunchWork(Gear: PGear);
 var
 Message := 0;
 SetLittle(dX);
 dY := _0;
 State := State or gstMoving;
 end;
-DeleteGear(Gear);
 if (GetAmmoEntry(HHGear^.Hedgehog^, amParachute)^.Count >= 1) and ((Ammoz[HHGear^.Hedgehog^.CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) and (HHGear^.Hedgehog^.MultiShootAttacks = 0) then
 HHGear^.Hedgehog^.CurAmmoType:= amParachute;
 isCursorVisible := false;
 ApplyAmmoChanges(HHGear^.Hedgehog^);
+DeleteGear(Gear);
 exit
 end;
 HHGear^.X := HHGear^.X + cWindSpeed * 200;
 if (hwRound(Gear^.X) > (max(LAND_WIDTH,4096)+2048)) or (hwRound(Gear^.X) < -2048) then
 begin
 // avoid to play forever (is this necessary?)
 StopSoundChan(Gear^.SoundChannel);
 DeleteGear(Gear)
-end;
+end
 end;
 procedure doStepAirAttack(Gear: PGear);
 begin
 AllInactive := false;
 AllInactive := false;
 doStepFallingGear(Gear);
 if (Gear^.State and gstCollision) <> 0 then
 begin
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), Gear^.Boom, Gear^.Hedgehog, EXPLAutoSound);
-DeleteGear(Gear);
 {$IFNDEF PAS2C}
 with mobileRecord do
 if (performRumble <> nil) and (not fastUntilLag) then
 performRumble(kSystemSoundID_Vibrate);
 {$ENDIF}
+DeleteGear(Gear);
 exit
 end;
 if (GameTicks and $3F) = 0 then
 AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
 end;
 end
 else
 begin
 PlaySound(sndPlaced);
 DeleteGear(Gear);
-AfterAttack;
+AfterAttack
 end;
 HHGear^.State := HHGear^.State and (not (gstAttacking or gstAttacked));
 HHGear^.Message := HHGear^.Message and (not gmAttack);
 end;
 begin
 if (Gear^.Hedgehog^.Gear = nil) or (Gear^.Hedgehog^.Gear^.Damage > 0) then
 begin
 DeleteGear(Gear);
 AfterAttack;
+		exit
 end;
 inc(Gear^.Timer);
 if Gear^.Timer = 65 then
 begin
 Gear^.Timer := 0;
 if ((Gear^.Message and (not (gmSwitch or gmPrecise))) <> 0) or (TurnTimeLeft = 0) then
 begin
 hedgehog := Gear^.Hedgehog;
 //Msg := Gear^.Message and (not gmSwitch);
-DeleteGear(Gear);
 ApplyAmmoChanges(hedgehog^);
 HHGear := CurrentHedgehog^.Gear;
 ApplyAmmoChanges(HHGear^.Hedgehog^);
 //HHGear^.Message := Msg;
+DeleteGear(Gear);
 exit
 end;
 if (Gear^.Message and gmSwitch) <> 0 then
 begin
 begin
 Message := 0;
 Active := true;
 State := State or gstMoving
 end;
-DeleteGear(Gear);
 if (GetAmmoEntry(HHGear^.Hedgehog^, amJetpack)^.Count >= 1) and ((Ammoz[HHGear^.Hedgehog^.CurAmmoType].Ammo.Propz and ammoprop_AltUse) <> 0) and (HHGear^.Hedgehog^.MultiShootAttacks = 0) then
 HHGear^.Hedgehog^.CurAmmoType:= amJetpack;
 isCursorVisible := false;
 ApplyAmmoChanges(HHGear^.Hedgehog^);
 //    if Gear^.Tex <> nil then FreeTexture(Gear^.Tex);
 //    Gear^.Tex:= RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(round(Gear^.Health / 20)) + '%', cWhiteColor, fntSmall)
 //AddCaption(trmsg[sidFuel]+': '+inttostr(round(Gear^.Health/20))+'%', cWhiteColor, capgrpAmmostate);
+DeleteGear(Gear);
 end
 end;
 procedure doStepJetpack(Gear: PGear);
 var
 AllInactive := false;
 Gear^.Pos := 0;
 if Gear^.Timer < 2000 then
 inc(Gear^.Timer, 1)
 else
-begin
+DeleteGear(Gear)
-DeleteGear(Gear);
-end;
 end;
 procedure doStepBirdyFly(Gear: PGear);
 var
 HHGear: PGear;

branch	0.9.25
changeset 14560	945bf1d4d1a4
parent 14363	1f87c7c2b151
child 14561	5e4df5413e1e