diff -r fbbb8bf4e6ce7a89052c092485a41c75bf40ab60 -r 1ed4c140978691178e1ba9e43cbe2fa725631607 axios/Axios_settings.cs --- a/axios/Axios_settings.cs Mon May 28 22:31:46 2012 -0500 +++ b/axios/Axios_settings.cs Tue May 29 16:43:50 2012 -0500 @@ -96,6 +96,7 @@ * - Adding IsNullOrWhiteSpace extension for support for Xbox 360 * - Upon some testing - developers will need to use #if WINDOWS/#endif tags to make sure they can't use XNACC in WP7/Xbox360 * - Adding axioslog command to output AxiosLog + * - Changing variables in CommandConsoleBase to be non-static * * */ diff -r fbbb8bf4e6ce7a89052c092485a41c75bf40ab60 -r 1ed4c140978691178e1ba9e43cbe2fa725631607 axios/Engine/AxiosCommandConsole.cs --- a/axios/Engine/AxiosCommandConsole.cs Mon May 28 22:31:46 2012 -0500 +++ b/axios/Engine/AxiosCommandConsole.cs Tue May 29 16:43:50 2012 -0500 @@ -23,18 +23,18 @@ { 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 @@ protected override void UnloadContent() { base.UnloadContent(); - ms_commands.Remove("axioslog"); + //ms_commands.Remove("axioslog"); } } } diff -r fbbb8bf4e6ce7a89052c092485a41c75bf40ab60 -r 1ed4c140978691178e1ba9e43cbe2fa725631607 axios/Engine/AxiosGameScreen.cs --- a/axios/Engine/AxiosGameScreen.cs Mon May 28 22:31:46 2012 -0500 +++ b/axios/Engine/AxiosGameScreen.cs Tue May 29 16:43:50 2012 -0500 @@ -391,7 +391,7 @@ 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 @@ #if WINDOWS if (_console != null) { + //System.Diagnostics.Debugger.Break(); ScreenManager.Game.Components.Remove(_console); _console.Dispose(); _console = null; diff -r fbbb8bf4e6ce7a89052c092485a41c75bf40ab60 -r 1ed4c140978691178e1ba9e43cbe2fa725631607 axios/XNACC/CommandConsoleBase.cs --- a/axios/XNACC/CommandConsoleBase.cs Mon May 28 22:31:46 2012 -0500 +++ b/axios/XNACC/CommandConsoleBase.cs Tue May 29 16:43:50 2012 -0500 @@ -498,16 +498,16 @@ #region Command Processing // -- Command Processing-Related Fields... /// Collection Of Command Objects. - protected static SortedDictionary ms_commands = new SortedDictionary(); + protected SortedDictionary ms_commands = new SortedDictionary(); /// Collection Of function Objects. - protected static SortedDictionary ms_functions = new SortedDictionary(); + protected SortedDictionary ms_functions = new SortedDictionary(); /// Collection Of External Functions. - protected static SortedDictionary ms_externalFunctions = new SortedDictionary(); + protected SortedDictionary ms_externalFunctions = new SortedDictionary(); /// Collection Of Binding Objects. - protected static List ms_bindings = new List( 8 ); + protected List ms_bindings = new List( 8 ); /// Colleciton Of Partial Command Matches - protected static List ms_partialCmdMatches = new List( 8 ); + protected List ms_partialCmdMatches = new List( 8 ); /// Symbol table for the console variables protected Dictionary m_cVars = new Dictionary( 8 ); /// Match index for the last partial command @@ -570,7 +570,7 @@ /// The stream for shadowing the log to protected StreamWriter m_logShadowFile = null; /// Storage for the log - protected List m_log = new List( 256 ); + protected static List m_log = new List( 256 ); #endregion #region Command History @@ -578,7 +578,7 @@ /// Specifies the limit of the command history protected int m_cmdHistoryLimit = 512; /// Collection of command history - protected List m_cmdHistory = new List( 128 ); + protected static List m_cmdHistory = new List( 128 ); /// Current index in the command history protected int m_cmdHistoryIndex = 0; /// Scanning (up/down) index in of the command history @@ -635,8 +635,9 @@ m_stringHeight = Vector2.Zero; } } - /// Indicates if the console is active or not - public bool Active + + /// Indicates if the console is active or not + public static bool Active { get; set;