hedgewars: comparison hedgewars/GSHandlers.inc

equal deleted inserted replaced

-:bde641cf53c8
+:e350500c4edb
 (*
 * Hedgewars, a free turn based strategy game
-* Copyright (c) 2004-2012 Andrey Korotaev <unC0Rr@gmail.com>
+* Copyright (c) 2004-2013 Andrey Korotaev <unC0Rr@gmail.com>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; version 2 of the License
 *
 Gear^.State := Gear^.State and (not gstCollision);
 collV := 0;
 collH := 0;
 tdX := Gear^.dX;
 tdY := Gear^.dY;
 // might need some testing/adjustments - just to avoid projectiles to fly forever (accelerated by wind/skips)
 if (hwRound(Gear^.X) < min(LAND_WIDTH div -2, -2048))
 or (hwRound(Gear^.X) > max(LAND_WIDTH * 3 div 2, 6144)) then
 doStepFallingGear(Gear);
 CalcRotationDirAngle(Gear);
 // let's add some smoke depending on speed
-s:= max(32,152 - hwRound(Distance(Gear^.dX,Gear^.dY)*120))+random(10);
+s:= max(32,152 - round((abs(hwFloat2FLoat(Gear^.dX))+abs(hwFloat2Float(Gear^.dY)))*120))+random(10);
 if (GameTicks mod s) = 0 then
 begin
 // adjust angle to match the texture
 if Gear^.dX.isNegative then
 i:= 130
-else
+else i:= 50;
-i:= 50;
 smoke:= AddVisualGear(hwRound(Gear^.X)-round(cos((Gear^.DirAngle+i) * pi / 180)*20), hwRound(Gear^.Y)-round(sin((Gear^.DirAngle+i) * pi / 180)*20), vgtSmoke);
 if smoke <> nil then
 smoke^.Scale:= 0.75;
 end;
 if (Gear^.Kind = gtMelonPiece)
 or (Gear^.Kind = gtBall) then
 CalcRotationDirAngle(Gear)
 else if (GameTicks and $1F) = 0 then
-AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
+begin
+if hwRound(Gear^.Y) > cWaterLine then
+AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble)
+else AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
+end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepShell(Gear: PGear);
 begin
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 50, Gear^.Hedgehog, EXPLAutoSound);
 DeleteGear(Gear);
 exit
 end;
 if (GameTicks and $3F) = 0 then
-AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
+begin
+if hwRound(Gear^.Y) > cWaterLine then
+AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble)
+else AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
+end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepSnowball(Gear: PGear);
 var kick, i: LongInt;
 particle: PVisualGear;
+gdX, gdY: hwFloat;
 begin
 AllInactive := false;
 if (GameFlags and gfMoreWind) = 0 then
 Gear^.dX := Gear^.dX + cWindSpeed;
+gdX := Gear^.dX;
+gdY := Gear^.dY;
 doStepFallingGear(Gear);
 CalcRotationDirAngle(Gear);
 if (Gear^.State and gstCollision) <> 0 then
 begin
-kick:= hwRound((hwAbs(Gear^.dX)+hwAbs(Gear^.dY)) * _20);
+kick:= hwRound((hwAbs(gdX)+hwAbs(gdY)) * _20);
-Gear^.dY.isNegative:= (not Gear^.dY.isNegative);
+Gear^.dX:= gdX;
-Gear^.dX.isNegative:= (not Gear^.dX.isNegative);
+Gear^.dY:= gdY;
 AmmoShove(Gear, 0, kick);
 for i:= 15 + kick div 10 downto 0 do
 begin
 particle := AddVisualGear(hwRound(Gear^.X) + Random(25), hwRound(Gear^.Y) + Random(25), vgtDust);
 if particle <> nil then
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepMine(Gear: PGear);
 var vg: PVisualGear;
-begin
+dxdy: hwFloat;
+begin
+if Gear^.Health = 0 then dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY);
 if (Gear^.State and gstMoving) <> 0 then
 begin
 DeleteCI(Gear);
 doStepFallingGear(Gear);
 if (Gear^.State and gstMoving) = 0 then
 end
 else if (GameTicks and $3F) = 25 then
 doStepFallingGear(Gear);
 if (Gear^.Health = 0) then
 begin
