From 6e86581e13b9784214237b7358bbd382be209d51 Mon Sep 17 00:00:00 2001
From: "nathan@daedalus" <nathan@daedalus>
Date: Sun, 8 Apr 2012 14:40:58 -0500
Subject: [PATCH] - Adding a check in the AxiosTimer update to only tick if the
 game is active

---
 axios.suo                  | Bin 208384 -> 211968 bytes
 axios/Axios_settings.cs    |   3 +++
 axios/Engine/AxiosTimer.cs |  26 ++++++++++++++------------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/axios.suo b/axios.suo
index 3e6dab3cc86dc11142064a87e1712046d4c9be22..c551a9ae1ad36f1b645593c2934ecdb07e83f5bc 100644
GIT binary patch
delta 2679
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
IYap!q7i9Kbc>n+a

delta 2771
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

diff --git a/axios/Axios_settings.cs b/axios/Axios_settings.cs
index c291a56..1b826a0 100644
--- a/axios/Axios_settings.cs
+++ b/axios/Axios_settings.cs
@@ -59,6 +59,9 @@
  * 1.0.1.2 - 4/1/2012
  * - Making AxiosTimer inheirt from AxiosGameObject for it to be casted properly
  * 
+ * 1.0.1.3 - 4/7/2012
+ * - Adding a check in the AxiosTimer update to only tick if the game is active
+ * 
  */
 
 using System.Reflection;
diff --git a/axios/Engine/AxiosTimer.cs b/axios/Engine/AxiosTimer.cs
index d5e4302..582f1c7 100644
--- a/axios/Engine/AxiosTimer.cs
+++ b/axios/Engine/AxiosTimer.cs
@@ -37,25 +37,27 @@ namespace Axios.Engine
 
         public override void Update(AxiosGameScreen gameScreen, GameTime gameTime, bool otherScreenHasFocus, bool coveredByOtherScreen)
         {
-
-            if (_enabled)
+            if (gameScreen.IsActive) //only "tick" if the window has focus - otherwise the Timer will play catchup
             {
-                if (gameTime.TotalGameTime - lastTick >= interval)
+                if (_enabled)
                 {
-                    if (Tick != null)
+                    if (gameTime.TotalGameTime - lastTick >= interval)
                     {
-                        //EventArgs e = new EventArgs();
-                        
-                        Tick(this, null);
-                    }
+                        if (Tick != null)
+                        {
+                            //EventArgs e = new EventArgs();
 
+                            Tick(this, null);
+                        }
+
+                        lastTick = gameTime.TotalGameTime;
+                    }
+                }
+                else
+                {
                     lastTick = gameTime.TotalGameTime;
                 }
             }
-            else
-            {
-                lastTick = gameTime.TotalGameTime;
-            }
         }
 
         public override void LoadContent(AxiosGameScreen gameScreen)