AxiosEngine-old 

AxiosEngine-old Commit Details


Date:2012-05-29 16:43:00 (12 years 6 months ago)
Author:Natalie Adams
Branch:default
Commit:1ed4c1409786
Parents: fbbb8bf4e6ce
Message:Changing variables in CommandConsoleBase to be non-static
Changes:
Maxios/Axios_settings.cs (1 diff)
Maxios/Engine/AxiosCommandConsole.cs (2 diffs)
Maxios/Engine/AxiosGameScreen.cs (2 diffs)
Maxios/XNACC/CommandConsoleBase.cs (4 diffs)

File differences

axios/Axios_settings.cs
9696
9797
9898
99
99100
100101
101102
* - 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␍␊
* ␍␊
* ␍␊
*/␍␊
axios/Engine/AxiosCommandConsole.cs
2323
2424
2525
26
26
2727
2828
2929
30
30
3131
3232
3333
3434
3535
3636
37
37
3838
3939
4040
......
7575
7676
7777
78
78
7979
8080
8181
{␍␊
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;␍␊
}␍␊
␍␊
protected override void UnloadContent()␍␊
{␍␊
base.UnloadContent();␍␊
ms_commands.Remove("axioslog");␍␊
//ms_commands.Remove("axioslog");␍␊
}␍␊
}␍␊
}␍␊
axios/Engine/AxiosGameScreen.cs
391391
392392
393393
394
394
395395
396396
397397
......
429429
430430
431431
432
432433
433434
434435
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);␍␊
#if WINDOWS␍␊
if (_console != null)␍␊
{␍␊
//System.Diagnostics.Debugger.Break();␍␊
ScreenManager.Game.Components.Remove(_console);␍␊
_console.Dispose();␍␊
_console = null;␍␊
axios/XNACC/CommandConsoleBase.cs
498498
499499
500500
501
501
502502
503
503
504504
505
505
506506
507
507
508508
509509
510
510
511511
512512
513513
......
570570
571571
572572
573
573
574574
575575
576576
......
578578
579579
580580
581
581
582582
583583
584584
......
635635
636636
637637
638
639
638
639
640
640641
641642
642643
␉␉␉#region Command Processing ␍␊
␉␉// -- Command Processing-Related Fields...␍␊
␉␉/// <summary>Collection Of Command Objects.</summary>␍␊
␉␉protected static SortedDictionary<string,CmdObject> ms_commands = new SortedDictionary<string, CmdObject>();␍␊
␉␉protected SortedDictionary<string,CmdObject> ms_commands = new SortedDictionary<string, CmdObject>();␍␊
/// <summary>Collection Of function Objects.</summary>␍␊
␉␉protected static SortedDictionary<string, FuncObject> ms_functions = new SortedDictionary<string, FuncObject>();␍␊
␉␉protected SortedDictionary<string, FuncObject> ms_functions = new SortedDictionary<string, FuncObject>();␍␊
␉␉/// <summary>Collection Of External Functions.</summary>␍␊
␉␉protected static SortedDictionary<string, ExternalFuncObject> ms_externalFunctions = new SortedDictionary<string, ExternalFuncObject>();␍␊
␉␉protected SortedDictionary<string, ExternalFuncObject> ms_externalFunctions = new SortedDictionary<string, ExternalFuncObject>();␍␊
␉␉/// <summary>Collection Of Binding Objects.</summary>␍␊
␉␉protected static List<BindingObject> ms_bindings = new List<BindingObject>( 8 );␍␊
␉␉protected List<BindingObject> ms_bindings = new List<BindingObject>( 8 );␍␊
␉␉␍␊
␉␉/// <summary>Colleciton Of Partial Command Matches</summary>␍␊
␉␉protected static List<string>␉␉ms_partialCmdMatches = new List<string>( 8 );␍␊
␉␉protected List<string>␉␉ms_partialCmdMatches = new List<string>( 8 );␍␊
␉␉/// <summary>Symbol table for the console variables</summary>␍␊
␉␉protected Dictionary<string, CVar> m_cVars = new Dictionary<string, CVar>( 8 );␍␊
␉␉/// <summary>Match index for the last partial command</summary>␍␊
/// <summary>The stream for shadowing the log to</summary>␍␊
␉␉protected StreamWriter m_logShadowFile = null;␍␊
␉␉/// <summary>Storage for the log</summary>␍␊
␉␉protected List<string> m_log = new List<string>( 256 );␍␊
␉␉protected static List<string> m_log = new List<string>( 256 );␍␊
␉␉#endregion␍␊
␍␊
␉␉␉#region Command History␍␊
/// <summary>Specifies the limit of the command history</summary>␍␊
protected int m_cmdHistoryLimit = 512;␍␊
␉␉/// <summary>Collection of command history</summary>␍␊
␉␉protected List<string> m_cmdHistory = new List<string>( 128 );␍␊
␉␉protected static List<string> m_cmdHistory = new List<string>( 128 );␍␊
␉␉/// <summary>Current index in the command history</summary>␍␊
␉␉protected int m_cmdHistoryIndex = 0;␍␊
␉␉/// <summary>Scanning (up/down) index in of the command history</summary>␍␊
␉␉␉␉m_stringHeight = Vector2.Zero;␍␊
␉␉␉}␍␊
␉␉}␍␊
␉␉/// <summary>Indicates if the console is active or not</summary>␍␊
public bool Active␍␊
␉␉␍␊
/// <summary>Indicates if the console is active or not</summary>␍␊
public static bool Active␍␊
{␍␊
get;␍␊
␉␉␉set;␍␊

Archive Download the corresponding diff file

Page rendered in 0.43122s using 14 queries.