-if (not Gear^.dY.isNegative) and (Gear^.dY > _0_2) and (TestCollisionYwithGear(Gear, 1) <> 0) then
+if (dxdy > _0_4) and (Gear^.State and gstCollision <> 0) then
-inc(Gear^.Damage, hwRound(Gear^.dY * _70))
+inc(Gear^.Damage, hwRound(dxdy * _50));
-else if (not Gear^.dX.isNegative) and (Gear^.dX > _0_2) and TestCollisionXwithGear(Gear, 1) then
-inc(Gear^.Damage, hwRound(Gear^.dX * _70))
-else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and (TestCollisionYwithGear(Gear, -1) <> 0) then
-inc(Gear^.Damage, hwRound(Gear^.dY * -_70))
-else if Gear^.dX.isNegative and (Gear^.dX < -_0_2) and TestCollisionXwithGear(Gear, -1) then
-inc(Gear^.Damage, hwRound(Gear^.dX * -_70));
 if ((GameTicks and $FF) = 0) and (Gear^.Damage > random(30)) then
 begin
 vg:= AddVisualGear(hwRound(Gear^.X) - 4  + Random(8), hwRound(Gear^.Y) - 4 - Random(4), vgtSmoke);
 if vg <> nil then
 dec(Gear^.Timer);
 end;
 ///////////////////////////////////////////////////////////////////////////////
-(*
-TODO
-Increase damage as barrel smokes?
-Try tweaking friction some more
-*)
 procedure doStepRollingBarrel(Gear: PGear);
 var
 i: LongInt;
 particle: PVisualGear;
+dxdy: hwFloat;
 begin
 if (Gear^.dY.QWordValue = 0) and (Gear^.dY.QWordValue = 0) and (TestCollisionYwithGear(Gear, 1) = 0) then
 SetLittle(Gear^.dY);
 Gear^.State := Gear^.State or gstAnimation;
+if Gear^.Health < cBarrelHealth then Gear^.State:= Gear^.State and not gstFrozen;
 if ((Gear^.dX.QWordValue <> 0)
 or (Gear^.dY.QWordValue <> 0))  then
 begin
 DeleteCI(Gear);
 AllInactive := false;
-if (not Gear^.dY.isNegative) and (Gear^.dY > _0_2) and (TestCollisionYwithGear(Gear, 1) <> 0) then
+dxdy:= hwAbs(Gear^.dX)+hwAbs(Gear^.dY);
-begin
+doStepFallingGear(Gear);
-Gear^.State := Gear^.State or gsttmpFlag;
+if (Gear^.State and gstCollision <> 0) and(dxdy > _0_4) then
-inc(Gear^.Damage, hwRound(Gear^.dY * _70));
+begin
-for i:= min(12, hwRound(Gear^.dY*_10)) downto 0 do
+if (TestCollisionYwithGear(Gear, 1) <> 0) then
 begin
-particle := AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12,vgtDust);
+Gear^.State := Gear^.State or gsttmpFlag;
-if particle <> nil then
+for i:= min(12, hwRound(dxdy*_10)) downto 0 do
-particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480)
+begin
-end
+particle := AddVisualGear(hwRound(Gear^.X) - 5 + Random(10), hwRound(Gear^.Y) + 12,vgtDust);
-end
+if particle <> nil then
-else if (not Gear^.dX.isNegative) and (Gear^.dX > _0_2) and TestCollisionXwithGear(Gear, 1) then
+particle^.dX := particle^.dX + (Gear^.dX.QWordValue / 21474836480)
-inc(Gear^.Damage, hwRound(Gear^.dX * _70))
+end
+end;
-else if Gear^.dY.isNegative and (Gear^.dY < -_0_2) and (TestCollisionYwithGear(Gear, -1) <> 0) then
+inc(Gear^.Damage, hwRound(dxdy * _50))
-inc(Gear^.Damage, hwRound(Gear^.dY * -_70))
+end;
-else if Gear^.dX.isNegative and (Gear^.dX < -_0_2) and TestCollisionXwithGear(Gear, -1) then
-inc(Gear^.Damage, hwRound(Gear^.dX * -_70));
-doStepFallingGear(Gear);
 CalcRotationDirAngle(Gear);
 //CheckGearDrowning(Gear)
 end
 else
 begin
 else
 AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmokeWhite);
 dec(Gear^.Health, Gear^.Damage);
 Gear^.Damage := 0;
 if Gear^.Health <= 0 then
