# HG changeset patch # User nemo # Date 1330019897 18000 # Node ID 9709d15dabfafd89abe3e87a30b278359ed07d45 # Parent 5abbc345a82f13363370fb5cc278180b0ba779df Revert most of 033e4a8a9c74 and 9d501dc22f71 (see bug #362) diff -r 5abbc345a82f -r 9709d15dabfa hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Thu Feb 23 18:41:52 2012 +0400 +++ b/hedgewars/hwengine.pas Thu Feb 23 12:58:17 2012 -0500 @@ -51,8 +51,7 @@ procedure DoTimer(Lag: LongInt); var s: shortstring; begin - if isPaused = false then - inc(RealTicks, Lag); + inc(RealTicks, Lag); case GameState of gsLandGen: @@ -88,20 +87,14 @@ begin DrawWorld(Lag); // never place between ProcessKbd and DoGameTick - bugs due to /put cmd and isCursorVisible ProcessKbd; - if not isPaused then - begin - DoGameTick(Lag); - ProcessVisualGears(Lag); - end; + DoGameTick(Lag); + ProcessVisualGears(Lag); end; gsChat: begin DrawWorld(Lag); - if not isPaused then - begin - DoGameTick(Lag); - ProcessVisualGears(Lag); - end; + DoGameTick(Lag); + ProcessVisualGears(Lag); end; gsExit: begin diff -r 5abbc345a82f -r 9709d15dabfa hedgewars/uWorld.pas --- a/hedgewars/uWorld.pas Thu Feb 23 18:41:52 2012 +0400 +++ b/hedgewars/uWorld.pas Thu Feb 23 12:58:17 2012 -0500 @@ -857,21 +857,18 @@ procedure DrawWorld(Lag: LongInt); begin -if not isPaused then + if ZoomValue < zoom then begin - if ZoomValue < zoom then + zoom:= zoom - 0.002 * Lag; + if ZoomValue > zoom then + zoom:= ZoomValue + end + else + if ZoomValue > zoom then begin - zoom:= zoom - 0.002 * Lag; - if ZoomValue > zoom then - zoom:= ZoomValue - end - else - if ZoomValue > zoom then - begin - zoom:= zoom + 0.002 * Lag; - if ZoomValue < zoom then - zoom:= ZoomValue - end + zoom:= zoom + 0.002 * Lag; + if ZoomValue < zoom then + zoom:= ZoomValue end else ZoomValue:= zoom;