hedgewars: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:1603a796f42a
+:3a96e93572cb
 procedure AfterAttack; forward;
 procedure FindPlace(Gear: PGear; withFall: boolean; Left, Right: LongInt); forward;
 procedure HedgehogStep(Gear: PGear); forward;
 procedure HedgehogChAngle(Gear: PGear); forward;
 procedure ShotgunShot(Gear: PGear); forward;
-procedure AddDamageTag(X, Y, Damage: LongWord; Gear: PGear); forward;
 {$INCLUDE GSHandlers.inc}
 {$INCLUDE HHHandlers.inc}
 const doStepHandlers: array[TGearType] of TGearStepProcedure = (
 			@doStepAirAttack,
 			@doStepAirBomb,
 			@doStepBlowTorch,
 			@doStepGirder,
 			@doStepTeleport,
-			@doStepHealthTag,
 			@doStepSwitcher,
 			@doStepCase,
 			@doStepMortar,
 			@doStepWhip,
 			@doStepKamikaze,
 procedure InsertGearToList(Gear: PGear);
 var tmp, ptmp: PGear;
 begin
 if GearsList = nil then
-GearsList:= Gear
+	GearsList:= Gear
-else begin
+	else begin
-tmp:= GearsList;
+	tmp:= GearsList;
-ptmp:= GearsList;
+	ptmp:= GearsList;
-while (tmp <> nil) and (tmp^.Z <= Gear^.Z) do
+	while (tmp <> nil) and (tmp^.Z <= Gear^.Z) do
-begin
+		begin
-ptmp:= tmp;
+		ptmp:= tmp;
-tmp:= tmp^.NextGear
+		tmp:= tmp^.NextGear
-end;
+		end;
-if ptmp <> nil then
+	if ptmp <> nil then
-begin
+		begin
-Gear^.NextGear:= ptmp^.NextGear;
+		Gear^.NextGear:= ptmp^.NextGear;
-Gear^.PrevGear:= ptmp;
+		Gear^.PrevGear:= ptmp;
-if ptmp^.NextGear <> nil then ptmp^.NextGear^.PrevGear:= Gear;
+		if ptmp^.NextGear <> nil then ptmp^.NextGear^.PrevGear:= Gear;
-ptmp^.NextGear:= Gear
+		ptmp^.NextGear:= Gear
-end
+		end
-else GearsList:= Gear
+	else GearsList:= Gear
-end
+	end
 end;
 procedure RemoveGearFromList(Gear: PGear);
 begin
 if Gear^.NextGear <> nil then Gear^.NextGear^.PrevGear:= Gear^.PrevGear;
-if Gear^.PrevGear <> nil then Gear^.PrevGear^.NextGear:= Gear^.NextGear
+if Gear^.PrevGear <> nil then
-else GearsList:= Gear^.NextGear
+	Gear^.PrevGear^.NextGear:= Gear^.NextGear
+else
+	GearsList:= Gear^.NextGear
 end;
 function AddGear(X, Y: LongInt; Kind: TGearType; State: Longword; dX, dY: hwFloat; Timer: LongWord): PGear;
 const Counter: Longword = 0;
 var Result: PGear;
 Result^.Timer:= Timer;
 Result^.Z:= cUsualZ;
 Result^.uid:= Counter;
 if CurrentTeam <> nil then
-begin
+	begin
-Result^.Hedgehog:= CurrentHedgehog;
+	Result^.Hedgehog:= CurrentHedgehog;
-Result^.IntersectGear:= CurrentHedgehog^.Gear
+	Result^.IntersectGear:= CurrentHedgehog^.Gear
-end;
+	end;
 case Kind of
 gtAmmo_Bomb,
 gtClusterBomb: begin
 Result^.Radius:= 4;
 Result^.Radius:= 5;
 end;
 gtBlowTorch: begin
 Result^.Radius:= cHHRadius + cBlowTorchC;
 Result^.Timer:= 7500;
-end;
-gtSmallDamage: begin
-Result^.Timer:= 1100;
-Result^.Z:= 2000;
 end;
 gtSwitcher: begin
 Result^.Z:= cCurrHHZ
 end;
 gtTarget: begin
 		else
 			dec(Gear^.Health, Gear^.Damage);
 		AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) - cHHRadius - 12,
 				gtHealthTag, Gear^.Damage, _0, _0, 0)^.Hedgehog:= Gear^.Hedgehog;
 		RenderHealth(PHedgehog(Gear^.Hedgehog)^);
 		RecountTeamHealth(PHedgehog(Gear^.Hedgehog)^.Team);
 		Gear^.Damage:= 0
 		end;
 	if Gear^.Kind = gtHedgehog then
 		Gear^.Damage:= min(cHealthDecrease, Gear^.Health - 1);
 	Gear:= Gear^.NextGear
 	end;
