Skip ammo menu open animation if playing with TurnTime <= 10s
authorWuzzy <Wuzzy2@mail.ru>
Mon, 10 Dec 2018 19:07:12 +0100
changeset 14414 85008b73e118
parent 14413 d1c1f899df20
child 14415 e72ffa27492d
Skip ammo menu open animation if playing with TurnTime <= 10s
ChangeLog.txt
hedgewars/uWorld.pas
--- a/ChangeLog.txt	Mon Dec 10 10:28:06 2018 +0100
+++ b/ChangeLog.txt	Mon Dec 10 19:07:12 2018 +0100
@@ -4,6 +4,7 @@
  + New chat command: “/help room” (shows room chat commands within the game)
  + Colorize switching arrows, pointing arrow and target cross in clan color
  + Longer delays between turns so its easier to see damage and messages
+ + Skip ammo menu animation when playing with turn time of 10s or less
  * King Mode: Fix team sometimes not being killed properly if king drowned
  * King Mode: Kill resurrected minions if king is not alive
  * Fix poison damage not working in first round
--- a/hedgewars/uWorld.pas	Mon Dec 10 10:28:06 2018 +0100
+++ b/hedgewars/uWorld.pas	Mon Dec 10 19:07:12 2018 +0100
@@ -600,12 +600,14 @@
 
 if AMState = AMShowingUp then // show ammo menu
     begin
-    if (cReducedQuality and rqSlowMenu) <> 0 then
+    // No "appear" animation in low quality or playing with very short turn time.
+    if ((cReducedQuality and rqSlowMenu) <> 0) or (cHedgehogTurnTime <= 10000) then
         begin
         AMShiftX:= 0;
         AMShiftY:= 0;
         AMState:= AMShowing;
         end
+    // "Appear" animation
     else
         if AMAnimState < 1 then
             begin
@@ -625,12 +627,14 @@
     end;
 if AMState = AMHiding then // hide ammo menu
     begin
-    if (cReducedQuality and rqSlowMenu) <> 0 then
+    // No "disappear" animation (see above)
+    if ((cReducedQuality and rqSlowMenu) <> 0) or (cHedgehogTurnTime <= 10000) then
         begin
         AMShiftX:= AMShiftTargetX;
         AMShiftY:= AMShiftTargetY;
         AMState:= AMHidden;
         end
+    // "Disappear" animation
     else
         if AMAnimState < 1 then
             begin