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

Changing variables in CommandConsoleBase to be non-static

Browse Source
This commit is contained in:
Nathan Adams
2012-05-29 16:43:50 -05:00
parent ff32d18553
commit 14cbefc6ef
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
axios/Engine/AxiosCommandConsole.cs
View File

@@ -23,18 +23,18 @@ namespace Axios.Engine
{
public class AxiosCommandConsole : CommandConsoleBase
{
//private AxiosGameScreen _gameScreen;
protected AxiosGameScreen GameScreen;
public AxiosCommandConsole(AxiosGameScreen gameScreen)
: base(gameScreen.ScreenManager.Game)
{
//_gameScreen = gameScreen;
GameScreen = gameScreen;
Keyboard = gameScreen.ScreenManager.InputState;
}
public AxiosCommandConsole(AxiosGameScreen gameScreen, SpriteFont font)
: base(gameScreen.ScreenManager.Game, font)
{
//_gameScreen = gameScreen;
GameScreen = gameScreen;
Keyboard = gameScreen.ScreenManager.InputState;
}
@@ -75,7 +75,7 @@ namespace Axios.Engine
protected override void UnloadContent()
{
base.UnloadContent();
ms_commands.Remove("axioslog");
//ms_commands.Remove("axioslog");
}
}
}

3
axios/Engine/AxiosGameScreen.cs
View File

@@ -391,7 +391,7 @@ namespace Axios.Engine
public override void HandleInput(GameTime gameTime, InputState input)
{
#if WINDOWS
if (_console == null || !_console.Active || (AllowKeyboardWhileConsoleIsActive && _console.Active) )
if (_console == null || !AxiosCommandConsole.Active || (AllowKeyboardWhileConsoleIsActive && AxiosCommandConsole.Active))
#endif
{
base.HandleInput(gameTime, input);
@@ -429,6 +429,7 @@ namespace Axios.Engine
#if WINDOWS
if (_console != null)
{
//System.Diagnostics.Debugger.Break();
ScreenManager.Game.Components.Remove(_console);
_console.Dispose();
_console = null;