Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uGears.pas
changeset 4215 36632d5b8492
parent 4210 caa9b08990eb
child 4216 184181604092 
--- a/hedgewars/uGears.pas	Mon Nov 08 14:24:31 2010 -0500
+++ b/hedgewars/uGears.pas	Mon Nov 08 22:12:14 2010 +0100
@@ -812,20 +812,23 @@
             inc(step)
             end;
     stHealth: begin
-            if (TotalRounds = cSuddenDTurns) and not SuddenDeathDmg and not isInMultiShoot then
+            if (cWaterRise <> 0) or (cHealthDecrease <> 0) then
                 begin
-                SuddenDeathDmg:= true;
-                AddCaption(trmsg[sidSuddenDeath], cWhiteColor, capgrpGameState);
-                playSound(sndSuddenDeath)
-                end
-            else if (TotalRounds < cSuddenDTurns) and not isInMultiShoot then
-                begin
-                i:= cSuddenDTurns - TotalRounds;
-                s:= inttostr(i);
-                if i = 1 then
-                    AddCaption(trmsg[sidRoundSD], cWhiteColor, capgrpGameState)
-                else if i in [2, 5, 10, 15, 20, 25, 50, 100] then
-                    AddCaption(Format(trmsg[sidRoundsSD], s), cWhiteColor, capgrpGameState);
+                if (TotalRounds = cSuddenDTurns) and not SuddenDeathDmg and not isInMultiShoot then
+                    begin
+                    SuddenDeathDmg:= true;
+                    AddCaption(trmsg[sidSuddenDeath], cWhiteColor, capgrpGameState);
+                    playSound(sndSuddenDeath)
+                    end
+                else if (TotalRounds < cSuddenDTurns) and not isInMultiShoot then
+                    begin
+                    i:= cSuddenDTurns - TotalRounds;
+                    s:= inttostr(i);
+                    if i = 1 then
+                        AddCaption(trmsg[sidRoundSD], cWhiteColor, capgrpGameState)
+                    else if i in [2, 5, 10, 15, 20, 25, 50, 100] then
+                        AddCaption(Format(trmsg[sidRoundsSD], s), cWhiteColor, capgrpGameState);
+                    end;
                 end;
             if bBetweenTurns
                 or isInMultiShoot
hedgewars