-Gear^.doStep := @doStepCase;
+doStepCase(Gear);
-// Hand off to doStepCase for the explosion
 end;
 procedure doStepCase(Gear: PGear);
 var
 i, x, y: LongInt;
 k: TGearType;
-exBoom: boolean;
 dX, dY: HWFloat;
 hog: PHedgehog;
 sparkles: PVisualGear;
 gi: PGear;
 begin
 k := Gear^.Kind;
-exBoom := false;
 if (Gear^.Message and gmDestroy) > 0 then
 begin
 DeleteGear(Gear);
 FreeActionsList;
 with CurrentHedgehog^ do
 if Gear <> nil then
 Gear^.Message := Gear^.Message and (not (gmLJump or gmHJump));
 exit
 end;
+if (k = gtExplosives) and (Gear^.Health < cBarrelHealth) then Gear^.State:= Gear^.State and not gstFrozen;
-if k = gtExplosives then
-begin
+if ((k <> gtExplosives) and (Gear^.Damage > 0)) or ((k = gtExplosives) and (Gear^.Health<=0)) then
-//if V > _0_03 then Gear^.State:= Gear^.State or gstAnimation;
-if (hwAbs(Gear^.dX) > _0_15) or ((hwAbs(Gear^.dY) > _0_15) and (hwAbs(Gear^.dX) > _0_02)) then
-Gear^.doStep := @doStepRollingBarrel;
-if (Gear^.Health > 0) and ((Gear^.Health * 100 div cBarrelHealth) < random(90)) and ((GameTicks and $FF) = 0) then
-if (cBarrelHealth div Gear^.Health) > 2 then
-AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmoke)
-else
-AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmokeWhite);
-dec(Gear^.Health, Gear^.Damage);
-Gear^.Damage := 0;
-if Gear^.Health <= 0 then
-exBoom := true;
-end
-else
-begin
-if (Gear^.Pos <> posCaseHealth) and (GameTicks and $1FFF = 0) then // stir 'em up periodically
-begin
-gi := GearsList;
-while gi <> nil do
-begin
-if gi^.Kind = gtGenericFaller then
-begin
-gi^.Active:= true;
-gi^.X:=  int2hwFloat(GetRandom(rightX-leftX)+leftX);
-gi^.Y:=  int2hwFloat(GetRandom(LAND_HEIGHT-topY)+topY);
-gi^.dX:= _90-(GetRandomf*_360);
-gi^.dY:= _90-(GetRandomf*_360)
-end;
-gi := gi^.NextGear
-end
-end;
-if Gear^.Timer = 500 then
-begin
-(* Can't make sparkles team coloured without working out what the next team is going to be. This should be solved, really, since it also screws up
-voices. Reinforcements voices is heard for active team, not team-to-be.  Either that or change crate spawn from end of turn to start, although that
-has its own complexities. *)
-// Abuse a couple of gear values to track origin
-Gear^.Angle:= hwRound(Gear^.Y);
-Gear^.Tag:= random(2);
-inc(Gear^.Timer)
-end;
-if Gear^.Timer < 1833 then inc(Gear^.Timer);
-if Gear^.Timer = 1000 then
-begin
-sparkles:= AddVisualGear(hwRound(Gear^.X), Gear^.Angle, vgtDust, 1);
-if sparkles <> nil then
-begin
-sparkles^.dX:= 0;
-sparkles^.dY:= 0;
-sparkles^.Angle:= 270;
-if Gear^.Tag = 1 then
-sparkles^.Tint:= $3744D7FF
-else sparkles^.Tint:= $FAB22CFF
-end;
-end;
-if Gear^.Timer < 1000 then
-begin
-AllInactive:= false;
-exit
-end
-end;
-if (Gear^.Damage > 0) or exBoom then
 begin
 x := hwRound(Gear^.X);
 y := hwRound(Gear^.Y);
 hog:= Gear^.Hedgehog;
 AddGear(x, y, gtFlame, gstTmpFlag, -dX, -dY, 0);
 end
 end;
 exit
 end;
