natalie/axiosengine
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Branching starting code for the new GSM

Browse Source 
--HG--
branch : axios-newgsm
This commit is contained in:
nathan@daedalus
2012-04-12 22:09:49 -05:00
parent 40b67fb6e8
commit 4057123b6e
16 changed files with 758 additions and 577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
axios/Engine/AxiosGameScreen.cs
View File

@@ -8,7 +8,9 @@ using Axios.Engine.UI;
using FarseerPhysics.Dynamics;
using FarseerPhysics.SamplesFramework;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Content;
using Microsoft.Xna.Framework.Graphics;
using GameStateManagement;
namespace Axios.Engine
{
@@ -158,19 +160,16 @@ namespace Axios.Engine
AxiosLog.Instance.AddLine("Memory usage after cleanup: ", LoggingFlag.DEBUG);
}
public override void ExitScreen()
public override void Activate(bool instancePreserved)
{
base.ExitScreen();
}
public override void LoadContent()
{
base.LoadContent();
base.Activate(instancePreserved);
#if DEBUG
if (!Axios.Settings.ScreenSaver)
this.DebugSpriteFont = this.ScreenManager.Content.Load<SpriteFont>(this.DebugTextFont);
{
ContentManager man = new ContentManager(ScreenManager.Game.Services, "Content");
this.DebugSpriteFont = man.Load<SpriteFont>(this.DebugTextFont);
}
#endif
}