diff -r 25cf22fd732b0a85c67ed33956e4c1930042fa0f -r e983ddaab7d8d44d94593b1962e148e3b01c3d9d axios.suo Binary file axios.suo has changed diff -r 25cf22fd732b0a85c67ed33956e4c1930042fa0f -r e983ddaab7d8d44d94593b1962e148e3b01c3d9d axios/Axios_settings.cs --- a/axios/Axios_settings.cs Sat Apr 07 13:15:15 2012 -0500 +++ b/axios/Axios_settings.cs Sun Apr 08 14:40:58 2012 -0500 @@ -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 -r 25cf22fd732b0a85c67ed33956e4c1930042fa0f -r e983ddaab7d8d44d94593b1962e148e3b01c3d9d axios/Engine/AxiosTimer.cs --- a/axios/Engine/AxiosTimer.cs Sat Apr 07 13:15:15 2012 -0500 +++ b/axios/Engine/AxiosTimer.cs Sun Apr 08 14:40:58 2012 -0500 @@ -37,25 +37,27 @@ public override void Update(AxiosGameScreen gameScreen, GameTime gameTime, bool otherScreenHasFocus, bool coveredByOtherScreen) { + if (gameScreen.IsActive) //only "tick" if the window has focus - otherwise the Timer will play catchup + { + if (_enabled) + { + if (gameTime.TotalGameTime - lastTick >= interval) + { + if (Tick != null) + { + //EventArgs e = new EventArgs(); - if (_enabled) - { - if (gameTime.TotalGameTime - lastTick >= interval) + Tick(this, null); + } + + lastTick = gameTime.TotalGameTime; + } + } + else { - if (Tick != null) - { - //EventArgs e = new EventArgs(); - - Tick(this, null); - } - lastTick = gameTime.TotalGameTime; } } - else - { - lastTick = gameTime.TotalGameTime; - } } public override void LoadContent(AxiosGameScreen gameScreen)