hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:2b7f2a43b999
+:c1ec4b15d70e
 else Gear.State:= Gear.State and not gstCollision
 end;
 procedure CheckHHDamage(Gear: PGear);
 begin
-if Gear.dY > 0.35 then Gear.Damage:= Gear.Damage + round(25 * (abs(Gear.dY) - 0.35));
+if Gear.dY > 0.35 then Gear.Damage:= Gear.Damage + round(75 * (abs(Gear.dY) - 0.35));
 end;
 ////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////
 procedure CalcRotationDirAngle(Gear: PGear);
 dec(Gear.Timer);
 if Gear.Timer = 0 then
 begin
 doMakeExplosion(round(Gear.X), round(Gear.Y), 50, EXPLAutoSound);
 DeleteGear(Gear);
-SetAllToActive;
 exit
 end;
 CalcRotationDirAngle(Gear);
 if (Gear.State and (gstCollision or gstMoving)) = (gstCollision or gstMoving) then PlaySound(sndGrenadeImpact)
 end;
 doStepFallingGear(Gear);
 if (Gear.State and gstCollision) <> 0 then
 begin
 doMakeExplosion(round(Gear.X), round(Gear.Y), 50, EXPLAutoSound);
 DeleteGear(Gear);
-SetAllToActive;
 exit
 end;
 if (GameTicks and $3F) = 0 then
 AddGear(round(Gear.X), round(Gear.Y), gtSmokeTrace, 0)
 end;
 dec(Gear.Timer);
 if ((Gear.State and gstCollision) <> 0) or (Gear.Timer = 0) then
 begin
 doMakeExplosion(round(Gear.X), round(Gear.Y), 50, EXPLAutoSound);
 DeleteGear(Gear);
-SetAllToActive
 end;
 end;
 procedure doStepUFO(Gear: PGear);
 begin
 CheckCollision(Gear);
 if (Gear.State and gstCollision) <> 0 then
 begin
 doMakeExplosion(round(Gear.X), round(Gear.Y), 50, EXPLAutoSound);
 DeleteGear(Gear);
-SetAllToActive;
 exit
 end;
 dec(Gear.Timer);
 if Gear.Timer = 0 then
 begin
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepShotgunShot(Gear: PGear);
 var i: LongWord;
+t: PGear;
 begin
 AllInactive:= false;
 if Gear.Timer > 0 then
 begin
 dec(Gear.Timer);
 Gear.X:= Gear.X + Gear.dX;
 Gear.Y:= Gear.Y + Gear.dY;
 CheckCollision(Gear);
 if (Gear.State and gstCollision) <> 0 then
 begin
-doMakeExplosion(round(Gear.X), round(Gear.Y), 25, EXPLAllDamageInRadius);
+t:= CheckGearsCollision(Gear, Sign(Gear.dX), true);
-DeleteGear(Gear);
+if t = nil then t:= CheckGearsCollision(Gear, Sign(Gear.dY), false);
-SetAllToActive;
+if t <> nil then
+AmmoShove(Gear, t, 25);
+doMakeExplosion(round(Gear.X), round(Gear.Y), 25, EXPLNoDamage);
+DeleteGear(Gear);
 exit
 end;
 dec(i)
 until i = 0;
 if (Gear.X < 0) or (Gear.Y < 0) or (Gear.X > 2048) or (Gear.Y > 1024) then
 DeleteGear(Gear)
 end;
 ////////////////////////////////////////////////////////////////////////////////
-procedure doStepDEagleShot(Gear: PGear);    // ���� ���� ������, ��� ������ ��� �� �������������� ������� �� �������� :)
+procedure doStepDEagleShot(Gear: PGear);
-var i: LongWord;                            // ���� � � ������ ����.. � ����� ������ ������.. � �������� ��������, ����� ����
+var i, x, y: LongWord;
-begin                                       // ������� �������, ���� ����� ������ ��������� � � ������� ������... ����� ��
+oX, oY: real;
-AllInactive:= false;                        // ������ ������ ������ ����.. �� ����� ����� ������ �� :))
+t: PGear;
+begin
+AllInactive:= false;
 i:= 80;
