hedgewars: comparison hedgewars/uGears.pas

equal deleted inserted replaced

-:bc8fd78d7598
+:ca089787f59d
 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 = (
 @doStepParachute,
 @doStepAirAttack,
 @doStepAirBomb,
 @doStepBlowTorch,
 @doStepGirder,
-@doStepTeleport
+@doStepTeleport,
+@doStepHealthTag
 );
 procedure InsertGearToList(Gear: PGear);
 var tmp: PGear;
 begin
 gtAmmo_Grenade: begin
 Result^.Radius:= 4;
 end;
 gtHealthTag: begin
 Result^.Timer:= 1500;
-Result^.Z:= 2000;
+Result^.Z:= 2001;
 end;
 gtGrave: begin
 Result^.Radius:= 10;
 Result^.Elasticity:= _0_6;
 end;
 end;
 gtBlowTorch: begin
 Result^.Radius:= cHHRadius + cBlowTorchC;
 Result^.Timer:= 7500;
 end;
+gtSmallDamage: begin
+Result^.Timer:= 1100;
+Result^.Z:= 2000;
+end;
 end;
 InsertGearToList(Result);
 AddGear:= Result
 end;
 procedure DeleteGear(Gear: PGear);
 var team: PTeam;
 t: Longword;
 begin
 DeleteCI(Gear);
-if Gear^.Surf <> nil then SDL_FreeSurface(Gear^.Surf);
+if Gear^.Surf <> nil then
+begin
+SDL_FreeSurface(Gear^.Surf);
+Gear^.Surf:= nil
+end;
 if Gear^.Kind = gtHedgehog then
 if CurAmmoGear <> nil then
 begin
 Gear^.Message:= gm_Destroy;
 CurAmmoGear^.Message:= gm_Destroy;
 if Gear^.Damage <> 0 then
 begin
 CheckNoDamage:= false;
 inc(StepDamage, Gear^.Damage);
 if Gear^.Health < Gear^.Damage then Gear^.Health:= 0
 else dec(Gear^.Health, Gear^.Damage);
-AddGear(hwRound(Gear^.X), hwRound(Gear^.Y) - cHHRadius - 12 - PHedgehog(Gear^.Hedgehog)^.HealthTag^.h,
+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;
 Gear:= Gear^.NextGear
 end;
+end;
+procedure AddDamageTag(X, Y, Damage: LongWord; Gear: PGear);
+begin
+AddGear(X, Y, gtSmallDamage, Damage, _0, _0, 0)^.Hedgehog:= Gear^.Hedgehog;
 end;
 procedure ProcessGears;
 const delay: LongInt = cInactDelay;
 step: (stDelay, stChDmg, stChWin, stSpawn, stNTurn) = stDelay;
 case Gear^.Kind of
 gtCloud: DrawSprite(sprCloud   , hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.State, Surface);
 gtAmmo_Bomb: DrawSprite(sprBomb , hwRound(Gear^.X) - 8 + WorldDx, hwRound(Gear^.Y) - 8 + WorldDy, hwRound(Gear^.DirAngle), Surface);
 gtHedgehog: DrawHH(Gear, Surface);
 gtAmmo_Grenade: DrawSprite(sprGrenade , hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, DxDy2Angle32(Gear^.dY, Gear^.dX), Surface);
-gtHealthTag: if Gear^.Surf <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Surf, Surface);
+gtHealthTag,
+gtSmallDamage: if Gear^.Surf <> nil then DrawCentered(hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.Surf, Surface);
 gtGrave: DrawSpriteFromRect(PHedgehog(Gear^.Hedgehog)^.Team^.GraveRect, hwRound(Gear^.X) + WorldDx - 16, hwRound(Gear^.Y) + WorldDy - 16, 32, (GameTicks shr 7) and 7, Surface);
 gtUFO: DrawSprite(sprUFO, hwRound(Gear^.X) - 16 + WorldDx, hwRound(Gear^.Y) - 16 + WorldDy, (GameTicks shr 7) mod 4, Surface);
 gtSmokeTrace: if Gear^.State < 8 then DrawSprite(sprSmokeTrace, hwRound(Gear^.X) + WorldDx, hwRound(Gear^.Y) + WorldDy, Gear^.State, Surface);
 gtRope: begin
 roplen:= 0;
 else dmgRadius:= Radius;
 Gear:= GearsList;
 while Gear <> nil do
 begin
 dmg:= dmgRadius - hwRound(Distance(Gear^.X - int2hwFloat(X), Gear^.Y - int2hwFloat(Y)));
-if dmg > 0 then
+if (dmg > 0) and
+((Gear^.State and gstNoDamage) = 0) then
 begin
 dmg:= dmg div 2;
 case Gear^.Kind of
 gtHedgehog,
 gtMine,
 gtCase,
 gtFlame: begin
 {$IFDEF DEBUGFILE}AddFileLog('Damage: ' + inttostr(dmg));{$ENDIF}
-if (Mask and EXPLNoDamage) = 0 then inc(Gear^.Damage, dmg);
+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)
+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));
 Gear^.dY:= Gear^.dY + SignAs(_0_005 * dmg + cHHKick, Gear^.Y - int2hwFloat(Y));
 end;
 procedure ShotgunShot(Gear: PGear);
 var t: PGear;
 dmg: integer;
+hh: PHedgehog;
 begin
 Gear^.Radius:= cShotgunRadius;
+hh:= Gear^.Hedgehog;
 t:= GearsList;
 while t <> nil do
 begin
 dmg:= min(Gear^.Radius + t^.Radius - hwRound(Distance(Gear^.X - t^.X, Gear^.Y - t^.Y)), 25);
 if dmg >= 0 then
 case t^.Kind of
 gtHedgehog,
 gtMine,
 gtCase: begin
 inc(t^.Damage, dmg);
+if t^.Kind = gtHedgehog then
+begin
+AddDamageTag(hwRound(Gear^.X), hwRound(Gear^.Y), dmg, Gear);
+inc(hh^.DamageGiven, dmg)
+end;
 DeleteCI(t);
 t^.dX:= t^.dX + SignAs(Gear^.dX * dmg * _0_01 + cHHKick, t^.X - Gear^.X);
 t^.dY:= t^.dY + Gear^.dY * dmg * _0_01;
 t^.State:= t^.State or gstMoving;
 t^.Active:= true;
 case t^.ar[i]^.Kind of
 gtHedgehog,
 gtMine,
 gtCase: begin
 inc(t^.ar[i]^.Damage, Damage);
-inc(hh^.DamageGiven, Damage);
+if t^.ar[i]^.Kind = gtHedgehog then
+begin
+AddDamageTag(hwRound(t^.ar[i]^.X), hwRound(t^.ar[i]^.Y), Damage, t^.ar[i]);
+inc(hh^.DamageGiven, Damage)
+end;
 t^.ar[i]^.dX:= Ammo^.dX * Power * _0_01;
 t^.ar[i]^.dY:= Ammo^.dY * Power * _0_01;
 t^.ar[i]^.Active:= true;
 t^.ar[i]^.State:= t^.ar[i]^.State or gstMoving;
 DeleteCI(t^.ar[i]);

changeset 522	ca089787f59d
parent 520	e83dfb7ffead
child 529	812682c1ab62