-end;
-procedure AddDamageTag(X, Y, Damage: LongWord; Gear: PGear);
-begin
-if cAltDamage then
-	AddGear(X, Y, gtSmallDamage, Damage, _0, _0, 0)^.Hedgehog:= Gear^.Hedgehog;
 end;
 procedure ProcessGears;
 const delay: LongWord = 0;
 	step: (stDelay, stChDmg, stTurnReact,
 var t: PGear;
 begin
 AllInactive:= false;
 t:= GearsList;
 while t <> nil do
-begin
+	begin
-t^.Active:= true;
+	t^.Active:= true;
-t:= t^.NextGear
+	t:= t^.NextGear
-end
+	end
 end;
 procedure SetAllHHToActive;
 var t: PGear;
 begin
 AllInactive:= false;
 t:= GearsList;
 while t <> nil do
-begin
+	begin
-if t^.Kind = gtHedgehog then t^.Active:= true;
+	if t^.Kind = gtHedgehog then t^.Active:= true;
-t:= t^.NextGear
+	t:= t^.NextGear
-end
+	end
 end;
 procedure DrawHH(Gear: PGear);
 var t: LongInt;
 	amt: TAmmoType;
 begin
 case Gear^.Kind of
 gtAmmo_Bomb: DrawRotated(sprBomb, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, Gear^.DirAngle);
 gtHedgehog: DrawHH(Gear);
 gtAmmo_Grenade: DrawRotated(sprGrenade, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, 0, DxDy2Angle(Gear^.dY, Gear^.dX));
-gtHealthTag,
+gtHealthTag: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
-gtSmallDamage: if Gear^.Tex <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Tex);
 gtGrave: DrawSurfSprite(hwRound(Gear^.X) + WorldDx - 16, hwRound(Gear^.Y) + WorldDy - 16, 32, (GameTicks shr 7) and 7, PHedgehog(Gear^.Hedgehog)^.Team^.GraveTex);
 gtUFO: DrawSprite(sprUFO, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, (GameTicks shr 7) mod 4);
 gtPickHammer: DrawSprite(sprPHammer, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 50 + LongInt(((GameTicks shr 5) and 1) * 2) + WorldDy, 0);
 gtRope: begin
 roplen:= 0;
 procedure FreeGearsList;
 var t, tt: PGear;
 begin
 tt:= GearsList;
 GearsList:= nil;
-while tt<>nil do
+while tt <> nil do
-begin
+	begin
-t:= tt;
+	t:= tt;
-tt:= tt^.NextGear;
+	tt:= tt^.NextGear;
-Dispose(t)
+	Dispose(t)
-end;
+	end;
 end;
 procedure AddMiscGears;
 var i: LongInt;
 begin
 						//{$IFDEF DEBUGFILE}AddFileLog('Damage: ' + inttostr(dmg));{$ENDIF}
 						if (Mask and EXPLNoDamage) = 0 then
 							begin
 							inc(Gear^.Damage, dmg);
 							if Gear^.Kind = gtHedgehog then
-								AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), dmg, Gear)
+								AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), dmg, PHedgehog(Gear^.Hedgehog)^.Team^.Clan^.Color)
 							end;
 						if ((Mask and EXPLDoNotTouchHH) = 0) or (Gear^.Kind <> gtHedgehog) then
 							begin
 							DeleteCI(Gear);
 							Gear^.dX:= Gear^.dX + SignAs(_0_005 * dmg + cHHKick, Gear^.X - int2hwFloat(X));
 			gtCase,
 			gtTarget: begin
 					inc(t^.Damage, dmg);
 					if t^.Kind = gtHedgehog then
-							AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), dmg, t);
+						AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), dmg, PHedgehog(t^.Hedgehog)^.Team^.Clan^.Color);
 					DeleteCI(t);
 					t^.dX:= t^.dX + Gear^.dX * dmg * _0_01 + SignAs(cHHKick, Gear^.dX);
 					t^.dY:= t^.dY + Gear^.dY * dmg * _0_01;
 					t^.State:= t^.State or gstMoving;
 			gtTarget,
 			gtCase: begin
 					inc(t^.ar[i]^.Damage, Damage);
 					if (t^.ar[i]^.Kind = gtHedgehog) and (Damage > 0) then
-						AddDamageTag(hwRound(t^.ar[i]^.X), hwRound(t^.ar[i]^.Y), Damage, t^.ar[i]);
+						AddDamageTag(hwRound(t^.ar[i]^.X), hwRound(t^.ar[i]^.Y), Damage, PHedgehog(t^.ar[i]^.Hedgehog)^.Team^.Clan^.Color);
 					DeleteCI(t^.ar[i]);
 					t^.ar[i]^.dX:= Ammo^.dX * Power * _0_01;
 					t^.ar[i]^.dY:= Ammo^.dY * Power * _0_01;
 					t^.ar[i]^.Active:= true;

changeset 1505	3a96e93572cb
parent 1503	a40b871d506b
child 1506	a4ab75470ce1