# HG changeset patch
# User smaxx
# Date 1283355776 -7200
# Node ID e097914ac0e24b432678cb23a5e833c4b8a257ea
# Parent  4ab6d6f783126ed18e5ec090173e95cb1817d59a
Engine:
* Changed ready screen's behaviour (e.g. hitting [attack] WILL close the screen and trigger an attack)
* Ammo menu keybind stops ready timer now.

diff -r 4ab6d6f78312 -r e097914ac0e2 hedgewars/CCHandlers.inc
--- a/hedgewars/CCHandlers.inc	Wed Sep 01 13:03:43 2010 +0200
+++ b/hedgewars/CCHandlers.inc	Wed Sep 01 17:42:56 2010 +0200
@@ -391,7 +391,7 @@
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('j');
-if ReadyTimeLeft > 1 then begin ReadyTimeLeft:= 1; exit end;
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
     Message:= Message or gm_LJump
@@ -402,7 +402,7 @@
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
 if not CurrentTeam^.ExtDriven then SendIPC('J');
-if ReadyTimeLeft > 1 then begin ReadyTimeLeft:= 1; exit end;
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
     Message:= Message or gm_HJump
@@ -412,12 +412,7 @@
 begin
 s:= s; // avoid compiler hint
 if CheckNoTeamOrHH or isPaused then exit;
-if ReadyTimeLeft > 1 then
-    begin
-    ReadyTimeLeft:= 1; // set to 1 millisecond so we still play the sound file
-    if not CurrentTeam^.ExtDriven then SendIPC('A');
-    exit
-    end;
+if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1;
 bShowFinger:= false;
 with CurrentHedgehog^.Gear^ do
     begin
@@ -687,10 +682,11 @@
 procedure chAmmoMenu(var s: shortstring);
 begin
 s:= s; // avoid compiler hint
-if CheckNoTeamOrHH then 
-bShowAmmoMenu:= true
+if CheckNoTeamOrHH then
+    bShowAmmoMenu:= true
 else
-with CurrentTeam^ do
+    begin
+    with CurrentTeam^ do
         with Hedgehogs[CurrHedgehog] do
             begin
             bSelected:= false;
@@ -699,7 +695,9 @@
             else if ((Gear^.State and (gstAttacking or gstAttacked)) <> 0) or 
                     ((MultiShootAttacks > 0) and ((Ammo^[CurSlot, CurAmmo].Propz and ammoprop_NoRoundEndHint) = 0)) or
                     ((Gear^.State and gstHHDriven) = 0) then else bShowAmmoMenu:= true
-            end
+            end;
+    if ReadyTimeLeft > 1 then ReadyTimeLeft:= 1
+    end
 end;
 
 procedure chFullScr(var s: shortstring);