AxiosEngine-old Commit Details

Date:

2012-03-21 00:12:00 (13 years 7 months ago)

Author:

nathan@daedalus

Branch:

default

Commit:

5f677872a79b

Parents:

295db41d9790

Message:

- Fixing bug with last screen not exiting if it is a background screen

Changes:

M	axios/Axios_settings.cs (1 diff)
M	axios/ScreenSystem/GameScreen.cs (1 diff)
M	axios/ScreenSystem/MenuScreen.cs (1 diff)
M	axios/ScreenSystem/ScreenManagerComponent.cs (1 diff)

File differences

-41
42 42
43 43
44
45
46
47
48
49
50
44 51
45 52
46 53
+ * ␍␊
 * 1.0.0.9 - 3/16/2012␍␊
 * - Changeing the complex objects alot - now they are more like "chained" objects␍␊
 * - Adding checks for if objects are getting deleted too fast␍␊
 * ␍␊
 * 1.0.1.0 - 3/20/2012␍␊
 * - Taking out hard coded debug statements for the screen system␍␊
 * - Adding field to allow/disallow automated mouse joints per object␍␊
 * - Fixing bug with last screen not exiting if it is a background screen␍␊
 * ␍␊
 * ␍␊
 */␍␊
␍␊
  * ␍␊
  * 1.0.0.9 - 3/16/2012␍␊
  * - Changeing the complex objects alot - now they are more like "chained" objects␍␊
+ * - Adding checks for if objects are getting deleted too fast␍␊
+ * ␍␊
+ * 1.0.1.0 - 3/20/2012␍␊
+ * - Taking out hard coded debug statements for the screen system␍␊
+ * - Adding field to allow/disallow automated mouse joints per object␍␊
+ * - Fixing bug with last screen not exiting if it is a background screen␍␊
+ * ␍␊
  * ␍␊
  */␍␊
 ␍␊

-270
271 271
272 272
273 
273
274 274
275 275
276 276
+        /// </summary>␍␊
        public virtual void ExitScreen()␍␊
        {␍␊
            if (TransitionOffTime == TimeSpan.Zero)␍␊
            if (TransitionOffTime == TimeSpan.Zero && this.TransitionPosition == 0 && this.TransitionAlpha == 1)␍␊
            {␍␊
                // If the screen has a zero transition time, remove it immediately.␍␊
                ScreenManager.RemoveScreen(this);␍␊
         /// </summary>␍␊
         public virtual void ExitScreen()␍␊
         {␍␊
-            if (TransitionOffTime == TimeSpan.Zero)␍␊
+            if (TransitionOffTime == TimeSpan.Zero && this.TransitionPosition == 0 && this.TransitionAlpha == 1)␍␊
             {␍␊
                 // If the screen has a zero transition time, remove it immediately.␍␊
                 ScreenManager.RemoveScreen(this);␍␊

-189
190 190
191 191
192 
192
193 193
194 
195 
196 
197 
194
195
196
197
198
199
200
198 201
199 202
200 203
+            }␍␊
            else if (input.IsMenuCancel())␍␊
            {␍␊
                if (this.ScreenState == SamplesFramework.ScreenState.Active)␍␊
                if (this.ScreenState == SamplesFramework.ScreenState.Active && this.TransitionPosition == 0 && this.TransitionAlpha == 1)␍␊
                {␍␊
                    if (ScreenManager.GetScreens().Length == 2)␍␊
                        ScreenManager.Game.Exit();␍␊
                    else␍␊
                        this.ExitScreen();␍␊
                    //GameScreen[] screens = ScreenManager.GetScreens();␍␊
                    //if (screens[screens.Length - 1] is BackgroundScreen ||| screens.Length )␍␊
                    //    ScreenManager.Game.Exit();␍␊
                    //if (ScreenManager.GetScreens().Length == 2)␍␊
                    //    ScreenManager.Game.Exit();␍␊
                    //else␍␊
                    this.ExitScreen();␍␊
                }␍␊
                //ScreenManager.Game.Exit();␍␊
            }␍␊
             }␍␊
             else if (input.IsMenuCancel())␍␊
             {␍␊
-                if (this.ScreenState == SamplesFramework.ScreenState.Active)␍␊
+                if (this.ScreenState == SamplesFramework.ScreenState.Active && this.TransitionPosition == 0 && this.TransitionAlpha == 1)␍␊
                 {␍␊
-                    if (ScreenManager.GetScreens().Length == 2)␍␊
-                        ScreenManager.Game.Exit();␍␊
-                    else␍␊
-                        this.ExitScreen();␍␊
+                    //GameScreen[] screens = ScreenManager.GetScreens();␍␊
+                    //if (screens[screens.Length - 1] is BackgroundScreen ||| screens.Length )␍␊
+                    //    ScreenManager.Game.Exit();␍␊
+                    //if (ScreenManager.GetScreens().Length == 2)␍␊
+                    //    ScreenManager.Game.Exit();␍␊
+                    //else␍␊
+                    this.ExitScreen();␍␊
                 }␍␊
                 //ScreenManager.Game.Exit();␍␊
             }␍␊

-139
140 140
141 141
142 
142
143 143
144 144
145 145
+            // the process of updating one screen adds or removes others.␍␊
            _screensToUpdate.Clear();␍␊
␍␊
            if (_screens.Count == 0)␍␊
            if (_screens.Count == 0 || (_screens.Count == 1 && _screens[0] is BackgroundScreen))␍␊
                //I'm done, exit␍␊
                this.Game.Exit();␍␊
␍␊
             // the process of updating one screen adds or removes others.␍␊
             _screensToUpdate.Clear();␍␊
 ␍␊
-            if (_screens.Count == 0)␍␊
+            if (_screens.Count == 0 || (_screens.Count == 1 && _screens[0] is BackgroundScreen))␍␊
                 //I'm done, exit␍␊
                 this.Game.Exit();␍␊
 ␍␊

Download the corresponding diff file

AxiosEngine-old

File differences

Branches

Tags