+if k = gtExplosives then
+begin
+//if V > _0_03 then Gear^.State:= Gear^.State or gstAnimation;
+if (hwAbs(Gear^.dX) > _0_15) or ((hwAbs(Gear^.dY) > _0_15) and (hwAbs(Gear^.dX) > _0_02)) then
+begin
+Gear^.doStep := @doStepRollingBarrel;
+exit;
+end
+else Gear^.dX:= _0;
+if ((Gear^.Health * 100 div cBarrelHealth) < random(90)) and ((GameTicks and $FF) = 0) then
+if (cBarrelHealth div Gear^.Health) > 2 then
+AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmoke)
+else
+AddVisualGear(hwRound(Gear^.X) - 16 + Random(32), hwRound(Gear^.Y) - 2, vgtSmokeWhite);
+dec(Gear^.Health, Gear^.Damage);
+Gear^.Damage := 0;
+end
+else
+begin
+if (Gear^.Pos <> posCaseHealth) and (GameTicks and $1FFF = 0) then // stir 'em up periodically
+begin
+gi := GearsList;
+while gi <> nil do
+begin
+if gi^.Kind = gtGenericFaller then
+begin
+gi^.Active:= true;
+gi^.X:=  int2hwFloat(GetRandom(rightX-leftX)+leftX);
+gi^.Y:=  int2hwFloat(GetRandom(LAND_HEIGHT-topY)+topY);
+gi^.dX:= _90-(GetRandomf*_360);
+gi^.dY:= _90-(GetRandomf*_360)
+end;
+gi := gi^.NextGear
+end
+end;
+if Gear^.Timer = 500 then
+begin
+(* Can't make sparkles team coloured without working out what the next team is going to be. This should be solved, really, since it also screws up
+voices. Reinforcements voices is heard for active team, not team-to-be.  Either that or change crate spawn from end of turn to start, although that
+has its own complexities. *)
+// Abuse a couple of gear values to track origin
+Gear^.Angle:= hwRound(Gear^.Y);
+Gear^.Tag:= random(2);
+inc(Gear^.Timer)
+end;
+if Gear^.Timer < 1833 then inc(Gear^.Timer);
+if Gear^.Timer = 1000 then
+begin
+sparkles:= AddVisualGear(hwRound(Gear^.X), Gear^.Angle, vgtDust, 1);
+if sparkles <> nil then
+begin
+sparkles^.dX:= 0;
+sparkles^.dY:= 0;
+sparkles^.Angle:= 270;
+if Gear^.Tag = 1 then
+sparkles^.Tint:= $3744D7FF
+else sparkles^.Tint:= $FAB22CFF
+end;
+end;
+if Gear^.Timer < 1000 then
+begin
+AllInactive:= false;
+exit
+end
+end;
 if (Gear^.dY.QWordValue <> 0)
 or (TestCollisionYwithGear(Gear, 1) = 0) then
 begin
 AllInactive := false;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepMortar(Gear: PGear);
 var
 dX, dY, gdX, gdY: hwFloat;
 i: LongInt;
-dxn, dyn: boolean;
 begin
 AllInactive := false;
-dxn := Gear^.dX.isNegative;
+gdX := Gear^.dX;
-dyn := Gear^.dY.isNegative;
+gdY := Gear^.dY;
 doStepFallingGear(Gear);
 if (Gear^.State and gstCollision) <> 0 then
 begin
-gdX := Gear^.dX;
-gdY := Gear^.dY;
 doMakeExplosion(hwRound(Gear^.X), hwRound(Gear^.Y), 20, Gear^.Hedgehog, EXPLAutoSound);
+gdX.isNegative := not gdX.isNegative;
-gdX.isNegative := not dxn;
+gdY.isNegative := not gdY.isNegative;
-gdY.isNegative := not dyn;
+gdX:= gdX*_0_2;
+gdY:= gdY*_0_2;
 for i:= 0 to 4 do
 begin
-dX := gdX + (GetRandomf - _0_5) * _0_03;
+dX := gdX + rndSign(GetRandomf) * _0_03;
-dY := gdY + (GetRandomf - _0_5) * _0_03;
+dY := gdY + rndSign(GetRandomf) * _0_03;
 AddGear(hwRound(Gear^.X), hwRound(Gear^.Y), gtCluster, 0, dX, dY, 25);
 end;
 DeleteGear(Gear);
 exit
 end;
 if (GameTicks and $3F) = 0 then
-AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
+begin
+if hwRound(Gear^.Y) > cWaterLine then
+AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble)
+else AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
+end
 end;
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepKamikazeWork(Gear: PGear);
 var
 ////////////////////////////////////////////////////////////////////////////////
 procedure doStepSeductionWork(Gear: PGear);
 var i: LongInt;
 hogs: PGearArrayS;
