hedgewars: comparison hedgewars/uGearsUtils.pas

equal deleted inserted replaced

-:d24257910f8d
+:aaefa587e277
 unit uGearsUtils;
 interface
 uses uTypes;
 procedure doMakeExplosion(X, Y, Radius: LongInt; AttackingHog: PHedgehog; Mask: Longword); inline;
 procedure doMakeExplosion(X, Y, Radius: LongInt; AttackingHog: PHedgehog; Mask: Longword; const Tint: LongWord);
 function  ModifyDamage(dmg: Longword; Gear: PGear): Longword;
 procedure ApplyDamage(Gear: PGear; AttackerHog: PHedgehog; Damage: Longword; Source: TDamageSource);
 procedure spawnHealthTagForHH(HHGear: PGear; dmg: Longword);
 procedure HHHurt(Hedgehog: PHedgehog; Source: TDamageSource);
 gtSMine,
 gtCase,
 gtTarget,
 gtFlame,
 gtKnife,
-gtExplosives,
+gtExplosives: begin //,
-gtStructure: begin
+//gtStructure: begin
 // Run the calcs only once we know we have a type that will need damage
 tdX:= Gear^.X-fX;
 tdY:= Gear^.Y-fY;
 if LongInt(tdX.Round + tdY.Round + 2) < dmgBase then
 dmg:= dmgBase - hwRound(Distance(tdX, tdY));
 end;
 inc(i, 5);
 end;
 end
 end;
 if ((GameFlags and gfKarma) <> 0) and
 ((GameFlags and gfInvulnerable) = 0)
 and (not CurrentHedgehog^.Gear^.Invulnerable) then
 begin // this cannot just use Damage or it interrupts shotgun and gets you called stupid
 inc(CurrentHedgehog^.Gear^.Karma, tmpDmg);
 CurrentHedgehog^.Gear^.LastDamage := CurrentHedgehog;
 spawnHealthTagForHH(CurrentHedgehog^.Gear, tmpDmg);
 end;
 uStats.HedgehogDamaged(Gear, AttackerHog, Damage, false);
 end;
