hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:93e97d3a2c10
+:b6f70f6335ee
 while i > 0 do
 begin
 dec(i);
 tmp:= t^.ar[i];
 if (tmp^.State and gstNoDamage) = 0 then
-if (tmp^.Kind = gtHedgehog) then
+if (tmp^.Kind = gtHedgehog) or (tmp^.Kind = gtMine) or (tmp^.Kind = gtExplosives) then
 begin
 //tmp^.State:= tmp^.State or gstFlatened;
 ApplyDamage(tmp, CurrentHedgehog, tmp^.Health div 3, dsUnknown);
 //DrawTunnel(tmp^.X, tmp^.Y - _1, _0, _0_5, cHHRadius * 6, cHHRadius * 3);
 tmp2:= AddGear(hwRound(tmp^.X), hwRound(tmp^.Y), gtHammerHit, 0, _0, _0, 0);
-tmp2^.Hedgehog:= tmp^.Hedgehog;
+tmp2^.IntersectGear:= tmp;
 SetAllToActive
 end
 else
 begin
 end
 end;
 procedure doStepHammerHitWork(Gear: PGear);
 var
 i, ei: LongInt;
-HHGear: PGear;
+HitGear: PGear;
 begin
 AllInactive := false;
-HHGear := Gear^.Hedgehog^.Gear;
+HitGear := Gear^.IntersectGear;
 dec(Gear^.Timer);
-if (HHGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gmDestroy) <> 0) then
+if (HitGear = nil) or (Gear^.Timer = 0) or ((Gear^.Message and gmDestroy) <> 0) then
 begin
 DeleteGear(Gear);
 exit
 end;
 SetAllHHToActive;
 end;
 if TestCollisionYwithGear(Gear, 1) then
 begin
 Gear^.dY := _0;
-SetLittle(HHGear^.dX);
+SetLittle(HitGear^.dX);
-HHGear^.dY := _0;
+HitGear^.dY := _0;
 end
 else
 begin
 Gear^.dY := Gear^.dY + cGravity;
 Gear^.Y := Gear^.Y + Gear^.dY;
 if hwRound(Gear^.Y) > cWaterLine then Gear^.Timer := 1
 end;
-Gear^.X := Gear^.X + HHGear^.dX;
+Gear^.X := Gear^.X + HitGear^.dX;
-HHGear^.X := Gear^.X;
+HitGear^.X := Gear^.X;
-HHGear^.Y := Gear^.Y - int2hwFloat(cHHRadius);
+HitGear^.Y := Gear^.Y - int2hwFloat(cHHRadius);
 end;
 procedure doStepHammerHit(Gear: PGear);
 var
 i, y: LongInt;

changeset 5624	b6f70f6335ee
parent 5612	2638dec1b323
child 5628	a9a0c67f9656