diff -r 646318719561be5f6c5172302afeb8cb9ef4997d -r db1caed4b78a12bdfee19d1d4bef292926407847 axios/Axios_settings.cs --- a/axios/Axios_settings.cs Sun Jun 03 15:42:58 2012 -0500 +++ b/axios/Axios_settings.cs Sun Jun 03 16:58:30 2012 -0500 @@ -99,6 +99,7 @@ * - Changing variables in CommandConsoleBase to be non-static * - Adding rotation to DrawableAxiosGameObject * - Adding InputState extensions to test for input agaisnt Player One + * - Adding the ability to disable commands in XNACC from AxiosCommandConsole * * */ diff -r 646318719561be5f6c5172302afeb8cb9ef4997d -r db1caed4b78a12bdfee19d1d4bef292926407847 axios/Engine/AxiosCommandConsole.cs --- a/axios/Engine/AxiosCommandConsole.cs Sun Jun 03 15:42:58 2012 -0500 +++ b/axios/Engine/AxiosCommandConsole.cs Sun Jun 03 16:58:30 2012 -0500 @@ -24,6 +24,7 @@ public class AxiosCommandConsole : CommandConsoleBase { protected AxiosGameScreen GameScreen; + protected List RestrictedCommands = new List(); public AxiosCommandConsole(AxiosGameScreen gameScreen) : base(gameScreen.ScreenManager.Game) { @@ -54,14 +55,27 @@ AddOutputToLog("============"); } + public void ToggleCamera() + { + GameScreen.EnableCameraControl = !GameScreen.EnableCameraControl; + } + public override void InitializeCustomCommands() { AddCommand(new CmdObject("axioslog", "Displays the current Axios Log", input => { ShowAxiosLog(); })); + AddCommand(new CmdObject("tcc", "Toggles user camera control", input => { ToggleCamera(); })); base.InitializeCustomCommands(); + } public override void LoadContent(ContentManager content) { base.LoadContent(content); + + foreach (string cmd in RestrictedCommands) + { + if (ms_commands.Keys.Contains(cmd)) + ms_commands.Remove(cmd); + } } protected override void LoadContent() @@ -77,6 +91,7 @@ base.UnloadContent(); //ms_commands.Remove("axioslog"); } + } } #else diff -r 646318719561be5f6c5172302afeb8cb9ef4997d -r db1caed4b78a12bdfee19d1d4bef292926407847 axios/Engine/AxiosGameScreen.cs --- a/axios/Engine/AxiosGameScreen.cs Sun Jun 03 15:42:58 2012 -0500 +++ b/axios/Engine/AxiosGameScreen.cs Sun Jun 03 16:58:30 2012 -0500 @@ -207,6 +207,12 @@ } #endif camera = new Camera(ScreenManager.GraphicsDevice.Viewport.Width, ScreenManager.GraphicsDevice.Viewport.Height); + +#if DEBUG + EnableCameraControl = true; +#else + EnableCameraControl = false; +#endif } public override void Draw(GameTime gameTime) diff -r 646318719561be5f6c5172302afeb8cb9ef4997d -r db1caed4b78a12bdfee19d1d4bef292926407847 axios/XNACC/CommandConsoleBase.cs --- a/axios/XNACC/CommandConsoleBase.cs Sun Jun 03 15:42:58 2012 -0500 +++ b/axios/XNACC/CommandConsoleBase.cs Sun Jun 03 16:58:30 2012 -0500 @@ -2310,12 +2310,15 @@ { string cvarName = cmdLine[ 1 ].ToLowerInvariant(); + // Isn't this preventing us from modifying a cvar? + // -- Nathan Adams [adamsna@datanethost.net] - 6/3/2012 if( m_cVars.TryGetValue( cvarName, out cvar ) ) { AddErrorToLog( "CVar " + cmdLine[ 1 ] + " already exists with a value of: " + cvar.Value ?? "(null" ); return; } + if( cmdLine.Length == 4 ) { string typeName = cmdLine[ 2 ];