-len: Integer;
 begin
 AllInactive := false;
 hogs := GearsNear(Gear^.X, Gear^.Y, gtHedgehog, Gear^.Radius);
 if hogs.size > 0 then
 begin
 oldDy := Gear^.dY;
 doStepFallingGear(Gear);
 if (GameTicks and $3F) = 0 then
-AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace);
+begin
+if hwRound(Gear^.Y) > cWaterLine then
+AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtBubble)
+else AddVisualGear(hwRound(Gear^.X), hwRound(Gear^.Y), vgtSmokeTrace)
+end;
 if ((Gear^.State and gstCollision) <> 0) then
 begin
 //hit
 Gear^.dX := oldDx;
 (*if (HHGear^.Message and gmPrecise) <> 0 then
 begin
 move:= _0_02;
 fuel:= 5;
 end;*)
+if HHGear^.Message and gmPrecise <> 0 then
-if Gear^.Health > 0 then
+HedgehogChAngle(HHGear)
-begin
+else if Gear^.Health > 0 then
-if (HHGear^.Message and gmUp) <> 0 then
+begin
+if HHGear^.Message and gmUp <> 0 then
 begin
 if (not HHGear^.dY.isNegative) or (HHGear^.Y > -_256) then
 begin
 if isUnderwater then
 begin
 //AddCaption('Fuel: '+inttostr(round(Gear^.Health/20))+'%', cWhiteColor, capgrpAmmostate);
 FreeTexture(Gear^.Tex);
 Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(i) + '%', cWhiteColor, fntSmall)
 end;
-if HHGear^.Message and (gmAttack or gmUp or gmPrecise or gmLeft or gmRight) <> 0 then
+if (HHGear^.Message and (gmAttack or gmUp or gmLeft or gmRight) <> 0) and
+(HHGear^.Message and gmPrecise = 0) then
 Gear^.State := Gear^.State and (not gsttmpFlag);
-HHGear^.Message := HHGear^.Message and (not (gmUp or gmPrecise or gmLeft or gmRight));
+if HHGear^.Message and gmPrecise = 0 then
+HHGear^.Message := HHGear^.Message and (not (gmUp or gmLeft or gmRight));
 HHGear^.State := HHGear^.State or gstMoving;
 Gear^.X := HHGear^.X;
 Gear^.Y := HHGear^.Y;
 doStepHedgehogMoving(HHGear);
 if // (Gear^.Health = 0)
 (HHGear^.Damage <> 0)
 //or CheckGearDrowning(HHGear)
-or (cWaterLine + 512 < hwRound(HHGear^.Y))
+or (cWaterLine + cVisibleWater * 4 < hwRound(HHGear^.Y))
 or (TurnTimeLeft = 0)
 // allow brief ground touches - to be fair on this, might need another counter
 or (((GameTicks and $1FF) = 0) and (not HHGear^.dY.isNegative) and (TestCollisionYwithGear(HHGear, 1) <> 0))
 or ((Gear^.Message and gmAttack) <> 0) then
 begin
 if (not (isbullet or iscake)) then
 begin
 // wow! good candidate there, let's see if the distance and direction is okay!
 if hasdxy then
 begin
-s := r / Distance(iterator^.dX, iterator^.dY);
+s := Distance(iterator^.dX, iterator^.dY);
+// if the resulting distance is 0 skip this gear
+if s.QWordValue = 0 then
+continue;
+s := r / s;
 ox:= iterator^.X + s * iterator^.dX;
 oy:= iterator^.Y + s * iterator^.dY;
 end
 else
 begin
 var
 graves: PGearArrayS;
 resgear: PGear;
 hh: PHedgehog;
 i: LongInt;
-len: Integer;
 begin
 if (TurnTimeLeft > 0) then
 dec(TurnTimeLeft);
 AllInactive := false;
 procedure doStepResurrector(Gear: PGear);
 var
 graves: PGearArrayS;
 hh: PHedgehog;
 i: LongInt;
-len: Integer;
 begin
 AllInactive := false;
 graves := GearsNear(Gear^.X, Gear^.Y, gtGrave, Gear^.Radius);
 if graves.size > 0 then
 Gear^.Damage:= t;
 FreeTexture(Gear^.Tex);
 Gear^.Tex := RenderStringTex(trmsg[sidFuel] + ': ' + inttostr(t) +
 '%', cWhiteColor, fntSmall)
 end;
