hedgewars/uWorld.pas
changeset 14409 85008b73e118
parent 14397 f9a3cfdec1df
child 14411 71359339a493
equal deleted inserted replaced
14408:d1c1f899df20 14409:85008b73e118
   598     FollowGear:=nil;
   598     FollowGear:=nil;
   599     end;
   599     end;
   600 
   600 
   601 if AMState = AMShowingUp then // show ammo menu
   601 if AMState = AMShowingUp then // show ammo menu
   602     begin
   602     begin
   603     if (cReducedQuality and rqSlowMenu) <> 0 then
   603     // No "appear" animation in low quality or playing with very short turn time.
       
   604     if ((cReducedQuality and rqSlowMenu) <> 0) or (cHedgehogTurnTime <= 10000) then
   604         begin
   605         begin
   605         AMShiftX:= 0;
   606         AMShiftX:= 0;
   606         AMShiftY:= 0;
   607         AMShiftY:= 0;
   607         AMState:= AMShowing;
   608         AMState:= AMShowing;
   608         end
   609         end
       
   610     // "Appear" animation
   609     else
   611     else
   610         if AMAnimState < 1 then
   612         if AMAnimState < 1 then
   611             begin
   613             begin
   612             AMShiftX:= Round(AMShiftTargetX * (1 - AMAnimState));
   614             AMShiftX:= Round(AMShiftTargetX * (1 - AMAnimState));
   613             AMShiftY:= Round(AMShiftTargetY * (1 - AMAnimState));
   615             AMShiftY:= Round(AMShiftTargetY * (1 - AMAnimState));
   623             AMState:= AMShowing;
   625             AMState:= AMShowing;
   624             end;
   626             end;
   625     end;
   627     end;
   626 if AMState = AMHiding then // hide ammo menu
   628 if AMState = AMHiding then // hide ammo menu
   627     begin
   629     begin
   628     if (cReducedQuality and rqSlowMenu) <> 0 then
   630     // No "disappear" animation (see above)
       
   631     if ((cReducedQuality and rqSlowMenu) <> 0) or (cHedgehogTurnTime <= 10000) then
   629         begin
   632         begin
   630         AMShiftX:= AMShiftTargetX;
   633         AMShiftX:= AMShiftTargetX;
   631         AMShiftY:= AMShiftTargetY;
   634         AMShiftY:= AMShiftTargetY;
   632         AMState:= AMHidden;
   635         AMState:= AMHidden;
   633         end
   636         end
       
   637     // "Disappear" animation
   634     else
   638     else
   635         if AMAnimState < 1 then
   639         if AMAnimState < 1 then
   636             begin
   640             begin
   637             AMShiftX:= Round(AMShiftTargetX * AMAnimState);
   641             AMShiftX:= Round(AMShiftTargetX * AMAnimState);
   638             AMShiftY:= Round(AMShiftTargetY * AMAnimState);
   642             AMShiftY:= Round(AMShiftTargetY * AMAnimState);