hedgewars/uGears.pas
changeset 7010 10a0a31804f3
parent 7007 0ccdff4ae8e9
child 7021 0c75512a8920
equal deleted inserted replaced
7007:0ccdff4ae8e9 7010:10a0a31804f3
   108                 end
   108                 end
   109             else
   109             else
   110                 dec(Gear^.Health, dmg);
   110                 dec(Gear^.Health, dmg);
   111 
   111 
   112             if (Gear^.Hedgehog^.Team = CurrentTeam) and (Gear^.Damage <> Gear^.Karma)
   112             if (Gear^.Hedgehog^.Team = CurrentTeam) and (Gear^.Damage <> Gear^.Karma)
   113             and (not Gear^.Hedgehog^.King) and (not Gear^.Hedgehog^.Effects[hePoisoned]) and (not SuddenDeathDmg) then
   113             and (not Gear^.Hedgehog^.King) and (Gear^.Hedgehog^.Effects[hePoisoned] = 0) and (not SuddenDeathDmg) then
   114                 Gear^.State:= Gear^.State or gstLoser;
   114                 Gear^.State:= Gear^.State or gstLoser;
   115 
   115 
   116             spawnHealthTagForHH(Gear, dmg);
   116             spawnHealthTagForHH(Gear, dmg);
   117 
   117 
   118             RenderHealth(Gear^.Hedgehog^);
   118             RenderHealth(Gear^.Hedgehog^);
   139     while Gear <> nil do
   139     while Gear <> nil do
   140     begin
   140     begin
   141         if Gear^.Kind = gtHedgehog then
   141         if Gear^.Kind = gtHedgehog then
   142             begin
   142             begin
   143             tmp:= 0;
   143             tmp:= 0;
   144             if Gear^.Hedgehog^.Effects[hePoisoned] then
   144             if Gear^.Hedgehog^.Effects[hePoisoned] <> 0 then
   145                 begin
   145                 begin
   146                 inc(tmp, ModifyDamage(5, Gear));
   146                 inc(tmp, ModifyDamage(5, Gear));
   147                 if (GameFlags and gfResetHealth) <> 0 then
   147                 if (GameFlags and gfResetHealth) <> 0 then
   148                     dec(Gear^.Hedgehog^.InitialHealth)  // does not need a minimum check since <= 1 basically disables it
   148                     dec(Gear^.Hedgehog^.InitialHealth)  // does not need a minimum check since <= 1 basically disables it
   149                 end;
   149                 end;