+oX:= Gear.X;
+oY:= Gear.Y;
 repeat
 Gear.X:= Gear.X + Gear.dX;
 Gear.Y:= Gear.Y + Gear.dY;
-CheckCollision(Gear);
+x:= round(Gear.X);
-if (Gear.State and gstCollision) <> 0 then
+y:= round(Gear.Y);
-begin
+if ((y and $FFFFFC00) = 0) and ((x and $FFFFF800) = 0)
-inc(Gear.Damage);
+and (Land[y, x] <> 0) then inc(Gear.Damage);
-doMakeExplosion(round(Gear.X), round(Gear.Y), 2, EXPLAllDamageInRadius);
+t:= CheckGearsCollision(Gear, Sign(Gear.dX), true);
-end;
+if t = nil then t:= CheckGearsCollision(Gear, Sign(Gear.dY), false);
-dec(i)
+if t <> nil then
-until i = 0;
+begin
-if (Gear.Damage > 20) or (Gear.X < 0) or (Gear.Y < 0) or (Gear.X > 2048) or (Gear.Y > 1024) then
+AmmoShove(Gear, t, 12);
+if t.CollIndex < High(Longword) then DeleteCR(t)
+end;
+dec(i)
+until (i = 0) or (Gear.Damage > Gear.Health);
+if Gear.Damage > 0 then
+begin
+DrawTunnel(oX, oY, Gear.dX, Gear.dY, 82 - i, 1);
+dec(Gear.Health, Gear.Damage);
+Gear.Damage:= 0
+end;
+if (Gear.Health <= 0) or (Gear.X < 0) or (Gear.Y < 0) or (Gear.X > 2048) or (Gear.Y > 1024) then
 DeleteGear(Gear)
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepActionTimer(Gear: PGear);
 dec(Gear.Timer);
 if (Gear.Timer = 0)or((Gear.Message and gm_Destroy) <> 0) then
 begin
 DeleteGear(Gear);
 AfterAttack;
-SetAllToActive;
 exit
 end;
 HHGear:= PHedgehog(Gear.Hedgehog).Gear;
 if (Gear.Timer and $3F) = 0 then
 begin
 while i <= ei do
 begin
 doMakeExplosion(i, round(Gear.Y) + 3, 3, 0);
 inc(i, 1)
 end;
-SetAllToActive;
 Gear.X:= Gear.X + Gear.dX;
 Gear.Y:= Gear.Y + 1.9
 end;
 if TestCollisionYwithGear(Gear, 1) then
 begin
 ar[i].Left := round(Gear.X) - Gear.HalfWidth - GetRandom(2);
 ar[i].Right:= round(Gear.X) + Gear.HalfWidth + GetRandom(2);
 inc(y, 2);
 inc(i)
 end;
-DrawLineExplosions(@ar, 3, round(Gear.Y) - cHHHalfHeight*2, 2, Pred(i));
+DrawHLineExplosions(@ar, 3, round(Gear.Y) - cHHHalfHeight*2, 2, Pred(i));
 Gear.dY:= PHedgehog(Gear.Hedgehog).Gear.dY;
 doStepPickHammerWork(Gear);
 Gear.doStep:= doStepPickHammerWork
 end;
 AllInactive:= false;
 if (Gear.Timer and $FF) = 0 then PlaySound(sndMineTick);
 if Gear.Timer = 0 then
 begin
 doMakeExplosion(round(Gear.X), round(Gear.Y), 50, EXPLAutoSound);
-SetAllToActive;
 DeleteGear(Gear)
 end;
 dec(Gear.Timer);
 end else // gsttmpFlag = 0
 if TurnTimeLeft = 0 then Gear.State:= Gear.State or gsttmpFlag;

changeset 38	c1ec4b15d70e
parent 37	2b7f2a43b999
child 39	b78e7185ed13