-end
+end else
-else if Gear^.Kind <> gtStructure then // not gtHedgehog nor gtStructure
+//else if Gear^.Kind <> gtStructure then // not gtHedgehog nor gtStructure
 Gear^.Hedgehog:= AttackerHog;
 inc(Gear^.Damage, Damage);
 ScriptCall('onGearDamage', Gear^.UID, Damage);
 end;
 procedure spawnHealthTagForHH(HHGear: PGear; dmg: Longword);
 var tag: PVisualGear;
 if (tag <> nil) then
 tag^.Hedgehog:= HHGear^.Hedgehog; // the tag needs the tag to determine the text color
 AllInactive:= false;
 HHGear^.Active:= true;
 end;
 procedure HHHurt(Hedgehog: PHedgehog; Source: TDamageSource);
 begin
 if (Source = dsFall) or (Source = dsExplosion) then
 case random(3) of
 0: PlaySoundV(sndOoff1, Hedgehog^.Team^.voicepack);
 3: PlaySoundV(sndOw4, Hedgehog^.Team^.voicepack);
 end
 end;
 procedure CheckHHDamage(Gear: PGear);
 var
 dmg: Longword;
 i: LongWord;
 particle: PVisualGear;
 begin
 if _0_4 < Gear^.dY then
 end
 end;
 procedure CalcRotationDirAngle(Gear: PGear);
 var
 dAngle: real;
 begin
 // Frac/Round to be kind to JS as of 2012-08-27 where there is yet no int64/uint64
 //dAngle := (Gear^.dX.QWordValue + Gear^.dY.QWordValue) / $80000000;
 dAngle := (Gear^.dX.Round + Gear^.dY.Round) / 2 + (Gear^.dX.Frac/$100000000+Gear^.dY.Frac/$100000000);
 else if 360 < Gear^.DirAngle then
 Gear^.DirAngle := Gear^.DirAngle - 360
 end;
 function CheckGearDrowning(Gear: PGear): boolean;
 var
 skipSpeed, skipAngle, skipDecay: hwFloat;
 i, maxDrops, X, Y: LongInt;
 vdX, vdY: real;
 particle, splash: PVisualGear;
 isSubmersible: boolean;
 end
 end
 else
 Gear^.doStep := @doStepDrowningGear;
 if Gear^.Kind = gtFlake then
 exit // skip splashes
 end;
 if ((not isSubmersible) and (Y < cWaterLine + 64 + Gear^.Radius))
 or (isSubmersible and (Y < cWaterLine + 2 + Gear^.Radius) and ((CurAmmoGear^.Pos = 0)
 and (CurAmmoGear^.dY < _0_01))) then
 if Gear^.Density * Gear^.dY > _1 then
 PlaySound(sndSplash)
 else if Gear^.Density * Gear^.dY > _0_5 then
 PlaySound(sndSkip)
 else
 PlaySound(sndDroplet2);
 end;
 and (((not isSubmersible) and (Y < cWaterLine + 64 + Gear^.Radius))
 or (isSubmersible and (Y < cWaterLine + 2 + Gear^.Radius) and ((CurAmmoGear^.Pos = 0)
 and (CurAmmoGear^.dY < _0_01)))) then
 begin
 splash:= AddVisualGear(X, cWaterLine, vgtSplash);
 if splash <> nil then
 with splash^ do
 begin
 Scale:= hwFloat2Float(Gear^.Density / _3 * Gear^.dY);
 if Scale > 1 then Scale:= power(Scale,0.3333)
 else Scale:= Scale + ((1-Scale) / 2);
 begin
 dX := dX - vdX / 10;
 dY := dY - vdY / 5;
 if splash <> nil then
 begin
 if splash^.Scale > 1 then
 begin
 dX:= dX * power(splash^.Scale,0.3333); // tone down the droplet height further
 dY:= dY * power(splash^.Scale, 0.3333)
 end
 else
 begin
 dX:= dX * splash^.Scale;
 dY:= dY * splash^.Scale
 end
 end
 gear^.Damage := 0;
 gear^.Health := gear^.Hedgehog^.InitialHealth;
 gear^.Hedgehog^.Effects[hePoisoned] := 0;
 if (CurrentHedgehog^.Effects[heResurrectable] = 0) or ((CurrentHedgehog^.Effects[heResurrectable] <> 0)
 and (Gear^.Hedgehog^.Team^.Clan <> CurrentHedgehog^.Team^.Clan)) then
 with CurrentHedgehog^ do
 begin
 inc(Team^.stats.AIKills);
 FreeTexture(Team^.AIKillsTex);
 Team^.AIKillsTex := RenderStringTex(inttostr(Team^.stats.AIKills), Team^.Clan^.Color, fnt16);
 end;
 if sparkles <> nil then
 begin
 sparkles^.Tint:= tempTeam^.Clan^.Color shl 8 or $FF;
 //sparkles^.Angle:= random(360);
 end;
 FindPlace(gear, false, 0, LAND_WIDTH, true);
 if gear <> nil then
 begin
 AddVisualGear(hwRound(gear^.X), hwRound(gear^.Y), vgtExplosion);
 PlaySound(sndWarp);
 RenderHealth(gear^.Hedgehog^);
 while y < cWaterLine do
 begin
 repeat
 inc(y, 2);
 until (y >= cWaterLine) or
 ((not ignoreOverlap) and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, $FFFF) = 0)) or
 (ignoreOverlap and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, $FF00) = 0));
 sy:= y;
 repeat
 inc(y);
 until (y >= cWaterLine) or
 ((not ignoreOverlap) and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, $FFFF) <> 0)) or
 (ignoreOverlap and (CountNonZeroz(x, y, Gear^.Radius - 1, 1, $FF00) <> 0));
 if (y - sy > Gear^.Radius * 2)
 and (((Gear^.Kind = gtExplosives)
 and (y < cWaterLine)
 and (ignoreNearObjects or NoGearsToAvoid(x, y - Gear^.Radius, 60, 60))
 inc(y, 10)
 end;
 if cnt > 0 then
-	    begin
+begin
-	       temp := ar[GetRandom(cnt)];
+temp := ar[GetRandom(cnt)];
 with temp do
 begin
 ar2[cnt2].x:= x;
 ar2[cnt2].y:= y;
 inc(cnt2)
-		    end
+end
-	       end
+end
 until (x + Delta > Right);
 dec(Delta, 60)
 until (cnt2 > 0) or (Delta < 70);
 // if either of these has not been tried, do another pass
 procedure CheckCollisionWithLand(Gear: PGear); inline;
 begin
 if TestCollisionX(Gear, hwSign(Gear^.dX))
 or TestCollisionY(Gear, hwSign(Gear^.dY)) then
 Gear^.State := Gear^.State or gstCollision
 else
 Gear^.State := Gear^.State and (not gstCollision)
 end;
 function MakeHedgehogsStep(Gear: PGear) : boolean;
 begin

branch	webgl
changeset 8330	aaefa587e277
parent 8026	4a4f21070479
parent 8199	886ed135665b
child 8833	c13ebed437cb