# HG changeset patch # User Wuzzy # Date 1491510842 -7200 # Node ID 9237bfb198c71381413fe0cfac51c5fde44cd755 # Parent 4a9e2ece66678e57e1345e322814976c50c5a844 Fix time box tooltip saying it is not *yet* available in SD When it is actually not available *anymore* diff -r 4a9e2ece6667 -r 9237bfb198c7 ChangeLog.txt --- a/ChangeLog.txt Thu Apr 06 22:02:29 2017 +0200 +++ b/ChangeLog.txt Thu Apr 06 22:34:02 2017 +0200 @@ -33,6 +33,7 @@ * Fixed Seduction's "Yoohoo!" sound not playing * Fixed Hedgehogs getting hurt while firing deagle / sniper rifle bullet in certains situations * Fixed hedgehogs saying “Missed” when drowning enemy without dealing damage + * Fixed incorrect time box tooltip when in Sudden Death * Various other fixes Highlander: diff -r 4a9e2ece6667 -r 9237bfb198c7 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Thu Apr 06 22:02:29 2017 +0200 +++ b/hedgewars/uStore.pas Thu Apr 06 22:34:02 2017 +0200 @@ -967,7 +967,10 @@ if (CurrentTeam <> nil) and (Ammoz[atype].SkipTurns >= CurrentTeam^.Clan^.TurnNumber) then // weapon or utility is not yet available begin - extra:= trmsg[sidNotYetAvailable]; + if (atype = amTardis) and (suddenDeathDmg) then + extra:= trmsg[sidNotAvailableInSD] + else + extra:= trmsg[sidNotYetAvailable]; extracolor:= LongInt($ffc77070); end else if (Ammoz[atype].Ammo.Propz and ammoprop_NoRoundEnd) <> 0 then // weapon or utility will not end your turn diff -r 4a9e2ece6667 -r 9237bfb198c7 hedgewars/uTypes.pas --- a/hedgewars/uTypes.pas Thu Apr 06 22:02:29 2017 +0200 +++ b/hedgewars/uTypes.pas Thu Apr 06 22:34:02 2017 +0200 @@ -461,7 +461,8 @@ sidConfirm, sidSuddenDeath, sidRemaining, sidFuel, sidSync, sidNoEndTurn, sidNotYetAvailable, sidRoundSD, sidRoundsSD, sidReady, sidBounce1, sidBounce2, sidBounce3, sidBounce4, sidBounce5, sidBounce, - sidMute, sidAFK, sidAutoCameraOff, sidAutoCameraOn, sidPressTarget); + sidMute, sidAFK, sidAutoCameraOff, sidAutoCameraOn, sidPressTarget, + sidNotAvailableInSD); // Events that are important for the course of the game or at least interesting for other reasons TEventId = (eidDied, eidDrowned, eidRoundStart, eidRoundWin, eidRoundDraw, diff -r 4a9e2ece6667 -r 9237bfb198c7 share/hedgewars/Data/Locale/en.txt --- a/share/hedgewars/Data/Locale/en.txt Thu Apr 06 22:02:29 2017 +0200 +++ b/share/hedgewars/Data/Locale/en.txt Thu Apr 06 22:34:02 2017 +0200 @@ -87,6 +87,7 @@ 01:23=Auto Camera Off 01:24=Auto Camera On 01:25=Press the target button to mark the target +01:26=The utility is unavailable in Sudden Death ; Event messages ; Normal hog (%1) died (0 health)