Fix time box tooltip saying it is not *yet* available in SD
authorWuzzy <almikes@aol.com>
Thu, 06 Apr 2017 22:34:02 +0200
changeset 12180 9237bfb198c7
parent 12179 4a9e2ece6667
child 12181 29f1ea94488b
Fix time box tooltip saying it is not *yet* available in SD When it is actually not available *anymore*
ChangeLog.txt
hedgewars/uStore.pas
hedgewars/uTypes.pas
share/hedgewars/Data/Locale/en.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:
--- 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
--- 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,
--- 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)