-if GameTicks mod 10 = 0 then dec(Gear^.Health);
+if Gear^.Message and (gmUp or gmDown) <> 0 then
+begin
+StopSoundChan(Gear^.SoundChannel);
+Gear^.SoundChannel:= -1;
+if GameTicks mod 40 = 0 then dec(Gear^.Health)
+end
+else
+begin
+if Gear^.SoundChannel = -1 then
+Gear^.SoundChannel := LoopSound(sndIceBeam);
+if GameTicks mod 10 = 0 then dec(Gear^.Health)
+end
 end;
 procedure updateTarget(Gear:PGear; newX, newY:HWFloat);
 //    var
 Pos:= 0;
 Target.X:= NoPointX;
 LastDamage:= nil;
 X:= Hedgehog^.Gear^.X;
 Y:= Hedgehog^.Gear^.Y;
-//unfreeze all semifrozen hogs - make this generic hog cleanup
-(*
-iter := GearsList;
-while iter <> nil do
-begin
-if (iter^.Kind = gtHedgehog) and
-(iter^.Hedgehog^.Effects[heFrozen] and $FF = 0) then
-iter^.Hedgehog^.Effects[heFrozen]:= 0;
-iter:= iter^.NextGear
-end
-*)
 end;
 end;
 procedure doStepIceGun(Gear: PGear);
 const iceWaitCollision:Longint = 0;
 //const waterFreezingTime:Longint = 500;
 const groundFreezingTime:Longint = 1000;
 const iceRadius = 32;
 const iceHeight = 40;
 var
-HHGear: PGear;
+HHGear, iter: PGear;
 landRect: TSDL_Rect;
 ndX, ndY: hwFloat;
-i, t, gX, gY: LongInt;
+i, j, t, gX, gY: LongInt;
 hogs: PGearArrayS;
-len: Integer;
+vg: PVisualGear;
 begin
 HHGear := Gear^.Hedgehog^.Gear;
-if (Gear^.Message and gmAttack <> 0) or (Gear^.Health = 0) or (HHGear = nil) or (HHGear^.Damage <> 0) then
+if (Gear^.Message and gmAttack <> 0) or (Gear^.Health = 0) or (HHGear = nil) or (HHGear^.Damage <> 0) or (HHGear^.dX.QWordValue > 4294967)  then
 begin
+StopSoundChan(Gear^.SoundChannel);
 DeleteGear(Gear);
 AfterAttack;
 exit
-end
+end;
-else if Gear^.Message and (gmUp or gmDown) = 0 then updateFuel(Gear);
+updateFuel(Gear);
 with Gear^ do
 begin
 HedgehogChAngle(HHGear);
 ndX:= SignAs(AngleSin(HHGear^.Angle), HHGear^.dX) * _4;
 gY:= hwRound(Y);
 if Target.X = NoPointX then t:= hwRound(hwSqr(X-HHGear^.X)+hwSqr(Y-HHGear^.Y));
 if Target.X <> NoPointX then
 begin
-CheckCollisionWithLand(Gear);
+CheckCollision(Gear);
 if (State and gstCollision) <> 0 then
 begin
 if Timer = iceWaitCollision then
 begin
 Timer := iceCollideWithGround;
 landRect.x := min(max(target.x - iceRadius, 0), LAND_WIDTH - 1);
 landRect.y := min(max(target.y - iceRadius, 0), LAND_HEIGHT - 1);
 landRect.w := min(2*iceRadius, LAND_WIDTH - landRect.x - 1);
 landRect.h := min(2*iceRadius, LAND_HEIGHT - landRect.y - 1);
 UpdateLandTexture(landRect.x, landRect.w, landRect.y, landRect.h, true);
