# HG changeset patch # User Wuzzy # Date 1462042516 -7200 # Node ID 232b57a70acab691fcf8695ea4b865896b162db8 # Parent d3a852554aa7238d0e5b277786c7c213ff69870e Make the timer red when it is the get-away time diff -r d3a852554aa7 -r 232b57a70aca hedgewars/uGearsHedgehog.pas --- a/hedgewars/uGearsHedgehog.pas Sat Apr 30 20:35:55 2016 +0200 +++ b/hedgewars/uGearsHedgehog.pas Sat Apr 30 20:55:16 2016 +0200 @@ -559,6 +559,7 @@ if (CurAmmoGear <> nil) and (CurAmmoGear^.State and gstSubmersible <> 0) and CheckCoordInWater(hwRound(CurAmmoGear^.X), hwRound(CurAmmoGear^.Y)) then TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 25 else TurnTimeLeft:=(Ammoz[a].TimeAfterTurn * cGetAwayTime) div 100; + IsGetAwayTime := true; end; if ((Ammoz[a].Ammo.Propz and ammoprop_NoRoundEnd) = 0) and (HHGear <> nil) then HHGear^.State:= HHGear^.State or gstAttacked; diff -r d3a852554aa7 -r 232b57a70aca hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Sat Apr 30 20:35:55 2016 +0200 +++ b/hedgewars/uTeams.pas Sat Apr 30 20:55:16 2016 +0200 @@ -320,6 +320,7 @@ TagTurnTimeLeft:= 0; NextClan:= false; end; +IsGetAwayTime:= false; if (TurnTimeLeft > 0) and (CurrentHedgehog^.BotLevel = 0) then begin diff -r d3a852554aa7 -r 232b57a70aca hedgewars/uVariables.pas --- a/hedgewars/uVariables.pas Sat Apr 30 20:35:55 2016 +0200 +++ b/hedgewars/uVariables.pas Sat Apr 30 20:55:16 2016 +0200 @@ -96,6 +96,7 @@ TurnClockActive : boolean; TagTurnTimeLeft : Longword; ReadyTimeLeft : Longword; + IsGetAwayTime : boolean; cSuddenDTurns : LongInt; cDamagePercent : LongInt; cMineDudPercent : LongWord; @@ -2652,6 +2653,7 @@ LeftImpactTimer := 0; RightImpactTimer := 0; TurnTimeLeft := 0; + IsGetAwayTime := false; TurnClockActive := true; TagTurnTimeLeft := 0; cSuddenDTurns := 15; diff -r d3a852554aa7 -r 232b57a70aca hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Sat Apr 30 20:35:55 2016 +0200 +++ b/hedgewars/uWorld.pas Sat Apr 30 20:55:16 2016 +0200 @@ -1444,6 +1444,8 @@ dec(t, 32); if (ReadyTimeLeft <> 0) then spr := sprBigDigitGreen + else if IsGetAwayTime then + spr := sprBigDigitRed else spr := sprBigDigit; DrawSprite(spr, -(cScreenWidth shr 1) + t + offsetY, cScreenHeight - offsetX, i mod 10);