+// Freeze nearby mines/explosives/cases too
+iter := GearsList;
+while iter <> nil do
+begin
+if (iter^.State and gstFrozen = 0) and
+((iter^.Kind = gtExplosives) or (iter^.Kind = gtCase) or (iter^.Kind = gtMine)) and
+(abs(iter^.X.Round-target.x)+abs(iter^.Y.Round-target.y)+2<2*iceRadius) and (Distance(iter^.X-int2hwFloat(target.x),iter^.Y-int2hwFloat(target.y))<int2hwFloat(iceRadius*2)) then
+begin
+for t:= 0 to 5 do
+begin
+vg:= AddVisualGear(hwRound(iter^.X)+random(4)-8, hwRound(iter^.Y)+random(8), vgtDust, 1);
+if vg <> nil then
+begin
+i:= random(100) + 155;
+vg^.Tint:= i shl 24 or i shl 16 or $FF shl 8 or Longword(random(200) + 55);
+vg^.Angle:= random(360);
+vg^.dx:= 0.001 * random(80);
+vg^.dy:= 0.001 * random(80)
+end
+end;
+PlaySound(sndHogFreeze);
+iter^.State:= iter^.State or gstFrozen;
+if iter^.Kind = gtMine then // dud mine block
+begin
+vg:= AddVisualGear(hwRound(iter^.X) - 4  + Random(8), hwRound(iter^.Y) - 4 - Random(4), vgtSmoke);
+if vg <> nil then
+vg^.Scale:= 0.5;
+PlaySound(sndVaporize);
+iter^.Health := 0;
+iter^.Damage := 0;
+iter^.State := iter^.State and (not gstAttacking)
+end
+else if iter^.Kind = gtCase then
+begin
+DeleteCI(iter);
+AddGearCI(iter)
+end
+else // gtExplosives
+iter^.Health:= iter^.Health + cBarrelHealth
+end;
+iter:= iter^.NextGear
+end;
 // FillRoundInLandWithIce(Target.X, Target.Y, iceRadius);
 SetAllHHToActive(true);
 Timer := iceWaitCollision;
 end;
 if (Timer = iceCollideWithWater) and ((GameTicks - Power) > groundFreezingTime) then
 begin
+PlaySound(sndHogFreeze);
 DrawIceBreak(Target.X, cWaterLine - iceHeight, iceRadius, iceHeight);
 SetAllHHToActive(true);
 Timer := iceWaitCollision;
 end;
+(*
+Any ideas for something that would look good here?
+if (Target.X <> NoPointX) and ((Timer = iceCollideWithGround) or (Timer = iceCollideWithWater)) and (GameTicks mod max((groundFreezingTime-((GameTicks - Power)*2)),2) = 0) then //and CheckLandValue(Target.X, Target.Y, lfIce) then
+begin
+vg:= AddVisualGear(Target.X+random(20)-10, Target.Y+random(40)-10, vgtDust, 1);
+if vg <> nil then
+begin
+i:= random(100) + 155;
+vg^.Tint:= IceColor or $FF;
+vg^.Angle:= random(360);
+vg^.dx:= 0.001 * random(80);
+vg^.dy:= 0.001 * random(80)
+end
+end;
+*)
 // freeze nearby hogs
 hogs := GearsNear(int2hwFloat(Target.X), int2hwFloat(Target.Y), gtHedgehog, Gear^.Radius*2);
 if hogs.size > 0 then
 for i:= 0 to hogs.size - 1 do
 begin
 hogs.ar^[i]^.Active:= true;
 if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] < 256 then
 hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] := hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] + 1
 else if hogs.ar^[i]^.Hedgehog^.Effects[heFrozen] = 256 then
-hogs.ar^[i]^.Hedgehog^.Effects[heFrozen]:= 200000;//cHedgehogTurnTime + cReadyDelay
+begin
+hogs.ar^[i]^.Hedgehog^.Effects[heFrozen]:= 200000-1;//cHedgehogTurnTime + cReadyDelay
+PlaySound(sndHogFreeze);
+end;
 end;
 inc(Pos)
 end
 else if (t > 400) and ((gY > cWaterLine) or
 (((gX and LAND_WIDTH_MASK = 0) and (gY and LAND_HEIGHT_MASK = 0))
 Target.X:= gX;
 Target.Y:= gY;
 X:= HHGear^.X;
 Y:= HHGear^.Y
 end;
-{if (gX > max(LAND_WIDTH,4096)*2) or
+if (gX > max(LAND_WIDTH,4096)*2) or
 (gX < -max(LAND_WIDTH,4096)) or
 (gY < -max(LAND_HEIGHT,4096)) or
 (gY > max(LAND_HEIGHT,4096)+512) then
 begin
-X:= HHGear^.X;
+//X:= HHGear^.X;
-Y:= HHGear^.Y
+//Y:= HHGear^.Y
-end}
+Target.X:= gX;
+Target.Y:= gY;
+end
 end
 end;
 end;
 procedure doStepAddAmmo(Gear: PGear);

branch	webgl
changeset 9127	e350500c4edb
parent 8850	ae8a957c69fd
parent 9080	9b42757d7e71
child 9160	fc46e75f6b72