View difference between Paste ID: dS87APbE and NNgaeYuv

-Index: code/ai/aicode.cpp
+Index: Makefile.am
 ===================================================================
---- code/ai/aicode.cpp	(revision 10462)
+--- Makefile.am	(Revision 10462)
-+++ code/ai/aicode.cpp	(working copy)
++++ Makefile.am	(Arbeitskopie)
 @@ -262,7 +262,9 @@
  	ddsutils/ddsutils.h	\
  	debris/debris.cpp	\
  	debris/debris.h	\
 +	debugconsole/consolecmds.cpp \
  	debugconsole/console.cpp	\
 +	debugconsole/consoleparse.cpp \
  	debugconsole/dbugfile.h	\
-@@ -11339,16 +11340,14 @@ float get_wing_largest_radius(object *objp, int formation_object_flag)
+ 	debugconsole/timerbar.cpp	\
  	debugconsole/timerbar.h	\
 Index: ai/aicode.cpp
 ===================================================================
 --- ai/aicode.cpp	(Revision 10462)
 +++ ai/aicode.cpp	(Arbeitskopie)
 @@ -18,6 +18,7 @@
 
 
  #include "ai/ai.h"
 +#include "debugconsole/console.h"
  #include "globalincs/linklist.h"
  #include "object/object.h"
  #include "physics/physics.h"
 @@ -11367,16 +11368,14 @@
 
  float Wing_y_scale = 2.0f;
  float Wing_scale = 1.0f;
 -DCF(wing_y_scale, "")
 +DCF(wing_y_scale, "Adjusts the wing formation scale along the Y axis (Default is 2.0)")
  {
-Index: code/ai/aiturret.cpp
+
 -	Wing_y_scale = Dc_arg_float;
---- code/ai/aiturret.cpp	(revision 10462)
+
-+++ code/ai/aiturret.cpp	(working copy)
+
 
 -DCF(wing_scale, "")
 +DCF(wing_scale, "Adjusts the wing formation scale. (Default is 1.0f)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Wing_scale = Dc_arg_float;
 +	dc_stuff_float(&Wing_scale);
  }
 
  /**
 Index: ai/aiturret.cpp
 ===================================================================
 --- ai/aiturret.cpp	(Revision 10462)
 +++ ai/aiturret.cpp	(Arbeitskopie)
 @@ -22,6 +22,7 @@
  #include "iff_defs/iff_defs.h"
  #include "weapon/muzzleflash.h"
  #include "parse/scripting.h"
-@@ -1466,10 +1466,16 @@ ship_subsys *aifft_list[MAX_AIFFT_TURRETS];
+
 
  #include <limits.h>
 
 @@ -38,8 +39,7 @@
  float Lethality_range_const = 2.0f;
  DCF(lethality_range, "N for modifying range: 1 / (1+N) at 100")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Lethality_range_const = Dc_arg_float;
 +	dc_stuff_float(&Lethality_range_const);
  }
 
  float Player_lethality_bump[NUM_SKILL_LEVELS] = {
 @@ -1466,10 +1466,16 @@
  float aifft_rank[MAX_AIFFT_TURRETS];
  int aifft_list_size = 0;
  int aifft_max_checks = 5;
 -DCF(mf, "")
 +DCF(mf, "Adjusts the maximum number of tries an AI may do when trying to pick a subsystem to attack (Default is 5)")
-Index: code/asteroid/asteroid.cpp
+
 -	dc_get_arg(ARG_INT);
---- code/asteroid/asteroid.cpp	(revision 10462)
+
-+++ code/asteroid/asteroid.cpp	(working copy)
+
 +
 +	if (aifft_max_checks <= 0) {
 +		dc_printf("Value must be a non-negative, non-zero integer\n");
 +		dc_printf("aifft_max_checks set to default value of 5\n");
 +
 +		aifft_max_checks = 5;
 +	}
  }
 
-@@ -1404,23 +1406,8 @@ void asteroid_level_close()
+
 Index: asteroid/asteroid.cpp
 ===================================================================
 --- asteroid/asteroid.cpp	(Revision 10462)
 +++ asteroid/asteroid.cpp	(Arbeitskopie)
 @@ -39,6 +39,8 @@
  #include "network/multimsgs.h"
  #include "network/multi.h"
  #include "parse/scripting.h"
 +#include "debugconsole/console.h"
 +
  #include <algorithm>
  #include "globalincs/compatibility.h"
 
 @@ -1404,24 +1406,9 @@
  	Asteroid_field.num_initial_asteroids=0;
  }
 
 -DCF(asteroids,"Turns asteroids on/off")
 -{
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )
 -			Asteroids_enabled = 1;
 -		else if ( Dc_arg_type & ARG_FALSE )
 -			Asteroids_enabled = 0;
-Index: code/bmpman/bmpman.cpp
+
 -			Asteroids_enabled ^= 1;
---- code/bmpman/bmpman.cpp	(revision 10462)
+
-+++ code/bmpman/bmpman.cpp	(working copy)
+
 -		dc_printf( "Usage: asteroids [bool]\nTurns asteroid system on/off.  If nothing passed, then toggles it.\n" );
 -
 -	if ( Dc_status )
 -		dc_printf( "asteroids are %s\n", (Asteroids_enabled?"ON":"OFF") );
 -}
 +DCF_BOOL2(asteroids, Asteroids_enabled, "enables or disables asteroids", "Usage: asteroids [bool]\nTurns asteroid system on/off.  If nothing passed, then toggles it.\n");
 
 +
-@@ -669,46 +670,53 @@ int bm_reload(int bitmap_handle, const char* filename)
+
  {
  	int	i;
 Index: bmpman/bmpman.cpp
 ===================================================================
 --- bmpman/bmpman.cpp	(Revision 10462)
 +++ bmpman/bmpman.cpp	(Arbeitskopie)
 @@ -37,6 +37,7 @@
  #include "jpgutils/jpgutils.h"
  #include "parse/parselo.h"
  #include "network/multiutil.h"
 +#include "debugconsole/console.h"
 
  #define BMPMAN_INTERNAL
  #include "bmpman/bm_internal.h"
 @@ -669,46 +670,53 @@
 
  DCF(bm_frag,"Shows BmpMan fragmentation")
  {
 -	if ( Dc_command )	{
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Displays a graphic showing the BmpMan fragmentation. Color key:\n");
 +		dc_printf("\tGray  : NONE\n");
 +		dc_printf("\tRed   : PCXn");
 +		dc_printf("\tGreen : USER, TGA, PNG, DDS\n");
 +		dc_printf("\tBlue  : ANI, EFF\n\n");
 
 -		gr_clear();
 +		dc_printf("Once done reviewing the graphic, press any key to return to the console\n");
 +		return;
 +	}
 +
 +	gr_clear();
 
 -		int x=0, y=0;
 -		int xs=2, ys=2;
 -		int w=4, h=4;
 +	int x=0, y=0;
 +	int xs=2, ys=2;
 +	int w=4, h=4;
 
 -		for (int i=0; i<MAX_BITMAPS; i++ )	{
 -			switch( bm_bitmaps[i].type )	{
 -			case BM_TYPE_NONE:
 -				gr_set_color(128,128,128);
 -				break;
 -			case BM_TYPE_PCX:
 -				gr_set_color(255,0,0);
 -				break;
 -			case BM_TYPE_USER:
 -			case BM_TYPE_TGA:
 -			case BM_TYPE_PNG:
 -			case BM_TYPE_DDS:
 -				gr_set_color(0,255,0);
 -				break;
 -			case BM_TYPE_ANI:
 -			case BM_TYPE_EFF:
 -				gr_set_color(0,0,255);
 -				break;
 -			}
 +	for (int i=0; i<MAX_BITMAPS; i++ )	{
 +		switch( bm_bitmaps[i].type )	{
 +		case BM_TYPE_NONE:
 +			gr_set_color(128,128,128);
 +			break;
 +		case BM_TYPE_PCX:
 +			gr_set_color(255,0,0);
 +			break;
 +		case BM_TYPE_USER:
 +		case BM_TYPE_TGA:
 +		case BM_TYPE_PNG:
 +		case BM_TYPE_DDS:
 +			gr_set_color(0,255,0);
 +			break;
 +		case BM_TYPE_ANI:
 +		case BM_TYPE_EFF:
 +			gr_set_color(0,0,255);
 +			break;
 +		}
 
 -			gr_rect( x+xs, y+ys, w, h );
 -			x += w+xs+xs;
 -			if ( x > 639 )	{
 -				x = 0;
 -				y += h + ys + ys;
 -			}
 -
 +		gr_rect( x+xs, y+ys, w, h );
-@@ -2068,48 +2076,52 @@ void bm_unload_all()
+
 +		if ( x > 639 )	{
 +			x = 0;
 +			y += h + ys + ys;
  		}
 +	}
 
 -		gr_flip();
 -		key_getch();
 -	}
 +	gr_flip();
 +	key_getch();
  }
 
  static int find_block_of(int n)
 @@ -2068,48 +2076,52 @@
 
  DCF(bmpman,"Shows/changes bitmap caching parameters and usage")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_STRING);
 -		if ( !strcmp( Dc_arg, "flush" ))	{
 -			dc_printf( "Total RAM usage before flush: %d bytes\n", bm_texture_ram );
 -			int i;
 -			for (i = 0; i < MAX_BITMAPS; i++)	{
 -				if ( bm_bitmaps[i].type != BM_TYPE_NONE )	{
 -					bm_free_data(i);
 -				}
 -			}
 -			dc_printf( "Total RAM after flush: %d bytes\n", bm_texture_ram );
 -		} else if ( !strcmp( Dc_arg, "ram" ))	{
 -			dc_get_arg(ARG_INT);
 -			Bm_max_ram = Dc_arg_int*1024*1024;
 -		} else {
 -			// print usage, not stats
 -			Dc_help = 1;
 -		}
 +	if ( dc_optional_string_either("help", "--help"))	{
 +		dc_printf( "Usage: BmpMan [arg]\nWhere arg can be any of the following:\n" );
 +		dc_printf( "\tflush    Unloads all bitmaps.\n" );
 +		dc_printf( "\tram [x]  Sets max mem usage to x MB. (Set to 0 to have no limit.)\n" );
 +		dc_printf( "\t?        Displays status of Bitmap manager.\n" );
 +		return;
  	}
 
 -	if ( Dc_help )	{
 -		dc_printf( "Usage: BmpMan keyword\nWhere keyword can be in the following forms:\n" );
 -		dc_printf( "BmpMan flush    Unloads all bitmaps.\n" );
 -		dc_printf( "BmpMan ram x    Sets max mem usage to x MB. (Set to 0 to have no limit.)\n" );
 -		dc_printf( "\nUse '? BmpMan' to see status of Bitmap manager.\n" );
 -		Dc_status = 0;	// don't print status if help is printed.  Too messy.
 -	}
 -
 -	if ( Dc_status )	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		dc_printf( "Total RAM usage: %d bytes\n", bm_texture_ram );
 
 +		if (Bm_max_ram > 1024*1024) {
 +			dc_printf( "\tMax RAM allowed: %.1f MB\n", i2fl(Bm_max_ram)/(1024.0f*1024.0f) );
 +		} else if ( Bm_max_ram > 1024 ) {
 +			dc_printf( "\tMax RAM allowed: %.1f KB\n", i2fl(Bm_max_ram)/(1024.0f) );
 +		} else if ( Bm_max_ram > 0 ) {
 +			dc_printf( "\tMax RAM allowed: %d bytes\n", Bm_max_ram );
 +		} else {
 +			dc_printf( "\tNo RAM limit\n" );
 +		}
 +		return;
 +	}
 
 -		if ( Bm_max_ram > 1024*1024 )
 -			dc_printf( "Max RAM allowed: %.1f MB\n", i2fl(Bm_max_ram)/(1024.0f*1024.0f) );
 -		else if ( Bm_max_ram > 1024 )
 -			dc_printf( "Max RAM allowed: %.1f KB\n", i2fl(Bm_max_ram)/(1024.0f) );
 -		else if ( Bm_max_ram > 0 )
 -			dc_printf( "Max RAM allowed: %d bytes\n", Bm_max_ram );
 -		else
 -			dc_printf( "No RAM limit\n" );
 
 +	if (dc_optional_string("flush")) {
 +		dc_printf( "Total RAM usage before flush: %d bytes\n", bm_texture_ram );
 +		int i;
 +		for (i = 0; i < MAX_BITMAPS; i++)	{
 +			if ( bm_bitmaps[i].type != BM_TYPE_NONE )	{
 +				bm_free_data(i);
 +			}
 +		}
 +		dc_printf( "Total RAM after flush: %d bytes\n", bm_texture_ram );
 +	} else if (dc_optional_string("ram")) {
 +		dc_stuff_int(&Bm_max_ram);
-Index: code/controlconfig/controlsconfig.cpp
+
 +		if (Bm_max_ram > 0) {
---- code/controlconfig/controlsconfig.cpp (revision 10462)
+
-+++ code/controlconfig/controlsconfig.cpp	(working copy)
+
-@@ -28,7 +28,8 @@
+
 +			dc_printf("!!BmpMan memory is unlimited!!\n");
 +		} else {
 +			dc_printf("Illegal value. Must be non-negative.");
 +		}
 +	} else {
 +		dc_printf("<BmpMan> No argument given\n");
  	}
  }
-@@ -347,7 +348,7 @@ int Config_allowed[] = {
+
 Index: controlconfig/controlsconfig.cpp
 ===================================================================
 --- controlconfig/controlsconfig.cpp	(Revision 10462)
 +++ controlconfig/controlsconfig.cpp	(Arbeitskopie)
 @@ -29,6 +29,7 @@
  #include "network/multi_pmsg.h"
  #include "network/multiutil.h"
  #include "parse/scripting.h"
-Index: code/debugconsole/console.cpp
+
 
---- code/debugconsole/console.cpp	(revision 10462)
+
-+++ code/debugconsole/console.cpp	(working copy)
+
 @@ -348,7 +349,7 @@
  #ifndef NDEBUG
  int Show_controls_info = 0;
 
 -DCF_BOOL(show_controls_info, Show_controls_info)
 +DCF_BOOL(show_controls_info, Show_controls_info);
  #endif
 
  static int Axes_origin[JOY_NUM_AXES];
 Index: debugconsole/console.cpp
 ===================================================================
 --- debugconsole/console.cpp	(Revision 10462)
 +++ debugconsole/console.cpp	(Arbeitskopie)
 @@ -8,740 +8,458 @@
  */
 
 
 -
 -#include <stdlib.h>
 -#include <stdio.h>
 -#include <stdarg.h>
 -#include <setjmp.h>
 -#include <string.h>
 -
 +#include "debugconsole/console.h"
 +#include "debugconsole/consoleparse.h"
 +#include "globalincs/alphacolors.h"
  #include "globalincs/pstypes.h"
 +#include "globalincs/version.h"
 +#include "globalincs/vmallocator.h"
  #include "graphics/font.h"
  #include "io/timer.h"
  #include "io/key.h"
 -#include "globalincs/alphacolors.h"
  #include "osapi/osapi.h"
 
 +#include <cstdarg>
 
 -#define MAX_COMMANDS 300
 +// ========================= GLOBALS =========================
 +dc_mode Dc_mode;		//!< Debug Console mode, can either process the command, report the command's status, or provide help. (But not all at the same time)
 
 -static int Num_debug_commands = 0;
 -static debug_command *Debug_command[MAX_COMMANDS];
 +bool Dc_debug_on;		//!< Flag used to print console and command debugging strings
 
 +// Commands and History
 +SCP_string dc_command_str;		//!< The entered command line, arguments and all.
 +								//!< Is progressively culled from the left as commands, arguments are parsed in DCF's
 
 -debug_command::debug_command(char *_name, char *_help, void (*_func)() )
 -{
 -	int i;
 +// Misc
 +bool debug_inited = FALSE;
 
 -	if ( Num_debug_commands >= MAX_COMMANDS ) {
 -		Int3();			// Too many debug console commands!! Increase MAX_COMMANDS!!
 -		return;
 -	}
 
 -	for (i=0; i<Num_debug_commands; i++ ) {
 -		int ret  = stricmp( Debug_command[i]->name, _name );
 +// ========================= LOCALS =========================
 +// Text Buffer
 +uint DBROWS = 80;	// # of buffer rows
 +uint DBCOLS = 120;	// # of buffer columns
 +unsigned char DTABS = 4;	//!< Tab size in spaces
 
 -		if ( ret == 0) {
 -			Int3();		// This debug console command already exists!!!!
 -			return;
 -		} else if ( ret > 0 ) {
 -			break;		// Insert it here
 +SCP_deque<SCP_string> dc_buffer;
 
 -		} else if ( ret < 0 ) {
 -			// do nothing
 -		}
 -	}
 +// Display Window
 +uint DROWS = 25;
 +uint DCOLS = 80;
 +const uint DROWS_MIN = 25;
 +const uint DCOLS_MIN = 80;
 +uint dc_scroll_x;	// X scroll position (Leftmost character)
 +uint dc_scroll_y;	// Y scroll position (Topmost character)
 
 -	if ( i < Num_debug_commands ) {
 -		// Insert it at element i
 -		int j;
 -		for (j=Num_debug_commands; j>i; j-- ) {
 -			Debug_command[j] = Debug_command[j-1];
 -		}
 -		Debug_command[i] = this;
 -		Num_debug_commands++;
 -	} else {
 -		Debug_command[Num_debug_commands] = this;
 -		Num_debug_commands++;
 -	}
 +SCP_string dc_title;
 
 -	name = _name;
 -	help = _help;
 -	func = _func;
 -}
 +// Commands and History
 +uint last_oldcommand;		// Index of the last old command. Is reset to 0 at every new command push.
 +uint DCMDS = 40;			// Max number of commands to remember
 +const uint DCMDS_MIN = 3;
 
 -// some global variables
 -int Dc_command;			// If this is set, then process the command
 -int Dc_help;			// If this is set, then print out the help text in the form, "usage: ... \nLong description\n" );
 -int Dc_status;			// If this is set, then print out the current status of the command.
 -char *Dc_arg;			// The (lowercased) string value of the argument retrieved from dc_arg
 -char *Dc_arg_org;		// Dc_arg before it got converted to lowercase
 -uint Dc_arg_type;		// The type of dc_arg.
 -char *Dc_command_line;	// The rest of the command line, from the end of the last processed arg on.
 -int Dc_arg_int;			// If Dc_arg_type & ARG_INT is set, then this is the value
 -ubyte Dc_arg_ubyte;		// If Dc_arg_type & ARG_UBYTE is set, then this is the value
 -float Dc_arg_float;		// If Dc_arg_type & ARG_FLOAT is set, then this is the value
 +SCP_deque<SCP_string> dc_history;
 
 -int scroll_times = 0;	// incremented each time display scrolls
 +const char dc_prompt[]= "> ";	// The prompt c_str
 +SCP_string dc_command_buf;		// The command line as shown in the console. Essentially an input buffer for dc_command_str
 
 -int debug_inited = 0;
 +// Local functions
 +void dc_init(void);
 
 -#define DROWS 25
 -#define DCOLS 80
 +void dc_do_command(SCP_string *cmd_str);
 
 -int debug_x=0, debug_y=0;
 -char debug_text[DROWS][DCOLS];
 +void dc_draw(bool show_prompt);
 +void dc_draw_cursor( SCP_string &cmd_string, int x, int y );
 +void dc_draw_window(bool show_prompt);
 
 +void dc_putc(char c);
 
 -static char command_line[1024];
 -static int command_line_pos = 0;
 -#define DEBUG_HISTORY 16
 -static char oldcommand_line[DEBUG_HISTORY][1024];
 -int last_oldcommand=-1;
 -int command_scroll = 0;
 -
 -///=========================== SCANNER =======================
 -typedef enum {
 -	LETTER, QUOTE, SPECIAL, EOF_CODE, DIGIT
 -} CHAR_CODE;
 -
 -typedef enum {
 -	NO_TOKEN, IDENTIFIER, NUMBER, STRING
 -} TOKEN_CODE;
 -
 -
 -#define MAX_TOKEN_STRING_LENGTH 128
 -
 -char		scanner_ch;
 -TOKEN_CODE	scanner_token;
 -
 -char scanner_token_string[MAX_TOKEN_STRING_LENGTH];
 -char scanner_word_string[MAX_TOKEN_STRING_LENGTH];
 -char * scanner_bufferp = "";
 -char * scanner_tokenp = scanner_token_string;
 -
 -CHAR_CODE scanner_char_table[256];
 -
 -#define scanner_char_code(x) scanner_char_table[x]
 -
 -void scanner_get_char()
 +// ============================== IMPLEMENTATIONS =============================
 +/**
 + * @brieft Prints the given char string to the debug console
 + * @details See the doc for std::printf() for formating and more details
 + */
 +void dc_printf(char *format, ...)
  {
 -	if ( *scanner_bufferp == '\0' ) {
 -		scanner_ch = 0;
 -		return;
 -	}
 -	scanner_ch = *scanner_bufferp++;
 -}
 +	SCP_string tmp;
 +	va_list args;
 +	SCP_string::iterator tmp_it;
 
 -void scanner_init()
 -{
 -	int ch;
 -	for (ch=0; ch<256; ++ch) scanner_char_table[ch] = SPECIAL;
 -	for (ch='0'; ch<='9'; ++ch) scanner_char_table[ch] = DIGIT;
 -	for (ch='A'; ch<='Z'; ++ch) scanner_char_table[ch] = LETTER;
 -	for (ch='a'; ch<='z'; ++ch) scanner_char_table[ch] = LETTER;
 +	va_start(args, format);
 +	vsprintf(tmp, format, args);
 +	va_end(args);
 
 -	scanner_char_table['.'] = DIGIT;
 -	scanner_char_table['-'] = DIGIT;
 -	scanner_char_table['+'] = DIGIT;
 -
 -	scanner_char_table['_'] = LETTER;
 -	scanner_char_table[34] = QUOTE;
 -	scanner_char_table[0] = EOF_CODE;
 -
 -	scanner_char_table[':'] = LETTER;
 -	scanner_char_table['\\'] = LETTER;
 -
 -	scanner_ch = 0;
 -}
 -
 -void scanner_skip_blanks()
 -{
 -	while( (scanner_ch ==' ') || (scanner_ch =='\t') )
 -		scanner_get_char();
 -}
 -
 -void scanner_downshift_word()
 -{
 -	int offset = 'a' - 'A';
 -	char * tp;
 -
 -	strcpy_s( scanner_word_string, scanner_token_string );
 -
 -	tp = scanner_word_string;
 -	do {
 -		*tp = (char)((*tp>='A') && (*tp <='Z') ? *tp + offset : *tp) ;
 -		tp++;
 -	} while (*tp != '\0' );
 -}
 -
 -void scanner_get_word()
 -{
 -	while( (scanner_char_code(scanner_ch)==LETTER) || (scanner_char_code(scanner_ch)==DIGIT) ) {
 -		*scanner_tokenp++ = scanner_ch;
 -		scanner_get_char();
 +	for (tmp_it = tmp.begin(); tmp_it != tmp.end(); ++tmp_it) {
 +		dc_putc(*tmp_it);
  	}
 -	*scanner_tokenp = '\0';
 -
 -	scanner_token = IDENTIFIER;
  }
 
 -void scanner_get_string()
 +/**
 + * @brief Opens and processes the debug console. (Blocking call)
 + * @details TODO: Make this a non-blocking call so that the game can still run while the debug console is open.
 + */
 +void debug_console(void (*_func)(void))
  {
 -	*scanner_tokenp++ = 34;
 -	scanner_get_char();
 +	int done = 0;
 
 -	while(scanner_ch != 34 ) {
 -		*scanner_tokenp++ = scanner_ch;
 -		scanner_get_char();
 +	while( key_inkey() ) {
 +		os_poll();
  	}
 -	scanner_get_char();
 -	*scanner_tokenp++ = 34;
 -	*scanner_tokenp = '\0';
 -	scanner_token = STRING;
 -}
 
 -void scanner_get_token()
 -{
 -	scanner_skip_blanks();
 -	scanner_tokenp = scanner_token_string;
 -	*scanner_tokenp = 0;
 -
 -	switch( scanner_char_code(scanner_ch) ) {
 -	case QUOTE: scanner_get_string(); break;
 -	case EOF_CODE: scanner_token = NO_TOKEN; break;
 -	case DIGIT:
 -	case LETTER: scanner_get_word(); break;
 -	default:
 -		*scanner_tokenp++ = scanner_ch;
 -		*scanner_tokenp = '\0';
 -		scanner_get_char();
 -		scanner_token = IDENTIFIER;
 -		break;
 +	if ( !debug_inited ) {
 +		dc_init();
  	}
 
 -	scanner_downshift_word();
 -}
 +	dc_draw(TRUE);
 
 -void scanner_start_command( char * s )
 -{
 -	scanner_bufferp = s;
 -	scanner_get_char();
 -}
 +	while (!done) {
 +		// poll the os
 +		os_poll();
 
 -int Dc_debug_on = 0;
 -jmp_buf dc_bad_arg;
 +		int k = key_inkey();
 +		switch( k ) {
 
 -void dc_get_arg(uint type)
 -{
 -	scanner_get_token();
 +		case KEY_SHIFTED+KEY_ENTER:
 +		case KEY_ESC:
 +			done = TRUE;
 +			break;
 
 -	Dc_command_line = scanner_bufferp;
 -	Dc_arg_org = scanner_token_string;
 -	Dc_arg = scanner_word_string;
 +		case KEY_BACKSP:
 +			if (!dc_command_buf.empty()) {
 +				dc_command_buf.erase(dc_command_str.end() - 1, dc_command_buf.end());
 +			}
 +			break;
 
 -	if (Dc_debug_on) {
 -		dc_printf( "next arg is '%s', was originally '%s'\n", Dc_arg, Dc_arg_org );
 -		dc_printf( "Rest of the command line is '%s'\n", Dc_command_line );
 -	}
 +		case KEY_F3:
 +		case KEY_UP:
 +			if (dc_history.empty()) {
 +				// No saved commands
 +				last_oldcommand = 0;
 +				break;
 +			}
 +
 +			CLAMP(last_oldcommand, 0, dc_history.size());
 
 -	if ( scanner_token == NO_TOKEN ) {
 -		Dc_arg_type = ARG_NONE;
 -	} else if ( scanner_token == IDENTIFIER ) {
 -		Dc_arg_type = ARG_STRING;
 -	} else if ( scanner_token == STRING ) {
 -		Dc_arg_type = ARG_QUOTE;
 -	} else {
 -		Dc_arg_type = ARG_STRING;
 -	}
 +			dc_command_buf = dc_history[last_oldcommand];
 +			++last_oldcommand;
 +			break;
 
 -	if ( Dc_arg_type & ARG_STRING ) {
 -		int i, num_digits, len;
 +		case KEY_DOWN:
 +			if (dc_history.empty()) {
 +				// No saved commands
 +				last_oldcommand = 0;
 +				break;
 +			}
 +
 +			CLAMP(last_oldcommand, 1, dc_history.size());
 
 -		len = strlen(Dc_arg);
 -		num_digits = 0;
 +			--last_oldcommand;
 +			dc_command_buf = dc_history[last_oldcommand];
 +			break;
 
 -		for (i=0; i<len; i++) {
 -			if ( scanner_char_table[Dc_arg[i]] == DIGIT ) {
 -				num_digits++;
 -			}
 +		case KEY_ENTER:
 +			// Clear the command line on the window, but don't print the prompt until the command has processed
 +			// Stuff a copy of the command line onto the history
 +			// Search for the command
 +				// If not found:
 +				//   abort,
 +				//   dc_printf("Error: Invalid or Missing command %s", cmd), and
 +				//   dc_printf(dc_prompt) when ready for input
 +			// Call the function for that command, and strip the cmd token from the command line string
 +			if (dc_command_buf.empty()) {
 +				dc_printf("No command given.\n");
 +				break;
 +			} // Else, continue to process the cmd_line
 
 -			if ( num_digits==len ) {
 -				Dc_arg_type |= ARG_FLOAT;
 -				Dc_arg_float = (float)atof(Dc_arg);
 -				if ( !strchr( Dc_arg, '.' )) {
 -					Dc_arg_type |= ARG_INT;
 -					Dc_arg_int = atoi(Dc_arg);
 -					Dc_arg_type |= ARG_UBYTE;
 -					Dc_arg_ubyte = (ubyte)atoi(Dc_arg);
 -				}
 -			} else {
 -				if ( (Dc_arg[0] == '0') && (Dc_arg[1] == 'x') ) {
 -					char *p;
 -					int n;
 -					n = strtol(Dc_arg,&p,0);
 -					if ( *p == 0 ) {
 -						Dc_arg_type |= ARG_INT|ARG_HEX;
 -						Dc_arg_int = n;
 -					}
 -				}
 -			}
 -		}
 +			// z64: Thread Note: Maybe lock a mutex here to allow a previous DCF to finish/abort before starting a new one
 +			// z64: We'll just assume we won't be here unless a command has finished...
 +			dc_history.push_front(dc_command_buf);	// Push the command onto the history queue
 
 -		if (Dc_debug_on) {
 -			if ( Dc_arg_type & ARG_FLOAT ) {
 -				dc_printf( "Found float number! %f\n", Dc_arg_float );
 +			while (dc_history.size() > DCMDS) {
 +				dc_history.pop_back();			// Keep the commands less than or equal to DCMDS
  			}
 
 -			if ( Dc_arg_type & ARG_INT ) {
 -				dc_printf( "Found int number! %d\n", Dc_arg_int );
 -			}
 +			dc_command_str = dc_command_buf;	// Xfer to the command string for processing
 +			dc_command_buf.resize(0);			// Nullify the buffer
 +			dc_draw(FALSE);					// Redraw the console without the command line.
 
 -			if ( Dc_arg_type & ARG_UBYTE ) {
 -				dc_printf( "Found ubyte number! %d\n", Dc_arg_ubyte );
 -			}
 +			dc_do_command(&dc_command_str);	// Try to do the command
 +			break;
 
 -			if ( Dc_arg_type & ARG_HEX ) {
 -				dc_printf( "Found hex number! 0x%x\n", Dc_arg_int );
 +		default:
 +			// Not any of the control key codes, so it's probably a letter or number.
 +			ubyte c = (ubyte)key_to_ascii(k);
 +			if ((c != 255) && (dc_command_buf.size() < MAX_CLI_LEN)) {
 +				dc_command_buf.push_back(c);
  			}
  		}
 
 -		if ( !stricmp( Dc_arg, "on" ) ) {
 -			Dc_arg_type |= ARG_TRUE;
 +		// Do the passed function
 +		if ( _func ) {
 +			_func();
  		}
 -		if ( !stricmp( Dc_arg, "true" ) ) {
 -			Dc_arg_type |= ARG_TRUE;
 -		}
 -		if ( !stricmp( Dc_arg, "off" ) ) {
 -			Dc_arg_type |= ARG_FALSE;
 -		}
 -		if ( !stricmp( Dc_arg, "false" ) ) {
 -			Dc_arg_type |= ARG_FALSE;
 -		}
 
 -		if ( !stricmp( Dc_arg, "+" ) ) {
 -			Dc_arg_type |= ARG_PLUS;
 -		}
 -
 -		if ( !stricmp( Dc_arg, "-" ) ) {
 -			Dc_arg_type |= ARG_MINUS;
 -		}
 -
 -		if ( !stricmp( Dc_arg, "," ) ) {
 -			Dc_arg_type |= ARG_COMMA;
 -		}
 +		// All done, and ready for new entry
 +		dc_draw(TRUE);
  	}
 
 -	if ( Dc_arg_type & ARG_INT) {
 -		if ( Dc_arg_int ) {
 -			Dc_arg_type |= ARG_TRUE;
 -		} else {
 -			Dc_arg_type |= ARG_FALSE;
 -		}
 +	while( key_inkey() ) {
 +		os_poll();
  	}
 -
 -	if ( Dc_arg_type & ARG_UBYTE) {
 -		if ( Dc_arg_ubyte ) {
 -			Dc_arg_type |= ARG_TRUE;
 -		} else {
 -			Dc_arg_type |= ARG_FALSE;
 -		}
 -	}
 -
 -	if ( !(Dc_arg_type&type) ) {
 -		if ( (Dc_arg_type & ARG_NONE) && !(type & ARG_NONE) ) {
 -			dc_printf( "Error: Not enough parameters.\n" );
 -		} else {
 -			dc_printf( "Error: '%s' invalid type\n", Dc_arg );
 -			longjmp(dc_bad_arg,1);
 -		}
 -	}
  }
 
 -void debug_help();
 -
 -void debug_do_command(char * command)
 +/**
 + * @brief Initializes the debug console.
 + */
 +void dc_init(void)
  {
 -
 -	int i;
 -	int mode = 0;
 -
 -	if ( strlen(command) < 1 ) {
 +	if (debug_inited) {
  		return;
  	}
 
 -	Dc_debug_on = 0;
 -	Dc_command_line = command;
 -	scanner_start_command(command);
 +	debug_inited = TRUE;
 
 -	if (setjmp(dc_bad_arg) ) {
 -		return;
 -	}
 +	dc_scroll_x = 0;
 +	dc_scroll_y = 0;
 
 -	dc_get_arg( ARG_ANY );
 -
 -	if ( !strcmp( Dc_arg, "debug" ) ) {
 -		Dc_debug_on = 1;
 -		dc_printf( "Command line: '%s'\n", Dc_command_line );
 -		dc_get_arg( ARG_ANY );
 +	// Empty the buffers
 +	if (!dc_buffer.empty()) {
 +		dc_buffer.clear();
  	}
 
 -	if ( !stricmp( Dc_arg, "xyzzy" ) ) {
 -		dc_printf("Nothing happens.\n");
 -		return;
 +	if (!dc_command_buf.empty()) {
 +		dc_command_buf.clear();
  	}
 
 -	if ( !strcmp( Dc_arg, "?" ) ) {
 -		mode = 1;
 -		dc_get_arg( ARG_ANY );
 +	sprintf(dc_title, "FreeSpace Open v%i.%i.%i", FS_VERSION_MAJOR, FS_VERSION_MINOR, FS_VERSION_BUILD);
 +	dc_printf("Debug console started.\n" );
 +}
 
 -		if ( Dc_arg_type&ARG_NONE ) {
 -			debug_help();
 -			return;
 -		}
 -	}
 +/**
 + * @brief Process the entered command string
 + */
 +void dc_do_command(SCP_string *cmd_str)
 +{
 +	/**
 +	 * Grab the first word from the cmd_str
 +	 *  If it is not a literal, ignore it "Invalid keyword: %s"
 +	 *  Search for the command...
 +	 *      Compare the word against valid commands
 +	 *      If command not found, ignore it "Invalid or unknown command: %s"\
 +	 *  Process the command...
 +	 *      Call the function to process the command (the rest of the command line is in the parser)
 +	 *          Function takes care of long_help and status depending on the mode.
 +	 */
 +	SCP_string command;
 +	extern SCP_map<SCP_string, debug_command*> dc_commands;	// z64: I don't like this extern here, at all. Nope nope nope.
 
 -	if ( !strcmp( Dc_arg, "help" ) || !strcmp( Dc_arg, "man" ) ) {
 -		mode = 2;
 -		dc_get_arg( ARG_ANY );
 -		if ( Dc_arg_type&ARG_NONE ) {
 -			debug_help();
 -			return;
 -		}
 -	}
 -
 -	if ( strstr( Dc_command_line, "?" ) ) {
 -		mode = 2;
 -	}
 -
 -	if ( !(Dc_arg_type&ARG_STRING) ) {
 -		dc_printf( "Invalid keyword '%s'\n", Dc_arg );
 +	if (cmd_str->empty()) {
  		return;
  	}
 
 +	dc_parse_init(*cmd_str);
 
 -	if (Dc_debug_on) {
 -		dc_printf( "Searching for command '%s'\n", Dc_arg );
 -	}
 +	dc_stuff_string_white(command);		// Grab the first token, presumably this is a command
 
 -	for (i=0; i<Num_debug_commands; i++ ) {
 -		if ( !stricmp( Debug_command[i]->name, Dc_arg ) ) {
 -
 -			if (mode==0) {
 -				if (Dc_debug_on) {
 -					dc_printf( "Calling function '%s'\n", Dc_arg );
 -				}
 -				Dc_command = 1;
 -				Dc_help = 0;
 -				Dc_status = 1;
 -			} else if (mode==1) {
 -				if (Dc_debug_on) {
 -					dc_printf( "Checking status for '%s'\n", Dc_arg );
 -				}
 -				Dc_command = 0;
 -				Dc_help = 0;
 -				Dc_status = 1;
-+		dc_printf("Command not found: '%s'\n", command);
+
 -				if (Dc_debug_on) {
 -					dc_printf( "Doing help for '%s'\n", Dc_arg );
 -				}
 -				Dc_command = 0;
 -				Dc_help = 1;
 -				Dc_status = 0;
 -			}
 +	SCP_map<SCP_string, debug_command*>::iterator it = dc_commands.find(command);
 
 -			(*Debug_command[i]->func)();
 +	if (it == dc_commands.end()) {
 +		dc_printf("Command not found: '%s'\n", command.c_str());
 +		return;
 +	} // Else, we found our command
 
-+		dc_printf( "Ignoring the unused command line tail '%s'\n", command );
+
 -				dc_get_arg(ARG_ANY);
 -				if (!(Dc_arg_type&ARG_NONE)) {
 -					dc_printf( "Ignoring the unused command line tail '%s %s'\n", Dc_arg_org, Dc_command_line );
 -				}
 -			}
 +	(it->second)->func();	// Run the command!
 
 -			return;
 -		}
 +	dc_stuff_string(command);
 +	if (command.size() > 0) {
 +		dc_printf( "Ignoring the unused command line tail '%s'\n", command.c_str() );
  	}
 -
 -	dc_printf( "Unknown command '%s'\n", Dc_arg );
  }
 
 -void debug_draw()
 +/**
 + * @brief Draws the in-game console.
 + */
 +void dc_draw(bool show_prompt = FALSE)
  {
 -	int i;
 -
  	gr_clear();
  	gr_set_font(FONT1);
  	gr_set_color_fast( &Color_bright );
 -	gr_string( 0x8000, 3, "Debug Console" );
 +	gr_string( 0x8000, 3, dc_title.c_str() );
 
  	gr_set_color_fast( &Color_normal );
 
 -	for (i=0; i<DROWS; i++ ) {
 -		gr_string( 0, i*16+16, debug_text[i] );
 -	}
 +	dc_draw_window(show_prompt);
 
 -	int t = timer_get_fixed_seconds() / (F1_0/3);
 -	if ( t & 1 ) {
 -		int w,h;
 -		char c;
 +	gr_flip();
 +}
 
 -		c = debug_text[debug_y][command_line_pos+1];
 -		debug_text[debug_y][command_line_pos+1] = 0;
 +/**
 + * Draws the cursor
 + * @param [in] cmd_string	The formatted command string displayed by dc_draw_window
 + * @param [in] x, y			The x and y screen position of the command string
 + */
 +void dc_draw_cursor( SCP_string &cmd_string, int x, int y )
 +{
 +	int t;
 +	int w, h;	// gr_string width and height
 
 -		gr_get_string_size( &w, &h, debug_text[debug_y] );
 +	t = timer_get_fixed_seconds() / (F1_0/3);
 +	if ( t & 1 ) {
 +		gr_get_string_size( &w, &h, cmd_string.c_str() );
 
  		//gr_string( w, debug_y*16, "_" );
 -		gr_rect(w+1,debug_y*16+1+16,2,14);
 -
 -		debug_text[debug_y][command_line_pos+1] = c;
 +		gr_rect((x + (w + 1)), (y + (h + 1) + 16), 2, 14);
  	}
 -
 -	gr_flip();
  }
 
 -
 -void debug_output( char c )
 +/**
 + * Draws the window text
 + */
 +void dc_draw_window(bool show_prompt)
  {
 -	if ( c == '\t' ) {
 -		int next_tab = ((debug_x/28)+1)*28;
 +	const int nocmd_lines = 2;      // Number of empty lines at the end when the command line is not shown
 +	uint cmd_lines;                 // Number of lines for the command string
 +	uint buffer_lines;              // Number of lines from the buffer to draw
 +	uint i;                         // The current row we're drawing
 +	uint j;                         // The current row of the command string we're drawing
 +	SCP_string out_str;             // The command string + prompt character
 +	SCP_string::iterator str_it;    // Iterator to out_str
 
 -		if ( next_tab >= DCOLS-1 ) {
 -			debug_x=0;
 -			debug_y++;
 -			scroll_times++;
 -			if ( debug_y >= DROWS ) {
 -				int i;
 -				for (i=1; i<DROWS; i++ ) {
 -					strcpy_s( debug_text[i-1], debug_text[i] );
 -				}
 -				debug_y = DROWS-1;
 -				debug_x = 0;
 -				debug_text[debug_y][debug_x] = 0;
 -			}
 -			debug_text[debug_y][debug_x] = 0;
 -			return;
 -		}
 -
 -		for ( ; debug_x < next_tab; ) {
 -			debug_text[debug_y][debug_x++] = ' ';
 -		}
 -		debug_text[debug_y][debug_x] = 0;
 -		return;
 +	out_str = dc_prompt + dc_command_buf;
 +	cmd_lines = (out_str.size() / DCOLS) + 1;
 +	if (show_prompt) {
 +		buffer_lines = DROWS - cmd_lines;
 +	} else {
 +		buffer_lines = DROWS - nocmd_lines;
  	}
 
 -	if ( (c == '\n') || (debug_x >= DCOLS-1) ) {
 -		debug_x=0;
 -		debug_y++;
 -		scroll_times++;
 -		if ( debug_y >= DROWS ) {
 -			int i;
 -			for (i=1; i<DROWS; i++ ) {
 -				strcpy_s( debug_text[i-1], debug_text[i] );
 -			}
 -			debug_y = DROWS-1;
 -			debug_x = 0;
 -			debug_text[debug_y][debug_x] = 0;
 -		}
 -		debug_text[debug_y][debug_x] = 0;
 -		if ( c == '\n' ) {
 -			return;
 -		}
 +	// Ensure the buffer has DBROWS number of rows, expanding it with null strings or shrinking it as necassary
 +	if (dc_buffer.size() != DBROWS) {
 +		dc_buffer.resize(DBROWS, "");
  	}
 
 -	debug_text[debug_y][debug_x++] = c;
 -	debug_text[debug_y][debug_x] = 0;
 -}
 +	// Ensure the window is not bigger than the buffer
 +	CLAMP(DROWS, DROWS_MIN, DBROWS);
 +	CLAMP(DCOLS, DCOLS_MIN, DBCOLS);
 
 -void dc_printf(char *format, ...)
 -{
 -	char tmp[DCOLS*DROWS];
 -	va_list args;
 +	// Ensure we don't scroll too far
 +	CLAMP(dc_scroll_x, 0, (DBCOLS - DCOLS));
 +	CLAMP(dc_scroll_y, 0, (dc_buffer.size() - buffer_lines));
 
 -	va_start(args, format);
 -	vsprintf(tmp, format, args);
 -	va_end(args);
 -
 -	char *p = tmp;
 -	while( *p != '\0' ) {
 -		debug_output(*p);
 -		p++;
 +	// Draw the buffer strings
 +	for (i = 0; i < buffer_lines; ++i) {
 +		gr_string(0, ((i * 16) + 16), dc_buffer[i + dc_scroll_y].substr(dc_scroll_x).c_str());	// z64: gr_string's y param may benifit from a font size (in pixels) variable
  	}
 -}
 
 -void debug_init()
 -{
 -	int i;
 -	if ( debug_inited ) {
 -		return;
 -	}
 +	// Draw the command string w/ padding only if the prompt is active.
 +	if (show_prompt) {
 +		i += 1;		// 1 line between the output and the input text
 
 -	debug_inited = 1;
 +		for (str_it = out_str.begin(), j = 0; str_it < out_str.end(); ++str_it, ++j) {
 +			if ((j % (DCOLS - 1)) == 0) {
 +				// Insert a newline char at every place the string needs to return the 'carriage'
 +				out_str.insert(str_it, '\n');
 +				++j;
 +			}
 +		}
 +		gr_string(0, ((i*16) + 16), out_str.c_str());
 
 -	debug_x=0;
 -	debug_y=0;
 -
 -	for (i=0; i<DROWS; i++ ) {
 -		debug_text[i][0] = 0;
 +		dc_draw_cursor(out_str, 0, ((i*16) + 16));
  	}
 -
 -	dc_printf("Debug console started.\n" );
  }
 
 -void debug_console( void (*_func)() )
 +
 +/**
 + * @brief   Stuffs the given character into the output buffer.
 + * @details Also handles tab alignment, newlines, and maintains the target.
 + */
 +void dc_putc(char c)
  {
 -	int done = 0;
 +	SCP_string* line_str = &dc_buffer.back();
 +	int i;
 
 -	scanner_init();
 +	if (c == '\t') {
 +		/**
 +		 * Calculate how many spaces to put in to align tabs,
 +		 * If we run out of room on the line, change c to a '\n' and let subsequent block handle it,
 +		 * Else, push the spaces onto the line
 +		 */
 +		i = DTABS - (line_str->size() % DTABS);
 
 -	while( key_inkey() ) {
 -		os_poll();
 +		if ((line_str->size() + i) >= (DBCOLS - 1)) {
 +			c = '\n';
 +		} else {
 +			for (; i > 0; --i) {
 +				line_str->push_back(' ');
 +			}
 +		}
  	}
 
 -	if ( !debug_inited ) {
 -		debug_init();
 +	if ((c == '\n') || (line_str->size() >= DBCOLS)) {
 +		/**
 +		 * Trash whatever char happens to be past (DBCOLS - 1),
 +		 * Push a blank line onto the dc_buffer from the bottom,
 +		 * Update line_str to point to the new line,
 +		 * Trash the topmost line(s) in the buffer, and finally
 +		 * Return if the char to push was a \n
 +		 */
 +		if (line_str->size() > DBCOLS) {
 +			line_str->resize(DBCOLS);
 +		}
 +		dc_buffer.push_back("");
 +		line_str = &dc_buffer.back();
 +		++dc_scroll_y;
 +		while (dc_buffer.size() > DBROWS) {
 +			dc_buffer.pop_front();
 +			--dc_scroll_y;
 +		}
 +		if (c == '\n') {
 +			return;
 +		}
  	}
 
 -	debug_draw();
 +	line_str->push_back(c);
 +}
 
 -	while (!done) {
 -		// poll the os
 -		os_poll();
 +/**
 + * @brief   Pauses the output of a command and allows user to scroll through the output history.
 + * @details Returns true if user has pressed Esc, returns false otherwise. Use this in your function to (safely?) break
 + *     out of the loop it's presumably in.
 + */
 +bool dc_pause_output(uint &lines)
 +{
 +	dc_printf("More to follow. Press any key to continue. ESC halts output...");
 
 -		int k = key_inkey();
 -		switch( k ) {
 +	int key;
 +	bool loop;
 +	do {
 +		loop = false;
 
 -		case KEY_SHIFTED+KEY_ENTER:
 +		key = key_inkey();
 +		switch (key) {
  		case KEY_ESC:
 -			done=1; break;
 -
 -		case KEY_BACKSP:
 -			if ( command_line_pos > 0 ) {
 -				command_line[--command_line_pos] = 0;
 -			}
 +			return true;
  			break;
 
 -		case KEY_F3:
 -			if ( last_oldcommand > -1 ) {
 -				strcpy_s( command_line, oldcommand_line[last_oldcommand] );
 -				command_line_pos = strlen(command_line);
 -				command_line[command_line_pos] = 0;
 -			}
 +		case KEY_PAGEUP:
 +			// TODO: Scroll Up
 +			loop = true;
  			break;
 -
 -		case KEY_UP:
 -			command_scroll--;
 -			if (command_scroll<0) {
 -				command_scroll = last_oldcommand;
 -			}
 -
 -			if ( command_scroll > -1 ) {
 -				strcpy_s( command_line, oldcommand_line[command_scroll] );
 -				command_line_pos = strlen(command_line);
 -				command_line[command_line_pos] = 0;
 -			}
 +		case KEY_PAGEDOWN:
 +			// TODO: Scroll Down
 +			loop = true;
  			break;
 -
 -		case KEY_DOWN:
 -			command_scroll++;
 -			if (command_scroll>last_oldcommand) {
 -				command_scroll = 0;
 -			}
 -			if (command_scroll>last_oldcommand) {
 -				command_scroll = -1;
 -			}
 -			if ( command_scroll > -1 ) {
 -				strcpy_s( command_line, oldcommand_line[command_scroll] );
 -				command_line_pos = strlen(command_line);
 -				command_line[command_line_pos] = 0;
 -			}
 +		case KEY_LEFT:
 +			// TODO: Scroll Left
 +			loop = true;
  			break;
 -
 -		case KEY_ENTER: {
 -			debug_output( '\n' );
 -			debug_draw();
 -
 -			debug_do_command(command_line);
 -
 -			int i, found = 0;
 -			for (i=0; i<=last_oldcommand; i++ ) {
 -				if (!stricmp( oldcommand_line[i], command_line )) {
 -					found = 1;
 -				}
 -			}
 -			if ( !found ) {
 -				if ( last_oldcommand < DEBUG_HISTORY-1 ) {
 -					last_oldcommand++;
 -					strcpy_s( oldcommand_line[last_oldcommand], command_line);
 -				} else {
 -					int iLoop;
 -					for (iLoop=0; iLoop<last_oldcommand; iLoop++ ) {
 -						strcpy_s( oldcommand_line[iLoop], oldcommand_line[iLoop+1] );
 -					}
 -					strcpy_s( oldcommand_line[last_oldcommand], command_line);
 -				}
 -			}
 -
 -			debug_output( '\n' );
 -			command_line_pos = 0;
 -			command_line[command_line_pos] = 0;
 -
 -			command_scroll = 0;
 -
 -			}
 +		case KEY_RIGHT:
 +			// TODO: Scroll Right
 +			loop = true;
  			break;
 -		default: {
 -				ubyte c = (ubyte)key_to_ascii(k);
 -				if ( c != 255 ) {
 -					command_line[command_line_pos++] = c;
 -					command_line[command_line_pos] = 0;
 -				}
 -			}
 +		default:
 +			lines = 0;
  		}
 +	} while (loop);
 
 -		strcpy_s( debug_text[debug_y], ">" );
 -		strcat_s( debug_text[debug_y], command_line );
 -		debug_draw();
 -
 -		if ( _func ) {
 -			_func();
 -		}
 -	}
 -
 -	while( key_inkey() ) {
 -		os_poll();
 -	}
 -}
 -
 -void debug_help()
 -{
 -	int s, i;
 -
 -	dc_printf( "Available functions:\n\n" );
 -
 -	s = scroll_times;
 -	for (i=0; i<Num_debug_commands; i++ ) {
 -		dc_printf( " %s - %s\n", Debug_command[i]->name, Debug_command[i]->help );
 -
 -		if ( scroll_times - s > DROWS - 3 ) {
 -			int k;
 -			dc_printf( "       Press a key...B for back\n" );
 -			debug_draw();
 -			k = key_getch();
 -			s = scroll_times;
 -			if ( k == KEY_B ) {
 -				i -= ((DROWS-3)*2);
 -				if ( i <= 0 ) {
 -					i = -1;
 -				}
 -			}
 -		}
-Index: code/debugconsole/console.h
+
 -	}
-index 0000000..966cec6
+
---- code/debugconsole/console.h	(revision 0)
+
-+++ code/debugconsole/console.h	(working copy)
+
-@@ -0,0 +1,260 @@
+
 -	dc_printf( "Typing ? or help will give you help.\n");
 -	dc_printf( "F3 selects last command line.\n" );
 -}
 +	return false;
 +};
 Index: debugconsole/console.h
 ===================================================================
 --- debugconsole/console.h	(Revision 0)
 +++ debugconsole/console.h	(Arbeitskopie)
 @@ -0,0 +1,1040 @@
 +#ifndef _CONSOLE_H
 +#define _CONSOLE_H
 +/*
 + * z64555's debug console, created for the FreeSpace Source Code project
 + *
 + * Portions of this source code are based on works by Volition, Inc. circa 1999. You may not sell or otherwise
 + * commercially exploit the source or things you created based on the source.
 + */
 +
 +/**
 + * @file console.h
 + * @brief An overhauled/updated debug console to allow monitoring, testing, and general debugging of new features.
 + *
 + * @details
 + * Of key interest is Volition's DCF macro, which adds the function argument to the available command list in the
 + * debug console. These functions may be defined in the .cpp file that they are related to, but it is recommended
 + * that they be in their own .cpp if they have multiple sub-arguments (ex: Git has its sub-arguments delimited by
 + * a pair of -'s, or --)
 + */
 +
 +#include "debugconsole/consoleparse.h"
 +#include "globalincs/pstypes.h"
 +#include "globalincs/vmallocator.h"
 +
 +/**
 + * @def DCF
 + *
 + * @brief The potent DCF macro, used to define new debug commands for the console.
 + *
 + * @param function_name[in] The name of the function, as shown in the debug console
 + * @param help_txt[in] The short-help text, as shown as listed from the 'help' command
 + *
 + * @details Usage example:
 + * DCF(toggle_it,"description")
 + * {
 + *     switch (Dc_mode) {
 + *     case dcm_command:
 + *          This_var = !This_var;
 + *     break;
 + *
 + *     case dcm_help:
 + *         dc_printf( "Usage: sample. Toggles This_var on/off.\n" );
 + *     break;
 + *
 + *     case dcm_status:
 + *         dc_printf( "The status is %d.\n", This_var );
 + *     break;
 + *     default:
 + *         if (Dc_debug_on) {
 + *             dc_printf( "<debug> Unknown command mode %i", Dc_mode);
 + *         }
 + *     }
 + * }
 + *
 + *  In the console, the command will be listed as 'toggle_it', and help will display it as:
 + *      toggle_it  - Usage: sample. Toggles This_var on/off.
 + *  Note: The only allowed function type is a void fn( void )
 + */
 +#define DCF(function_name, help_text)	\
 +		void dcf_##function_name();	\
 +		debug_command dcmd_##function_name(#function_name, help_text, dcf_##function_name);	\
 +		void dcf_##function_name()
 +
 +
 +/**
 + *  @def Shortcut for debug commands that toggle a bool, such as Show_lightning
 + *
 + *  @param [in] function_name Name of the function, as shown in the debug console
 + *  @param [in] bool_variable Name of the variable to allow toggling.
 + */
 +#define DCF_BOOL(function_name, bool_variable)	\
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, "Sets or toggles the boolean: "#bool_variable, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		if (dc_optional_string_either("help", "--help")) {	\
 +				dc_printf( "Usage: %s [bool]\nSets %s to true or false.  If nothing passed, then toggles it.\n", #function_name, #bool_variable );	\
 +				return;		\
 +		}	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %s\n", #function_name, (bool_variable ? "TRUE" : "FALSE"));		\
 +			return;		\
 +		}	\
 +		if (!dc_maybe_stuff_boolean(&bool_variable)) {	\
 +			bool_variable = !bool_variable;	\
 +		}	\
 +	}	\
 +
 +
 +/**
 + *  @def Same as DCF_BOOL, but with custom help strings
 + *
 + *  @param [in] function_name Name of the function, as shown in the debug console
 + *  @param [in] bool_variable Name of the variable to allow toggling.
 + */
 +#define DCF_BOOL2(function_name, bool_variable, short_help, long_help)	\
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		if (dc_optional_string_either("help", "--help")) {	\
 +			dc_printf( #long_help );	\
 +				return;		\
 +		}	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %s\n", #function_name, (bool_variable ? "TRUE" : "FALSE"));		\
 +			return;		\
 +		}	\
 +		if (!dc_maybe_stuff_boolean(&bool_variable)) {	\
 +			bool_variable = !bool_variable;	\
 +		}	\
 +	}	\
 +
 + /**
 +  * @def Shortcut for single-variable setters/monitors
 +  *
 +  * @param [in] function_name
 +  * @param [in] float_variable
 +  * @param [in] short_help
 +  */
 + #define DCF_FLOAT(function_name, float_variable, short_help)	\
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		float value;	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %f\n", #float_variable, float_variable);		\
 +			return;		\
 +		}	\
 +		dc_stuff_float(&value);	\
 +		float_variable = value;	\
 +		dc_printf("%s set to %f\n", #float_variable, float_variable);	\
 +	}	\
 +
 + /**
 +  * @def Shortcut for single-variable setters/monitors with lower/upper bounds clamping
 +  *
 +  * @param [in] function_name
 +  * @param [in] float_variable
 +  * @param [in] short_help
 +  */
 + #define DCF_FLOAT2(function_name, float_variable, lower_bounds, upper_bounds, short_help)	\
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		float value;	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %f\n", #float_variable, float_variable);		\
 +			return;		\
 +		}	\
 +		dc_stuff_float(&value);	\
 +		CLAMP(float_variable, lower_bounds, upper_bounds);	\
 +		float_variable = value;	\
 +		dc_printf("%s set to %f\n", #float_variable, float_variable);	\
 +	}	\
 +
 + /**
 +  * @def Shortcut for single-variable setters/monitors
 +  *
 +  * @param [in] function_name
 +  * @param [in] int_variable
 +  * @param [in] short_help
 +  */
 + #define DCF_INT(function_name, int_variable, short_help)	\
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		float value;	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %f\n", #int_variable, int_variable);		\
 +			return;		\
 +		}	\
 +		dc_stuff_float(&value);	\
 +		int_variable = value;	\
 +		dc_printf("%s set to %f\n", #int_variable, int_variable);	\
 +	}	\
 +
 + /**
 +  * @def Shortcut for single-variable setters/monitors with lower/upper bounds clamping
 +  *
 +  * @param [in] function_name
 +  * @param [in] int_variable
 +  * @param [in] short_help
 +  */
 + #define DCF_INT2(function_name, int_variable, lower_bounds, upper_bounds, short_help)	\
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		float value;	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %f\n", #int_variable, int_variable);		\
 +			return;		\
 +		}	\
 +		dc_stuff_float(&value);	\
 +		CLAMP(int_variable, lower_bounds, upper_bounds);	\
 +		int_variable = value;	\
 +		dc_printf("%s set to %f\n", #int_variable, int_variable);	\
 +	}	\
 +
 +/**
 + *  @class debug_command
 + *  @brief Class to aggregate a debug command with its name (as shown in the console) and short help.
 + *
 + *  @details
 + *  Note: Long help, as evoked by '<command> help', should be handled by the function itself. It is recommended
 + *  that arguments that have sub-arguments be in their own function, so as to aide in organization and to keep the
 + *  size of the command function down.
 + */
 +class debug_command {
 +public:
 +	char *name;		//!< The name of the command, as shown in the debug console
 +	char *help;		//!< The short help string, as shown by 'help <command>'
 +	void (*func)();	//!< Pointer to the function that is run when this command is evoked
 +
 +	/**
 +	* @brief Adds a debug command to the debug_commands map, if it isn't in there already.
 +	*
 +	* @details The DCF macro more or less guarantees that a command won't be duplicated on compile time. But no harm in
 +	*   some extra caution.
 +	*/
 +	debug_command(char *name, char *help, void (*func)());
 +};
 +
 +/**
 + * Dc_mode tells your function what to do.
 + * Your function _must_ process the command.
 + *
 + * It is recommended that each function have, at minimum, this switch statement:
 + *   switch (Dc_mode) {
 + *   case dcm_command:
 + *   	// process command
 + *   	break;
 + *
 + *   case dcm_help:
 + *   	// provide detailed help
 + *   	break;
 + *
 + *   case dcm_status:
 + *   	// provide status on the command
 + *   	break;
 + *
 + *   default:
 + *		// (optional)
 + *   	dc_printf("<command_name> Unknown command mode %i\n", Dc_mode);
 + *   }
 + */
 +enum dc_mode {
 +	dcm_command,	// process the command
 +	dcm_help,		// print out the help text in the form, "usage: ... \nLong description\n" );
 +	dcm_status		// print out the current status of the command.
 +};
 +
 +extern dc_mode Dc_mode;
-Index: code/debugconsole/consolecmds.cpp
+
 +
-index 0000000..da30632
+
---- code/debugconsole/consolecmds.cpp	(revision 0)
+
-+++ code/debugconsole/consolecmds.cpp	(working copy)
+
 +void dc_printf( char *format, ... );				// Outputs to the debug console
 +bool dc_pause_output(uint &lines);					// Pauses execution and waits for user intput. Allows scrolling.
 +
 +#endif // _CONSOLE_H
 +#ifndef _CONSOLE_H
 +#define _CONSOLE_H
-+ * 1999. You may not sell or otherwise commercially exploit the source or things you
+
 + * z64555's debug console, created for the FreeSpace Source Code project
 + *
 + * Portions of this source code are based on works by Volition, Inc. circa 1999. You may not sell or otherwise
 + * commercially exploit the source or things you created based on the source.
 + */
 +
 +/**
 + * @file console.h
 + * @brief An overhauled/updated debug console to allow monitoring, testing, and general debugging of new features.
 + *
 + * @details
 + * Of key interest is Volition's DCF macro, which adds the function argument to the available command list in the
 + * debug console. These functions may be defined in the .cpp file that they are related to, but it is recommended
 + * that they be in their own .cpp if they have multiple sub-arguments (ex: Git has its sub-arguments delimited by
 + * a pair of -'s, or --)
 + */
 +
 +#include "debugconsole/consoleparse.h"
 +#include "globalincs/pstypes.h"
 +#include "globalincs/vmallocator.h"
 +
 +/**
 + * @def DCF
 + *
-+	SCP_map<SCP_string, debug_command*>::iterator it = dc_commands.find(_name);
+
 + *
-+	if (it != dc_commands.end()) {
+
-+		Int3();		// Command already exists! Somebody didn't use the DCF macro as they should've...
+
 + *
 + * @details Usage example:
-+	dc_commands[_name] = this;
+
 + * {
-+	name = _name;
+
-+	help = _help;
+
-+	func = _func;
+
 + *     break;
 + *
 + *     case dcm_help:
 + *         dc_printf( "Usage: sample. Toggles This_var on/off.\n" );
-+	SCP_string command = "";
+
-+	Dc_debug_on = true;
+
 + *     case dcm_status:
-+	dc_stuff_string_white(command);
+
 + *     break;
-+	if (command == "") {
+
-+		dc_printf("<debug> No command given");
+
 + *             dc_printf( "<debug> Unknown command mode %i", Dc_mode);
-+	} // Else, command is present.
+
 + *     }
-+	dc_commands_it it = dc_commands.find(command);
+
 + *
 + *  In the console, the command will be listed as 'toggle_it', and help will display it as:
-+		dc_printf("<debug> Command not found: '%s'\n", command);
+
 + *  Note: The only allowed function type is a void fn( void )
-+	} // Else, command exists. Run it.
+
 +#define DCF(function_name, help_text)	\
-+	dc_printf("<debug> Executing command: '%s'\n", command);
+
-+	// try {
+
-+	(it->second)->func();
+
-+	// } catch {
+
-+	// }
+
 +/**
-+	Dc_debug_on = false;
+
 + *
 + *  @param [in] function_name Name of the function, as shown in the debug console
 + *  @param [in] bool_variable Name of the variable to allow toggling.
 + */
-+	extern uint DBCOLS;
+
-+	unsigned int lines;
+
-+	SCP_string command = "";
+
 +	void dcf_##function_name() {	\
-+	dc_stuff_string_white(command);
+
 +				dc_printf( "Usage: %s [bool]\nSets %s to true or false.  If nothing passed, then toggles it.\n", #function_name, #bool_variable );	\
-+	if (command != "") {
+
-+		dc_commands_it it = dc_commands.find(command);
+
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
-+		if (it == dc_commands.end()) {
+
-+			dc_printf("Command not found: '%s'\n", command);
+
 +		}	\
 +		if (!dc_maybe_stuff_boolean(&bool_variable)) {	\
 +			bool_variable = !bool_variable;	\
-+		dc_printf((it->second)->help);
+
 +	}	\
-+	} // Else, command line is empty, print out the help list
+
 +
-+	dc_printf("FreeSpace Open Debug Console\n");
+
-+	dc_printf(" These commands are defined internally.\n");
+
-+	dc_printf(" Typing 'help function_name' will give the short help on the function.\n");
+
-+	dc_printf(" Some functions may have detailed help, try passing \"help\" or \"--help\" to them.");
+
-+	dc_printf(" F3 selects last command line. Up and Down arrow keys scroll through the command history\n");
+
-+	dc_printf("\n");
+
 +#define DCF_BOOL2(function_name, bool_variable, short_help, long_help)	\
-+	dc_printf(" Available commands:\n");
+
-+	lines = 0;
+
-+	for (dc_commands_it it = dc_commands.begin(); it != dc_commands.end(); ++it) {
+
-+		if (lines >= (DBCOLS - 1)) {
+
-+			if (dc_pause_output(lines) == true) {
+
 +				return;		\
 +		}	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %s\n", #function_name, (bool_variable ? "TRUE" : "FALSE"));		\
-+		dc_printf(" %s\t\t- %s", (it->second)->name, (it->second)->help);
+
-+		++lines;
+
 +		if (!dc_maybe_stuff_boolean(&bool_variable)) {	\
 +			bool_variable = !bool_variable;	\
 +		}	\
 +	}	\
 +
 + /**
 +  * @def Shortcut for single-variable setters/monitors
 +  *
 +  * @param [in] function_name
 +  * @param [in] float_variable
 +  * @param [in] short_help
-+	switch (Dc_mode) {
+
-+	case dcm_command:
+
-+		dc_printf("Sorry, This command is not implemented yet...");
+
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
-+	case dcm_help:
+
-+		dc_printf("Shell: Change/set various console-related settings.\n");
+
-+		dc_printf(" Available arguments:\n");
+
-+		dc_printf("\t-font       - Change the console font");
+
-+		dc_printf("\t-resize     - Resize the console window\n");
+
-+		dc_printf("\t-resize_buf - Resize the console buffer\n");
+
 +		float_variable = value;	\
 +		dc_printf("%s set to %f\n", #float_variable, float_variable);	\
-+	case dcm_status:
+
-+		dc_printf("<shell> No status available.\n");
+
 + /**
 +  * @def Shortcut for single-variable setters/monitors with lower/upper bounds clamping
 +  *
-+		dc_printf("<shell> Unknown command mode %i\n", Dc_mode);
+
 +  * @param [in] float_variable
 +  * @param [in] short_help
 +  */
 + #define DCF_FLOAT2(function_name, float_variable, lower_bounds, upper_bounds, short_help)	\
 +	void dcf_##function_name();		\
-+	switch (Dc_mode) {
+
-+	case dcm_command:
+
-+		dc_printf("Sorry, This command is not implemented yet...");
+
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %f\n", #float_variable, float_variable);		\
-+	case dcm_help:
+
-+		dc_printf("Pause: Pause/Unpause the game.\n");
+
-+		dc_printf(" Only available in singleplayer games.\n");
+
 +		CLAMP(float_variable, lower_bounds, upper_bounds);	\
 +		float_variable = value;	\
-+	case dcm_status:
+
-+		dc_printf("No status available.\n");
+
 +
 + /**
 +  * @def Shortcut for single-variable setters/monitors
-+		dc_printf("<pause> Unknown command mode %i\n", Dc_mode);
+
 +  * @param [in] function_name
 +  * @param [in] int_variable
-Index: code/debugconsole/consoleparse.cpp
+
 +  */
-index 0000000..2c9c2ae
+
---- code/debugconsole/consoleparse.cpp	(revision 0)
+
-+++ code/debugconsole/consoleparse.cpp	(working copy)
+
-@@ -0,0 +1,1452 @@
+
 +		float value;	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %f\n", #int_variable, int_variable);		\
 +			return;		\
 +		}	\
 +		dc_stuff_float(&value);	\
 +		int_variable = value;	\
 +		dc_printf("%s set to %f\n", #int_variable, int_variable);	\
 +	}	\
 +
 + /**
 +  * @def Shortcut for single-variable setters/monitors with lower/upper bounds clamping
 +  *
 +  * @param [in] function_name
 +  * @param [in] int_variable
 +  * @param [in] short_help
 +  */
 + #define DCF_INT2(function_name, int_variable, lower_bounds, upper_bounds, short_help)	\
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		float value;	\
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %f\n", #int_variable, int_variable);		\
 +			return;		\
 +		}	\
-+	si_start   = 0,
+
-+	si_end     = 1,
+
-+	si_invalid,
+
-+	si_sign,        //!< Sign character, '-' '+'
+
-+	si_prefix,      //!< prefix character sequence, 0b, 0o, or 0x
+
-+	si_numeral,     //!< Numeral state, 0 - 9
+
-+	si_numeral_bin,     //!< Numeral altstate, 0, 1
+
-+	si_numeral_octal,   //!< Numeral altstate, 0 - 7
+
-+	si_numeral_hex      //!< Numeral altstate, 0 - 9 and 'a' - 'f'
+
 + *
 + *  @details
 + *  Note: Long help, as evoked by '<command> help', should be handled by the function itself. It is recommended
-+	sf_start = 0,
+
-+	sf_end = 1,
+
-+	sf_invalid,
+
-+	sf_sign,		//!< Sign character for mantessa
+
-+	sf_whole,		//!< Whole value numeral
+
-+	sf_decimal,		//!< Decimal character
+
-+	sf_fraction,	//!< Fractional value numeral
+
-+	sf_expprefix,	//!< Exponent prefix, 'e', 'E'
+
-+	sf_expsign,		//!< Exponent sign
+
-+	sf_exponent		//!< Exponent value numeral
+
 +	* @brief Adds a debug command to the debug_commands map, if it isn't in there already.
 +	*
 +	* @details The DCF macro more or less guarantees that a command won't be duplicated on compile time. But no harm in
 +	*   some extra caution.
 +	*/
 +	debug_command(char *name, char *help, void (*func)());
 +};
 +
 +/**
 + * Dc_mode tells your function what to do.
 + * Your function _must_ process the command.
 + *
 + * It is recommended that each function have, at minimum, this switch statement:
 + *   switch (Dc_mode) {
 + *   case dcm_command:
 + *   	// process command
 + *   	break;
 + *
 + *   case dcm_help:
 + *   	// provide detailed help
 + *   	break;
 + *
 + *   case dcm_status:
 + *   	// provide status on the command
 + *   	break;
 + *
 + *   default:
 + *		// (optional)
 + *   	dc_printf("<command_name> Unknown command mode %i\n", Dc_mode);
 + *   }
 + */
 +enum dc_mode {
 +	dcm_command,	// process the command
 +	dcm_help,		// print out the help text in the form, "usage: ... \nLong description\n" );
 +	dcm_status		// print out the current status of the command.
-+	return ((ch == '-') || (ch == '+'));
+
 +
 +extern dc_mode Dc_mode;
 +extern bool Dc_debug_on;
 +
 +extern SCP_string dc_command_str;	// The rest of the command line, from the end of the last processed arg on.
-+	return ((ch >= '0') && (ch <= '9'));
+
 +void debug_console(void (*func)(void) = NULL);		// Starts the debug console, and runs the given function after each time a command is processed
 +void dc_printf( char *format, ... );				// Outputs to the debug console
 +bool dc_pause_output(uint &lines);					// Pauses execution and waits for user intput. Allows scrolling.
 +
 +#endif // _CONSOLE_H
-+	return (ch == '.');
+
 +#define _CONSOLE_H
 +/*
 + * z64555's debug console, created for the FreeSpace Source Code project
 + *
 + * Portions of this source code are based on works by Volition, Inc. circa 1999. You may not sell or otherwise
-+	return ((ch == '0') || (ch == '1'));
+
 + */
 +
 +/**
 + * @file console.h
 + * @brief An overhauled/updated debug console to allow monitoring, testing, and general debugging of new features.
-+	return ((ch >= '0') && (ch <= '7'));
+
 + * @details
 + * Of key interest is Volition's DCF macro, which adds the function argument to the available command list in the
 + * debug console. These functions may be defined in the .cpp file that they are related to, but it is recommended
 + * that they be in their own .cpp if they have multiple sub-arguments (ex: Git has its sub-arguments delimited by
 + * a pair of -'s, or --)
-+	return (((ch >= '0') && (ch <= '9')) || ((ch >= 'a') && (ch <= 'f')) || ((ch >= 'A') || (ch <= 'F')));
+
 +
 +#include "debugconsole/consoleparse.h"
 +#include "globalincs/pstypes.h"
 +#include "globalincs/vmallocator.h"
 +
-+	return (ch == '0');
+
 + * @def DCF
 + *
 + * @brief The potent DCF macro, used to define new debug commands for the console.
 + *
 + * @param function_name[in] The name of the function, as shown in the debug console
-+	return ((ch == 'b') || (ch == 'B'));
+
 + *
 + * @details Usage example:
 + * DCF(toggle_it,"description")
 + * {
 + *     switch (Dc_mode) {
-+	return ((ch == 'o') || (ch == 'O'));
+
 + *          This_var = !This_var;
 + *     break;
 + *
 + *     case dcm_help:
 + *         dc_printf( "Usage: sample. Toggles This_var on/off.\n" );
-+	return ((ch == 'x') || (ch == 'X'));
+
 + *
 + *     case dcm_status:
 + *         dc_printf( "The status is %d.\n", This_var );
 + *     break;
 + *     default:
-+	return ((ch == 'e') || (ch == 'E'));
+
 + *             dc_printf( "<debug> Unknown command mode %i", Dc_mode);
 + *         }
 + *     }
 + * }
 + *
 + *  In the console, the command will be listed as 'toggle_it', and help will display it as:
 + *      toggle_it  - Usage: sample. Toggles This_var on/off.
 + *  Note: The only allowed function type is a void fn( void )
-+	char token[MAX_TOKEN_LENGTH];
+
-+	char *begin_ptr;
+
 +		void dcf_##function_name();	\
-+	dc_ignore_gray_space();
+
 +		void dcf_##function_name()
-+	begin_ptr = Cp;
+
 +
-+	while ((*Cp != '\0') && !is_gray_space(*Cp)) {
+
-+		Cp++;
+
 + *
 + *  @param [in] function_name Name of the function, as shown in the debug console
-+	strncpy(token, begin_ptr, (Cp - begin_ptr));
+
-+	return token;
+
 +#define DCF_BOOL(function_name, bool_variable)	\
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, "Sets or toggles the boolean: "#bool_variable, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		if (dc_optional_string_either("help", "--help")) {	\
 +				dc_printf( "Usage: %s [bool]\nSets %s to true or false.  If nothing passed, then toggles it.\n", #function_name, #bool_variable );	\
-+	char token[MAX_TOKEN_LENGTH];
+
-+	char *begin_ptr;
+
-+	char *ch_ptr = Cp;
+
 +			dc_printf("%s = %s\n", #function_name, (bool_variable ? "TRUE" : "FALSE"));		\
-+	while ((*ch_ptr != '\0') && is_gray_space(*ch_ptr)) {
+
-+		ch_ptr++;
+
 +		if (!dc_maybe_stuff_boolean(&bool_variable)) {	\
 +			bool_variable = !bool_variable;	\
-+	begin_ptr = ch_ptr;
+
 +	}	\
-+	while ((*ch_ptr != '\0') && !is_gray_space(*ch_ptr)) {
+
-+		ch_ptr++;
+
 +/**
 + *  @def Same as DCF_BOOL, but with custom help strings
-+	strncpy(token, begin_ptr, (ch_ptr - begin_ptr));
+
-+	return token;
+
 + *  @param [in] bool_variable Name of the variable to allow toggling.
 + */
 +#define DCF_BOOL2(function_name, bool_variable, short_help, long_help)	\
-+	while (is_white_space(*Cp) && (*Cp != '\0')) {
+
-+		Cp++;
+
 +	void dcf_##function_name() {	\
 +		if (dc_optional_string_either("help", "--help")) {	\
 +			dc_printf( #long_help );	\
 +				return;		\
-+	while (is_gray_space(*Cp) && (*Cp != '\0')) {
+
-+		Cp++;
+
 +			dc_printf("%s = %s\n", #function_name, (bool_variable ? "TRUE" : "FALSE"));		\
 +			return;		\
 +		}	\
 +		if (!dc_maybe_stuff_boolean(&bool_variable)) {	\
 +			bool_variable = !bool_variable;	\
 +		}	\
-+	char *str_found = NULL;
+
 +
-+	dc_ignore_gray_space();
+
 +  * @def Shortcut for single-variable setters/monitors
-+	if (strnicmp(pstr, Cp, strlen(pstr))) {
+
-+		str_found = pstr;
+
 +  * @param [in] float_variable
 +  * @param [in] short_help
-+	if (str_found != NULL) {
+
-+		// Found a required string
+
-+		if (Dc_debug_on) {
+
-+			dc_printf("<debug> Found required string [%s}\n", str_found);
+
 +	void dcf_##function_name() {	\
 +		float value;	\
-+		Cp += strlen(str_found);
+
 +			dc_printf("%s = %f\n", #float_variable, float_variable);		\
-+		// Didn't find a required string.
+
-+		throw errParseString(dc_get_token_no_advance(), pstr);
+
 +		dc_stuff_float(&value);	\
-+	return true;
+
 +		dc_printf("%s set to %f\n", #float_variable, float_variable);	\
 +	}	\
 +
 + /**
-+	char *str_found = NULL;
+
-+	int i = -1;
+
 +  * @param [in] function_name
-+	dc_ignore_gray_space();
+
 +  * @param [in] short_help
-+	if (strncmp(str1, Cp, strlen(str1) == 0)) {
+
-+		str_found = str1;
+
-+		i = 0;
+
-+	} else if (strncmp(str2, Cp, strlen(str2) == 0)) {
+
-+		str_found = str2;
+
-+		i = 1;
+
 +		if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {	\
 +			dc_printf("%s = %f\n", #float_variable, float_variable);		\
-+	if (i > -1) {
+
-+		// Found a required string
+
-+		if (Dc_debug_on) {
+
-+			dc_printf("<debug> Found required string [%s}\n", str_found);
+
 +		float_variable = value;	\
 +		dc_printf("%s set to %f\n", #float_variable, float_variable);	\
-+		Cp += strlen(str_found);
+
 +
-+		// Didn't find a required string.
+
-+		throw errParseString(dc_get_token_no_advance(), str1, str2);
+
 +  *
 +  * @param [in] function_name
-+	return i;
+
 +  * @param [in] short_help
 +  */
 + #define DCF_INT(function_name, int_variable, short_help)	\
 +	void dcf_##function_name();		\
-+	char *str_found = NULL;
+
-+	int i = -1;
+
 +		float value;	\
-+	dc_ignore_gray_space();
+
 +			dc_printf("%s = %f\n", #int_variable, int_variable);		\
-+	if (strncmp(str1, Cp, strlen(str1) == 0)) {
+
-+		str_found = str1;
+
-+		i = 0;
+
-+	} else if (strncmp(str2, Cp, strlen(str2) == 0)) {
+
-+		str_found = str2;
+
-+		i = 1;
+
-+	} else if (strncmp(str3, Cp, strlen(str3) == 0)) {
+
-+		str_found = str3;
+
-+		i = 2;
+
 +  *
 +  * @param [in] function_name
-+	if (i > -1) {
+
-+		// Found a required string
+
-+		if (Dc_debug_on) {
+
-+			dc_printf("<debug> Found required string [%s}\n", str_found);
+
 +	void dcf_##function_name();		\
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
-+		Cp += strlen(str_found);
+
 +		float value;	\
-+		// Didn't find a required string.
+
-+		throw errParseString(dc_get_token_no_advance(), str1, str2, str3);
+
 +			return;		\
 +		}	\
-+	return i;
+
 +		CLAMP(int_variable, lower_bounds, upper_bounds);	\
 +		int_variable = value;	\
 +		dc_printf("%s set to %f\n", #int_variable, int_variable);	\
 +	}	\
-+	char *str_found = NULL;
+
-+	int i = -1;
+
 + *  @class debug_command
-+	dc_ignore_gray_space();
+
 + *
-+	if (strncmp(str1, Cp, strlen(str1) == 0)) {
+
-+		str_found = str1;
+
-+		i = 0;
+
-+	} else if (strncmp(str2, Cp, strlen(str2) == 0)) {
+
-+		str_found = str2;
+
-+		i = 1;
+
-+	} else if (strncmp(str3, Cp, strlen(str3) == 0)) {
+
-+		str_found = str3;
+
-+		i = 2;
+
-+	} else if (strncmp(str4, Cp, strlen(str4) == 0)) {
+
-+		str_found = str4;
+
-+		i = 3;
+
 +	* @brief Adds a debug command to the debug_commands map, if it isn't in there already.
 +	*
-+	if (i > -1) {
+
-+		// Found a required string
+
-+		if (Dc_debug_on) {
+
-+			dc_printf("<debug> Found required string [%s}\n", str_found);
+
 +};
 +
-+		Cp += strlen(str_found);
+
 + * Dc_mode tells your function what to do.
-+		// Didn't find a required string.
+
-+		throw errParseString(dc_get_token_no_advance(), str1, str2, str3, str4);
+
 + * It is recommended that each function have, at minimum, this switch statement:
 + *   switch (Dc_mode) {
-+	return i;
+
 + *   	// process command
 + *   	break;
 + *
 + *   case dcm_help:
-+	dc_ignore_gray_space();
+
 + *   	break;
-+	if (strncmp(pstr, Cp, strlen(pstr) != 0)) {
+
-+		return false;
+
-+	} // Else, optional string was found
+
 + *   	break;
-+	if (Dc_debug_on) {
+
-+		dc_printf("<debug> Found optional string [%s]\n", pstr);
+
 + *		// (optional)
 + *   	dc_printf("<command_name> Unknown command mode %i\n", Dc_mode);
-+	Cp += strlen(pstr);
+
-+	return true;
+
 +enum dc_mode {
 +	dcm_command,	// process the command
 +	dcm_help,		// print out the help text in the form, "usage: ... \nLong description\n" );
 +	dcm_status		// print out the current status of the command.
-+	char * str_found = NULL;
+
 +
-+	dc_ignore_gray_space();
+
 +extern bool Dc_debug_on;
-+	if (strncmp(str1, Cp, strlen(str1)) == 0) {
+
-+		str_found = str1;
+
-+	} else if (strncmp(str2, Cp, strlen(str2)) == 0) {
+
-+		str_found = str2;
+
 +void dc_printf( char *format, ... );				// Outputs to the debug console
-+		return false;
+
 +
 +#endif // _CONSOLE_H
-+	if (Dc_debug_on) {
+
-+		dc_printf("<debug> Found optional string [%s]\n",str_found);
+
 +/*
 + * z64555's debug console, created for the FreeSpace Source Code project
-+	Cp += strlen(str_found);
+
-+	return true;;
+
 + * commercially exploit the source or things you created based on the source.
 + */
 +
 +/**
 + * @file console.h
 + * @brief An overhauled/updated debug console to allow monitoring, testing, and general debugging of new features.
 + *
 + * @details
 + * Of key interest is Volition's DCF macro, which adds the function argument to the available command list in the
-+	strcpy(Command_string, str.c_str());
+
-+	Cp = Command_string;
+
 + * a pair of -'s, or --)
 + */
 +
 +#include "debugconsole/consoleparse.h"
 +#include "globalincs/pstypes.h"
 +#include "globalincs/vmallocator.h"
 +
 +/**
 + * @def DCF
 + *
 + * @brief The potent DCF macro, used to define new debug commands for the console.
 + *
 + * @param function_name[in] The name of the function, as shown in the debug console
-+	char *ch_ptr = ch;
+
-+	char *end_ptr;
+
-+	double ret;
+
-+	state_float state = sf_start;
+
-+	SCP_string buffer_str;
+
 + *     switch (Dc_mode) {
 + *     case dcm_command:
-+		if ((ch_ptr == '\0') || is_white_space(*ch_ptr)) {
+
-+			state = sf_end;
+
 + *
 + *     case dcm_help:
-+		switch (state) {
+
-+		case sf_start:
+
-+			if (ch_is_sign(*ch_ptr)) {
+
-+				state = sf_sign;
+
-+				if (*ch_ptr == '-') {
+
-+					buffer_str.push_back(*ch_ptr);
+
-+				} // Else, sign is positive, and isn't needed on the buffer
+
-+				ch_ptr++;
+
 + *             dc_printf( "<debug> Unknown command mode %i", Dc_mode);
-+			} else if (ch_is_numeral(*ch_ptr)) {
+
-+				state = sf_whole;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 + *  In the console, the command will be listed as 'toggle_it', and help will display it as:
-+			} else if (ch_is_decimal(*ch_ptr)) {
+
-+				state = sf_decimal;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +		void dcf_##function_name();	\
 +		debug_command dcmd_##function_name(#function_name, help_text, dcf_##function_name);	\
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_start\n", *ch_ptr);
+
-+				}
+
-+				state = sf_invalid;
+
 + *  @def Shortcut for debug commands that toggle a bool, such as Show_lightning
 + *
 + *  @param [in] function_name Name of the function, as shown in the debug console
-+		case sf_end:
+
-+			if ((buffer_str == "") || (buffer_str == "-"))
+
-+			{
+
-+				state = sf_invalid;
+
-+			} // Else, we can convert the token.
+
-+			// Do nothing, and allow the while loop exit condition to trigger
+
 +		if (dc_optional_string_either("help", "--help")) {	\
-+		case sf_sign:
+
-+			if (ch_is_numeral(*ch_ptr)) {
+
-+				state = sf_whole;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +			return;		\
-+			} else if (ch_is_decimal(*ch_ptr)) {
+
-+				state = sf_decimal;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +	}	\
 +
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_sign\n", *ch_ptr);
+
-+				}
+
-+				state = sf_invalid;
+
 + *  @param [in] function_name Name of the function, as shown in the debug console
 + *  @param [in] bool_variable Name of the variable to allow toggling.
 + */
-+		case sf_whole:
+
-+			if (ch_is_numeral(*ch_ptr)) {
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +		if (dc_optional_string_either("help", "--help")) {	\
-+			} else if (ch_is_decimal(*ch_ptr)) {
+
-+				state = sf_decimal;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +			dc_printf("%s = %s\n", #function_name, (bool_variable ? "TRUE" : "FALSE"));		\
-+			} else if (ch_is_exp_prefix(*ch_ptr)) {
+
-+				state = sf_expprefix;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +		}	\
 +	}	\
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_whole\n", *ch_ptr);
+
-+				}
+
-+				state = sf_invalid;
+
 +  * @param [in] function_name
 +  * @param [in] float_variable
 +  * @param [in] short_help
-+		case sf_decimal:
+
-+			if (ch_is_numeral(*ch_ptr)) {
+
-+				state = sf_fraction;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +		float value;	\
-+			} else if (ch_is_exp_prefix(*ch_ptr)) {
+
-+				state = sf_expprefix;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +		dc_stuff_float(&value);	\
 +		float_variable = value;	\
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_decimal\n", *ch_ptr);
+
-+				}
+
-+				state = sf_invalid;
+
 +  * @def Shortcut for single-variable setters/monitors with lower/upper bounds clamping
 +  *
 +  * @param [in] function_name
-+		case sf_fraction:
+
-+			if (ch_is_numeral(*ch_ptr)) {
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +	void dcf_##function_name();		\
-+			} else if (ch_is_exp_prefix(*ch_ptr)) {
+
-+				state = sf_expprefix;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +			dc_printf("%s = %f\n", #float_variable, float_variable);		\
 +			return;		\
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_faction\n", *ch_ptr);
+
-+				}
+
-+				state = sf_invalid;
+
 +		dc_printf("%s set to %f\n", #float_variable, float_variable);	\
 +	}	\
 +
-+		case sf_expprefix:
+
-+			if (ch_is_sign(*ch_ptr)) {
+
-+				state = sf_expsign;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +  * @param [in] short_help
-+			} else if (ch_is_numeral(*ch_ptr)) {
+
-+				state = sf_exponent;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +	void dcf_##function_name() {	\
 +		float value;	\
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_expprefix\n", *ch_ptr);
+
-+				}
+
-+				state = sf_invalid;
+
 +		dc_stuff_float(&value);	\
 +		int_variable = value;	\
 +		dc_printf("%s set to %f\n", #int_variable, int_variable);	\
-+		case sf_expsign:
+
-+			if (ch_is_numeral(*ch_ptr)) {
+
-+				state = sf_exponent;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +  * @param [in] function_name
 +  * @param [in] int_variable
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_expsign\n", *ch_ptr);
+
-+				}
+
-+				state = sf_invalid;
+
 +	debug_command dcmd_##function_name(#function_name, #short_help, dcf_##function_name );	\
 +	void dcf_##function_name() {	\
 +		float value;	\
-+		case sf_exponent:
+
-+			if (ch_is_numeral(*ch_ptr)) {
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +		dc_stuff_float(&value);	\
 +		CLAMP(int_variable, lower_bounds, upper_bounds);	\
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_exponent\n", *ch_ptr);
+
-+				}
+
-+				state = sf_invalid;
+
 +/**
 + *  @class debug_command
 + *  @brief Class to aggregate a debug command with its name (as shown in the console) and short help.
-+		case sf_invalid:
+
 + *  @details
-+			SCP_string token = dc_get_token_no_advance();
+
-+			dc_printf("Syntax Error: Expected integer, found '%s'\n", token);
+
-+			throw errParse(token.c_str(), type);
+
 + */
-+	} while (state != sf_end);
+
 +public:
-+	ret = strtod(buffer_str.c_str(), &end_ptr);
+
 +	char *help;		//!< The short help string, as shown by 'help <command>'
-+	return ret;
+
 +
 +	/**
 +	* @brief Adds a debug command to the debug_commands map, if it isn't in there already.
 +	*
 +	* @details The DCF macro more or less guarantees that a command won't be duplicated on compile time. But no harm in
 +	*   some extra caution.
 +	*/
 +	debug_command(char *name, char *help, void (*func)());
 +};
 +
 +/**
 + * Dc_mode tells your function what to do.
 + * Your function _must_ process the command.
 + *
 + * It is recommended that each function have, at minimum, this switch statement:
 + *   switch (Dc_mode) {
 + *   case dcm_command:
 + *   	// process command
-+	char *ch_ptr = ch;
+
-+	char *end_ptr;
+
-+	int base = 10;
+
-+	long ret;
+
-+	state_int state = si_start;
+
-+	SCP_string buffer_str;
+
 + *   case dcm_status:
-+	while ((*ch_ptr != '\0') || is_white_space(*ch_ptr)) {
+
-+		ch_ptr++;
+
 + *
 + *   default:
-+	if (*ch_ptr == '\0') {
+
-+		if (Dc_debug_on) {
+
-+			dc_printf("<debug> [parse_long] no argument found\n");
+
 + */
-+		throw errParse("", type);
+
 +	dcm_command,	// process the command
 +	dcm_help,		// print out the help text in the form, "usage: ... \nLong description\n" );
 +	dcm_status		// print out the current status of the command.
-+		if ((ch_ptr == '\0') || is_white_space(*ch_ptr)) {
+
-+			state = si_end;
+
 +extern dc_mode Dc_mode;
 +extern bool Dc_debug_on;
-+		switch (state) {
+
-+		case si_start:
+
-+			if (ch_is_sign(*ch_ptr)) {
+
-+				state = si_sign;
+
-+				if (*ch_ptr == '-') {
+
-+					buffer_str.push_back(*ch_ptr);
+
-+				} // Else, it's positive. Positive sign isn't needed for conversion
+
-+				ch_ptr++;
+
 \ No newline at end of file
-+			} else if (ch_is_prefix(*ch_ptr)) {
+Index: debugconsole/consolecmds.cpp
-+				// prefixes must be checked before numeral, because they all start with a numeral zero
+
-+				state = si_prefix;
+--- debugconsole/consolecmds.cpp	(Revision 0)
-+				ch_ptr++;
++++ debugconsole/consolecmds.cpp	(Arbeitskopie)
 @@ -0,0 +1,162 @@
-+			} else if (ch_is_numeral(*ch_ptr)) {
+
-+				state = si_numeral;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 + * Portions of this source code are based on works by Volition, Inc. circa
 + * 1999. You may not sell or otherwise commercially exploit the source or things you
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_long] Invalid character '%c' found in si_start\n", *ch_ptr);
+
-+				}
+
-+				state = si_invalid;
+
 + *  @file consolecmds.cpp
 + *
 + *  @brief This file contains the "built-in" commands for the debug console, and is listed by the 'help' and '?' commands
-+		case si_end:
+
-+			if ((buffer_str == "") || (buffer_str == "-"))
+
-+			{
+
-+				state = si_invalid;
+
-+			} // Else, we can convert the token.
+
-+			// Do nothing, and allow the while loop exit condition to trigger
+
 +#include "debugconsole/console.h"
 +#include "debugconsole/consoleparse.h"
-+		case si_sign:
+
-+			state = process_state_sign(ch_ptr, buffer_str);
+
 +#include "io/key.h"
 +
-+		case si_prefix:
+
-+			state = process_state_prefix(ch_ptr, buffer_str, base);
+
 +
 +debug_command::debug_command(char *_name, char *_help, void (*_func)())
-+		case si_numeral_bin:
+
-+			state = process_state_numeral_bin(ch_ptr, buffer_str);
++       SCP_map<SCP_string, debug_command*>::iterator it = dc_commands.find(_name);
 +
 +       if (it != dc_commands.end()) {
-+		case si_numeral_octal:
++               Int3();         // Command already exists! Somebody didn't use the DCF macro as they should've...
-+			state = process_state_numeral_octal(ch_ptr, buffer_str);
++       }
 +
 +       dc_commands[_name] = this;
-+		case si_numeral_hex:
+
-+			state = process_state_numeral_hex(ch_ptr, buffer_str);
++       name = _name;
 +       help = _help;
 +       func = _func;
-+		case si_numeral:
+
-+			state = process_state_numeral(ch_ptr, buffer_str);
+
 +DCF( debug, "Runs a command in debug mode.")
 +{
-+		case si_invalid:
++       SCP_string command = "";
 +       Dc_debug_on = true;
-+			SCP_string token = dc_get_token_no_advance();
+
-+			dc_printf("Syntax Error: Expected integer, found '%s'\n", token);
++       dc_stuff_string_white(command);
-+			throw errParse(token.c_str(), type);
+
 +       if (command == "") {
-+	} while (state != si_end);
++               dc_printf("<debug> No command given");
 +               return;
-+	ret = strtol(buffer_str.c_str(), &end_ptr, base);
++       } // Else, command is present.
 +
-+	// This last check can be omitted once I can verify the operation of strtol in this sense
++       dc_commands_it it = dc_commands.find(command);
-+	if (end_ptr != ch_ptr) {
+
-+		dc_printf("Error: Could not convert all of the buffer '%s'.\n", buffer_str.c_str());
++       if (it == dc_commands.end()) {
-+		if (Dc_debug_on) {
++               dc_printf("<debug> Command not found: '%s'\n", command.c_str());
-+			dc_printf("<debug> Buffer value: %s\n", buffer_str.c_str());
++               return;
-+			dc_printf("<debug> Return value: %i", ret);
++       } // Else, command exists. Run it.
 +
-+		throw errParse(ch, type);
++       dc_printf("<debug> Executing command: '%s'\n", command.c_str());
 +       // try {
 +       (it->second)->func();
-+	return ret;
++       // } catch {
 +       // }
 +
 +       Dc_debug_on = false;
 +}
 +
 +DCF( help, "Displays the help list." )
 +{
 +       extern uint DBCOLS;
 +       unsigned int lines;
 +       SCP_string command = "";
 +
 +       dc_stuff_string_white(command);
 +
 +       if (command != "") {
 +               dc_commands_it it = dc_commands.find(command);
 +
-+	char *ch_ptr = ch;
++               if (it == dc_commands.end()) {
-+	char *end_ptr;
++                       dc_printf("Command not found: '%s'\n", command.c_str());
-+	int base = 10;
++                       return;
-+	ulong ret;
++               }
-+	state_int state = si_start;
+
-+	SCP_string buffer_str;
++               dc_printf((it->second)->help);
 +               return;
-+	while ((*ch_ptr != '\0') || is_white_space(*ch_ptr)) {
++       } // Else, command line is empty, print out the help list
-+		ch_ptr++;
+
 +       dc_printf("FreeSpace Open Debug Console\n");
 +       dc_printf(" These commands are defined internally.\n");
-+	if (*ch_ptr == '\0') {
++       dc_printf(" Typing 'help function_name' will give the short help on the function.\n");
-+		if (Dc_debug_on) {
++       dc_printf(" Some functions may have detailed help, try passing \"help\" or \"--help\" to them.");
-+			dc_printf("<debug> [parse_long] no argument found\n");
++       dc_printf(" F3 selects last command line. Up and Down arrow keys scroll through the command history\n");
 +       dc_printf("\n");
-+		throw errParse("", type);
+
 +       dc_printf(" Available commands:\n");
 +       lines = 0;
 +       for (dc_commands_it it = dc_commands.begin(); it != dc_commands.end(); ++it) {
-+		if ((ch_ptr == '\0') || is_white_space(*ch_ptr)) {
++               if (lines >= (DBCOLS - 1)) {
-+			state = si_end;
++                       if (dc_pause_output(lines) == true) {
 +                               break;
 +                       }
 +               }
-+		switch (state) {
+
-+		case si_start:
++               dc_printf(" %s\t\t- %s", (it->second)->name, (it->second)->help);
-+			if (ch_is_prefix(*ch_ptr)) {
++               ++lines;
-+				// prefixes must be checked before numeral, because they all start with a numeral zero
++       }
-+				state = si_prefix;
+
-+				ch_ptr++;
+
 +debug_command dc_man("man", "Also displays the help list", dcf_help);
-+			} else if (ch_is_numeral(*ch_ptr)) {
+
-+				state = si_numeral;
+
-+				buffer_str.push_back(*ch_ptr);
+
-+				ch_ptr++;
+
 +
 +DCF( shell, "Change/set various console-related settings.\n" )
-+				if (Dc_debug_on) {
+
-+					dc_printf("<debug> [parse_long] Invalid character '%s' found in si_start\n", *ch_ptr);
++       switch (Dc_mode) {
-+				}
++       case dcm_command:
-+				state = si_invalid;
++               dc_printf("Sorry, This command is not implemented yet...");
 +               break;
 +
 +       case dcm_help:
-+		case si_end:
++               dc_printf("Shell: Change/set various console-related settings.\n");
-+			if (buffer_str == "")
++               dc_printf(" Available arguments:\n");
-+			{
++               dc_printf("\t-font       - Change the console font");
-+				state = si_invalid;
++               dc_printf("\t-resize     - Resize the console window\n");
-+			} // Else, we can convert the token.
++               dc_printf("\t-resize_buf - Resize the console buffer\n");
-+			// Do nothing, and allow the while loop exit condition to trigger
++               break;
 +
 +       case dcm_status:
-+		case si_sign:
++               dc_printf("<shell> No status available.\n");
-+			state = process_state_sign(ch_ptr, buffer_str);
++               break;
 +
 +       default:
-+		case si_prefix:
++               dc_printf("<shell> Unknown command mode %i\n", Dc_mode);
-+			state = process_state_prefix(ch_ptr, buffer_str, base);
++       }
 +}
 +
-+		case si_numeral_bin:
+
-+			state = process_state_numeral_bin(ch_ptr, buffer_str);
+
 +       switch (Dc_mode) {
 +       case dcm_command:
-+		case si_numeral_octal:
++               dc_printf("Sorry, This command is not implemented yet...");
-+			state = process_state_numeral_octal(ch_ptr, buffer_str);
++               break;
 +
 +       case dcm_help:
-+		case si_numeral_hex:
++               dc_printf("Pause: Pause/Unpause the game.\n");
-+			state = process_state_numeral_hex(ch_ptr, buffer_str);
++               dc_printf(" Only available in singleplayer games.\n");
 +               break;
 +
-+		case si_numeral:
++       case dcm_status:
-+			state = process_state_numeral(ch_ptr, buffer_str);
++               dc_printf("No status available.\n");
 +               break;
 +
-+		case si_invalid:
++       default:
 +               dc_printf("<pause> Unknown command mode %i\n", Dc_mode);
-+			SCP_string token = dc_get_token();
++       }
-+			dc_printf("Syntax Error: Expected unsigned integer, found '%s'\n", token);
+
-+			throw errParse(token.c_str(), type);
+Index: debugconsole/consoleparse.cpp
 ===================================================================
-+	} while (state != si_end);
+--- debugconsole/consoleparse.cpp	(Revision 0)
 +++ debugconsole/consoleparse.cpp	(Arbeitskopie)
-+	ret = strtoul(buffer_str.c_str(), &end_ptr, base);
+@@ -0,0 +1,1453 @@
 +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-+	// This last check can be omitted once I can verify the operation of strtol in this sense
+
-+	if (end_ptr != ch_ptr) {
+
-+		dc_printf("Error: Could not convert all of the buffer '%s'.\n", buffer_str.c_str());
+
-+		if (Dc_debug_on) {
+
-+			dc_printf("<debug> Buffer value: %s\n", buffer_str.c_str());
+
-+			dc_printf("<debug> Return value: %i", ret);
+
 +/////////////////
-+		throw errParse(ch, type);
+
 +// Breakpoints are set at places that need testing:
 +// * the value of endptr strtol and strtoul needs to investigated, according to cplusplus.com, *endptr = end of the string that was successfully converted
-+	return ret;
+
 +////////////////
 +#include "debugconsole/consoleparse.h"
 +
 +#include "debugconsole/console.h"
 +#include "globalincs/pstypes.h"
 +#include "parse/parselo.h"
 +
 +#include <cstring>
 +#include <limits.h>
 +
 +// ========================= LOCALS =========================
 +char Command_string[MAX_CLI_LEN];
 +char *Cp = NULL;
 +
-+	double value_d;
+
 +       si_start   = 0,
-+	dc_ignore_gray_space();
++       si_end     = 1,
 +       si_invalid,
-+	value_d = dc_parse_double(Cp, DCT_FLOAT);
++       si_sign,        //!< Sign character, '-' '+'
 +       si_prefix,      //!< prefix character sequence, 0b, 0o, or 0x
-+	if ((value_d < FLT_MAX) && (value_d > FLT_MIN)) {
++       si_numeral,     //!< Numeral state, 0 - 9
-+		*f = value_d;
++       si_numeral_bin,     //!< Numeral altstate, 0, 1
-+		dc_get_token();    // Advance Cp
++       si_numeral_octal,   //!< Numeral altstate, 0 - 7
 +       si_numeral_hex      //!< Numeral altstate, 0 - 9 and 'a' - 'f'
 +};
-+		throw errParse(dc_get_token(), DCT_FLOAT);
+
 +enum state_float {
 +       sf_start = 0,
 +       sf_end = 1,
 +       sf_invalid,
 +       sf_sign,                //!< Sign character for mantessa
-+	long value_l;
++       sf_whole,               //!< Whole value numeral
 +       sf_decimal,             //!< Decimal character
-+	dc_ignore_gray_space();
++       sf_fraction,    //!< Fractional value numeral
 +       sf_expprefix,   //!< Exponent prefix, 'e', 'E'
-+	value_l = dc_parse_long(Cp, DCT_INT);
++       sf_expsign,             //!< Exponent sign
 +       sf_exponent             //!< Exponent value numeral
-+	if ((value_l < INT_MAX) && (value_l > INT_MIN)) {
+
-+		*i = value_l;
+
-+		dc_get_token();    // Advance Cp
+
 +bool ch_is_numeral(char ch);
 +bool ch_is_decimal(char ch);
-+		throw errParse(dc_get_token(), DCT_INT);
+
 +bool ch_is_octal(char ch);
 +bool ch_is_hex(char ch);
 +
 +bool ch_is_prefix(char ch);
 +bool ch_is_binary_prefix(char ch);
-+	ulong value_l;
+
 +bool ch_is_hex_prefix(char ch);
-+	dc_ignore_gray_space();
+
 +
-+	value_l = dc_parse_long(Cp, DCT_INT);
+
 +char *dc_get_token_no_advance(void);
-+	if (value_l < UINT_MAX) {
+
-+		*i = value_l;
+
-+		dc_get_token();    // Advance Cp
+
 +ulong  dc_parse_ulong(char *ch, dc_token type);
 +
-+		throw errParse(dc_get_token(), DCT_INT);
+
 +state_int process_state_sign(char *ch_ptr, SCP_string &buffer_str);
 +state_int process_state_numeral(char *ch_ptr, SCP_string &buffer_str);
 +state_int process_state_numeral_bin(char *ch_ptr, SCP_string &buffer_str);
 +state_int process_state_numeral_hex(char *ch_ptr, SCP_string &buffer_str);
 +state_int process_state_numeral_octal(char *ch_ptr, SCP_string &buffer_str);
-+	ulong value_ul;
+
 +
-+	dc_ignore_gray_space();
+
 +// Character identification
-+	value_ul = dc_parse_ulong(Cp, DCT_UBYTE);
+
 +bool ch_is_sign(char ch)
-+	// Since some system's chars may be greater than 1 byte, we can't use UCHAR_MAX for a UBYTE
+
-+	if ((value_ul <= 255) && (value_ul >= 0)) {
++       return ((ch == '-') || (ch == '+'));
-+		*i = value_ul;
+
-+		dc_get_token();    // Advance Cp
+
 +inline
 +bool ch_is_numeral(char ch)
-+		throw errParse(dc_get_token(), DCT_UBYTE);
+
 +       return ((ch >= '0') && (ch <= '9'));
 +}
 +
 +inline
 +bool ch_is_decimal(char ch)
-+	SCP_string token;
+
 +       return (ch == '.');
-+	token = dc_get_token();
+
 +
-+	if ((token == "yes")
+
-+		|| (token == "true")
+
-+		|| (token == "ja")          // German
+
-+		|| (token == "Oui")         // French
++       return ((ch == '0') || (ch == '1'));
-+		|| (token == "si")          // Spanish
+
-+//		|| (token == "ita vero")    // Latin, not supported
+
-+		|| (token == "HIja") || (token == "HISLaH"))    // Klingon
+
 +bool ch_is_octal(char ch)
-+		*b = true;
+
 +       return ((ch >= '0') && (ch <= '7'));
-+	} else if ((token == "no")
+
-+		|| (token == "false")
+
-+		|| (token == "nein")    // German
+
-+		|| (token == "Non")     // French
+
-+//		|| (token == "no")      // Spanish, redundant with English "no"
+
-+//		|| (token == "minime")  // Latin, not supported
++       return (((ch >= '0') && (ch <= '9')) || ((ch >= 'a') && (ch <= 'f')) || ((ch >= 'A') || (ch <= 'F')));
-+		|| (token == "ghobe'"))  // Klingon
+
 +
-+		*b = false;
+
 +bool ch_is_prefix(char ch)
 +{
-+		throw errParse(token.c_str(), DCT_BOOL);
++       return (ch == '0');
 +}
 +
 +inline
 +bool ch_is_binary_prefix(char ch)
 +{
 +       return ((ch == 'b') || (ch == 'B'));
-+	bool value_b;
+
 +
-+	dc_stuff_boolean(&value_b);
+
 +bool ch_is_octal_prefix(char ch)
-+	value_b ? *i = 1 : *i = 0;
+
 +       return ((ch == 'o') || (ch == 'O'));
 +}
 +
 +inline
 +bool ch_is_hex_prefix(char ch)
 +{
 +       return ((ch == 'x') || (ch == 'X'));
 +}
 +
 +inline
 +bool ch_is_exp_prefix(char ch)
 +{
-+	size_t count = 0;
++       return ((ch == 'e') || (ch == 'E'));
-+	char *c_ptr = Cp;
+
 +
-+	Assert(Cp);
+
-+	Assert(out_str);
+
 +/**
-+	// Advance past grayspace, stopping at null terminator
+
-+	while (is_gray_space(*c_ptr) && (*c_ptr != '\0')) {
+
-+		c_ptr++;
+
 +       char token[MAX_TOKEN_LENGTH];
 +       char *begin_ptr;
-+	// Bail if we're at the terminator
+
-+	if (*c_ptr == '\0') {
++       dc_ignore_gray_space();
-+		throw errParse("Nothing!", DCT_STRING);
+
 +       begin_ptr = Cp;
 +
 +       while ((*Cp != '\0') && !is_gray_space(*Cp)) {
-+	// Scan the string, stopping at null terminator, or before we overflow
++               Cp++;
-+	while ((*c_ptr != '\0') && (count < maxlen)) {
++       }
-+		count++;
+
 +       strncpy(token, begin_ptr, (Cp - begin_ptr));
 +       return token;
-+	// Bail if overflow
+
-+	if (count == maxlen) {
+
-+		throw errParse("", DCT_STRING);
+
 + * @brief Returns a single token, but does not advances Cp
 + */
 +char * dc_get_token_no_advance(void) {
-+	// Copy string into out_str
++       char token[MAX_TOKEN_LENGTH];
-+	strncpy(out_str, Cp, (c_ptr - Cp));
++       char *begin_ptr;
 +       char *ch_ptr = Cp;
-+	// Advance the parser pointer past what we copied
+
-+	Cp = c_ptr;
++       while ((*ch_ptr != '\0') && is_gray_space(*ch_ptr)) {
 +               ch_ptr++;
 +       }
 +
 +       begin_ptr = ch_ptr;
 +
 +       while ((*ch_ptr != '\0') && !is_gray_space(*ch_ptr)) {
 +               ch_ptr++;
-+ * @details
++       }
 +
 +       strncpy(token, begin_ptr, (ch_ptr - begin_ptr));
 +       return token;
-+	size_t count = 0;
+
-+	char *c_ptr = Cp;
+
 +void dc_ignore_white_space(void) {
-+	Assert(Cp);
++       while (is_white_space(*Cp) && (*Cp != '\0')) {
 +               Cp++;
-+	// Advance past grayspace, stopping at null terminator
++       }
-+	while (is_gray_space(*c_ptr) && (*c_ptr != '\0')) {
+
-+		c_ptr++;
+
 +void dc_ignore_gray_space(void) {
 +       while (is_gray_space(*Cp) && (*Cp != '\0')) {
-+	// Bail if we're at the terminator
++               Cp++;
-+	if (*c_ptr == '\0') {
++       }
-+		throw errParse("Nothing!", DCT_STRING);
+
 +
 +// Required/Optional Strings
 +bool dc_required_string(char *pstr)
-+	// Scan the string, stopping at null terminator, or before we overflow
+
-+	while ((*c_ptr != '\0') && (count < out_str.max_size())) {
++       char *str_found = NULL;
-+		count++;
+
 +       dc_ignore_gray_space();
 +
-+	// Bail if overflow
++       if (strnicmp(pstr, Cp, strlen(pstr))) {
-+	if (count == out_str.max_size()) {
++               str_found = pstr;
-+		throw errParse("", DCT_STRING);
++       }
 +
 +       if (str_found != NULL) {
 +               // Found a required string
-+	// Copy string into out_str
++               if (Dc_debug_on) {
-+	out_str.copy(Cp, (c_ptr - Cp));
++                       dc_printf("<debug> Found required string [%s}\n", str_found);
 +               }
-+	// Advance the parser pointer past what we copied
+
-+	Cp = c_ptr;
++               Cp += strlen(str_found);
 +       } else {
 +               // Didn't find a required string.
 +               throw errParseString(dc_get_token_no_advance(), pstr);
 +       }
 +       return true;
 +}
 +
 +int dc_required_string_either(char *str1, char *str2)
 +{
 +       char *str_found = NULL;
-+	size_t count = 0;
++       int i = -1;
-+	char *c_ptr = Cp;
+
 +       dc_ignore_gray_space();
-+	Assert(Cp);
+
-+	Assert(out_str);
++       if (strncmp(str1, Cp, strlen(str1) == 0)) {
 +               str_found = str1;
-+	// Advance past grayspace, stopping at null terminator
++               i = 0;
-+	while (is_gray_space(*c_ptr) && (*c_ptr != '\0')) {
++       } else if (strncmp(str2, Cp, strlen(str2) == 0)) {
-+		c_ptr++;
++               str_found = str2;
 +               i = 1;
 +       }
-+	// Bail if we're at the terminator
+
-+	if (*c_ptr == '\0') {
++       if (i > -1) {
-+		throw errParse("Nothing!", DCT_STRING);
++               // Found a required string
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> Found required string [%s}\n", str_found);
 +               }
-+	// Scan the string, stopping at grayspace, null terminator, or before we overflow
+
-+	while (!is_gray_space(*c_ptr) && (*c_ptr != '\0') && (count < maxlen)) {
++               Cp += strlen(str_found);
-+		count++;
++       } else {
 +               // Didn't find a required string.
 +               throw errParseString(dc_get_token_no_advance(), str1, str2);
-+	// Bail if overflow
++       }
-+	if (count == maxlen) {
+
-+		throw errParse("", DCT_STRING);
++       return i;
 +}
 +
 +int dc_required_string_3(char *str1, char *str2, char *str3)
-+	// Copy string into out_str
+
-+	strncpy(out_str, Cp, (c_ptr - Cp));
++       char *str_found = NULL;
 +       int i = -1;
-+	// Advance the parser pointer past what we copied
+
-+	Cp = c_ptr;
++       dc_ignore_gray_space();
 +
 +       if (strncmp(str1, Cp, strlen(str1) == 0)) {
 +               str_found = str1;
 +               i = 0;
-+	size_t count = 0;
++       } else if (strncmp(str2, Cp, strlen(str2) == 0)) {
-+	char *c_ptr = Cp;
++               str_found = str2;
 +               i = 1;
-+	Assert(Cp);
++       } else if (strncmp(str3, Cp, strlen(str3) == 0)) {
 +               str_found = str3;
-+	// Advance past grayspace, stopping at null terminator
++               i = 2;
-+	while (is_gray_space(*c_ptr) && (*c_ptr != '\0')) {
++       }
-+		c_ptr++;
+
 +       if (i > -1) {
 +               // Found a required string
-+	// Bail if we're at the terminator
++               if (Dc_debug_on) {
-+	if (*c_ptr == '\0') {
++                       dc_printf("<debug> Found required string [%s}\n", str_found);
-+		throw errParse("Nothing!", DCT_STRING);
++               }
 +
 +               Cp += strlen(str_found);
 +       } else {
-+	// Scan the string, stopping at grayspace, null terminator, or before we overflow
++               // Didn't find a required string.
-+	while (!is_gray_space(*c_ptr) && (*c_ptr != '\0') && (count < out_str.max_size())) {
++               throw errParseString(dc_get_token_no_advance(), str1, str2, str3);
-+		count++;
++       }
 +
 +       return i;
-+	// Bail if overflow
+
-+	if (count == out_str.max_size()) {
+
-+		throw errParse("", DCT_STRING);
+
 +{
 +       char *str_found = NULL;
 +       int i = -1;
-+	// Copy string into out_str
+
-+	out_str.copy(Cp, (c_ptr - Cp));
++       dc_ignore_gray_space();
 +
-+	// Advance the parser pointer past what we copied
++       if (strncmp(str1, Cp, strlen(str1) == 0)) {
-+	Cp = c_ptr;
++               str_found = str1;
 +               i = 0;
 +       } else if (strncmp(str2, Cp, strlen(str2) == 0)) {
 +               str_found = str2;
 +               i = 1;
 +       } else if (strncmp(str3, Cp, strlen(str3) == 0)) {
 +               str_found = str3;
 +               i = 2;
 +       } else if (strncmp(str4, Cp, strlen(str4) == 0)) {
 +               str_found = str4;
 +               i = 3;
 +       }
 +
 +       if (i > -1) {
 +               // Found a required string
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> Found required string [%s}\n", str_found);
 +               }
 +
 +               Cp += strlen(str_found);
-+	dc_ignore_gray_space();
++       } else {
 +               // Didn't find a required string.
-+	if (Cp != '\0') {
++               throw errParseString(dc_get_token_no_advance(), str1, str2, str3, str4);
-+		dc_stuff_float(f);
++       }
-+		return true;
+
 +       return i;
 +}
-+		*f = 0;
+
-+		return false;
+
 +{
 +       dc_ignore_gray_space();
 +
 +       if (strncmp(pstr, Cp, strlen(pstr) != 0)) {
 +               return false;
 +       } // Else, optional string was found
 +
 +       if (Dc_debug_on) {
 +               dc_printf("<debug> Found optional string [%s]\n", pstr);
 +       }
 +
 +       Cp += strlen(pstr);
 +       return true;
 +}
 +
 +bool dc_optional_string_either(char *str1, char *str2)
 +{
 +       char * str_found = NULL;
-+	dc_ignore_gray_space();
+
 +       dc_ignore_gray_space();
-+	if (Cp != '\0') {
+
-+		dc_stuff_int(i);
++       if (strncmp(str1, Cp, strlen(str1)) == 0) {
-+		return true;
++               str_found = str1;
 +       } else if (strncmp(str2, Cp, strlen(str2)) == 0) {
-+		*i = 0;
++               str_found = str2;
-+		return false;
++       } else {
 +               return false;
 +       }
 +
 +       if (Dc_debug_on) {
 +               dc_printf("<debug> Found optional string [%s]\n",str_found);
 +       }
 +
 +       Cp += strlen(str_found);
 +       return true;;
 +}
 +
 +// Parsers
 +
 +/**
 + * @brief Initializes the DC command line parser
 + */
 +void dc_parse_init(SCP_string &str)
 +{
-+	dc_ignore_gray_space();
++       strcpy(Command_string, str.c_str());
 +       Cp = Command_string;
-+	if (Cp != '\0') {
+
-+		dc_stuff_uint(i);
+
-+		return true;
+
 + * @brief Parses a double-precision floating point type. Supports, Whole, Fractional, and Mixed numbers, and supports
-+		*i = 0;
+
-+		return false;
+
 + * @param[in] ch   Points to the start of the string to parse
 + * @param[in] type The expected type. is thrown along with ch when an unexpected/malformed float is found
 + *
 + * @details
 + *   The returned double may be cast to a single-precision float, but be sure to check it before doing so!
 + */
 +double dc_parse_double(char *ch, dc_token type) {
 +       char *ch_ptr = ch;
 +       char *end_ptr;
 +       double ret;
 +       state_float state = sf_start;
 +       SCP_string buffer_str;
 +
 +       do {
 +               if ((ch_ptr == '\0') || is_white_space(*ch_ptr)) {
 +                       state = sf_end;
 +               }
 +
-+	dc_ignore_gray_space();
++               switch (state) {
 +               case sf_start:
-+	if (Cp != '\0') {
++                       if (ch_is_sign(*ch_ptr)) {
-+		dc_stuff_ubyte(i);
++                               state = sf_sign;
-+		return true;
++                               if (*ch_ptr == '-') {
 +                                       buffer_str.push_back(*ch_ptr);
-+		*i = 0;
++                               } // Else, sign is positive, and isn't needed on the buffer
-+		return false;
++                               ch_ptr++;
 +
 +                       } else if (ch_is_numeral(*ch_ptr)) {
 +                               state = sf_whole;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else if (ch_is_decimal(*ch_ptr)) {
 +                               state = sf_decimal;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else {
 +                               if (Dc_debug_on) {
 +                                       dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_start\n", *ch_ptr);
 +                               }
 +                               state = sf_invalid;
 +
 +                       }
-+	dc_ignore_gray_space();
++                       break;
 +               case sf_end:
-+	if (Cp != '\0') {
++                       if ((buffer_str == "") || (buffer_str == "-"))
-+		dc_stuff_boolean(b);
++                       {
-+		return true;
++                               state = sf_invalid;
 +                       } // Else, we can convert the token.
-+		*b = false;
++                       // Do nothing, and allow the while loop exit condition to trigger
-+		return false;
++                       break;
 +               case sf_sign:
 +                       if (ch_is_numeral(*ch_ptr)) {
 +                               state = sf_whole;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else if (ch_is_decimal(*ch_ptr)) {
 +                               state = sf_decimal;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else {
 +                               if (Dc_debug_on) {
 +                                       dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_sign\n", *ch_ptr);
 +                               }
 +                               state = sf_invalid;
 +
 +                       }
-+	dc_ignore_gray_space();
++                       break;
 +               case sf_whole:
-+	if (Cp != '\0') {
++                       if (ch_is_numeral(*ch_ptr)) {
-+		dc_stuff_boolean(i);
++                               buffer_str.push_back(*ch_ptr);
-+		return true;
++                               ch_ptr++;
 +
-+		*i = 0;
++                       } else if (ch_is_decimal(*ch_ptr)) {
-+		return false;
++                               state = sf_decimal;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else if (ch_is_exp_prefix(*ch_ptr)) {
 +                               state = sf_expprefix;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else {
 +                               if (Dc_debug_on) {
 +                                       dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_whole\n", *ch_ptr);
 +                               }
 +                               state = sf_invalid;
 +
 +                       }
 +                       break;
 +               case sf_decimal:
 +                       if (ch_is_numeral(*ch_ptr)) {
 +                               state = sf_fraction;
-+	dc_ignore_gray_space();
++                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
-+	if (Cp != '\0') {
+
-+		dc_stuff_string_white(str, len);
++                       } else if (ch_is_exp_prefix(*ch_ptr)) {
-+		return true;
++                               state = sf_expprefix;
 +                               buffer_str.push_back(*ch_ptr);
-+		*str = '\0';
++                               ch_ptr++;
-+		return false;
+
 +                       } else {
 +                               if (Dc_debug_on) {
 +                                       dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_decimal\n", *ch_ptr);
 +                               }
 +                               state = sf_invalid;
 +
 +                       }
 +                       break;
 +               case sf_fraction:
 +                       if (ch_is_numeral(*ch_ptr)) {
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else if (ch_is_exp_prefix(*ch_ptr)) {
-+ *   If there's a token on the command line, but we can't fit it inside of str (token.size() >= str.max_size()), then
++                               state = sf_expprefix;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else {
-+	dc_ignore_gray_space();
++                               if (Dc_debug_on) {
 +                                       dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_faction\n", *ch_ptr);
-+	if (Cp != '\0') {
++                               }
-+		dc_stuff_string_white(str);
++                               state = sf_invalid;
-+		return true;
+
 +                       }
-+		str = "";
++                       break;
-+		return false;
++               case sf_expprefix:
 +                       if (ch_is_sign(*ch_ptr)) {
 +                               state = sf_expsign;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
 +
 +                       } else if (ch_is_numeral(*ch_ptr)) {
-+	state_int state = si_invalid;
++                               state = sf_exponent;
 +                               buffer_str.push_back(*ch_ptr);
-+	if (ch_is_binary_prefix(*ch_ptr)) {
++                               ch_ptr++;
-+		state = si_numeral_bin;
+
-+		base = 2;
++                       } else {
-+		ch_ptr++;
++                               if (Dc_debug_on) {
 +                                       dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_expprefix\n", *ch_ptr);
-+	} else if (ch_is_octal_prefix(*ch_ptr)) {
++                               }
-+		state = si_numeral_octal;
++                               state = sf_invalid;
-+		base = 8;
+
-+		ch_ptr++;
++                       }
 +                       break;
-+	} else if (ch_is_hex_prefix(*ch_ptr)) {
++               case sf_expsign:
-+		state = si_numeral_hex;
++                       if (ch_is_numeral(*ch_ptr)) {
-+		base = 16;
++                               state = sf_exponent;
-+		ch_ptr++;
++                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
-+	} else if (ch_is_numeral(*ch_ptr)) {
+
-+		// User passed something like 0123
++                       } else {
-+		// Just ignore the first 0, if the user passed something like 00001 then state si_numeral can handle it
++                               if (Dc_debug_on) {
-+		state = si_numeral;
++                                       dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_expsign\n", *ch_ptr);
-+		ch_ptr++;
++                               }
 +                               state = sf_invalid;
-+	} else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
+
-+		// Just a 0 was passed.
++                       }
-+		buffer_str.push_back('0');
++                       break;
-+		state = si_end;
++               case sf_exponent:
 +                       if (ch_is_numeral(*ch_ptr)) {
 +                               buffer_str.push_back(*ch_ptr);
-+		if (Dc_debug_on) {
++                               ch_ptr++;
-+			dc_printf("<debug> [parse_long] Invalid character '%c' found in si_prefix\n", *ch_ptr);
+
 +                       } else {
-+		state = si_invalid;
++                               if (Dc_debug_on) {
 +                                       dc_printf("<debug> [parse_double] Invalid character '%c' found in sf_exponent\n", *ch_ptr);
 +                               }
-+	return state;
++                               state = sf_invalid;
 +
 +                       }
 +                       break;
 +               case sf_invalid:
-+	state_int state;
++               default:
-+	if (ch_is_numeral(*ch_ptr)) {
++                       SCP_string token = dc_get_token_no_advance();
-+		state = si_numeral;
++                       dc_printf("Syntax Error: Expected integer, found '%s'\n", token.c_str());
-+		buffer_str.push_back(*ch_ptr);
++                       throw errParse(token.c_str(), type);
-+		ch_ptr++;
++               }
 +       } while (state != sf_end);
-+	} else if (ch_is_prefix(*ch_ptr)) {
+
-+		state = si_prefix;
++       ret = strtod(buffer_str.c_str(), &end_ptr);
-+		ch_ptr++;
+
 +       return ret;
-+	} else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
+
-+		// Error condition, but let si_end handle it (consistant with how the numerals handle it)
+
-+		state = si_end;
+
 + * @brief Parses a long integral type. Supports decimal, binary, octal, and hexidecimal strings.
 + *
-+		if (Dc_debug_on) {
+
-+			dc_printf("<debug> [parse_long] Invalid character '%c' found in si_sign\n", *ch_ptr);
+
 + *
-+		state = si_invalid;
+
 + * ! Non-decimal values must be prefixed by their corresponding sequence. Binary: "0b", Octal: "0o", Hex: "0x"
 + *
-+	return state;
+
 + *
 + *   The only thing left making this function specific to the DC is the expected type. So, if you want to use this
 + *   for parsing something other than the debug CL, you'll have to make a set of errParse classes that take a
 + *   different expected type.
-+	state_int state = si_numeral;
+
 +long dc_parse_long(char *ch, dc_token type) {
-+	if (ch_is_numeral(*ch_ptr)) {
++       char *ch_ptr = ch;
-+		buffer_str.push_back(*ch_ptr);
++       char *end_ptr;
-+		ch_ptr++;
++       int base = 10;
 +       long ret;
-+	} else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
++       state_int state = si_start;
-+		state = si_end;
++       SCP_string buffer_str;
 +
 +       while ((*ch_ptr != '\0') || is_white_space(*ch_ptr)) {
-+		// Invalid character, throw and bail
++               ch_ptr++;
-+		if (Dc_debug_on) {
++       }
-+			dc_printf("<debug> [parse_long] Invalid character '%c' found in si_numeral\n", *ch_ptr);
+
 +       if (*ch_ptr == '\0') {
-+		state = si_invalid;
++               if (Dc_debug_on) {
 +                       dc_printf("<debug> [parse_long] no argument found\n");
 +               }
-+	return state;
++               throw errParse("", type);
 +       }
 +
 +       do {
 +               if ((ch_ptr == '\0') || is_white_space(*ch_ptr)) {
-+	state_int state = si_numeral_bin;
++                       state = si_end;
 +               }
-+	if (ch_is_binary(*ch_ptr)) {
+
-+		buffer_str.push_back(*ch_ptr);
++               switch (state) {
-+		ch_ptr++;
++               case si_start:
 +                       if (ch_is_sign(*ch_ptr)) {
-+	} else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
++                               state = si_sign;
-+		state = si_end;
++                               if (*ch_ptr == '-') {
 +                                       buffer_str.push_back(*ch_ptr);
 +                               } // Else, it's positive. Positive sign isn't needed for conversion
-+		if (Dc_debug_on) {
++                               ch_ptr++;
-+			dc_printf("<debug> [parse_long] Invalid character '%c' found in si_numeral_bin\n", *ch_ptr);
+
 +                       } else if (ch_is_prefix(*ch_ptr)) {
-+		state = si_invalid;
++                               // prefixes must be checked before numeral, because they all start with a numeral zero
 +                               state = si_prefix;
 +                               ch_ptr++;
-+	return state;
++
 +                       } else if (ch_is_numeral(*ch_ptr)) {
 +                               state = si_numeral;
 +                               buffer_str.push_back(*ch_ptr);
 +                               ch_ptr++;
-+	state_int state = si_numeral_hex;
++
 +                       } else {
-+	if (ch_is_hex(*ch_ptr)) {
++                               if (Dc_debug_on) {
-+		buffer_str.push_back(*ch_ptr);
++                                       dc_printf("<debug> [parse_long] Invalid character '%c' found in si_start\n", *ch_ptr);
-+		ch_ptr++;
++                               }
 +                               state = si_invalid;
-+	} else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
+
-+		state = si_end;
++                       }
 +                       break;
 +               case si_end:
-+		if (Dc_debug_on) {
++                       if ((buffer_str == "") || (buffer_str == "-"))
-+			dc_printf("<debug> [parse_long] Invalid character '%c' found in si_numeral_hex\n", *ch_ptr);
++                       {
 +                               state = si_invalid;
-+		state = si_invalid;
++                       } // Else, we can convert the token.
 +                       // Do nothing, and allow the while loop exit condition to trigger
-+	return state;
++                       break;
 +
 +               case si_sign:
 +                       state = process_state_sign(ch_ptr, buffer_str);
 +                       break;
-+	state_int state = si_numeral_octal;
+
 +               case si_prefix:
-+	if (ch_is_octal(*ch_ptr)) {
++                       state = process_state_prefix(ch_ptr, buffer_str, base);
-+		buffer_str.push_back(*ch_ptr);
++                       break;
-+		ch_ptr++;
+
 +               case si_numeral_bin:
-+	} else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
++                       state = process_state_numeral_bin(ch_ptr, buffer_str);
-+		state = si_end;
++                       break;
 +
 +               case si_numeral_octal:
-+		// Invalid character, throw and bail
++                       state = process_state_numeral_octal(ch_ptr, buffer_str);
-+		if (Dc_debug_on) {
++                       break;
-+			dc_printf("<debug> [parse_long] Invalid character '%c' found in si_numeral_octal\n", *ch_ptr);
+
 +               case si_numeral_hex:
-+		state = si_invalid;
++                       state = process_state_numeral_hex(ch_ptr, buffer_str);
 +                       break;
-+	return state;
+
 +               case si_numeral:
-Index: code/debugconsole/consoleparse.h
++                       state = process_state_numeral(ch_ptr, buffer_str);
 +                       break;
-index 0000000..9358476
+
---- code/debugconsole/consoleparse.h	(revision 0)
++               case si_invalid:
-+++ code/debugconsole/consoleparse.h	(working copy)
++               default:
 +                       SCP_string token = dc_get_token_no_advance();
 +                       dc_printf("Syntax Error: Expected integer, found '%s'\n", token.c_str());
 +                       throw errParse(token.c_str(), type);
 +               }
 +       } while (state != si_end);
 +
 +       ret = strtol(buffer_str.c_str(), &end_ptr, base);
 +
 +       // This last check can be omitted once I can verify the operation of strtol in this sense
 +       if (end_ptr != ch_ptr) {
 +               dc_printf("Error: Could not convert all of the buffer '%s'.\n", buffer_str.c_str());
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> Buffer value: %s\n", buffer_str.c_str());
 +                       dc_printf("<debug> Return value: %i", ret);
 +               }
 +               throw errParse(ch, type);
 +       }
 +
 +       return ret;
 +}
 +
 +/**
 + * @brief Parses an unsigned long integral type. Supports decimal, binary, octal, and hexidecimal strings.
-+	DCT_NONE = 0,
+
-+	DCT_STRING,
+
-+	DCT_FLOAT,
+
-+	DCT_INT,
+
-+	DCT_UINT,
+
-+	DCT_BYTE,
+
-+	DCT_UBYTE,
+
-+	DCT_BOOL
+
 + *   for parsing something other than the debug CL, you'll have to make a set of errParse classes that take a
 + *   different expected type.
 + */
 +ulong dc_parse_ulong(char *ch, dc_token type) {
 +       char *ch_ptr = ch;
 +       char *end_ptr;
 +       int base = 10;
 +       ulong ret;
 +       state_int state = si_start;
 +       SCP_string buffer_str;
 +
 +       while ((*ch_ptr != '\0') || is_white_space(*ch_ptr)) {
 +               ch_ptr++;
 +       }
 +
-+	SCP_string found_token;
++       if (*ch_ptr == '\0') {
-+	dc_token expected_type;
++               if (Dc_debug_on) {
 +                       dc_printf("<debug> [parse_long] no argument found\n");
 +               }
-+	*  @brief Invalid/Unexpected token constructor
++               throw errParse("", type);
-+	*  @param [in] found_str The token that was found
++       }
-+	*  @param [in] expected_dct The token type that was expected
+
 +       do {
-+	errParse(const char *found_str, dc_token expected_dct)
++               if ((ch_ptr == '\0') || is_white_space(*ch_ptr)) {
-+		: found_token(found_str), expected_type(expected_dct)
++                       state = si_end;
 +               }
 +
 +
 +               switch (state) {
 +               case si_start:
 +                       if (ch_is_prefix(*ch_ptr)) {
 +                               // prefixes must be checked before numeral, because they all start with a numeral zero
 +                               state = si_prefix;
 +                               ch_ptr++;
 +
 +                       } else if (ch_is_numeral(*ch_ptr)) {
 +                               state = si_numeral;
-+	SCP_string expected_token1;
++                               buffer_str.push_back(*ch_ptr);
-+	SCP_string expected_token2;
++                               ch_ptr++;
-+	SCP_string expected_token3;
++
-+	SCP_string expected_token4;
++                       } else {
 +                               if (Dc_debug_on) {
-+	 *  @brief Invalid/Unexpected token constructor.
++                                       dc_printf("<debug> [parse_long] Invalid character '%s' found in si_start\n", *ch_ptr);
-+	 *
++                               }
-+	 *  @param [in] found_str The string that was found
++                               state = si_invalid;
-+	 *  @param [in] str The token that was expected
+
 +                       }
-+	errParseString(char *found_str, char *str)
++                       break;
-+	    : errParse(found_str, DCT_STRING), expected_token1(str)
++               case si_end:
 +                       if (buffer_str == "")
 +                       {
 +                               state = si_invalid;
 +                       } // Else, we can convert the token.
-+	 *  @brief Invalid/Unexpected token constructor.
++                       // Do nothing, and allow the while loop exit condition to trigger
-+	 *
++                       break;
-+	 *  @param [in] found_str The string that was found
+
-+	 *  @param [in] str1 The first token that was expected
++               case si_sign:
-+	 *  @param [in] str2 The second token that was expected
++                       state = process_state_sign(ch_ptr, buffer_str);
 +                       break;
-+	errParseString(char *found_str, char *str1, char *str2)
+
-+	    : errParse(found_str, DCT_STRING), expected_token1(str1), expected_token2(str2)
++               case si_prefix:
 +                       state = process_state_prefix(ch_ptr, buffer_str, base);
 +                       break;
 +
 +               case si_numeral_bin:
-+	 *  @brief Invalid/Unexpected token constructor.
++                       state = process_state_numeral_bin(ch_ptr, buffer_str);
-+	 *
++                       break;
-+	 *  @param [in] found_str The string that was found
+
-+	 *  @param [in] str1 The first token that was expected
++               case si_numeral_octal:
-+	 *  @param [in] str2 The second token that was expected
++                       state = process_state_numeral_octal(ch_ptr, buffer_str);
-+	 *  @param [in] str3 The third token that was expected
++                       break;
 +
-+	errParseString(char *found_str, char *str1, char *str2, char *str3)
++               case si_numeral_hex:
-+	    : errParse(found_str, DCT_STRING), expected_token1(str1), expected_token2(str2), expected_token3(str3)
++                       state = process_state_numeral_hex(ch_ptr, buffer_str);
 +                       break;
 +
 +               case si_numeral:
 +                       state = process_state_numeral(ch_ptr, buffer_str);
-+	 *  @brief Invalid/Unexpected token constructor.
++                       break;
-+	 *
+
-+	 *  @param [in] found_str The string that was found
++               case si_invalid:
-+	 *  @param [in] str1 The first token that was expected
++               default:
-+	 *  @param [in] str2 The second token that was expected
++                       SCP_string token = dc_get_token();
-+	 *  @param [in] str3 The third token that was expected
++                       dc_printf("Syntax Error: Expected unsigned integer, found '%s'\n", token.c_str());
-+	 *  @param [in] str4 The fourth token that was expected
++                       throw errParse(token.c_str(), type);
 +               }
-+	errParseString(char *found_str, char *str1, char *str2, char *str3, char *str4)
++       } while (state != si_end);
-+	    : errParse(found_str, DCT_STRING), expected_token1(str1), expected_token2(str2), expected_token3(str3), expected_token4(str4)
+
 +       ret = strtoul(buffer_str.c_str(), &end_ptr, base);
 +
 +       // This last check can be omitted once I can verify the operation of strtol in this sense
 +       if (end_ptr != ch_ptr) {
 +               dc_printf("Error: Could not convert all of the buffer '%s'.\n", buffer_str.c_str());
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> Buffer value: %s\n", buffer_str.c_str());
 +                       dc_printf("<debug> Return value: %i", ret);
 +               }
 +               throw errParse(ch, type);
 +       }
 +
 +       return ret;
 +}
 +
 +// Stuffs
 +
 +/**
 + * @brief Stuffs a float to the given variable.
 + *
 + * @param[in] f  The float variable to stuff to
 + *
 + * @details Throws an errParse class if an unexpected or otherwise malformed float string is found. Also throws an
 + *   errParse class if nothing was found
 + */
-+void dc_stuff_boolean(int *i);	// Stupid hack to get around plain C's lack of a bool type
+
 +{
 +       double value_d;
 +
 +       dc_ignore_gray_space();
 +
 +       value_d = dc_parse_double(Cp, DCT_FLOAT);
 +
 +       if ((value_d < FLT_MAX) && (value_d > FLT_MIN)) {
 +               *f = value_d;
 +               dc_get_token();    // Advance Cp
 +
 +       } else {
 +               throw errParse(dc_get_token(), DCT_FLOAT);
 +       }
 +}
 +
 +void dc_stuff_int(int *i)
 +{
 +       long value_l;
 +
-Index: code/freespace2/freespace.cpp
++       dc_ignore_gray_space();
 +
---- code/freespace2/freespace.cpp	(revision 10462)
++       value_l = dc_parse_long(Cp, DCT_INT);
-+++ code/freespace2/freespace.cpp	(working copy)
+
 +       if ((value_l < INT_MAX) && (value_l > INT_MIN)) {
 +               *i = value_l;
 +               dc_get_token();    // Advance Cp
 +
 +       } else {
 +               throw errParse(dc_get_token(), DCT_INT);
 +       }
 +}
-@@ -665,10 +666,9 @@ void big_explosion_flash(float flash)
+
 +void dc_stuff_uint(uint *i)
 +{
 +       ulong value_l;
 +
 +       dc_ignore_gray_space();
 +
 +       value_l = dc_parse_long(Cp, DCT_INT);
 +
 +       if (value_l < UINT_MAX) {
 +               *i = value_l;
 +               dc_get_token();    // Advance Cp
 +
-@@ -1499,80 +1499,101 @@ DCF_BOOL(i_framerate, Interface_framerate )
++       } else {
 +               throw errParse(dc_get_token(), DCT_INT);
 +       }
 +}
 +
 +void dc_stuff_ubyte(ubyte *i)
 +{
 +       ulong value_ul;
 +
 +       dc_ignore_gray_space();
 +
 +       value_ul = dc_parse_ulong(Cp, DCT_UBYTE);
 +
 +       // Since some system's chars may be greater than 1 byte, we can't use UCHAR_MAX for a UBYTE
 +       if ((value_ul <= 255) && (value_ul >= 0)) {
 +               *i = value_ul;
 +               dc_get_token();    // Advance Cp
 +
 +       } else {
 +               throw errParse(dc_get_token(), DCT_UBYTE);
 +       }
 +}
 +
 +void dc_stuff_boolean(bool *b)
 +{
 +       SCP_string token;
 +
 +       token = dc_get_token();
 +
 +       if ((token == "yes")
 +               || (token == "true")
 +               || (token == "ja")          // German
 +               || (token == "Oui")         // French
 +               || (token == "si")          // Spanish
 +//             || (token == "ita vero")    // Latin, not supported
 +               || (token == "HIja") || (token == "HISLaH"))    // Klingon
 +       {
 +               *b = true;
 +
 +       } else if ((token == "no")
 +               || (token == "false")
 +               || (token == "nein")    // German
 +               || (token == "Non")     // French
 +//             || (token == "no")      // Spanish, redundant with English "no"
 +//             || (token == "minime")  // Latin, not supported
 +               || (token == "ghobe'"))  // Klingon
 +       {
 +               *b = false;
 +
 +       } else {
 +               throw errParse(token.c_str(), DCT_BOOL);
 +       }
 +}
 +
 +// Stupid hack to get around plain C's lack of a bool type
 +void dc_stuff_boolean(int *i)
 +{
 +       bool value_b;
 +
 +       dc_stuff_boolean(&value_b);
 +
 +       value_b ? *i = 1 : *i = 0;
 +}
 +
 +/**
 + * @brief Stuffs a string to out_str from the Command_string, stopping at the end of the Command_string
 + *
 + * @param[out] out_str  Destination string
 + * @param[in]  maxlen   Maximum length to copy, is less than or equal to sizeof(out_str)
 + *
 + * @details Throws an errParseOverflow when parser cannot stuff the entirety of the found string into out_str
 + */
 +void dc_stuff_string(char *out_str, size_t maxlen)
 +{
 +       size_t count = 0;
 +       char *c_ptr = Cp;
 +
 +       Assert(Cp);
 +       Assert(out_str);
 +
 +       // Advance past grayspace, stopping at null terminator
 +       while (is_gray_space(*c_ptr) && (*c_ptr != '\0')) {
 +               c_ptr++;
 +       }
 +
 +       // Bail if we're at the terminator
 +       if (*c_ptr == '\0') {
 +               throw errParse("Nothing!", DCT_STRING);
 +               return;
 +       }
 +
 +       // Scan the string, stopping at null terminator, or before we overflow
 +       while ((*c_ptr != '\0') && (count < maxlen)) {
 +               count++;
 +       }
 +
 +       // Bail if overflow
 +       if (count == maxlen) {
 +               throw errParse("", DCT_STRING);
 +               return;
 +       }
 +
 +       // Copy string into out_str
 +       strncpy(out_str, Cp, (c_ptr - Cp));
 +
 +       // Advance the parser pointer past what we copied
 +       Cp = c_ptr;
 +}
 +
 +/**
 + * @brief Stuffs a string to out_str from the Command_string, stopping at the end of the Command_string
 + *
 + * @param[out] out_str  Destination string
 + *
 + * @details
 + */
 +void dc_stuff_string(SCP_string &out_str)
 +{
 +       size_t count = 0;
 +       char *c_ptr = Cp;
 +
 +       Assert(Cp);
 +
 +       // Advance past grayspace, stopping at null terminator
 +       while (is_gray_space(*c_ptr) && (*c_ptr != '\0')) {
 +               c_ptr++;
 +       }
 +
 +       // Bail if we're at the terminator
 +       if (*c_ptr == '\0') {
 +               throw errParse("Nothing!", DCT_STRING);
 +               return;
 +       }
 +
 +       // Scan the string, stopping at null terminator, or before we overflow
 +       while ((*c_ptr != '\0') && (count < out_str.max_size())) {
 +               count++;
 +       }
 +
 +       // Bail if overflow
 +       if (count == out_str.max_size()) {
 +               throw errParse("", DCT_STRING);
 +               return;
 +       }
 +
 +       // Copy string into out_str
 +       out_str.copy(Cp, (c_ptr - Cp));
 +
 +       // Advance the parser pointer past what we copied
 +       Cp = c_ptr;
 +}
 +
 +/**
 + * @brief Stuffs a string to str from the Command_string, stopping at the first whitespace character
 + * @details Actually stops at the first grayspace character, since there will never be an EOF character in the
 + *     Command_line string.
 + * TODO: Double Quote support
 + */
 +void dc_stuff_string_white(char *out_str, size_t maxlen)
-@@ -1582,42 +1603,56 @@ DCF(show_cpu,"Toggles showing cpu usage")
+
 +       size_t count = 0;
 +       char *c_ptr = Cp;
 +
 +       Assert(Cp);
 +       Assert(out_str);
 +
 +       // Advance past grayspace, stopping at null terminator
 +       while (is_gray_space(*c_ptr) && (*c_ptr != '\0')) {
 +               c_ptr++;
 +       }
 +
 +       // Bail if we're at the terminator
 +       if (*c_ptr == '\0') {
 +               throw errParse("Nothing!", DCT_STRING);
 +               return;
 +       }
 +
 +       // Scan the string, stopping at grayspace, null terminator, or before we overflow
 +       while (!is_gray_space(*c_ptr) && (*c_ptr != '\0') && (count < maxlen)) {
 +               count++;
 +       }
 +
 +       // Bail if overflow
 +       if (count == maxlen) {
 +               throw errParse("", DCT_STRING);
 +               return;
 +       }
 +
 +       // Copy string into out_str
 +       strncpy(out_str, Cp, (c_ptr - Cp));
 +
 +       // Advance the parser pointer past what we copied
 +       Cp = c_ptr;
 +}
 +
 +void dc_stuff_string_white(SCP_string &out_str)
 +{
 +       size_t count = 0;
 +       char *c_ptr = Cp;
 +
 +       Assert(Cp);
 +
 +       // Advance past grayspace, stopping at null terminator
 +       while (is_gray_space(*c_ptr) && (*c_ptr != '\0')) {
 +               c_ptr++;
 +       }
 +
 +       // Bail if we're at the terminator
 +       if (*c_ptr == '\0') {
 +               throw errParse("Nothing!", DCT_STRING);
 +               return;
 +       }
 +
 +       // Scan the string, stopping at grayspace, null terminator, or before we overflow
 +       while (!is_gray_space(*c_ptr) && (*c_ptr != '\0') && (count < out_str.max_size())) {
 +               count++;
 +       }
 +
 +       // Bail if overflow
 +       if (count == out_str.max_size()) {
 +               throw errParse("", DCT_STRING);
 +               return;
 +       }
 +
 +       // Copy string into out_str
 +       out_str.copy(Cp, (c_ptr - Cp));
 +
 +       // Advance the parser pointer past what we copied
 +       Cp = c_ptr;
 +}
 +
 +// Maybe stuffs
 +
 +/**
 + * @brief Tries to stuff a float from the Command_string.
 + *
 + * @param[in] f  The float variable to maybe stuff.
 + *
 + * @details
 + *   If there's nothing on the command line, *f = 0 and false is returned
 + *
 + *   If there's something on the command line, and we're able to convert it, *f = the converted value, true is
 + *     returned, and the parser is advanced past the token
-@@ -1627,14 +1662,26 @@ DCF(low_mem,"Uses low memory settings regardless of RAM")
+
 + *   If there's something on command line, but we can't convert it, an errParse is thrown
 + */
 +bool dc_maybe_stuff_float(float *f)
 +{
 +       dc_ignore_gray_space();
 +
 +       if (Cp != '\0') {
 +               dc_stuff_float(f);
 +               return true;
 +
 +       } else {
 +               *f = 0;
 +               return false;
 +       }
 +}
 +
 +/**
 + * @brief Tries to stuff an int from the Command_string.
 + *
 + * @param[in] i  The int variable to maybe stuff.
 + *
 + * @details
 + *   If there's nothing on the command line, *i = 0 and false is returned
 + *
 + *   If there's something on the command line, and we're able to convert it, *i = the converted value, true is
 + *     returned, and the parser is advanced past the token
 + *
 + *   If there's something on command line, but we can't convert it, an errParse is thrown
 + */
 +bool dc_maybe_stuff_int(int *i)
 +{
 +       dc_ignore_gray_space();
 +
 +       if (Cp != '\0') {
-@@ -1643,37 +1690,33 @@ int	Framerate_delay = 0;
++               dc_stuff_int(i);
 +               return true;
 +       } else {
 +               *i = 0;
 +               return false;
 +       }
 +}
 +
 +/**
 + * @brief Tries to stuff an uint from the Command_string.
 + *
 + * @param[in] i  The uint variable to maybe stuff.
 + *
 + * @details
 + *   If there's nothing on the command line, *i = 0 and false is returned
 + *
 + *   If there's something on the command line, and we're able to convert it, *i = the converted value, true is
 + *     returned, and the parser is advanced past the token
 + *
 + *   If there's something on command line, but we can't convert it, an errParse is thrown
 + */
 +bool dc_maybe_stuff_uint(uint *i)
 +{
 +       dc_ignore_gray_space();
 +
 +       if (Cp != '\0') {
 +               dc_stuff_uint(i);
 +               return true;
 +       } else {
 +               *i = 0;
 +               return false;
 +       }
 +}
 +
 +/**
 + * @brief Tries to stuff an ubyte from the Command_string.
 + *
 + * @param[in] i  The ubyte variable to maybe stuff.
 + *
 + * @details
 + *   If there's nothing on the command line, *i = 0 and false is returned
 + *
 + *   If there's something on the command line, and we're able to convert it, *i = the converted value, true is
 + *     returned, and the parser is advanced past the token
 + *
 + *   If there's something on command line, but we can't convert it, an errParse is thrown
 + */
 +bool dc_maybe_stuff_ubyte(ubyte *i)
 +{
 +       dc_ignore_gray_space();
 +
 +       if (Cp != '\0') {
 +               dc_stuff_ubyte(i);
 +               return true;
 +       } else {
 +               *i = 0;
 +               return false;
 +       }
-@@ -2399,33 +2442,54 @@ void game_show_time_left()
+
 +
 +/**
 + * @brief Tries to stuff a bool from the Command_string.
 + *
 + * @param[in] b  The bool variable to maybe stuff.
 + *
 + * @details
 + *   If there's nothing on the command line, *b = false and false is returned
 + *
 + *   If there's something on the command line, and we're able to convert it, *b = the converted value, true is
 + *     returned, and the parser is advanced past the token
 + *
 + *   If there's something on command line, but we can't convert it, an errParse is thrown
 + */
 +bool dc_maybe_stuff_boolean(bool *b)
 +{
 +       dc_ignore_gray_space();
 +
 +       if (Cp != '\0') {
 +               dc_stuff_boolean(b);
 +               return true;
 +       } else {
 +               *b = false;
 +               return false;
 +       }
 +}
 +
 +/**
 + * @brief Tries to stuff an int with a bool value from the Command_string.
 + *
 + * @param[in] i  The int variable to maybe stuff.
 + *
 + * @details
 + *   If there's nothing on the command line, *i = 0 and false is returned
 + *
 + *   If there's something on the command line, and we're able to convert it, *i = the converted value, true is
 + *     returned, and the parser is advanced past the token
 + *
 + *   If there's something on command line, but we can't convert it, an errParse is thrown
 + */
 +bool dc_maybe_stuff_boolean(int *i)
 +{
 +       dc_ignore_gray_space();
 +
 +       if (Cp != '\0') {
 +               dc_stuff_boolean(i);
 +               return true;
 +       } else {
 +               *i = 0;
 +               return false;
 +       }
 +}
 +
 +/**
 + * @brief Tries to stuff a whitespace delimited string from the Command_string.
 + *
 + * @param[in] str  The string to maybe stuff.
 + *
 + * @details
 + *   If there's nothing on the command line, *str = "" and false is returned
 + *
 + *   If there's something on the command line, *str = the token, true is
 + *     returned, and the parser is advanced past the token
 + *
 + *   If there's a token on the command line, but we can't fit it inside of str (token.size() >= len), then errParse is
 + *     thrown
 + */
 +bool dc_maybe_stuff_string_white(char *str, size_t len)
 +{
 +       dc_ignore_gray_space();
 +
 +       if (Cp != '\0') {
 +               dc_stuff_string_white(str, len);
 +               return true;
 +       } else {
-@@ -2472,22 +2536,28 @@ int View_percent = 100;
++               *str = '\0';
 +               return false;
 +       }
 +}
 +
 +/**
 + * @brief Tries to stuff a whitespace delimited string from the Command_string.
 + *
 + * @param[in] str  The string to maybe stuff.
 + *
 + * @details
 + *   If there's nothing on the command line, str = "" and false is returned
 + *
 + *   If there's something on the command line, str = the token, true is
 + *     returned, and the parser is advanced past the token
 + *
 + *   If there's a token on the command line, but we can't fit it inside of str (token.size() >= str.max_size()), then
 + *     errParse is thrown. Very unlikely to happen.
 + */
 +bool dc_maybe_stuff_string_white(SCP_string &str)
 +{
 +       dc_ignore_gray_space();
 +
 +       if (Cp != '\0') {
 +               dc_stuff_string_white(str);
 +               return true;
 +       } else {
 +               str = "";
 +               return false;
 +       }
 +}
 +
 +// State machine processes
 +inline
 +state_int process_state_prefix(char *ch_ptr, SCP_string &buffer_str, int &base) {
 +       state_int state = si_invalid;
 +
 +       if (ch_is_binary_prefix(*ch_ptr)) {
 +               state = si_numeral_bin;
 +               base = 2;
 +               ch_ptr++;
-@@ -2814,65 +2884,86 @@ void do_timing_test(float frame_time)
++
 +       } else if (ch_is_octal_prefix(*ch_ptr)) {
 +               state = si_numeral_octal;
 +               base = 8;
 +               ch_ptr++;
 +
 +       } else if (ch_is_hex_prefix(*ch_ptr)) {
 +               state = si_numeral_hex;
 +               base = 16;
 +               ch_ptr++;
 +
 +       } else if (ch_is_numeral(*ch_ptr)) {
 +               // User passed something like 0123
 +               // Just ignore the first 0, if the user passed something like 00001 then state si_numeral can handle it
 +               state = si_numeral;
 +               ch_ptr++;
 +
 +       } else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
 +               // Just a 0 was passed.
 +               buffer_str.push_back('0');
 +               state = si_end;
 +
 +       } else {
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> [parse_long] Invalid character '%c' found in si_prefix\n", *ch_ptr);
 +               }
 +               state = si_invalid;
 +
 +       }
 +       return state;
 +}
 +
 +inline
 +state_int process_state_sign(char *ch_ptr, SCP_string &buffer_str) {
 +       state_int state;
 +       if (ch_is_numeral(*ch_ptr)) {
 +               state = si_numeral;
 +               buffer_str.push_back(*ch_ptr);
 +               ch_ptr++;
 +
 +       } else if (ch_is_prefix(*ch_ptr)) {
 +               state = si_prefix;
 +               ch_ptr++;
 +
 +       } else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
 +               // Error condition, but let si_end handle it (consistant with how the numerals handle it)
 +               state = si_end;
 +
 +       } else {
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> [parse_long] Invalid character '%c' found in si_sign\n", *ch_ptr);
 +               }
 +               state = si_invalid;
 +
 +       }
 +       return state;
 +}
 +
 +inline
 +state_int process_state_numeral(char* ch_ptr, SCP_string &buffer_str) {
 +       state_int state = si_numeral;
 +
 +       if (ch_is_numeral(*ch_ptr)) {
 +               buffer_str.push_back(*ch_ptr);
 +               ch_ptr++;
 +
 +       } else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
 +               state = si_end;
 +
 +       } else {
 +               // Invalid character, throw and bail
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> [parse_long] Invalid character '%c' found in si_numeral\n", *ch_ptr);
 +               }
 +               state = si_invalid;
 +
 +       }
 +       return state;
 +}
 +
 +inline
 +state_int process_state_numeral_bin(char* ch_ptr, SCP_string &buffer_str) {
 +       state_int state = si_numeral_bin;
 +
 +       if (ch_is_binary(*ch_ptr)) {
 +               buffer_str.push_back(*ch_ptr);
 +               ch_ptr++;
 +
 +       } else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
 +               state = si_end;
 +
 +       } else {
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> [parse_long] Invalid character '%c' found in si_numeral_bin\n", *ch_ptr);
 +               }
 +               state = si_invalid;
 +
 +       }
 +       return state;
 +}
 +
 +inline
 +state_int process_state_numeral_hex(char* ch_ptr, SCP_string &buffer_str) {
 +       state_int state = si_numeral_hex;
 +
 +       if (ch_is_hex(*ch_ptr)) {
 +               buffer_str.push_back(*ch_ptr);
 +               ch_ptr++;
 +
 +       } else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
 +               state = si_end;
 +
 +       } else {
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> [parse_long] Invalid character '%c' found in si_numeral_hex\n", *ch_ptr);
 +               }
 +               state = si_invalid;
 +       }
 +       return state;
 +}
 +
 +inline
 +state_int process_state_numeral_octal(char* ch_ptr, SCP_string &buffer_str) {
 +       state_int state = si_numeral_octal;
 +
 +       if (ch_is_octal(*ch_ptr)) {
 +               buffer_str.push_back(*ch_ptr);
 +               ch_ptr++;
-@@ -3774,87 +3865,71 @@ void john_debug_stuff(vec3d *eye_pos, matrix *eye_orient)
++
 +       } else if ((*ch_ptr == '\0') || is_white_space(*ch_ptr)) {
 +               state = si_end;
 +
 +       } else {
 +               // Invalid character, throw and bail
 +               if (Dc_debug_on) {
 +                       dc_printf("<debug> [parse_long] Invalid character '%c' found in si_numeral_octal\n", *ch_ptr);
 +               }
 +               state = si_invalid;
 +       }
 +       return state;
 +}
 Index: debugconsole/consoleparse.h
 ===================================================================
 --- debugconsole/consoleparse.h	(Revision 0)
 +++ debugconsole/consoleparse.h	(Arbeitskopie)
 @@ -0,0 +1,163 @@
 +#ifndef _CONSOLEPARSE_H
 +#define _CONSOLEPARSE_H
 +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 +// Command-line parsing functions for z64555's debug console, created for the FreeSpace Source Code project
 +//
 +// Portions of this source code are based on works by Volition, Inc. circa 1999. You may not sell or otherwise
 +// commercially exploit the source or things you created based on the source.
 +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 +
 +/**
 + * @file consoleparse.h
 + * @brief Parsing functions for the command line. Previously known as the command line scanner
 + *
 + * @details A lot of functions here are blatently copied from parselo.h :D
 +  */
 +
 +#include "globalincs/pstypes.h"
 +
 +#define MAX_CLI_LEN 512
 +#define MAX_TOKEN_LENGTH 255
 +
 +enum dc_token {
 +       DCT_NONE = 0,
 +       DCT_STRING,
 +       DCT_FLOAT,
 +       DCT_INT,
 +       DCT_UINT,
 +       DCT_BYTE,
 +       DCT_UBYTE,
 +       DCT_BOOL
 +};
 +
 +/**
 + * @class errParse
 + *
 + * @brief Class thrown when a required token is not found
 + *
 + *  @details This is a basic parser error, it contains the token (a single word) that was found, and the expected token
 + *      type. Some DCT's, such as the DCT_STRING's, have their own specific requirements for error handling, and as
 + *      such get their own class derived from errParse. The catching routines should be able to catch the derived error
 + *      objects, but if not, they can be caught by a routine looking for the base class and then be casted to their
 + *      proper type.
 + */
 +class errParse {
 +public:
 +       SCP_string found_token;
 +       dc_token expected_type;
 +
 +       /**
 +       *  @brief Invalid/Unexpected token constructor
 +       *  @param [in] found_str The token that was found
 +       *  @param [in] expected_dct The token type that was expected
 +       */
 +       errParse(const char *found_str, dc_token expected_dct)
 +               : found_token(found_str), expected_type(expected_dct)
 +       {
 +       }
 +};
 +
 +/**
 + * @class errParseString
 + *
 + * @brief Class thrown when an expected string was not found. Supports up to 4 required strings.
 + */
 +class errParseString : public errParse
 +{
 +public:
 +       SCP_string expected_token1;
 +       SCP_string expected_token2;
 +       SCP_string expected_token3;
 +       SCP_string expected_token4;
 +       /**
 +        *  @brief Invalid/Unexpected token constructor.
 +        *
 +        *  @param [in] found_str The string that was found
 +        *  @param [in] str The token that was expected
 +        */
 +       errParseString(char *found_str, char *str)
 +           : errParse(found_str, DCT_STRING), expected_token1(str)
 +       {
 +       }
 +
 +       /**
 +        *  @brief Invalid/Unexpected token constructor.
 +        *
 +        *  @param [in] found_str The string that was found
 +        *  @param [in] str1 The first token that was expected
 +        *  @param [in] str2 The second token that was expected
 +        */
 +       errParseString(char *found_str, char *str1, char *str2)
 +           : errParse(found_str, DCT_STRING), expected_token1(str1), expected_token2(str2)
 +       {
 +       }
 +
 +       /**
 +        *  @brief Invalid/Unexpected token constructor.
 +        *
 +        *  @param [in] found_str The string that was found
 +        *  @param [in] str1 The first token that was expected
 +        *  @param [in] str2 The second token that was expected
 +        *  @param [in] str3 The third token that was expected
 +        */
 +       errParseString(char *found_str, char *str1, char *str2, char *str3)
 +           : errParse(found_str, DCT_STRING), expected_token1(str1), expected_token2(str2), expected_token3(str3)
 +       {
 +       }
 +
 +       /**
 +        *  @brief Invalid/Unexpected token constructor.
 +        *
 +        *  @param [in] found_str The string that was found
 +        *  @param [in] str1 The first token that was expected
 +        *  @param [in] str2 The second token that was expected
 +        *  @param [in] str3 The third token that was expected
 +        *  @param [in] str4 The fourth token that was expected
 +        */
 +       errParseString(char *found_str, char *str1, char *str2, char *str3, char *str4)
 +           : errParse(found_str, DCT_STRING), expected_token1(str1), expected_token2(str2), expected_token3(str3), expected_token4(str4)
 +       {
 +       }
-@@ -6920,7 +6995,7 @@ void game_spew_pof_info()
+
 +
 +void dc_parse_init(SCP_string &str);
 +
 +void dc_ignore_white_space(void);
 +void dc_ignore_gray_space(void);
 +
 +// Required/Optional Token
 +bool dc_required_string(char *pstr);
-Index: code/gamehelp/contexthelp.cpp
+
 +int dc_required_string_3(char *str1, char *str2, char *str3);
---- code/gamehelp/contexthelp.cpp	(revision 10462)
+
-+++ code/gamehelp/contexthelp.cpp	(working copy)
+
 +bool dc_optional_string(char *pstr);
 +bool dc_optional_string_either(char *str1, char *str2);
 +
 +// Stuffs
 +// These provide a limited support of math evaluations.
 +void dc_stuff_float(float *f);
 +void dc_stuff_int(int *i);
 +void dc_stuff_uint(uint *i);
-@@ -556,20 +557,14 @@ void help_overlay_blit(int overlay_id)
+
 +void dc_stuff_boolean(bool *b);
 +void dc_stuff_boolean(int *i); // Stupid hack to get around plain C's lack of a bool type
 +
 +void dc_stuff_string(char *str);
 +void dc_stuff_string(SCP_string &str);
 +void dc_stuff_string_white(char *str, size_t len);
 +void dc_stuff_string_white(SCP_string &str);
 +
 +// Maybe Stuffs.
 +// These won't throw errors if there is nothing left on the command line. They'll still throw an error if an unexpected type is found
 +// Each returns TRUE if a stuff was actually performed. FALSE if nothing was stuffed.
 +bool dc_maybe_stuff_float(float *f);
 +bool dc_maybe_stuff_int(int *i);
 +bool dc_maybe_stuff_uint(uint *i);
 +bool dc_maybe_stuff_ubyte(ubyte *i);
 +bool dc_maybe_stuff_boolean(bool *b);
 +bool dc_maybe_stuff_boolean(int *i);
 +bool dc_maybe_stuff_string_white(char *str, size_t len);
 +bool dc_maybe_stuff_string_white(SCP_string &str);
 +
 +#endif // _CONSOLEPARSE_H
 Index: freespace2/freespace.cpp
 ===================================================================
-@@ -630,150 +625,115 @@ void showplinepos(int plinenum)
+--- freespace2/freespace.cpp	(Revision 10462)
 +++ freespace2/freespace.cpp	(Arbeitskopie)
 @@ -33,6 +33,7 @@
  #include "cutscene/cutscenes.h"
  #include "cutscene/movie.h"
  #include "debris/debris.h"
 +#include "debugconsole/console.h"
  #include "exceptionhandler/exceptionhandler.h"
  #include "external_dll/trackirpublic.h" // header file for the TrackIR routines (Swifty)
  #include "fireball/fireballs.h"
 @@ -665,10 +666,9 @@
  int Sun_drew = 0;
 
  float sn_glare_scale = 1.7f;
 -DCF(sn_glare, "")
 +DCF(sn_glare, "Sets the sun glare scale (Default is 1.7)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	sn_glare_scale = Dc_arg_float;
 +	dc_stuff_float(&sn_glare_scale);
  }
 
  float Supernova_last_glare = 0.0f;
 @@ -1499,80 +1499,101 @@
 
  DCF(warp, "Tests warpin effect")
  {
 -	if ( Dc_command )	{
 -		bool warpin = true;
 -		int idx = -1;
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Params: bool warpin, string Target = ""\n  Warps in if true, out if false. Player is target unless specific ship is specified\n" );
 +		return;
 +	} // Else, process command
 
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if( Dc_arg_type & ARG_TRUE) warpin = true;
 -		else if(Dc_arg_type & ARG_FALSE) warpin = false;
 +	// TODO: Provide status flag
 
 -		if(!(Dc_arg_type & ARG_NONE))
 -		{
 -			dc_get_arg(ARG_STRING|ARG_NONE);
 -			if(Dc_arg_type & ARG_STRING)
 -			{
 -				idx = ship_name_lookup(Dc_arg);
 -				if(idx > -1)
 -				{
 -					if(warpin)
 -						shipfx_warpin_start(&Objects[Ships[idx].objnum]);
 -					else
 -						shipfx_warpout_start(&Objects[Ships[idx].objnum]);
 -				}
 +	bool warpin;
 +	char target[MAX_NAME_LEN];
 +	int idx = -1;
 +
 +	dc_stuff_boolean(&warpin);
 +	if (dc_maybe_stuff_string_white(target, MAX_NAME_LEN)) {
 +		idx = ship_name_lookup(target);
 +	}	// Else, default target to player
 +
 +	if (idx < 0) {
 +		// Player is target
 +		if (Player_ai->target_objnum > -1) {
 +			if(warpin) {
 +				shipfx_warpin_start(&Objects[Player_ai->target_objnum]);
 +			} else {
 +				shipfx_warpout_start(&Objects[Player_ai->target_objnum]);
  			}
  		}
 -
 -		if(idx < 0)
 -		{
 -			if(Player_ai->target_objnum > -1)
 -			{
 -				if(warpin)
 -					shipfx_warpin_start(&Objects[Player_ai->target_objnum]);
 -				else
 -					shipfx_warpout_start(&Objects[Player_ai->target_objnum]);
 -			}
 +	} else {
 +		// Non-player is targer
 +		if (warpin) {
 +			shipfx_warpin_start(&Objects[Ships[idx].objnum]);
 +		} else {
 +			shipfx_warpout_start(&Objects[Ships[idx].objnum]);
  		}
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: Show_mem\nWarps in if true, out if false, player target unless specific ship is specified\n" );
 +	}
 +
  }
 
  DCF(show_mem,"Toggles showing mem usage")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )	Show_mem = 1;
 -		else if ( Dc_arg_type & ARG_FALSE ) Show_mem = 0;
 -		else if ( Dc_arg_type & ARG_NONE ) Show_mem ^= 1;
 +	bool process = true;
 
 -		if ( Show_mem )	{
 -			Show_cpu = 0;
 -		}
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: Show_mem\nSets show_mem to true or false.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	{
 -		dc_printf( "Show_mem is %s\n", (Show_mem?"TRUE":"FALSE") );
 -		dc_printf( "Show_cpu is %s\n", (Show_cpu?"TRUE":"FALSE") );
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: (optional) bool Show_mem\n If true, Show_mem is set and Show_cpu is cleared.  If false, then Show_mem is cleared.  If nothing passed, then toggle.\n" );
 +		process = false;
  	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Show_mem is %s\n", (Show_mem ? "TRUE" : "FALSE"));
 +		dc_printf("Show_cpu is %s\n", (Show_cpu ? "TRUE" : "FALSE"));
 +		process = false;
 +	}
 +
 +	if (!process) {
 +		// Help and/or status was given, so don't process the command
 +		return;
 +	} // Else, process the command
 +
 +	if (!dc_maybe_stuff_boolean(&Show_mem)) {
 +		// Nothing passed, so toggle
 +		Show_mem = !Show_mem;
 +	}	// Else, value was set/cleared by user
 +
 +	// Can't show mem and cpu at same time
 +	if (Show_mem) {
 +		Show_cpu = false;
 +	}
  }
 
  DCF(show_cpu,"Toggles showing cpu usage")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )	Show_cpu = 1;
 -		else if ( Dc_arg_type & ARG_FALSE ) Show_cpu = 0;
 -		else if ( Dc_arg_type & ARG_NONE ) Show_cpu ^= 1;
 +	bool process = true;
 
 -		if ( Show_cpu )	{
 -			Show_mem = 0;
 -		}
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: Show_cpu\nSets show_cpu to true or false.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	{
 -		dc_printf( "Show_mem is %s\n", (Show_mem?"TRUE":"FALSE") );
 -		dc_printf( "Show_cpu is %s\n", (Show_cpu?"TRUE":"FALSE") );
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: (optional) bool Show_cpu\n If true, Show_cpu is set and Show_mem is cleared.  If false, then Show_cpu is cleared.  If nothing passed, then toggle.\n" );
 +		process = false;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Show_cpu is %s\n", (Show_cpu ? "TRUE" : "FALSE"));
 +		dc_printf("Show_mem is %s\n", (Show_mem ? "TRUE" : "FALSE"));
 +		process = false;
 +	}
 
 +	if (!process) {
 +		// Help and/or status was given, so don't process the command
 +		return;
 +	} // Else, process the command
 +
 +	if (!dc_maybe_stuff_boolean(&Show_cpu)) {
 +		// Nothing passed, so toggle
 +		Show_cpu = !Show_cpu;
 +	}	// Else, value was set/cleared by user
 +
 +	// Can't show mem and cpu at same time
 +	if (Show_cpu) {
 +		Show_mem = false;
  	}
  }
 
 @@ -1582,43 +1603,57 @@
 
  DCF(use_joy_mouse,"Makes joystick move mouse cursor")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )	Use_joy_mouse = 1;
 -		else if ( Dc_arg_type & ARG_FALSE ) Use_joy_mouse = 0;
 -		else if ( Dc_arg_type & ARG_NONE ) Use_joy_mouse ^= 1;
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: use_joy_mouse [bool]\nSets use_joy_mouse to true or false.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	dc_printf( "use_joy_mouse is %s\n", (Use_joy_mouse?"TRUE":"FALSE") );
 +	bool process = true;
 
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: use_joy_mouse [bool]\nSets use_joy_mouse to true or false.  If nothing passed, then toggles it.\n");
 +		process = false;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("use_joy_mouse is %s\n", (Use_joy_mouse ? "TRUE" : "FALSE"));
 +		process = false;
 +	}
 +
 +	if (!process) {
-@@ -781,46 +741,37 @@ DCF(help_nudgerbracket_y, "Use to visually position overlay right bracket.")
+
 +	}
 +
 +	if(!dc_maybe_stuff_boolean(&Use_joy_mouse)) {
 +		// Nothing passed, so toggle
 +		Use_joy_mouse = !Use_joy_mouse;
 +	} // Else, value was set/cleared by user
 +
  	os_config_write_uint( NULL, NOX("JoystickMovesCursor"), Use_joy_mouse );
  }
 
 -DCF(palette_flash,"Toggles palette flash effect on/off")
 -{
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )	Use_palette_flash = 1;
 -		else if ( Dc_arg_type & ARG_FALSE ) Use_palette_flash = 0;
 -		else if ( Dc_arg_type & ARG_NONE ) Use_palette_flash ^= 1;
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: palette_flash [bool]\nSets palette_flash to true or false.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	dc_printf( "palette_flash is %s\n", (Use_palette_flash?"TRUE":"FALSE") );
 -}
 +DCF_BOOL(palette_flash, Use_palette_flash);
 
  int Use_low_mem = 0;
 
  DCF(low_mem,"Uses low memory settings regardless of RAM")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )	Use_low_mem = 1;
 -		else if ( Dc_arg_type & ARG_FALSE ) Use_low_mem = 0;
 -		else if ( Dc_arg_type & ARG_NONE ) Use_low_mem ^= 1;
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: low_mem [bool]\nSets low_mem to true or false.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	dc_printf( "low_mem is %s\n", (Use_low_mem?"TRUE":"FALSE") );
 +	bool process = true;
 
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: low_mem [bool]\nSets low_mem to true or false.  If nothing passed, then toggles it.\n");
 +		process = false;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("low_mem is %s\n", (Use_low_mem ? "TRUE" : "FALSE"));
 +		process = false;
 +	}
 +
 +	if (!process) {
 +		return;
 +	}
 +
 +	if (!dc_maybe_stuff_boolean(&Use_low_mem)) {
 +		// Nothing passed, so toggle
 +		Use_low_mem = !Use_low_mem;
 +	} // Else, value was set/cleared by user
 +
  	os_config_write_uint( NULL, NOX("LowMem"), Use_low_mem );
  }
 
 @@ -1627,14 +1662,26 @@
 
  DCF(force_fullscreen, "Forces game to startup in fullscreen mode")
  {
 -	if ( Dc_command )	{
-Index: code/globalincs/pstypes.h
+
 -		if ( Dc_arg_type & ARG_TRUE )	Use_fullscreen_at_startup = 1;
---- code/globalincs/pstypes.h	(revision 10462)
+
-+++ code/globalincs/pstypes.h	(working copy)
+
-@@ -319,113 +319,6 @@ extern int Fred_running;  // Is Fred running, or FreeSpace?
+
 -	if ( Dc_help )	dc_printf( "Usage: force_fullscreen [bool]\nSets force_fullscreen to true or false.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	dc_printf( "force_fullscreen is %s\n", (Use_fullscreen_at_startup?"TRUE":"FALSE") );
 +	bool process = true;
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: low_mem [bool]\nSets low_mem to true or false.  If nothing passed, then toggles it.\n");
 +		process = false;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("low_mem is %s\n", (Use_fullscreen_at_startup ? "TRUE" : "FALSE"));
 +		process = false;
 +	}
 +
 +	if (!process) {
 +		return;
 +	}
 +
 +	if (dc_maybe_stuff_boolean(&Use_fullscreen_at_startup)) {
 +		// Nothing passed, so toggle
 +		Use_fullscreen_at_startup = !Use_fullscreen_at_startup;
 +	} // Else, value was set/cleared by user
 +
  	os_config_write_uint( NULL, NOX("ForceFullscreen"), Use_fullscreen_at_startup );
  }
  #endif
 @@ -1643,37 +1690,33 @@
 
  float FreeSpace_gamma = 1.0f;
 
 -DCF(gamma,"Sets Gamma factor")
 +DCF(gamma,"Sets and saves Gamma Factor")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_FLOAT|ARG_NONE);
 -		if ( Dc_arg_type & ARG_FLOAT )	{
 -			FreeSpace_gamma = Dc_arg_float;
 -		} else {
 -			dc_printf( "Gamma reset to 1.0f\n" );
 -			FreeSpace_gamma = 1.0f;
 -		}
 -		if ( FreeSpace_gamma < 0.1f )	{
 -			FreeSpace_gamma = 0.1f;
 -		} else if ( FreeSpace_gamma > 5.0f )	{
 -			FreeSpace_gamma = 5.0f;
 -		}
 -		gr_set_gamma(FreeSpace_gamma);
 -
 -		char tmp_gamma_string[32];
 -		sprintf( tmp_gamma_string, NOX("%.2f"), FreeSpace_gamma );
 -		os_config_write_string( NULL, NOX("Gamma"), tmp_gamma_string );
 -	}
 -
 -	if ( Dc_help )	{
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: gamma <float>\n" );
  		dc_printf( "Sets gamma in range 1-3, no argument resets to default 1.2\n" );
 -		Dc_status = 0;	// don't print status if help is printed.  Too messy.
 +		return;
  	}
 
 -	if ( Dc_status )	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		dc_printf( "Gamma = %.2f\n", FreeSpace_gamma );
 +		return;
  	}
 +
 +	if (!dc_maybe_stuff_float(&FreeSpace_gamma)) {
 +		dc_printf( "Gamma reset to 1.0f\n" );
 +		FreeSpace_gamma = 1.0f;
 +	}
 +	if ( FreeSpace_gamma < 0.1f )	{
 +		FreeSpace_gamma = 0.1f;
 +	} else if ( FreeSpace_gamma > 5.0f )	{
 +		FreeSpace_gamma = 5.0f;
 +	}
 +	gr_set_gamma(FreeSpace_gamma);
 +
 +	char tmp_gamma_string[32];
 +	sprintf( tmp_gamma_string, NOX("%.2f"), FreeSpace_gamma );
 +	os_config_write_string( NULL, NOX("Gamma"), tmp_gamma_string );
  }
 
  #ifdef APPLE_APP
 @@ -2399,33 +2442,54 @@
 
  DCF(ai_pause,"Pauses ai")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )	ai_paused = 1;
 -		else if ( Dc_arg_type & ARG_FALSE ) ai_paused = 0;
 -		else if ( Dc_arg_type & ARG_NONE ) ai_paused = !ai_paused;
 +	bool process = true;
 +
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: ai_paused [bool]\nSets ai_paused to true or false.  If nothing passed, then toggles it.\n" );
 +		process = false;
 +	}
 
 -		if (ai_paused)	{
 -			obj_init_all_ships_physics();
 -		}
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: ai_paused [bool]\nSets ai_paused to true or false.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	dc_printf( "ai_paused is %s\n", (ai_paused?"TRUE":"FALSE") );
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf( "ai_paused is %s\n", (ai_paused?"TRUE":"FALSE") );
 +		process = false;
 +	}
 +
 +	if (!process) {
 +		return;
 +	}
-Index: code/globalincs/systemvars.cpp
+
 +	if (!dc_maybe_stuff_boolean(&ai_paused)) {
---- code/globalincs/systemvars.cpp	(revision 10462)
+
-+++ code/globalincs/systemvars.cpp	(working copy)
+
 +
 +	if (ai_paused) {
 +		obj_init_all_ships_physics();
 +	}
  }
 
 -DCF(single_step,"Single steps the game")
 +DCF(single_step,"Enables single step mode.")
  {
-@@ -248,73 +248,76 @@ int Monitor_inited = 0;
+
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )	game_single_step = 1;
 -		else if ( Dc_arg_type & ARG_FALSE ) game_single_step = 0;
 -		else if ( Dc_arg_type & ARG_NONE ) game_single_step = !game_single_step;
 +	bool process = true;
 +
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: game_single_step [bool]\nEnables or disables single-step mode.  If nothing passed, then toggles it.\nSingle-step mode will freeze the game, and will advance frame by frame with each key press\n");
 +		process = false;
 +	}
 
 -		last_single_step = 0;	// Make so single step waits a frame before stepping
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf( "ai_paused is %s\n", (game_single_step ? "TRUE" : "FALSE") );
 +		process = false;
 +	}
 
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: single_step [bool]\nSets single_step to true or false.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	dc_printf( "single_step is %s\n", (game_single_step?"TRUE":"FALSE") );
 +	if (!process) {
 +		return;
 +	}
 +
 +	if (!dc_maybe_stuff_boolean(&game_single_step)) {
 +		game_single_step = !game_single_step;
 +	}
 +
 +	last_single_step = 0;	// Make so single step waits a frame before stepping
  }
 
  DCF_BOOL(physics_pause, physics_paused)
 @@ -2472,23 +2536,29 @@
 
  DCF(view, "Sets the percent of the 3d view to render.")
  {
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_INT);
 -		if ( (Dc_arg_int >= 5 ) || (Dc_arg_int <= 100) ) {
 -			View_percent = Dc_arg_int;
 -		} else {
 -			dc_printf( "Illegal value for view. (Must be from 5-100) \n\n");
- 				dc_printf( "Monitor already on\n" );
+
 -		}
 -	}
 +	bool process = true;
 +	int value;
 
 -	if ( Dc_help ) {
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf("Usage: view [n]\nwhere n is percent of view to show (5-100).\n");
 +		process = false;
  	}
 -
 -	if ( Dc_status ) {
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		dc_printf("View is set to %d%%\n", View_percent );
 +		process = false;
  	}
 +
 +	if (!process) {
 +		return;
 +	}
 +
 +	dc_stuff_int(&value);
 +	if ( (value >= 5 ) && (value <= 100) ) {
 +		View_percent = value;
 +	} else {
 +		dc_printf("Error: Outside legal range [5 - 100]");
 +	}
  }
 
 
 @@ -2814,38 +2884,44 @@
  DCF(dcf_fov, "Change the field of view of the main camera")
  {
  	camera *cam = Main_camera.getCamera();
 -	if ( Dc_command )
 -	{
 -		if(cam == NULL)
 -			return;
 +	bool process = true;
 +	float value;
 
 -		dc_get_arg(ARG_FLOAT|ARG_NONE);
 -		if ( Dc_arg_type & ARG_NONE )	{
 -			cam->set_fov(VIEWER_ZOOM_DEFAULT);
 -			dc_printf( "Zoom factor reset\n" );
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: fov [factor]\nFactor is the zoom factor btwn .25 and 1.25\nNo parameter resets it to default.\n" );
 +		process = false;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		if(cam == NULL) {
 +			dc_printf("Camera unavailable.");
 +		} else {
 +			dc_printf("Zoom factor set to %6.3f (original = 0.5, John = 0.75)\n", cam->get_fov());
  		}
 -		if ( Dc_arg_type & ARG_FLOAT )	{
 -			if (Dc_arg_float < 0.25f) {
 -				cam->set_fov(0.25f);
 -				dc_printf("Zoom factor pinned at 0.25.\n");
 -			} else if (Dc_arg_float > 1.25f) {
 -				cam->set_fov(1.25f);
 -				dc_printf("Zoom factor pinned at 1.25.\n");
 -			} else {
 -				cam->set_fov(Dc_arg_float);
 -			}
 -		}
 +
 +		process = false;
  	}
 
 -	if ( Dc_help )
 -		dc_printf( "Usage: fov [factor]\nFactor is the zoom factor btwn .25 and 1.25\nNo parameter resets it to default.\n" );
 +	if ((cam == NULL) || (!process)) {
 +		return;
 +	}
 
 -	if ( Dc_status )
 -	{
 -		if(cam == NULL)
 -			dc_printf("Camera unavailable.");
 -		else
 -			dc_printf("Zoom factor set to %6.3f (original = 0.5, John = 0.75)", cam->get_fov());
 +	if (!dc_maybe_stuff_float(&value)) {
 +		// No value passed, use default
-@@ -508,44 +511,41 @@ int current_detail_level()
+
 +	} else {
 +		// Value passed, Clamp it to valid values
 +		if (value < 0.25f) {
 +			value = 0.25f;
 +			dc_printf("Zoom factor clamped to 0.25\n");
 +		} else if (value > 1.25f) {
 +			value = 1.25f;
 +			dc_printf("Zoom factor clamped to 1.25\n");
 +		} else {
 +			dc_printf("Zoom factor set to %6.3f\n", value);
 +		}
 +
 +		cam->set_fov(value);
  	}
  }
 
 @@ -2852,28 +2928,43 @@
 
  DCF(framerate_cap, "Sets the framerate cap")
  {
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_INT);
 -		if ( (Dc_arg_int >= 1 ) || (Dc_arg_int <= 120) ) {
 -			Framerate_cap = Dc_arg_int;
 -		} else {
 -			dc_printf( "Illegal value for framerate cap. (Must be from 1-120) \n\n");
 -			Dc_help = 1;
 -		}
 -	}
 +	bool process = true;
- 		dc_printf("Detail level set to %d\n", Game_detail_level);
+
 -	if ( Dc_help ) {
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf("Usage: framerate_cap [n]\nwhere n is the frames per second to cap framerate at.\n");
  		dc_printf("If n is 0 or omitted, then the framerate cap is removed\n");
  		dc_printf("[n] must be from 1 to 120.\n");
 +		process = false;
  	}
 -
 -	if ( Dc_status ) {
 -		if ( Framerate_cap )
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		if ( Framerate_cap ) {
  			dc_printf("Framerate cap is set to %d fps\n", Framerate_cap );
 -		else
 +		} else {
  			dc_printf("There is no framerate cap currently active.\n");
 +		}
 +
 +		process = false;
  	}
 +
 +	if (!process) {
 +		return;
 +	}
 +
 +	if (!dc_maybe_stuff_int(&Framerate_cap)) {
 +		Framerate_cap = 0;
 +	}
 +
 +	if ((Framerate_cap < 0) || (Framerate_cap > 120)) {
 +		dc_printf( "Illegal value for framerate cap. (Must be from 1-120) \n");
 +		Framerate_cap = 0;
 +	}
 +
 +	if (Framerate_cap == 0) {
 +		dc_printf("Framerate cap disabled");
 +	} else {
 +		dc_printf("Framerate cap is set to %d fps\n", Framerate_cap );
 +	}
-@@ -555,21 +555,38 @@ DCF(detail, "Turns on/off parts of the game for speed testing" )
+
 
  #define	MIN_DIST_TO_DEAD_CAMERA		50.0f
 @@ -3774,87 +3865,71 @@
  #ifndef NDEBUG
 
  // function to toggle state of dumping every frame into PCX when playing the game
 -DCF(dump_frames, "Starts/stop frame dumping at 15 hz")
 +DCF(dump_frames, "Toggles On/off frame dumping at 15 hz")
  {
 -	if ( Dc_command )	{
 -
 -		if ( Debug_dump_frames == 0 )	{
 -			// Turn it on
 -			Debug_dump_frames = 15;
 -			Debug_dump_trigger = 0;
 -			gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
 -			dc_printf( "Frame dumping at 15 hz is now ON\n" );
 -		} else {
 -			// Turn it off
 -			Debug_dump_frames = 0;
 -			Debug_dump_trigger = 0;
 -			gr_dump_frame_stop();
 -			dc_printf( "Frame dumping is now OFF\n" );
 -		}
 -
 +	if ( Debug_dump_frames == 0 )	{
 +		// Turn it on
 +		Debug_dump_frames = 15;
 +		Debug_dump_trigger = 0;
 +		gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
 +		dc_printf( "Frame dumping at 15 hz is now ON\n" );
 +	} else {
 +		// Turn it off
 +		Debug_dump_frames = 0;
 +		Debug_dump_trigger = 0;
 +		gr_dump_frame_stop();
 +		dc_printf( "Frame dumping is now OFF\n" );
  	}
  }
 
  DCF(dump_frames_trigger, "Starts/stop frame dumping at 15 hz")
  {
 -	if ( Dc_command )	{
 -
 -		if ( Debug_dump_frames == 0 )	{
 -			// Turn it on
 -			Debug_dump_frames = 15;
 -			Debug_dump_trigger = 1;
 -			gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
 -			dc_printf( "Frame dumping at 15 hz is now ON\n" );
-Index: code/globalincs/vmallocator.h
+
 -			// Turn it off
---- code/globalincs/vmallocator.h	(revision 10462)
+
-+++ code/globalincs/vmallocator.h	(working copy)
+
 -			gr_dump_frame_stop();
 -			dc_printf( "Frame dumping is now OFF\n" );
 -		}
 -
 +	if ( Debug_dump_frames == 0 )	{
 +		// Turn it on
 +		Debug_dump_frames = 15;
 +		Debug_dump_trigger = 1;
-@@ -127,6 +128,9 @@ class SCP_multimap : public std::multimap<T, U, std::less<T>, SCP_vm_allocator<s
+
 +		dc_printf( "Frame dumping at 15 hz is now ON\n" );
 +	} else {
 +		// Turn it off
 +		Debug_dump_frames = 0;
 +		Debug_dump_trigger = 0;
 +		gr_dump_frame_stop();
 +		dc_printf( "Frame dumping is now OFF\n" );
  	}
  }
-Index: code/globalincs/windebug.cpp
+
  DCF(dump_frames30, "Starts/stop frame dumping at 30 hz")
---- code/globalincs/windebug.cpp	(revision 10462)
+
-+++ code/globalincs/windebug.cpp	(working copy)
+
 -
 -		if ( Debug_dump_frames == 0 )	{
 -			// Turn it on
 -			Debug_dump_frames = 30;
 -			Debug_dump_trigger = 0;
 -			gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
 -			dc_printf( "Frame dumping at 30 hz is now ON\n" );
 -		} else {
-@@ -1522,7 +1523,7 @@ void windebug_memwatch_init()
+
 -			Debug_dump_frames = 0;
 -			Debug_dump_trigger = 0;
 -			gr_dump_frame_stop();
 -			dc_printf( "Frame dumping is now OFF\n" );
 -		}
 -
 +	if ( Debug_dump_frames == 0 )	{
 +		// Turn it on
-Index: code/graphics/2d.cpp
+
 +		Debug_dump_trigger = 0;
---- code/graphics/2d.cpp	(revision 10462)
+
-+++ code/graphics/2d.cpp	(working copy)
+
 +	} else {
 +		// Turn it off
 +		Debug_dump_frames = 0;
 +		Debug_dump_trigger = 0;
 +		gr_dump_frame_stop();
 +		dc_printf( "Frame dumping is now OFF\n" );
  	}
  }
-@@ -266,12 +267,9 @@ DCF(clear_color, "set clear color r, g, b")
+
  DCF(dump_frames30_trigger, "Starts/stop frame dumping at 30 hz")
  {
 -	if ( Dc_command )	{
 -
 -		if ( Debug_dump_frames == 0 )	{
 -			// Turn it on
 -			Debug_dump_frames = 30;
 -			Debug_dump_trigger = 1;
 -			gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
 -			dc_printf( "Triggered frame dumping at 30 hz is now ON\n" );
 -		} else {
 -			// Turn it off
 -			Debug_dump_frames = 0;
 -			Debug_dump_trigger = 0;
 -			gr_dump_frame_stop();
-Index: code/graphics/gropengl.cpp
+
 -		}
---- code/graphics/gropengl.cpp	(revision 10462)
+
-+++ code/graphics/gropengl.cpp	(working copy)
+
 +		// Turn it on
 +		Debug_dump_frames = 30;
 +		Debug_dump_trigger = 1;
 +		gr_dump_frame_start( Debug_dump_frame_num, DUMP_BUFFER_NUM_FRAMES );
 +		dc_printf( "Triggered frame dumping at 30 hz is now ON\n" );
 +	} else {
 +		// Turn it off
 +		Debug_dump_frames = 0;
-@@ -2078,56 +2079,61 @@ bool gr_opengl_init()
+
 +		gr_dump_frame_stop();
 +		dc_printf( "Triggered frame dumping is now OFF\n" );
  	}
  }
 
 @@ -6921,7 +6996,7 @@
  	BAIL();
  }
 
 -DCF(pofspew, "")
 +DCF(pofspew, "Spews POF info without shutting down the game")
  {
  	game_spew_pof_info();
  }
 Index: gamehelp/contexthelp.cpp
 ===================================================================
 --- gamehelp/contexthelp.cpp	(Revision 10462)
 +++ gamehelp/contexthelp.cpp	(Arbeitskopie)
 @@ -19,6 +19,7 @@
  #include "localization/localize.h"
  #include "globalincs/alphacolors.h"
  #include "globalincs/systemvars.h"
 +#include "debugconsole/console.h"
 
 
 
 @@ -556,20 +557,14 @@
  // --------------------------------------------------
  // DEBUGGING STUFF
  // --------------------------------------------------
 -
 +// z64: These DCF's really need a do-over.
  DCF(help_reload, "Reloads help overlay data from help.tbl")
  {
 -	if (Dc_command)	{
 -		parse_helptbl();
 -	}
 -
 -	if (Dc_help)	{
 +	if (dc_optional_string_either("help", "--help")) {
--		dc_printf("Error: Anisotropic filter is not settable!\n");
+
  	}
 
 -	if (Dc_status)	{
 -		dc_printf( "Yes, my master." );
 -	}
 +	parse_helptbl();
  }
 
  int h_textnum=0, h_amt=0, h_vtx = 0;
 @@ -630,150 +625,115 @@
 
  DCF(help_nudgetext_x, "Use to visually position overlay text.")
  {
 -	if (Dc_command)	{
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_textnum = Dc_arg_int;
 -		}
-+		dc_printf("Error: Anisotropic filter is not settable!\n");
+
 -		if(Dc_arg_type & ARG_INT){
 -			 h_amt = Dc_arg_int;
 -		}
 -		nudgetext_x(h_textnum, h_amt);
 -	}
 
 -	if (Dc_help)	{
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: sample\nCrashes your machine.\n" );
 +		return;
  	}
 
 -	if (Dc_status)	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		showtextpos(h_textnum);
 +		return;
  	}
 +
 +	dc_stuff_int(&h_textnum);
 +	dc_stuff_int(&h_amt);
 +
 +	nudgetext_x(h_textnum, h_amt);
  }
 
  DCF(help_nudgetext_y, "Use to visually position overlay text.")
  {
 -	if (Dc_command)	{
 -		dc_get_arg(ARG_INT);
-Index: code/hud/hudlock.cpp
+
 -			 h_textnum = Dc_arg_int;
---- code/hud/hudlock.cpp	(revision 10462)
+
-+++ code/hud/hudlock.cpp	(working copy)
+
 -		if(Dc_arg_type & ARG_INT){
 -			 h_amt = Dc_arg_int;
 -		}
 -		nudgetext_y(h_textnum, h_amt);
 -	}
 -
 -	if (Dc_help)	{
 +	if (dc_optional_string_either("help", "--help")) {
-@@ -333,7 +334,7 @@ int hud_lock_has_homing_point()
+
 +		return;
  	}
 
 -	if (Dc_status)	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		showtextpos(h_textnum);
 +		return;
  	}
-Index: code/io/joy.cpp
+
 +	dc_stuff_int(&h_textnum);
---- code/io/joy.cpp	(revision 10462)
+
-+++ code/io/joy.cpp	(working copy)
+
 +	nudgetext_y(h_textnum, h_amt);
  }
 
  DCF(help_nudgepline_x, "Use to visually position overlay polylines.")
  {
 -	if (Dc_command)	{
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
-@@ -300,45 +301,51 @@ void joy_get_caps(int max)
+
 -		}
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_vtx = Dc_arg_int;
 -		}
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_amt = Dc_arg_int;
 -		}
 -		nudgepline_x(h_textnum, h_vtx, h_amt);
 -	}
 -
 -	if (Dc_help)	{
 +		if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: help_nudgepline [pline_number] [vertex_number] [distance]\n" );
 +		return;
  	}
 
 -	if (Dc_status)	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?"))	{
  		showplinepos(h_textnum);
 +		return;
  	}
 +
 +	dc_stuff_int(&h_textnum);
 +	dc_stuff_int(&h_vtx);
 +	dc_stuff_int(&h_amt);
 +
 +	nudgepline_x(h_textnum, h_vtx, h_amt);
  }
 
 
  DCF(help_nudgepline_y, "Use to visually position overlay polylines.")
  {
 -	if (Dc_command)	{
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_textnum = Dc_arg_int;
 -		}
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_vtx = Dc_arg_int;
 -		}
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_amt = Dc_arg_int;
 -		}
 -		nudgepline_y(h_textnum, h_vtx, h_amt);
 -	}
 -
 -	if (Dc_help)	{
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: help_nudgepline [pline_number] [vertex_number] [distance]\n" );
 +		return;
  	}
 
 -	if (Dc_status)	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?"))	{
  		showplinepos(h_textnum);
 +		return;
  	}
 +
 +	dc_stuff_int(&h_textnum);
 +	dc_stuff_int(&h_vtx);
 +	dc_stuff_int(&h_amt);
 +
 +	nudgepline_y(h_textnum, h_vtx, h_amt);
  }
 
 
  DCF(help_nudgerbracket_x, "Use to visually position overlay right bracket.")
  {
 -	if (Dc_command)	{
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_textnum = Dc_arg_int;
 -		}
-Index: code/lighting/lighting.cpp
+
 -		if(Dc_arg_type & ARG_INT){
---- code/lighting/lighting.cpp	(revision 10462)
+
-+++ code/lighting/lighting.cpp	(working copy)
+
 -		nudgerbracket_x(h_textnum, h_amt);
 -	}
 -
 -	if (Dc_help)	{
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: help_nudgerbracket_x [num] [amount]\n" );
 +		return;
  	}
-@@ -62,52 +63,11 @@ int Lighting_flag = 1;
+
 -	if (Dc_status)	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?"))	{
  		showrbracketpos(h_textnum);
 +		return;
  	}
 +
 +	dc_stuff_int(&h_textnum);
 +	dc_stuff_int(&h_amt);
 +
 +	nudgerbracket_x(h_textnum, h_amt);
  }
 
  DCF(help_nudgerbracket_y, "Use to visually position overlay right bracket.")
  {
 -	if (Dc_command)	{
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_textnum = Dc_arg_int;
 -		}
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_amt = Dc_arg_int;
 -		}
 -		nudgerbracket_y(h_textnum, h_amt);
 -	}
 -
 -	if (Dc_help)	{
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: help_nudgerbracket_y [num] [amount]\n" );
 +		return;
  	}
 
 -	if (Dc_status)	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?"))	{
  		showrbracketpos(h_textnum);
 +		return;
  	}
 +
 +	dc_stuff_int(&h_textnum);
 +	dc_stuff_int(&h_amt);
 +
 +	nudgerbracket_y(h_textnum, h_amt);
  }
 
 
 @@ -781,46 +741,37 @@
 
  DCF(help_nudgelbracket_x, "Use to visually position overlay left bracket.")
  {
 -	if (Dc_command)	{
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_textnum = Dc_arg_int;
 -		}
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
-@@ -117,18 +77,70 @@ DCF(light,"Changes lighting parameters")
+
 -		}
 -		nudgelbracket_x(h_textnum, h_amt);
 -	}
 
 -	if (Dc_help)	{
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: help_nudgelbracket_x [num] [amount]\n" );
 +		return;
  	}
 
 -	if (Dc_status)	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		showlbracketpos(h_textnum);
 +		return;
  	}
 +
 +	dc_stuff_int(&h_textnum);
 +	dc_stuff_int(&h_amt);
 +
 +	nudgelbracket_x(h_textnum, h_amt);
  }
 
  DCF(help_nudgelbracket_y, "Use to visually position overlay left bracket.")
  {
 -	if (Dc_command)	{
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_textnum = Dc_arg_int;
 -		}
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			 h_amt = Dc_arg_int;
 -		}
 -		nudgelbracket_y(h_textnum, h_amt);
 -	}
 -
 -	if (Dc_help)	{
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: help_nudgelbracket_y [num] [amount]\n" );
 +		return;
  	}
 
 -	if (Dc_status)	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?"))	{
  		showlbracketpos(h_textnum);
 +		return;
  	}
 +
 +	dc_stuff_int(&h_textnum);
 +	dc_stuff_int(&h_amt);
 +
 +	nudgelbracket_y(h_textnum, h_amt);
  }
 Index: globalincs/pstypes.h
 ===================================================================
 --- globalincs/pstypes.h	(Revision 10462)
 +++ globalincs/pstypes.h	(Arbeitskopie)
 @@ -319,115 +319,8 @@
 
 
-+			dc_printf(" Error: unknown light mode: '%s'\n", arg_str);
+
 -//======          D E B U G    C O N S O L E   S T U F F        ========================
  //======================================================================================
 -
 -// Here is a a sample command to toggle something that would
 -// be called by doing "toggle it" from the debug console command window/
 -
 -/*
 -DCF(toggle_it,"description")
 -{
 -	if (Dc_command) {
 -		This_var = !This_var;
 -	}
 -
 -	if (Dc_help) {
 -		dc_printf( "Usage: sample\nToggles This_var on/off.\n" );
-Index: code/menuui/playermenu.cpp
+
 -
---- code/menuui/playermenu.cpp	(revision 10462)
+
-+++ code/menuui/playermenu.cpp	(working copy)
+
 -	}
 -*/
 -
 -class debug_command {
 -	public:
 -	char *name;
 -	char *help;
 -	void (*func)();
-@@ -1236,39 +1237,37 @@ void player_select_cancel_create()
+
 -};
 -
 -#define DCF(function_name,help_text)	\
 -		void dcf_##function_name();	\
 -		debug_command dc_##function_name(#function_name,help_text,dcf_##function_name);	\
 -		void dcf_##function_name()
 -
 -// Starts the debug console
 -extern void debug_console( void (*func)() = NULL );
 -
 -// The next three variables tell your function what to do.  It should
 -// only change something if the dc_command is set.   A minimal function
 -// needs to process the dc_command.   Usually, these will be called in
 -// these combinations:
 -// dc_command=true, dc_status=true  means process it and show status
 -// dc_help=true means show help only
 -// dc_status=true means show status only
 -// I would recommend doing this in each function:
 -// if (dc_command) { process command }
 -// if (dc_help) { print out help }
 -// if (dc_status) { print out status }
 -// with the last two being optional
 -
 -extern int Dc_command;			// If this is set, then process the command
 -extern int Dc_help;				// If this is set, then print out the help text in the form, "usage: ... \nLong description\n" );
 -extern int Dc_status;			// If this is set, then print out the current status of the command.
 -
 -void dc_get_arg(uint flags);	// Gets the next argument.   If it doesn't match the flags, this function will print an error and not return.
 -extern char *Dc_arg;			// The (lowercased) string value of the argument retrieved from dc_arg
 -extern char *Dc_arg_org;		// Dc_arg before it got converted to lowercase
 -extern uint Dc_arg_type;		// The type of dc_arg.
 -extern char *Dc_command_line;	// The rest of the command line, from the end of the last processed arg on.
 -extern int Dc_arg_int;			// If Dc_arg_type & ARG_INT or ARG_HEX is set, then this is the value
 -extern ubyte Dc_arg_ubyte;		// If Dc_arg_type & ARG_UBYTE is set, then this is the value
 -extern float Dc_arg_float;		// If Dc_arg_type & ARG_FLOAT is set, then this is the value
 -
 -// Outputs text to the console
 -void dc_printf( char *format, ... );
 -
 -// Each dc_arg_type can have one or more of these flags set.
 -// This is because some things can fit into two categories.
 -// Like 1 can be an integer, a float, a string, or a true boolean
 -// value.
 -#define ARG_NONE		(1<<0)		// no argument
 -#define ARG_ANY			0xFFFFFFFF	// Anything.
 -#define ARG_STRING		(1<<1)		// any valid string
 -#define ARG_QUOTE		(1<<2)		// a quoted string
 -#define ARG_INT			(1<<3)		// a valid integer
 -#define ARG_FLOAT		(1<<4)		// a valid floating point number
 -
 -// some specific commonly used predefined types. Can add up to (1<<31)
 -#define ARG_HEX			(1<<5)		// a valid hexadecimal integer. Note that ARG_INT will always be set also in this case.
 -#define ARG_TRUE		(1<<6)		// on, true, non-zero number
 -#define ARG_FALSE		(1<<7)		// off, false, zero
 -#define ARG_PLUS		(1<<8)		// Plus sign
 -#define ARG_MINUS		(1<<9)		// Minus sign
 -#define ARG_COMMA		(1<<10)		// a comma
 -#define ARG_UBYTE		(1<<11)		// a valid ubyte
 -
 -// A shortcut for boolean only variables.
 -// Example:
 -// DCF_BOOL( lighting, Show_lighting )
 -//
-Index: code/mission/missiongoals.cpp
+
 -	void dcf_##function_name();	\
---- code/mission/missiongoals.cpp	(revision 10462)
+
-+++ code/mission/missiongoals.cpp	(working copy)
+
 -	if ( Dc_command )	{	\
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);		\
 -		if ( Dc_arg_type & ARG_TRUE )	bool_variable = 1;	\
 -		else if ( Dc_arg_type & ARG_FALSE ) bool_variable = 0;	\
 -		else if ( Dc_arg_type & ARG_NONE ) bool_variable ^= 1;	\
 -	}	\
 -	if ( Dc_help )	dc_printf( "Usage: %s [bool]\nSets %s to true or false.  If nothing passed, then toggles it.\n", #function_name, #bool_variable );	\
 -	if ( Dc_status )	dc_printf( "%s is %s\n", #function_name, (bool_variable?"TRUE":"FALSE") );	\
-@@ -1262,77 +1263,101 @@ void mission_goal_mark_events_complete()
+
 -
 -
  //======================================================================================
 -//======================================================================================
 -//======================================================================================
 
 
  #include "math/fix.h"
 Index: globalincs/systemvars.cpp
 ===================================================================
 --- globalincs/systemvars.cpp	(Revision 10462)
 +++ globalincs/systemvars.cpp	(Arbeitskopie)
 @@ -8,7 +8,7 @@
  */
 
 
 -
 +#include "debugconsole/console.h"
  #include "globalincs/pstypes.h"
  #include "globalincs/systemvars.h"
  #include "io/timer.h"
 @@ -248,73 +248,76 @@
  char Monitor_filename[128];
  fix monitor_last_time = -1;
 
 -DCF(monitor,"Monitors game performace")
 +DCF(monitor,"Monitors game performace by saving to file")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_STRING|ARG_NONE);
 -		if ( Dc_arg_type == ARG_NONE )	{
 -			if ( Monitor_inited )	{
 -				Monitor_inited = 0;
 +	SCP_string filename;
 
 -/*
 -				FILE *fp = fopen( Monitor_filename, "at" );
 -				if ( fp )	{
 -					fprintf( fp, "\n\n" );
 -					fprintf( fp, "Name\tMin\tMax\tAvg\n" );
 -					for (int i=0; i<Num_monitors; i++ )	{
 -						if ( Monitor[i]->cnt > 0 )	{
 -							fprintf( fp, "%s\t%d\t%d\t%d\n", Monitor[i]->name, Monitor[i]->min, Monitor[i]->max, Monitor[i]->sum / Monitor[i]->cnt  );
 -						} else {
 -							fprintf( fp, "%s\t%d\t%d\t?\n", Monitor[i]->name, Monitor[i]->min, Monitor[i]->max );
 -						}
 -					}
 -					fclose(fp);
 -				}
 -*/
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: monitor [filename]\n");
 +		dc_printf("Outputs monitoring info to [filename]. No filename turns it off\n" );
 +		return;
 +	}
 
 -				dc_printf( "Monitor to file '%s' turned off\n", Monitor_filename );
 -			} else {
 -				dc_printf( "Monitor isn't on\n" );
 -			}
 +	if (dc_maybe_stuff_string_white(filename)) {
 +		if ( Monitor_inited )	{
 +				dc_printf( "Monitor already on\n" );
  		} else {
 -			if ( Monitor_inited )	{
 -				dc_printf( "Monitor already on\n" );
 -			} else {
 -				Monitor_inited = 1;
 +			Monitor_inited = 1;
 
 -				strcpy_s( Monitor_filename, Dc_arg );
 +			strcpy(Monitor_filename, filename.c_str());
 
 -				// Reset them all
 -				int i;
 +			// Reset them all
 +			int i;
 +			for (i=0; i<Num_monitors; i++ )	{
 +				Monitor[i]->value = 0;
 +				Monitor[i]->sum = 0;
 +				Monitor[i]->cnt = 0;
 +				Monitor[i]->min = 0;
 +				Monitor[i]->max = 0;
 +			}
 +
 +			FILE *fp = fopen( Monitor_filename, "wt" );
 +			if ( fp )	{
  				for (i=0; i<Num_monitors; i++ )	{
 -					Monitor[i]->value = 0;
 -					Monitor[i]->sum = 0;
 -					Monitor[i]->cnt = 0;
 -					Monitor[i]->min = 0;
 -					Monitor[i]->max = 0;
 +					if ( i > 0 )	{
 +						fprintf( fp, "\t" );
 +					}
 +					fprintf( fp, "%s", Monitor[i]->name );
 +
  				}
 +				fprintf( fp, "\n" );
 +				fclose(fp);
 +			}
 +			dc_printf( "Monitor outputting to file '%s'\n", Monitor_filename );
 +			monitor_last_time = -1;
 +		}
 
 -				FILE *fp = fopen( Monitor_filename, "wt" );
 -				if ( fp )	{
 -					for (i=0; i<Num_monitors; i++ )	{
 -						if ( i > 0 )	{
 -							fprintf( fp, "\t" );
 -						}
 -						fprintf( fp, "%s", Monitor[i]->name );
 -
 +	} else {
 +		// Turn off monitoring
 +		if ( Monitor_inited )	{
 +			Monitor_inited = 0;
 +
 +/*
 +			FILE *fp = fopen( Monitor_filename, "at" );
 +			if ( fp )	{
 +				fprintf( fp, "\n\n" );
 +				fprintf( fp, "Name\tMin\tMax\tAvg\n" );
 +				for (int i=0; i<Num_monitors; i++ )	{
 +					if ( Monitor[i]->cnt > 0 )	{
 +						fprintf( fp, "%s\t%d\t%d\t%d\n", Monitor[i]->name, Monitor[i]->min, Monitor[i]->max, Monitor[i]->sum / Monitor[i]->cnt  );
 +					} else {
 +						fprintf( fp, "%s\t%d\t%d\t?\n", Monitor[i]->name, Monitor[i]->min, Monitor[i]->max );
  					}
 -					fprintf( fp, "\n" );
 -					fclose(fp);
  				}
 -				dc_printf( "Monitor outputting to file '%s'\n", Monitor_filename );
 -				monitor_last_time = -1;
 +				fclose(fp);
  			}
 +*/
 +
 +			dc_printf( "Monitor to file '%s' turned off\n", Monitor_filename );
 +		} else {
 +			dc_printf( "Monitor isn't on\n" );
  		}
  	}
 -	if ( Dc_help )	{
 -		dc_printf( "Usage: monitor filename\nOutputs monitoring info to filename. No filename turns it off\n" );
 -	}
 -
  }
 
 
 @@ -508,44 +511,41 @@
  #ifndef NDEBUG
  DCF(detail_level,"Change the detail level")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_INT|ARG_NONE);
-Index: code/model/modelinterp.cpp
+
 -			Game_detail_level = 0;
---- code/model/modelinterp.cpp	(revision 10462)
+
-+++ code/model/modelinterp.cpp	(working copy)
+
 -		if ( Dc_arg_type & ARG_INT )	{
 -			Game_detail_level = Dc_arg_int;
 -		}
 +	int value;
 +
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: detail_level [n]\n");
 +		dc_printf("[n]  -- is detail level.\n");
-@@ -1942,19 +1943,20 @@ float Interp_depth_scale = 1500.0f;
+
 +			dc_printf("\tnegative values are lower, and\n");
 +			dc_printf("\tpositive values are higher.\n\n");
 +
 +		dc_printf("No parameter resets it to default.\n");
 +		return;
  	}
 
 -	if ( Dc_help )
 -		dc_printf( "Usage: detail_level [n]\nn is detail level. 0 normal, - lower, + higher, -2 to 2 usually\nNo parameter resets it to default.\n" );
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Detail level set to %d\n", Game_detail_level);
 +		return;
 +	}
 
 -	if ( Dc_status )
 -		dc_printf("Detail level set to %d\n", Game_detail_level);
 +	if (dc_maybe_stuff_int(&value)) {
 +		Game_detail_level = value;
 +		dc_printf("Detail level set to %i\n", Game_detail_level);
- 		dc_printf( "model_darkening = %.1f\n", Interp_depth_scale );
+
 +	} else {
 +		Game_detail_level = 0;
 +		dc_printf("Detail level reset\n");
 +	}
  }
 
  DCF(detail, "Turns on/off parts of the game for speed testing" )
  {
 -	if ( Dc_command )	{
-@@ -2117,8 +2119,13 @@ float model_find_closest_point( vec3d *outpnt, int model_num, int submodel_num,
+
 -		if ( Dc_arg_type & ARG_NONE )	{
 -			if ( Game_detail_flags == DETAIL_DEFAULT )	{
 -				Game_detail_flags = DETAIL_FLAG_CLEAR;
 -				dc_printf( "Detail flags set lowest (except has screen clear)\n" );
 -			} else {
 -				Game_detail_flags = DETAIL_DEFAULT;
 -				dc_printf( "Detail flags set highest\n" );
 -			}
 -		}
 -		if ( Dc_arg_type & ARG_INT )	{
 -			Game_detail_flags ^= Dc_arg_int;
 -		}
 -	}
 +	int value;
-Index: code/nebula/neb.cpp
+
 -	if ( Dc_help )	{
---- code/nebula/neb.cpp	(revision 10462)
+
-+++ code/nebula/neb.cpp	(working copy)
+
 +		dc_printf( "Usage: detail [n]\n");
 +		dc_printf("[n] is detail bit to toggle:\n" );
  		dc_printf( "   1: draw the stars\n" );
  		dc_printf( "   2: draw the nebulas\n" );
  		dc_printf( "   4: draw the motion debris\n" );
 @@ -555,22 +555,39 @@
  		dc_printf( "  64: clear screen background after each frame\n" );
  		dc_printf( " 128: draw hud stuff\n" );
-@@ -503,7 +504,7 @@ void neb2_page_in()
+
 -		dc_printf( " 512: do collision detection\n" );
 +		dc_printf( " 512: do collision detection\n\n" );
 +
 +		dc_printf("No argument will toggle between highest/lowest detail settings\n");
 +		return;
  	}
 
 -	if ( Dc_status )	{
-@@ -896,12 +897,14 @@ void neb2_regen()
+
  		dc_printf("Detail flags set to 0x%08x\n", Game_detail_flags);
 -		dc_printf( "   1: draw the stars: %s\n", (Game_detail_flags&1?"on":"off") );
 -		dc_printf( "   2: draw the nebulas: %s\n", (Game_detail_flags&2?"on":"off") );
 -		dc_printf( "   4: draw the motion debris: %s\n", (Game_detail_flags&4?"on":"off")  );
 -		dc_printf( "   8: draw planets: %s\n", (Game_detail_flags&8?"on":"off")  );
 -		dc_printf( "  16: draw models not as blobs: %s\n", (Game_detail_flags&16?"on":"off")  );
 -		dc_printf( "  32: draw lasers not as pixels: %s\n", (Game_detail_flags&32?"on":"off")  );
 -		dc_printf( "  64: clear screen background after each frame: %s\n", (Game_detail_flags&64?"on":"off")  );
 -		dc_printf( " 128: draw hud stuff: %s\n", (Game_detail_flags&128?"on":"off")  );
 -		dc_printf( " 256: draw fireballs: %s\n", (Game_detail_flags&256?"on":"off")  );
 -		dc_printf( " 512: do collision detection: %s\n", (Game_detail_flags&512?"on":"off")  );
 +		dc_printf( "   1: draw the stars: %s\n", ((Game_detail_flags & 1) ? "on" : "off"));
 +		dc_printf( "   2: draw the nebulas: %s\n", ((Game_detail_flags & 2)?"on" : "off"));
 +		dc_printf( "   4: draw the motion debris: %s\n", ((Game_detail_flags & 4) ? "on" : "off"));
 +		dc_printf( "   8: draw planets: %s\n", ((Game_detail_flags & 8) ? "on" : "off"));
 +		dc_printf( "  16: draw models not as blobs: %s\n", ((Game_detail_flags & 16) ? "on" : "off"));
-@@ -1443,7 +1446,7 @@ int neb2_get_bitmap()
+
 +		dc_printf( "  64: clear screen background after each frame: %s\n", ((Game_detail_flags & 64) ? "on" : "off"));
 +		dc_printf( " 128: draw hud stuff: %s\n", ((Game_detail_flags & 128) ? "on" : "off"));
 +		dc_printf( " 256: draw fireballs: %s\n", ((Game_detail_flags & 256) ? "on" : "off"));
 +		dc_printf( " 512: do collision detection: %s\n", ((Game_detail_flags & 512) ? "on" : "off"));
 +		return;
  	}
 +
 +	if (dc_maybe_stuff_int(&value)) {
-@@ -1463,7 +1466,7 @@ DCF(neb2, "list nebula console commands")
+
 +
 +	} else {
 +		if (Game_detail_flags == DETAIL_DEFAULT) {
 +			Game_detail_flags = DETAIL_FLAG_CLEAR;
 +			dc_printf( "Detail flags set lowest (except has screen clear)\n" );
 +		} else {
 +			Game_detail_flags = DETAIL_DEFAULT;
 +			dc_printf( "Detail flags set highest\n" );
-@@ -1471,95 +1474,91 @@ DCF(neb2, "list nebula console commands")
+
 +	}
  }
  #endif
 
 Index: globalincs/vmallocator.h
 ===================================================================
 --- globalincs/vmallocator.h	(Revision 10462)
 +++ globalincs/vmallocator.h	(Arbeitskopie)
 @@ -8,6 +8,7 @@
  #include <map>
  #include <string>
  #include <queue>
 +#include <deque>
 
  #if defined __GNUC__
  #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
 @@ -127,6 +128,9 @@
  template< typename T >
  class SCP_queue : public std::queue< T, std::deque< T, SCP_vm_allocator< T > > > { };
 
 +template< typename T >
 +class SCP_deque : public std::deque< T, SCP_vm_allocator< T > > { };
 +
  template <class T1, class T2>
  bool operator==(const SCP_vm_allocator<T1>&, const SCP_vm_allocator<T2>&) throw()
  {
 Index: globalincs/windebug.cpp
 ===================================================================
 --- globalincs/windebug.cpp	(Revision 10462)
 +++ globalincs/windebug.cpp	(Arbeitskopie)
 @@ -33,6 +33,7 @@
  #include "cmdline/cmdline.h"
  #include "parse/lua.h"
  #include "parse/parselo.h"
 +#include "debugconsole/console.h"
 
  #if defined( SHOW_CALL_STACK ) && defined( PDB_DEBUGGING )
  #	include "globalincs/mspdb_callstack.h"
 @@ -1522,7 +1523,7 @@
  #endif
 
  int Watch_malloc = 0;
 -DCF_BOOL(watch_malloc, Watch_malloc )
 +DCF_BOOL(watch_malloc, Watch_malloc );
 
  // Returns 0 if not enough RAM.
  int vm_init(int min_heap_size)
 Index: graphics/2d.cpp
 ===================================================================
 --- graphics/2d.cpp	(Revision 10462)
 +++ graphics/2d.cpp	(Arbeitskopie)
 @@ -31,6 +31,7 @@
  #include "parse/scripting.h"
  #include "gamesequence/gamesequence.h"	//WMC - for scripting hooks in gr_flip()
  #include "io/keycontrol.h" // m!m
 +#include "debugconsole/console.h"
 
 
  #if defined(SCP_UNIX) && !defined(__APPLE__)
 @@ -266,12 +267,9 @@
  {
  	ubyte r, g, b;
 
 -	dc_get_arg(ARG_UBYTE);
 -	r = Dc_arg_ubyte;
 -	dc_get_arg(ARG_UBYTE);
 -	g = Dc_arg_ubyte;
 -	dc_get_arg(ARG_UBYTE);
 -	b = Dc_arg_ubyte;
 +	dc_stuff_ubyte(&r);
 +	dc_stuff_ubyte(&g);
 +	dc_stuff_ubyte(&b);
 
  	// set the color
  	gr_set_clear_color(r, g, b);
 Index: graphics/gropengl.cpp
 ===================================================================
 --- graphics/gropengl.cpp	(Revision 10462)
 +++ graphics/gropengl.cpp	(Arbeitskopie)
 @@ -22,6 +22,7 @@
  #include "io/timer.h"
  #include "ddsutils/ddsutils.h"
  #include "model/model.h"
 +#include "debugconsole/console.h"
  #include "debugconsole/timerbar.h"
  #include "graphics/gropenglbmpman.h"
  #include "graphics/gropengllight.h"
 @@ -2078,56 +2079,61 @@
 
  DCF(ogl_minimize, "Minimizes opengl")
  {
 +	bool minimize_ogl = false;
 +
  	if ( gr_screen.mode != GR_OPENGL ) {
  		dc_printf("Command only available in OpenGL mode.\n");
  		return;
  	}
 
 -	if (Dc_command) {
 -		dc_get_arg(ARG_TRUE);
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("[bool] If true is passed, then the OpenGL window will minimize.\n");
 +		return;
 +	}
 +	dc_stuff_boolean(&minimize_ogl);
 
 -		if ( Dc_arg_type & ARG_TRUE ) {
 -			opengl_minimize();
 -		}
 +	if (minimize_ogl) {
 +		opengl_minimize();
  	}
 -
 -	if (Dc_help)
 -		dc_printf("If set to true then the OpenGL window will minimize.\n");
  }
 
  DCF(ogl_anisotropy, "toggles anisotropic filtering")
  {
 +	bool process = true;
 +	int value;
 +
  	if ( gr_screen.mode != GR_OPENGL ) {
  		dc_printf("Can only set anisotropic filter in OpenGL mode.\n");
  		return;
  	}
 
 -	if ( Dc_command && !Is_Extension_Enabled(OGL_EXT_TEXTURE_FILTER_ANISOTROPIC) ) {
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Sets OpenGL anisotropic filtering level.\n");
 +		dc_printf("GL_anisotropy [int]  Valid values are 0 to %i. 0 turns off anisotropic filtering.\n", (int)opengl_get_max_anisotropy());
 +		process = false;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Current anisotropic filter value is %i\n", (int)GL_anisotropy);
 +		process = false;
-@@ -1586,39 +1585,32 @@ DCF(neb2_mode, "")
+
 +
 +	if (!process) {
 +		return;
 +	}
 +
 +	if ( !Is_Extension_Enabled(OGL_EXT_TEXTURE_FILTER_ANISOTROPIC) ) {
  		dc_printf("Error: Anisotropic filter is not settable!\n");
  		return;
  	}
 
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_INT | ARG_NONE);
 -
 -		if ( Dc_arg_type & ARG_NONE ) {
 +	if (!dc_maybe_stuff_int(&value)) {
 +		// No arg passed, set to default
  			GL_anisotropy = 1.0f;
  		//	opengl_set_anisotropy();
  			dc_printf("Anisotropic filter value reset to default level.\n");
 -		}
 -
 -		if ( Dc_arg_type & ARG_INT ) {
 -			GL_anisotropy = (GLfloat)Dc_arg_float;
 +	} else {
 +		GL_anisotropy = (GLfloat)value;
  		//	opengl_set_anisotropy( (float)Dc_arg_float );
 -		}
  	}
 -
 -	if ( Dc_status ) {
 -		dc_printf("Current anisotropic filter value is %i\n", (int)GL_anisotropy);
 -	}
 -
 -	if (Dc_help) {
 -		dc_printf("Sets OpenGL anisotropic filtering level.\n");
 -		dc_printf("Valid values are 1 to %i, or 0 to turn off.\n", (int)opengl_get_max_anisotropy());
 -	}
  }
 Index: hud/hudlock.cpp
 ===================================================================
 --- hud/hudlock.cpp	(Revision 10462)
 +++ hud/hudlock.cpp	(Arbeitskopie)
 @@ -26,6 +26,7 @@
  #include "mission/missionparse.h"
  #include "iff_defs/iff_defs.h"
  #include "network/multi.h"
 +#include "debugconsole/console.h"
 
 
-Index: code/nebula/neblightning.cpp
+
 @@ -333,7 +334,7 @@
---- code/nebula/neblightning.cpp	(revision 10462)
+
-+++ code/nebula/neblightning.cpp	(working copy)
+
  int Nebula_sec_range = 0;
 -DCF_BOOL(nebula_sec_range, Nebula_sec_range)
 +DCF_BOOL(nebula_sec_range, Nebula_sec_range);
 
  int hud_lock_world_pos_in_range(vec3d *target_world_pos, vec3d *vec_to_target)
  {
 Index: io/joy.cpp
 ===================================================================
-@@ -81,52 +82,43 @@ vec3d Nebl_bolt_strike;			// strike point of the bolt being generated
+--- io/joy.cpp	(Revision 10462)
 +++ io/joy.cpp	(Arbeitskopie)
 @@ -21,6 +21,7 @@
  #include "io/joy_ff.h"
  #include "directx/vdinput.h"
  #include "osapi/osapi.h"
 +#include "debugconsole/console.h"
 
 
 
 @@ -300,45 +301,51 @@
  int joy_get_scaled_reading(int raw, int axn);
  int joy_get_unscaled_reading(int raw, int axn);
 
 -DCF(joytest, "Test joystick")
 +DCF(joytest, "Test joystick (X, Y)")
  {
 -	if (Dc_command) {
 -		while (!keyd_pressed[KEY_ESC]) {
 -			int x, y, axis[JOY_NUM_AXES];
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Outputs the scaled reading of the joystick to a seperate window.\n");
 +		dc_printf("Press ESC to end the test\n");
 +	}
 
 -			if (joy_num_sticks < 1)
 -				return;
 +	while (!keyd_pressed[KEY_ESC]) {
 +		int x, y, axis[JOY_NUM_AXES];
 
 -			joystick_read_raw_axis(JOY_NUM_AXES, axis);
 +		if (joy_num_sticks < 1)
 +			return;
 
 -			x = joy_get_scaled_reading(axis[0], 0);
 -			y = joy_get_scaled_reading(axis[1], 1);
 +		joystick_read_raw_axis(JOY_NUM_AXES, axis);
 
 -			mprintf(("X=%5d Y=%5d  Calibrated X=%6d Y=%6d\n", axis[0], axis[1], x, y));
 -			Sleep(100);
 -		}
 +		x = joy_get_scaled_reading(axis[0], 0);
 +		y = joy_get_scaled_reading(axis[1], 1);
 +
 +		mprintf(("X=%5d Y=%5d  Calibrated X=%6d Y=%6d\n", axis[0], axis[1], x, y));
 +		Sleep(100);
  	}
  }
 
 -DCF(joytest2, "Test joystick (extended)")
 +DCF(joytest2, "Test joystick (X, Y, Z, Rx, Ry, Rz)")
  {
 -	if (Dc_command) {
 -		while (!keyd_pressed[KEY_ESC]) {
 -			int x, y, z, r, axis[JOY_NUM_AXES];
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Outputs the scaled reading of the joystick to a seperate window.\n");
 +		dc_printf("Press ESC to end the test\n");
 +	}
 
 -			if (joy_num_sticks < 1)
 -				return;
 +	while (!keyd_pressed[KEY_ESC]) {
 +		int x, y, z, r, axis[JOY_NUM_AXES];
 
 -			joystick_read_raw_axis(JOY_NUM_AXES, axis);
 +		if (joy_num_sticks < 1)
 +			return;
 
 -			x = joy_get_scaled_reading(axis[0], 0);
 -			y = joy_get_scaled_reading(axis[1], 1);
 -			z = joy_get_unscaled_reading(axis[2], 2);
-@@ -144,12 +136,12 @@ DCF(b_list, "")
+
 +		joystick_read_raw_axis(JOY_NUM_AXES, axis);
 
 -			mprintf(("X=%5d Y=%5d Z=%5d Rx=%5d Ry=%5d Rz=%5d Cal X=%6d Y=%6d Z=%6d R=%6d\n", axis[0], axis[1], axis[2], axis[3], axis[4], axis[5], x, y, z, r));
 -			Sleep(100);
 -		}
 +		x = joy_get_scaled_reading(axis[0], 0);
 +		y = joy_get_scaled_reading(axis[1], 1);
 +		z = joy_get_unscaled_reading(axis[2], 2);
 +		r = joy_get_scaled_reading(axis[3], 3);
 +
 +		mprintf(("X=%5d Y=%5d Z=%5d Rx=%5d Ry=%5d Rz=%5d Cal X=%6d Y=%6d Z=%6d R=%6d\n", axis[0], axis[1], axis[2], axis[3], axis[4], axis[5], x, y, z, r));
 +		Sleep(100);
  	}
  }
 
 Index: lighting/lighting.cpp
 ===================================================================
-Index: code/network/multi.cpp
+--- lighting/lighting.cpp	(Revision 10462)
 +++ lighting/lighting.cpp	(Arbeitskopie)
---- code/network/multi.cpp	(revision 10462)
+
-+++ code/network/multi.cpp	(working copy)
+
  #include "graphics/2d.h"
  #include "cmdline/cmdline.h"
 +#include "debugconsole/console.h"
 
 
 
 @@ -62,52 +63,11 @@
 
-@@ -1105,14 +1106,15 @@ void multi_process_incoming()
+
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_STRING);
 -		if ( !strcmp( Dc_arg, "ambient" ))	{
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) )	{
--	eye_tog = !eye_tog;
+
 -			} else {
 -				Ambient_light = Dc_arg_float;
 -			}
 -		} else if ( !strcmp( Dc_arg, "reflect" ))	{
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) )	{
 -				Dc_help = 1;
 -			} else {
 -				Reflective_light = Dc_arg_float;
-+	eye_tog = !eye_tog;
+
 -		} else if ( !strcmp( Dc_arg, "default" ))	{
 -			Lighting_mode = LM_BRIGHTEN;
 -			Ambient_light = AMBIENT_LIGHT_DEFAULT;
 -			Reflective_light = REFLECTIVE_LIGHT_DEFAULT;
-@@ -1772,13 +1774,14 @@ void multi_reset_timestamps()
+
 -		} else if ( !strcmp( Dc_arg, "mode" ))	{
 -			dc_get_arg(ARG_STRING);
 -			if ( !strcmp(Dc_arg, "light") )	{
 -				Lighting_mode = LM_BRIGHTEN;
 -			} else if ( !strcmp(Dc_arg, "darken"))	{
 -				Lighting_mode = LM_DARKEN;
 -			} else {
 -				Dc_help = 1;
 -			}
 -		} else if ( !strcmp( Dc_arg, "dynamic" ))	{
 -			dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -			if ( Dc_arg_type & ARG_TRUE )	Lighting_flag = 1;
 -			else if ( Dc_arg_type & ARG_FALSE ) Lighting_flag = 0;
 -			else if ( Dc_arg_type & ARG_NONE ) Lighting_flag ^= 1;
 -		} else if ( !strcmp( Dc_arg, "on" ) )	{
 -			Lighting_off = 0;
 -		} else if ( !strcmp( Dc_arg, "off" ) )	{
 -			Lighting_off = 1;
 -		} else {
-Index: code/network/multi_kick.cpp
+
 -			Dc_help = 1;
---- code/network/multi_kick.cpp	(revision 10462)
+
-+++ code/network/multi_kick.cpp	(working copy)
+
 +	SCP_string arg_str;
 +	float val_f;
 +	bool  val_b;
 
 -	if ( Dc_help )	{
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: light keyword\nWhere keyword can be in the following forms:\n" );
  		dc_printf( "light on|off          Turns all lighting on/off\n" );
-@@ -137,18 +138,14 @@ int multi_kick_is_banned(net_addr *addr)
+
 @@ -117,19 +77,71 @@
  		dc_printf( "light mode [light|darken]   Changes the lighting mode.\n" );
  		dc_printf( "   Where 'light' means the global light adds light.\n");
  		dc_printf( "   and 'darken' means the global light subtracts light.\n");
 -		Dc_status = 0;	// don't print status if help is printed.  Too messy.
 +		return;
  	}
 
 -	if ( Dc_status )	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		dc_printf( "Ambient light is set to %.2f\n", Ambient_light );
  		dc_printf( "Reflective light is set to %.2f\n", Reflective_light );
  		dc_printf( "Dynamic lighting is: %s\n", (Lighting_flag?"on":"off") );
 -		switch( Lighting_mode )	{
 -		case LM_BRIGHTEN:   dc_printf( "Lighting mode is: light\n" ); break;
 -		case LM_DARKEN:   dc_printf( "Lighting mode is: darken\n" ); break;
 -		default: dc_printf( "Lighting mode is: UNKNOWN\n" ); break;
 +		switch( Lighting_mode ) {
 +		case LM_BRIGHTEN:
 +			dc_printf( "Lighting mode is: light\n" );
 +			break;
-@@ -156,7 +153,7 @@ void multi_dcf_kick()
+
 +			dc_printf( "Lighting mode is: darken\n" );
 +			break;
 +		default:
 +			dc_printf( "Lighting mode is: UNKNOWN\n" );
-+		dc_printf("Could not find player %s to kick!", arg);
+
 +		return;
  	}
 +
-Index: code/network/multi_obj.cpp
+
 +		dc_stuff_float(&val_f);
---- code/network/multi_obj.cpp	(revision 10462)
+
-+++ code/network/multi_obj.cpp	(working copy)
+
 +		} else {
 +			Ambient_light = val_f;
 +		}
 +
 +	} else if (dc_optional_string("reflect")) {
 +		dc_stuff_float(&val_f);
 +		if ( (val_f < 0.0f) || (val_f > 1.0f))	{
 +			dc_printf(" Error: reflect value mus be between 0.0 and 1.0\n");
-@@ -1569,10 +1570,21 @@ int OO_server_rate_stamp = -1;
+
 +			Reflective_light = val_f;
 +		}
 +
 +	} else if (dc_optional_string("default")) {
 +		Lighting_mode = LM_BRIGHTEN;
 +		Ambient_light = AMBIENT_LIGHT_DEFAULT;
 +		Reflective_light = REFLECTIVE_LIGHT_DEFAULT;
 +		Lighting_flag = 0;
 +
 +	} else if (dc_optional_string("mode")) {
 +		dc_stuff_string_white(arg_str);
 +		if (arg_str == "light") {
 +			Lighting_mode = LM_BRIGHTEN;
 +
 +		} else if (arg_str == "darken") {
 +			Lighting_mode = LM_DARKEN;
 +
 +		} else {
 +			dc_printf(" Error: unknown light mode: '%s'\n", arg_str.c_str());
 +		}
 +
 +	} else if (dc_optional_string("dynamic")) {
 +		dc_stuff_boolean(&val_b);
 +		Lighting_flag = val_b;
-@@ -1939,10 +1951,21 @@ void multi_oo_interp(object *objp)
+
 +	} else if(dc_maybe_stuff_boolean(&Lighting_off)) {
 +		Lighting_off = !Lighting_off;
 +
 +	} else {
 +		dc_stuff_string_white(arg_str);
 +		dc_printf("Error: Unknown argument '%s'\n");
 +	}
  }
 
  void light_reset()
 Index: menuui/playermenu.cpp
 ===================================================================
 --- menuui/playermenu.cpp	(Revision 10462)
 +++ menuui/playermenu.cpp	(Arbeitskopie)
 @@ -31,6 +31,7 @@
  #include "parse/parselo.h"
  #include "cfile/cfile.h"
  #include "network/multi.h"
 +#include "debugconsole/console.h"
 
 
  // --------------------------------------------------------------------------------------------------------
 @@ -1236,40 +1237,38 @@
 
-@@ -1994,14 +2017,16 @@ void oo_update_time()
+
  {
 -	if(gameseq_get_state() != GS_STATE_INITIAL_PLAYER_SELECT) {
 -		dc_printf("This command can only be run in the initial player select screen.\n");
 +	int idx;
 +
 +	if (gameseq_get_state() != GS_STATE_INITIAL_PLAYER_SELECT) {
--	display_oo_bez = !display_oo_bez;
+
  		return;
  	}
 
 -	if (Dc_command) {
 -		dc_get_arg(ARG_INT | ARG_NONE);
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: bastion [index]\n");
 +		dc_printf("    [index] -- optional main hall index; if not supplied, defaults to 1\n");
 +		return;
-+	display_oo_bez = !display_oo_bez;
+
 
 -		if (Dc_arg_type & ARG_INT) {
 -			int idx = Dc_arg_int;
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Player is on main hall '%s'\n", Player_select_force_main_hall.c_str());
-Index: code/network/multi_pxo.cpp
+
 +	}
---- code/network/multi_pxo.cpp	(revision 10462)
+
-+++ code/network/multi_pxo.cpp	(working copy)
+
 -			if (idx < 0 || idx >= (int) Main_hall_defines.at(gr_screen.res).size()) {
 -				dc_printf("Main hall index out of range\n");
 -			} else {
 -				main_hall_get_name(Player_select_force_main_hall, idx);
 -				dc_printf("Player is now on main hall '%d'\n", Player_select_force_main_hall.c_str());
 -			}
 +	if (dc_maybe_stuff_int(&idx)) {
 +		Assert(Main_hall_defines.at(gr_screen.res).size() < INT_MAX);
-@@ -461,14 +462,15 @@ void multi_pxo_scroll_players_down();
+
 +			dc_printf("Main hall index out of range\n");
  		} else {
 -			Player_select_force_main_hall = "1";
 -			dc_printf("Player is now on the Bastion... hopefully\n");
 +			main_hall_get_name(Player_select_force_main_hall, idx);
 +			dc_printf("Player is now on main hall '%d'\n", Player_select_force_main_hall.c_str());
  		}
 -		Dc_status = 0;
 +
- 	// add a bunch of bogus players
+
 +		// No argument passed
 +		Player_select_force_main_hall = "1";
 +		dc_printf("Player is now on the Bastion... hopefully\n");
  	}
 -
 -	if (Dc_help) {
 -		dc_printf("Usage: bastion [index]\n");
 -		dc_printf("       [index] -- optional main hall index; if not supplied, defaults to 1\n");
 -		Dc_status = 0;
 -	}
-Index: code/network/multi_voice.cpp
+
 -	if (Dc_status) {
---- code/network/multi_voice.cpp	(revision 10462)
+
-+++ code/network/multi_voice.cpp	(working copy)
+
-@@ -22,7 +22,7 @@
+
 
  #define MAX_PLAYER_TIPS			40
 Index: mission/missiongoals.cpp
 ===================================================================
 --- mission/missiongoals.cpp	(Revision 10462)
 +++ mission/missiongoals.cpp	(Arbeitskopie)
 @@ -13,6 +13,7 @@
  #include "mission/missiongoals.h"
-@@ -483,16 +483,17 @@ void multi_voice_process()
+
  #include "missionui/missionscreencommon.h"
 +#include "debugconsole/console.h"
  #include "freespace2/freespace.h"
  #include "gamesequence/gamesequence.h"
  #include "hud/hud.h"
 @@ -1262,77 +1263,101 @@
  }
 
  // some debug console functions to help list and change the status of mission goals
 -DCF(show_mission_goals,"List and change the status of mission goals")
 +DCF(show_mission_goals,"Lists the status of mission goals")
  {
  	int i, type;
 
 -	if (Dc_command)
 -		Dc_status = 1;
 -
 -	if (Dc_help) {
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf("Usage: show_mission_goals\n\nList all mission goals and their current status.\n");
 -		Dc_status = 0;
 +		return;
  	}
 
 -	if (Dc_status) {
-Index: code/network/multilag.cpp
+
 -			type = Mission_goals[i].type & GOAL_TYPE_MASK;
---- code/network/multilag.cpp	(revision 10462)
+
-+++ code/network/multilag.cpp	(working copy)
+
 -				dc_printf("satisfied.\n");
 -			else if ( Mission_goals[i].satisfied == GOAL_INCOMPLETE )
 -				dc_printf("not satisfied\n");
 -			else if ( Mission_goals[i].satisfied == GOAL_FAILED )
 -				dc_printf("failed\n");
 -			else
 -				dc_printf("\t[unknown goal status].\n");
 -		}
-@@ -392,6 +393,7 @@ void multi_lag_put_free(lag_buf *buf)
+
 +		// Don't do anything, but advance the parser past the flag
  	}
 +
 +	for (i=0; i<Num_goals; i++) {
 +		type = Mission_goals[i].type & GOAL_TYPE_MASK;
 +		dc_printf("%2d. %32s(%10s) -- ", i, Mission_goals[i].name, Goal_type_text(type));
 +		if ( Mission_goals[i].satisfied == GOAL_COMPLETE )
-@@ -400,183 +402,290 @@ void multi_lagloss_dcf()
+
 +		else if ( Mission_goals[i].satisfied == GOAL_INCOMPLETE )
 +			dc_printf("unsatisfied\n");
 +		else if ( Mission_goals[i].satisfied == GOAL_FAILED )
 +			dc_printf("failed\n");
 +		else
 +			dc_printf("Warning! Mission goal %i is in an invalid state! (value: %i)", i, Mission_goals[i].satisfied);
 +	}
 +
  }
 
  //XSTR:OFF
 -DCF(change_mission_goal, "Change the mission goal")
 +DCF(change_mission_goal, "Changes the mission goal status")
  {
  	int num;
 +	bool val_b;
 +	char *string;
 
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_INT);
 -		if ( Dc_arg_int >= Num_goals ) {
 -			dc_printf ("First parameter must be a valid goal number.\n");
 -			return;
 -		}
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: change_mission_goal <goal_num> [status]\n");
 +		dc_printf("<goal_num> --  Integer number of goal to change.  See show_mission_goals\n");
 +		dc_printf("[status]   --  Goal status to change to.\n\n");
 
 -		num = Dc_arg_int;
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_STRING);
 -		if ( Dc_arg_type & ARG_TRUE )
 -			Mission_goals[num].satisfied = GOAL_COMPLETE;
 -		else if ( Dc_arg_type & ARG_FALSE )
 -			Mission_goals[num].satisfied = GOAL_FAILED;
 -		else if ( Dc_arg_type & ARG_NONE )
 -			Mission_goals[num].satisfied = GOAL_INCOMPLETE;
 -		else if ( Dc_arg_type & ARG_STRING) {
 -			if ( !stricmp(Dc_arg, "satisfied") )
 -				Mission_goals[num].satisfied = GOAL_COMPLETE;
 -			else if ( !stricmp( Dc_arg, "failed") )
 -				Mission_goals[num].satisfied = GOAL_FAILED;
 -			else if ( !stricmp( Dc_arg, "unknown") )
 -				Mission_goals[num].satisfied = GOAL_INCOMPLETE;
 -			else
 -				dc_printf("Unknown status %s.  Use 'satisfied', 'failed', or 'unknown'\n", Dc_arg);
 -		}
 +		dc_printf("The optional [status] field may be either a bool type or a string.\n");
 +		dc_printf("\ttrue  -- Goal status set to 'complete'\n");
 +		dc_printf("\tfalse -- Goal status set to 'failed'\n\n");
 +
 +		dc_printf("A string value of 'satisfied', 'failed', or 'unknown' will set the goal status to the respective state.\n");
 +		dc_printf("If [status] is not given, then the goal status will be set to 'unknown'");
 +
 +		dc_printf("Examples:\n");
 +		dc_printf("\t'change_mission_goal 1 true'  makes goal 1 as successful.\n");
 +		dc_printf("\t'change_mission_goal 2'       marks goal 2 as unknown/incomplete\n");
 +		dc_printf("\t'change_mission_goal 0 satisfied'    marks goal 0 as satisfied\n");
 +		return;
  	}
 
 -	if ( Dc_help ) {
 -		dc_printf("Usage: change_mission_goal <goal_num> <status>\n");
 -		dc_printf("<goal_num> --  Integer number of goal to change.  See show_mission_goals\n");
 -		dc_printf("<status>   --  [bool] where a true value makes the goal satisfied,\n");
 -		dc_printf("               a false value makes the goal failed.\n");
 -		dc_printf("The <status> field may also be one of 'satisfied', 'failed', or 'unknown'\n");
 -		dc_printf("\nExamples:\n\n'change_mission_goal 1 true' makes goal 1 successful.\n");
 -		dc_printf("'change_mission_goal 2' marks goal 2 not complete\n");
 -		dc_printf("'change_mission_goal 0 satisfied' marks goal 0 as satisfied\n");
 -		Dc_status = 0;
 +	dc_stuff_int(&num);
 +	if ( num >= Num_goals ) {
 +		dc_printf (" Error: Invalid value for <goal_num>. Valid values: 0 - %i\n", Num_goals);
 +		return;
  	}
 +
 +	if (dc_optional_string("satisfied")) {
 +		Mission_goals[num].satisfied = GOAL_COMPLETE;
 +
 +	} else if (dc_optional_string("failed")) {
 +		Mission_goals[num].satisfied = GOAL_FAILED;
 +
 +	} else if (dc_optional_string("unsatisfied")) {
 +		Mission_goals[num].satisfied = GOAL_INCOMPLETE;
 +
 +	} else if (dc_maybe_stuff_boolean(&val_b)) {
 +		val_b ? Mission_goals[num].satisfied = GOAL_COMPLETE : Mission_goals[num].satisfied = GOAL_FAILED;
 +
 +	} else {
 +		// No argument given
 +		Mission_goals[num].satisfied = GOAL_INCOMPLETE;
 +	}
 +
 +	switch(Mission_goals[num].satisfied) {
 +	case GOAL_COMPLETE:
 +		string = "satisfied";
 +		break;
 +
 +	case GOAL_FAILED:
 +		string = "failed";
 +		break;
 +
 +	case GOAL_INCOMPLETE:
 +		string = "unsatisfied";
 +		break;
 +
 +	default:
 +		dc_printf("Warning! Mission goal %i is in an invalid state! (value: %i)", num, Mission_goals[num].satisfied);
 +		return;
 +	}
 +	dc_printf("Mission goal %i set to '%s'\n", num, string);
  }
  //XSTR:ON
 
 Index: model/modelinterp.cpp
 ===================================================================
 --- model/modelinterp.cpp	(Revision 10462)
 +++ model/modelinterp.cpp	(Arbeitskopie)
 @@ -33,6 +33,7 @@
  #include "graphics/gropengllight.h"
  #include "ship/shipfx.h"
  #include "gamesequence/gamesequence.h"
 +#include "debugconsole/console.h"
 
  #include <limits.h>
 
 @@ -1941,19 +1942,20 @@
 
  DCF(model_darkening,"Makes models darker with distance")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_FLOAT);
 -		Interp_depth_scale = Dc_arg_float;
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: model_darkening <float>\n" );
 +		dc_printf("Sets the distance at which to start blacking out models (namely asteroids).\n");
 +		return;
  	}
 
 -	if ( Dc_help )	{
 -		dc_printf( "Usage: model_darkening float\n" );
 -		Dc_status = 0;	// don't print status if help is printed.  Too messy.
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf( "model_darkening = %.1f\n", Interp_depth_scale );
 +		return;
  	}
 
 -	if ( Dc_status )	{
 -		dc_printf( "model_darkening = %.1f\n", Interp_depth_scale );
 -	}
 +	dc_stuff_float(&Interp_depth_scale);
 +
 +	dc_printf("model_darkening set to %.1f\n", Interp_depth_scale);
  }
 
  void model_render(int model_num, matrix *orient, vec3d * pos, uint flags, int objnum, int lighting_skip, int *replacement_textures)
 @@ -2116,8 +2118,13 @@
  }
 
  int tiling = 1;
 -DCF(tiling, "")
 +DCF(tiling, "Toggles rendering of tiled textures (default is on)")
  {
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Tiled textures are %s", tiling ? "ON" : "OFF");
 +		return;
 +	}
 +
  	tiling = !tiling;
  	if(tiling){
  		dc_printf("Tiled textures\n");
 Index: nebula/neb.cpp
 ===================================================================
 --- nebula/neb.cpp	(Revision 10462)
 +++ nebula/neb.cpp	(Arbeitskopie)
 @@ -24,6 +24,7 @@
  #include "mission/missionparse.h"
  #include "ship/ship.h"
  #include "cmdline/cmdline.h"
 +#include "debugconsole/console.h"
 
 
  // --------------------------------------------------------------------------------------------------------
 @@ -503,7 +504,7 @@
 
  // should we not render this object because its obscured by the nebula?
  int neb_skip_opt = 1;
 -DCF(neb_skip, "")
 +DCF(neb_skip, "Toggles culling of objects obscured by nebula")
  {
  	neb_skip_opt = !neb_skip_opt;
  	if (neb_skip_opt) {
 @@ -896,12 +897,14 @@
  	}
  }
 
 +/*
 + * TODO: remove this
  float max_area = 100000000.0f;
  DCF(max_area, "")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	max_area = Dc_arg_float;
 +	dc_stuff_float(&max_area);
  }
 +*/
 
  float g3_draw_rotated_bitmap_area(vertex *pnt, float angle, float rad, uint tmap_flags, float area);
  int neb_mode = 1;
 @@ -1443,7 +1446,7 @@
  }
 
  // nebula DCF functions ------------------------------------------------------
 -
 +// TODO: With the new debug parser in place, most of these sub-commands can now be handled by neb2. This should clear up the DCF list a bit
  DCF(neb2, "list nebula console commands")
  {
  //	dc_printf("neb2_fog <X> <float> <float>  : set near and far fog planes for ship type X\n");
 @@ -1463,7 +1466,7 @@
  	dc_printf("neb2_cinner      : poof cube inner dimension\n");
  	dc_printf("neb2_couter      : poof cube outer dimension\n");
  	dc_printf("neb2_jitter      : poof jitter\n");
 -	dc_printf("neb2_mode        : switch between no nebula, polygon background, pof background, lame or HTL rendering (0, 1, 2, 3 and 4 respectively)\n\n");
 +	dc_printf("neb2_mode        : switch between no nebula, polygon background, pof background, lame, or HTL rendering (0, 1, 2, 3 and 4 respectively)\n\n");
  	dc_printf("neb2_ff          : flash fade/sec\n");
  	dc_printf("neb2_background	: rgb background color\n");
  	dc_printf("neb2_fog_color   : rgb fog color\n");
 @@ -1471,95 +1474,91 @@
  //	dc_printf("neb2_fog_vals    : display all the current settings for all above values\n");
  }
 
 -DCF(neb2_prad, "")
 +DCF(neb2_prad, "set cloud poof radius")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Nd->prad = Dc_arg_float;
 +	dc_stuff_float(&Nd->prad);
  }
 -DCF(neb2_cdim, "")
 +DCF(neb2_cdim, "poof cube dimension")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Nd->cube_dim = Dc_arg_float;
 +	dc_stuff_float(&Nd->cube_dim);
  }
 
 -DCF(neb2_cinner, "")
 +DCF(neb2_cinner, "poof cube inner dimension")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Nd->cube_inner = Dc_arg_float;
 +	dc_stuff_float(&Nd->cube_inner);
  }
 
 -DCF(neb2_couter, "")
 +DCF(neb2_couter, "poof cube outer dimension")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Nd->cube_outer = Dc_arg_float;
 +	dc_stuff_float(&Nd->cube_outer);
  }
 
 -DCF(neb2_jitter, "")
 +DCF(neb2_jitter, "poof jitter")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Nd->hj = Nd->dj = Nd->wj = Dc_arg_float;
 +	float value;
 +	dc_stuff_float(&value);
 +	Nd->hj = Nd->dj = Nd->wj = value;
  }
 
 -DCF(neb2_max_alpha, "")
 +DCF(neb2_max_alpha, "max alpha value (0.0 to 1.0) for cloud poofs.")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Nd->max_alpha_glide = Dc_arg_float;
 +	dc_stuff_float(&Nd->max_alpha_glide);
  }
 
 -DCF(neb2_break_alpha, "")
 +DCF(neb2_break_alpha, "alpha value (0.0 to 1.0) at which faded polygons are not drawn.")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Nd->break_alpha = Dc_arg_float;
 +	dc_stuff_float(&Nd->break_alpha);
  }
 
 -DCF(neb2_break_off, "")
 +DCF(neb2_break_off, "how many pixels offscreen (left, right, top, bottom) when a cloud poof becomes fully transparent.")
  {
 -	dc_get_arg(ARG_INT);
 -	Nd->break_y = (float)Dc_arg_int;
 -	Nd->break_x = Nd->break_y * 1.3333f;
 +	int value;
 +	dc_stuff_int(&value);
 +	Nd->break_y = (float)value;
 +	Nd->break_x = Nd->break_y * gr_screen.aspect;
  }
 
 -DCF(neb2_smooth, "")
 +DCF(neb2_smooth, "magic fog smoothing modes (0 - 3)")
  {
  	int index;
 -	dc_get_arg(ARG_INT);
 -	index = Dc_arg_int;
 +	dc_stuff_int(&index);
  	if ( (index >= 0) && (index <= 3) ) {
  		wacky_scheme = index;
 +	} else {
 +		dc_printf("Invalid smooth mode %i", index);
  	}
  }
 
 -DCF(neb2_select, "")
 +DCF(neb2_select, "Enables/disables a poof bitmap")
  {
 -	dc_get_arg(ARG_INT);
 -	int bmap = Dc_arg_int;
 +	int bmap;
 +	bool val_b;
 +
 +	dc_stuff_int(&bmap);
 +
  	if ( (bmap >= 0) && (bmap < Neb2_poof_count) ) {
 -		dc_get_arg(ARG_INT);
 -		if (Dc_arg_int) {
 -			Neb2_poof_flags |= (1<<bmap);
 -		} else {
 -			Neb2_poof_flags &= ~(1<<bmap);
 -		}
 +		dc_stuff_boolean(&val_b);
 +
 +		val_b ? (Neb2_poof_flags |= (1<<bmap)) : (Neb2_poof_flags &= ~(1<<bmap));
  	}
  }
 
 -DCF(neb2_rot, "")
 +DCF(neb2_rot, "set max rotation speed for poofs")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	max_rotation = Dc_arg_float;
 +	dc_stuff_float(&max_rotation);
  }
 
 -DCF(neb2_ff, "")
 +DCF(neb2_ff, "flash fade/sec")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	neb2_flash_fade = Dc_arg_float;
 +	dc_stuff_float(&neb2_flash_fade);
  }
 
 -DCF(neb2_mode, "")
 +DCF(neb2_mode, "Switches nebula render modes")
  {
 -	dc_get_arg(ARG_INT);
 +	int mode;
 +	dc_stuff_int(&mode);
 
 -	switch (Dc_arg_int) {
 +	switch (mode) {
  		case NEB2_RENDER_NONE:
  			Neb2_render_mode = NEB2_RENDER_NONE;
  		break;
 @@ -1586,23 +1585,19 @@
  	}
  }
 
 -DCF(neb2_slices, "")
 +DCF(neb2_slices, "Sets how many 'slices' are used in the nebula")
  {
 -	dc_get_arg(ARG_INT);
 -	Neb2_slices = Dc_arg_int;
 +	dc_stuff_int(&Neb2_slices);
  	neb2_eye_changed();
  }
 
 -DCF(neb2_background, "")
 +DCF(neb2_background, "Sets the RGB background color (lame rendering)")
  {
  	int r, g, b;
 
 -	dc_get_arg(ARG_INT);
 -	r = Dc_arg_int;
 -	dc_get_arg(ARG_INT);
 -	g = Dc_arg_int;
 -	dc_get_arg(ARG_INT);
 -	b = Dc_arg_int;
 +	dc_stuff_int(&r);
 +	dc_stuff_int(&g);
 +	dc_stuff_int(&b);
 
  	Neb2_background_color[0] = r;
  	Neb2_background_color[1] = g;
 @@ -1609,16 +1604,13 @@
-@@ -587,29 +696,46 @@ DCF(lagloss, "")
+
  }
 
 -DCF(neb2_fog_color, "")
 +DCF(neb2_fog_color, "Sets the RGB fog color (HTL)")
  {
  	ubyte r, g, b;
 
 -	dc_get_arg(ARG_UBYTE);
 -	r = Dc_arg_ubyte;
 -	dc_get_arg(ARG_UBYTE);
 -	g = Dc_arg_ubyte;
 -	dc_get_arg(ARG_UBYTE);
 -	b = Dc_arg_ubyte;
 +	dc_stuff_ubyte(&r);
 +	dc_stuff_ubyte(&g);
 +	dc_stuff_ubyte(&b);
 
  	Neb2_fog_color_r = r;
  	Neb2_fog_color_g = g;
 Index: nebula/neblightning.cpp
 ===================================================================
 --- nebula/neblightning.cpp	(Revision 10462)
 +++ nebula/neblightning.cpp	(Arbeitskopie)
 @@ -13,6 +13,7 @@
  #include "parse/parselo.h"
  #include "globalincs/linklist.h"
  #include "io/timer.h"
 +#include "debugconsole/console.h"
  #include "freespace2/freespace.h"
  #include "gamesnd/gamesnd.h"
  #include "render/3d.h"
 @@ -81,52 +82,43 @@
  storm_type *Storm = NULL;
 
  // vars
 -DCF(b_scale, "")
 +DCF(b_scale, "Sets the scale factor for debug nebula bolts")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Bolt_types[DEBUG_BOLT].b_scale = Dc_arg_float;
 +	dc_stuff_float(&Bolt_types[DEBUG_BOLT].b_scale);
  }
 -DCF(b_rand, "")
 +DCF(b_rand, "Sets the randomness factor for debug nebula bolts")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Bolt_types[DEBUG_BOLT].b_rand = Dc_arg_float;
 +	dc_stuff_float(&Bolt_types[DEBUG_BOLT].b_rand);
  }
 -DCF(b_shrink, "")
 +DCF(b_shrink, "Sets the shrink factor for debug nebula bolts")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Bolt_types[DEBUG_BOLT].b_shrink = Dc_arg_float;
-@@ -627,7 +753,7 @@ DCF(lag_bad, "")
+
  }
 -DCF(b_poly_pct, "")
 +DCF(b_poly_pct, "Sets b_poly_pct")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Bolt_types[DEBUG_BOLT].b_poly_pct = Dc_arg_float;
 +	dc_stuff_float(&Bolt_types[DEBUG_BOLT].b_poly_pct);
  }
-@@ -635,6 +761,11 @@ DCF(lag_avg, "")
+
 +DCF(b_add, "Sets b_add")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Bolt_types[DEBUG_BOLT].b_add = Dc_arg_float;
 +	dc_stuff_float(&Bolt_types[DEBUG_BOLT].b_add);
  }
 -DCF(b_strikes, "")
 +DCF(b_strikes, "Sets num_strikes")
  {
 -	dc_get_arg(ARG_INT);
 -	Bolt_types[DEBUG_BOLT].num_strikes = Dc_arg_int;
-@@ -651,7 +782,7 @@ DCF(lag_avg, "")
+
  }
 -DCF(b_noise, "")
 +DCF(b_noise, "Sets noise factor")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Bolt_types[DEBUG_BOLT].noise = Dc_arg_float;
 +	dc_stuff_float(&Bolt_types[DEBUG_BOLT].noise);
  }
-@@ -659,6 +790,11 @@ DCF(lag_good, "")
+
 +DCF(b_bright, "Sets brightness factor")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Bolt_types[DEBUG_BOLT].b_bright = Dc_arg_float;
 +	dc_stuff_float(&Bolt_types[DEBUG_BOLT].b_bright);
  }
 -DCF(b_lifetime, "")
 +DCF(b_lifetime, "Sets lifetime duration")
  {
 -	dc_get_arg(ARG_INT);
 -	Bolt_types[DEBUG_BOLT].lifetime = Dc_arg_int;
-Index: code/network/multiui.cpp
+
  }
---- code/network/multiui.cpp	(revision 10462)
+
-+++ code/network/multiui.cpp	(working copy)
+
  {
  	dc_printf("Debug lightning bolt settings :\n");
 
 @@ -144,13 +136,13 @@
  // nebula lightning intensity (0.0 to 1.0)
  float Nebl_intensity = 0.6667f;
 
 -DCF(lightning_intensity, "")
-@@ -754,13 +755,20 @@ int multi_join_maybe_warn();
+
  {
 -	dc_get_arg(ARG_FLOAT);
 -	float val = Dc_arg_float;
 -
 -    CLAMP(val, 0.0f, 1.0f);
 +	float val;
 +	dc_stuff_float(&val);
 
 +	CLAMP(val, 0.0f, 1.0f);
 +
  	Nebl_intensity = 1.0f - val;
  }
 
 Index: network/multi.cpp
 ===================================================================
 --- network/multi.cpp	(Revision 10462)
 +++ network/multi.cpp	(Arbeitskopie)
 @@ -48,6 +48,7 @@
  #include "cfile/cfile.h"
  #include "fs2netd/fs2netd_client.h"
  #include "pilotfile/pilotfile.h"
 +#include "debugconsole/console.h"
 
-@@ -776,7 +784,7 @@ DCF(mj_make, "")
+
 
 @@ -1105,14 +1106,15 @@
  //
 
  int eye_tog = 1;
 -DCF(eye_tog, "")
 +DCF(eye_tog, "Toggles setting of the local player eyepoint on every frame (Multiplayer)")
  {
-Index: code/network/multiutil.cpp
+
 +		dc_printf("proper eye stuff is %s\n", eye_tog ? "ON" : "OFF");
---- code/network/multiutil.cpp	(revision 10462)
+
-+++ code/network/multiutil.cpp	(working copy)
+
 +
  	eye_tog = !eye_tog;
 -	if(eye_tog){
 -		dc_printf("proper eye stuff on\n");
 -	} else {
 -		dc_printf("proper eye stuff off\n");
 -	}
 +	dc_printf("proper eye stuff is %s\n", eye_tog ? "ON" : "OFF");
-@@ -3198,65 +3199,73 @@ short multi_get_new_id()
+
 
  void multi_do_frame()
 @@ -1772,13 +1774,14 @@
  }
 
  // netgame debug flags for debug console stuff
 -DCF(netd, "change/list netgame debug flags")
 +DCF(netd, "change netgame debug flags (Mulitplayer)")
  {
 -	dc_get_arg(ARG_INT);
 +	int value;
 +	dc_stuff_int(&value);
 
 -	// if we got an integer, and we're the server, change flags
 -	if((Dc_arg_type & ARG_INT) && (Net_player != NULL) && (Net_player->flags & NETINFO_FLAG_AM_MASTER) && (Dc_arg_int <= 7)){
 -		Netgame.debug_flags ^= (1<<Dc_arg_int);
 +	// if we're the server, change flags
 +	if ((Net_player != NULL) && (Net_player->flags & NETINFO_FLAG_AM_MASTER) && (value <= 7)) {
 +		Netgame.debug_flags ^= (1 << value);
  	}
 
  	// display network flags
 Index: network/multi_kick.cpp
 ===================================================================
 --- network/multi_kick.cpp	(Revision 10462)
 +++ network/multi_kick.cpp	(Arbeitskopie)
 @@ -18,6 +18,7 @@
  #include "freespace2/freespace.h"
  #include "playerman/player.h"
  #include "io/timer.h"
 +#include "debugconsole/console.h"
 
 
  // ----------------------------------------------------------------------------------
 @@ -137,18 +138,14 @@
  void multi_dcf_kick()
  {
  	int player_num,idx;
 +	SCP_string arg;
 
  	// get the callsign of the player to kick
 -	dc_get_arg(ARG_STRING);
 +	dc_stuff_string(arg);
 
 -	if(Dc_arg[0] == '\0'){
 -		dc_printf("Invalid player callsign!\n");
 -		return ;
 -	}
 -
  	player_num = -1;
  	for(idx=0;idx<MAX_PLAYERS;idx++){
 -		if(MULTI_CONNECTED(Net_players[idx]) && (stricmp(Net_players[idx].m_player->callsign,Dc_arg)==0)){
 +		if(MULTI_CONNECTED(Net_players[idx]) && (stricmp(Net_players[idx].m_player->callsign, arg.c_str()) == 0)) {
  			player_num = idx;
  			break;
  		}
 @@ -156,7 +153,7 @@
 
  	// if we didn't find the player, notify of the results
  	if(player_num == -1){
 -		dc_printf("Could not find player %s to kick!",Dc_arg);
 +		dc_printf("Could not find player %s to kick!", arg.c_str());
  	}
  	// if we found the guy, then try and kick him
  	else {
 Index: network/multi_obj.cpp
 ===================================================================
 --- network/multi_obj.cpp	(Revision 10462)
 +++ network/multi_obj.cpp	(Arbeitskopie)
 @@ -26,6 +26,7 @@
  #include "physics/physics.h"
  #include "ship/afterburner.h"
  #include "cfile/cfile.h"
 +#include "debugconsole/console.h"
 
 
  // ---------------------------------------------------------------------------------------------------
 @@ -1569,10 +1570,21 @@
 
  // bandwidth granularity
  int OO_gran = 1;
 -DCF(oog, "")
 +DCF(oog, "Sets bandwidth granularity (Multiplayer)")
  {
 -	dc_get_arg(ARG_INT);
 -	OO_gran = Dc_arg_int;
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: oog <OO_gran>\n");
 +		dc_printf("Sets bandwidth granularity\n");
 +		return;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Current Granularity is '%i' (default is 1)", OO_gran);
 +		return;
 +	}
 +
 +	dc_stuff_int(&OO_gran);
 +	dc_printf("Ganularity set to %i", OO_gran);
  }
 
  // process datarate limiting stuff for the server
 @@ -1939,10 +1951,21 @@
  }
 
  float oo_error = 0.8f;
 -DCF(oo_error, "")
 +DCF(oo_error, "Sets error factor for flight path prediction physics (Multiplayer)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	oo_error = Dc_arg_float;
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: oo_error <value>\n");
 +		return;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("oo_error is currently %f", oo_error);
 +		return;
 +	}
 +
 +	dc_stuff_float(&oo_error);
 +
 +	dc_printf("oo_error set to %f", oo_error);
  }
-@@ -3447,19 +3456,20 @@ Done:
+
  void multi_oo_calc_interp_splines(int ship_index, vec3d *cur_pos, matrix *cur_orient, physics_info *cur_phys_info, vec3d *new_pos, matrix *new_orient, physics_info *new_phys_info)
 @@ -1994,14 +2017,16 @@
  }
 
  int display_oo_bez = 0;
 -DCF(bez, "")
 +DCF(bez, "Toggles rendering of player ship trajectory interpolation splines (Multiplayer) *disabled*")
  {
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Rendering of interpolation splines is '%s'", display_oo_bez ? "ON" : "OFF");
 +		return;
 +	}
 +
  	display_oo_bez = !display_oo_bez;
 -	if(display_oo_bez){
 -		dc_printf("Showing interp splines");
 -	} else {
 -		dc_printf("Not showing interp splines");
 -	}
 +
 +	dc_printf("%showing interp splines", display_oo_bez ? "S" : "Not s");
  }
 
  void oo_display()
 Index: network/multi_pxo.cpp
 ===================================================================
 --- network/multi_pxo.cpp	(Revision 10462)
 +++ network/multi_pxo.cpp	(Arbeitskopie)
 @@ -42,6 +42,7 @@
-Index: code/object/collideshipship.cpp
+
  #include "fs2netd/fs2netd_client.h"
---- code/object/collideshipship.cpp	(revision 10462)
+
-+++ code/object/collideshipship.cpp	(working copy)
+
 
 
 
 @@ -461,14 +462,15 @@
  // get the absolute index of the displayed items which our currently selected one is
  int multi_pxo_get_select_index();
 
 -DCF(players, "")
-Index: code/object/object.cpp
+
  {
---- code/object/object.cpp	(revision 10462)
+
-+++ code/object/object.cpp	(working copy)
+
 +	// add a bunch of bogus players
 +	dc_stuff_int(&i);
 
 -	// add a bunch of bogus players
 -	dc_get_arg(ARG_INT);
 -	for(int idx=0; idx<Dc_arg_int; idx++){
 -		sprintf(name, "player %d", idx);
 +	for(int idx = 0; idx < i; idx++){
-Index: code/object/objectsnd.cpp
+
  		multi_pxo_add_player(name);
---- code/object/objectsnd.cpp	(revision 10462)
+
-+++ code/object/objectsnd.cpp	(working copy)
+
-@@ -22,7 +22,7 @@
+Index: network/multi_voice.cpp
 ===================================================================
 --- network/multi_voice.cpp	(Revision 10462)
 +++ network/multi_voice.cpp	(Arbeitskopie)
 @@ -22,9 +22,9 @@
  #include "menuui/optionsmenumulti.h"
  #include "network/multi.h"
  #include "playerman/player.h"
 +#include "debugconsole/console.h"
-@@ -96,62 +96,65 @@ void obj_snd_source_pos(vec3d *sound_pos, obj_snd *osp)
+
 
 -
  // --------------------------------------------------------------------------------------------------
  // MULTI VOICE DEFINES/VARS
  //
 @@ -483,16 +483,17 @@
  // voice settings debug console function
  void multi_voice_dcf()
  {
 -	dc_get_arg(ARG_STRING);
 +	SCP_string arg;
 +	int value;
 
 +	dc_stuff_string_white(arg);
 +
  	// set the quality of sound
 -	if (strcmp(Dc_arg, NOX("qos")) == 0) {
 -		dc_get_arg(ARG_INT);
 -		if(Dc_arg_type & ARG_INT){
 -			if((Dc_arg_int >= 1) && (Dc_arg_int <= 10) && (Net_player->flags & NETINFO_FLAG_AM_MASTER)){
 -				multi_voice_set_vars(Dc_arg_int,-1);
 -				dc_printf("Quality of sound : %d\n",Dc_arg_int);
 -			}
 +	if (arg == NOX("qos")) {
 +		dc_stuff_int(&value);
 +		if((value >= 1) && (value <= 10) && (Net_player->flags & NETINFO_FLAG_AM_MASTER)){
 +			multi_voice_set_vars(value,-1);
 +			dc_printf("Quality of sound : %d\n", value);
  		}
  	}
  }
 Index: network/multilag.cpp
 ===================================================================
 --- network/multilag.cpp	(Revision 10462)
 +++ network/multilag.cpp	(Arbeitskopie)
 @@ -18,6 +18,7 @@
  #include "io/timer.h"
  #include "globalincs/linklist.h"
  #include "network/psnet2.h"
 +#include "debugconsole/console.h"
 
 
 
 @@ -392,6 +393,7 @@
  	Lag_buf_count--;
  }
 
 +// Help and status provider for the lag-loss system
  void multi_lagloss_dcf()
  {
  	// if the lag system isn't inited, don't do anything
 @@ -400,20 +402,62 @@
  		return;
  	}
 
 +	// display status of lag system
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Lag system status:\n");
 +		// display lag settings
 +		dc_printf("Lag : \n");
 +		dc_printf("Base  \t\tMin   \t\tMax   \t\tStreak\n");
 +		dc_printf("%f\t\t%f\t\t%f\t\t%f\n\n", Multi_lag_base, Multi_lag_min, Multi_lag_max, Multi_streak_time);
 +
 +		// display loss settings
 +		dc_printf("Loss : \n");
 +		dc_printf("Base  \t\tMin   \t\tMax\n");
 +		dc_printf("%f\t\t%f\t\t%f\n", Multi_loss_base, Multi_loss_min, Multi_loss_max);
 +		return;
 +	}
 +
  	// display all available commands
 -	dc_printf("Usage :\nlag <ms>  (-1 to disable)\nlag_min <ms>\nlag_max <ms>\nloss <0-100>  (-1 to disable)\nloss_min <0-100>\nloss_max <0-100>\nlag_streak <ms>\nlagloss\n");
 +	dc_printf("Lag system commands\n\n");
 
 -	// display lag settings
 -	dc_printf("Lag : ");
 -	dc_printf("\n   Base %d\n   Min %d\n   Max %d\n   Streak %d\n", Multi_lag_base, Multi_lag_min, Multi_lag_max, Multi_streak_time);
 +	dc_printf("Usage :\n");
 +	dc_printf("lag <ms>\n");
 +		dc_printf("\tSets the lag base value if <ms> is within the max and min limits (see lag_min and lag_max)\n");
 +		dc_printf("\tIf <ms> is outside of the max and min limits, then nothing is done\n");
 +		dc_printf("\tIf <ms> is negative, then lag simulation is turned off\n\n");
 
 -	// display loss settings
 -	dc_printf("Loss : ");
 -	dc_printf("\n   Base %f\n   Min %f\n   Max %f\n", Multi_loss_base, Multi_loss_min, Multi_loss_max);
 +	dc_printf("lag_min <ms>\n");
 +		dc_printf("\tSets the lag min value if <ms> is less than the base value\n");
 +		dc_printf("\tIf <ms> is outside the base or max values, then nothing is done\n");
 +		dc_printf("\tIf <ms> is negative, then the min limit is removed\n\n");
 +
 +	dc_printf("lag_max <ms>\n");
 +		dc_printf("\tSets the lag max value if <ms> is greater than the base value\n");
 +		dc_printf("\tIf <ms> is outside the base or min values, then nothing is done\n");
 +		dc_printf("\tIf <ms> is negative, then the max limit is removed\n\n");
 +
 +	dc_printf("loss    <0-100>  (-1 to disable)\n");
 +		dc_printf("\tSimilar to lag, but applies value to loss base value\n\n");
 +
 +	dc_printf("loss_min <0-100>\n");
 +		dc_printf("\tSimilar to lag_min, but applies value to loss min value\n\n");
 +
 +	dc_printf("loss_max <0-100>\n");
 +		dc_printf("\tSimilar to lag_max, but applies value to loss max value\n\n");
 +
 +
 +	dc_printf("lag_streak <ms>\n");
-+		dc_printf("Unknown argument '%s'\n", arg);
+
 +		dc_printf("\tEx: A value of 2000 would result in lag streaks that last 2 seconds each\n\n");
 +
 +	dc_printf("lagloss\n");
-Index: code/palman/palman.cpp
+
  }
---- code/palman/palman.cpp	(revision 10462)
+
-+++ code/palman/palman.cpp	(working copy)
+
 +DCF(lag, "Sets the lag base value (Muliplayer)")
  {
 +	int value;
 +
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
  		dc_printf("Lag System Not Initialized!\n");
 @@ -420,29 +464,44 @@
-@@ -165,17 +166,14 @@ void palette_load_table( const char * filename )
+
  	}
 
 -	dc_get_arg(ARG_INT);
 +	if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Lag base value is currently %i\n", Multi_lag_base);
 +		return;
 +	}
 +
 +	dc_stuff_int(&value);
  	// parse the argument and change things around accordingly
 -	if(Dc_arg_type & ARG_INT){
 -		if(Dc_arg_int < 0){
 -			// switch the lag sim off
 -			Multi_lag_base = -1;
 -			Multi_lag_min = -1;
 -			Multi_lag_max = -1;
 -			dc_printf("Turning simulated lag off\n");
 -			multi_lagloss_dcf();
-Index: code/parse/sexp.cpp
+
 -			dc_printf("Base value greater than max value, ignoring...");
---- code/parse/sexp.cpp	(revision 10462)
+
-+++ code/parse/sexp.cpp	(working copy)
+
 -		} else {
 -			Multi_lag_base = Dc_arg_int;
 -			multi_lagloss_dcf();
 -		}
 -	}
 +	if (value < 0) {
 +		// switch the lag sim off
 +		Multi_lag_base = -1;
-@@ -24451,40 +24452,38 @@ int run_sexp(const char* sexpression)
+
 +		Multi_lag_max = -1;
 +		dc_printf("Turning simulated lag off\n");
 +		multi_lagloss_dcf();
 +
 +	} else if ((Multi_lag_max >= 0) && (value > Multi_lag_max)) {
 +		dc_printf("Base value greater than max value, ignoring...");
 +
 +	} else if ((Multi_lag_min >= 0) && (value < Multi_lag_min)) {
 +		dc_printf("Base value smaller than min value, ignoring...");
 +
 +	} else {
 +
 +		Multi_lag_base = value;
 +		multi_lagloss_dcf();
 +		dc_printf("Base value set to %i", value);
 +	}
  }
 
 -DCF(lag_min, "")
 +DCF(lag_min, "Sets the lag min value (Multiplayer)")
  {
 +	int value;
 +
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
  		dc_printf("Lag System Not Initialized!\n");
 @@ -449,48 +508,70 @@
  		return;
  	}
-+	sprintf(sexp_always, "( when ( true ) ( %s ) )", sexp);
+
 -	dc_get_arg(ARG_INT);
 +	if (dc_optional_string_either("help", "--help")) {
-+	dc_printf("SEXP '%s' run, sexp_val = %d\n", sexp_always, sexp_val);
+
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Lag min value is currently %i\n", Multi_lag_min);
 +	}
 +
 +	dc_stuff_int(&value);
  	// parse the argument and change things around accordingly
 -	if(Dc_arg_type & ARG_INT){
 -		if(Dc_arg_int > Multi_lag_base){
 -			dc_printf("Min value greater than base value, ignoring...");
 -		} else {
 -			if(Dc_arg_int < 0){
 -				Multi_lag_min = -1;
 -			} else {
 -				Multi_lag_min = Dc_arg_int;
 -			}
 -			multi_lagloss_dcf();
 -		}
 -	}
 +
 +	if (value > Multi_lag_base) {
 +		dc_printf("Min value greater than base value, ignoring...");
 +		return;
 +
-+	dc_printf("SEXP '%s' run, sexp_val = %d\n", dc_command_str, sexp_val);
+
 +		Multi_lag_min = -1;
 +
 +	} else {
-Index: code/particle/particle.cpp
+
 +	}
---- code/particle/particle.cpp	(revision 10462)
+
-+++ code/particle/particle.cpp	(working copy)
+
 
 -DCF(lag_max, "")
 +DCF(lag_max, "Sets the lag max value (Multiplayer)")
  {
 +	int value;
 +
  	// if the lag system isn't inited, don't do anything
 -	if(!Multi_lag_inited){
-@@ -90,18 +91,7 @@ void particle_page_in()
+
  		dc_printf("Lag System Not Initialized!\n");
  		return;
  	}
 
 +	if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Lag max value is currently %i\n", Multi_lag_max);
 +		return;
 +	}
 +
  	// parse the argument and change things around accordingly
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -		if((Dc_arg >=0) && (Dc_arg_int < Multi_lag_base)){
 -			dc_printf("Max value smaller than base value, ignoring...");
-Index: code/playerman/playercontrol.cpp
+
 -			if(Dc_arg_int < 0){
---- code/playerman/playercontrol.cpp	(revision 10462)
+
-+++ code/playerman/playercontrol.cpp	(working copy)
+
 -				Multi_lag_max = Dc_arg_int;
 -			}
 -			multi_lagloss_dcf();
 -		}
 -	}
 +	dc_stuff_int(&value);
 +
 +	if ((value >= 0) && (value < Multi_lag_base)) {
-@@ -286,10 +287,16 @@ void do_view_chase(float frame_time)
+
 +
 +	} else if (value < 0) {
 +		Multi_lag_max = -1;
 +
 +	} else {
 +		Multi_lag_max = value;
 +	}
 +	dc_printf("Lag max value set to %i\n", Multi_lag_max);
  }
 
 -DCF(loss, "")
 +DCF(loss, "Sets the loss base value (Multiplayer)")
  {
 +	int val_i;
 +	float val_f;
 +
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
  		dc_printf("Lag System Not Initialized!\n");
-Index: code/radar/radarsetup.cpp
+@@ -497,33 +578,46 @@
  		return;
---- code/radar/radarsetup.cpp	(revision 10462)
+
-+++ code/radar/radarsetup.cpp	(working copy)
+
 +		if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Loss value is currently %i percent", Multi_loss_base);
 +		return;
-@@ -84,7 +85,7 @@ extern int radar_iff_color[5][2][4];
+
 +
  	// parse the argument and change things around accordingly
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -		float val = (float)Dc_arg_int / 100.0f;
 -
 -		if(Dc_arg_int > 100){
 -			dc_printf("Illegal loss base value, ignoring...");
-Index: code/render/3dlaser.cpp
+
 -			// switch the loss sim off
---- code/render/3dlaser.cpp	(revision 10462)
+
-+++ code/render/3dlaser.cpp	(working copy)
+
 -			Multi_loss_min = -1.0f;
 -			Multi_loss_max = -1.0f;
 -			multi_lagloss_dcf();
 -		} else if((Multi_loss_max >= 0.0f) && (val > Multi_loss_max)){
 -			dc_printf("Base value greater than max value, ignoring...");
 -		} else if((Multi_loss_min >= 0.0f) && (val < Multi_loss_min)){
 -			dc_printf("Base value smaller than min value, ignoring...");
 -		} else {
-Index: code/ship/ship.cpp
+
 -			multi_lagloss_dcf();
---- code/ship/ship.cpp	(revision 10462)
+
-+++ code/ship/ship.cpp	(working copy)
+
 +	dc_stuff_int(&val_i);
 +
 +	val_f = (float)val_i / 100.0f;
 +
 +	if(val_i > 100){
 +		dc_printf("Illegal loss base value, ignoring...");
 +	} else if (val_i < 0){
 +		// switch the loss sim off
-@@ -8356,10 +8357,14 @@ int ship_subsys_disrupted(ship *sp, int type)
+
 +		Multi_loss_base = -1.0f;
 +		Multi_loss_min = -1.0f;
 +		Multi_loss_max = -1.0f;
 +
 +	} else if((Multi_loss_max >= 0.0f) && (val_f > Multi_loss_max)){
 +		dc_printf("Base value greater than max value, ignoring...");
 +
 +	} else if((Multi_loss_min >= 0.0f) && (val_f < Multi_loss_min)){
 +		dc_printf("Base value smaller than min value, ignoring...");
 +
 +	} else {
 +		Multi_loss_base = val_f;
 +	}
  }
 
 -DCF(loss_min, "")
 +DCF(loss_min, "Sets the loss min value (Multiplayer)")
-@@ -9865,31 +9870,44 @@ float t_len = 10.0f;
+
 +	int val_i;
 +	float val_f;
 +
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
  		dc_printf("Lag System Not Initialized!\n");
 @@ -530,27 +624,36 @@
  		return;
  	}
 
 +	if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("loss_min value is currently %f percent", Multi_loss_min);
 +	}
 +
  	// parse the argument and change things around accordingly
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -      float val = (float)Dc_arg_int / 100.0f;
 +	dc_stuff_int(&val_i);
 
 -		if(val > Multi_loss_base){
 -			dc_printf("Min value greater than base value, ignoring...");
 +	val_f = (float)val_i / 100.0f;
 +
 +	if(val_f > Multi_loss_base){
 +		dc_printf("Min value greater than base value, ignoring...");
 +	} else {
 +		// otherwise set the value
 +		if (val_f < 0) {
 +			Multi_loss_min = -1.0f;
  		} else {
 -			// otherwise set the value
 -			if(Dc_arg_int < 0){
 -				Multi_loss_min = -1.0f;
 -			} else {
 -				Multi_loss_min = val;
 -			}
 -			multi_lagloss_dcf();
 +			Multi_loss_min = val_f;
  		}
  	}
  }
 
 -DCF(loss_max, "")
 -{
 +DCF(loss_max, "Sets the loss max value (Multiplayer)")
 +{
 +	int val_i;
 +	float val_f;
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
  		dc_printf("Lag System Not Initialized!\n");
-@@ -13610,26 +13628,25 @@ void ship_assign_sound_all()
+@@ -557,26 +660,32 @@
  		return;
  	}
 
 +	if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
 +	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("loss_max value is currently %f percent", Multi_loss_max);
 +	}
 +
  	// parse the argument and change things around accordingly
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -      float val = (float)Dc_arg_int / 100.0f;
 +	dc_stuff_int(&val_i);
 +	val_f = (float)val_i / 100.0f;
 
 -		if(val < Multi_loss_base){
 -			dc_printf("Max value smaller than base value, ignoring...");
 +	if (val_f < Multi_loss_base) {
 +		dc_printf("Max value smaller than base value, ignoring...");
 +	} else {
 +		// otherwise set the value
 +		if (val_f < 0) {
 +			Multi_loss_max = -1.0f;
  		} else {
 -			// otherwise set the value
 -			if(Dc_arg_int < 0){
 -				Multi_loss_max = -1.0f;
 -			} else {
 -				Multi_loss_min = val;
 -			}
 -			multi_lagloss_dcf();
 +			Multi_loss_max = val_f;
  		}
 -	}
-@@ -13637,26 +13654,24 @@ DCF(set_shield,"Change player ship shield strength")
+
  }
 
 -DCF(lagloss, "")
 +DCF(lagloss, "Help provider for the lag system (Multiplayer)")
  {
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
 @@ -587,23 +696,35 @@
  	multi_lagloss_dcf();
  }
 
 -DCF(lag_streak, "")
 +DCF(lag_streak, "Sets the duration of lag streaks (Multiplayer)")
  {
 +	int val;
 +
  	// if the lag system isn't inited, don't do anything
 -	if(!Multi_lag_inited){
 +	if (!Multi_lag_inited) {
  		dc_printf("Lag System Not Initialized!\n");
  		return;
  	}
 
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -		if(Dc_arg_int >= 0){
 -			Multi_streak_time = Dc_arg_int;
 -		}
 +	if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
  	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("lag_streak value is currently %i", Multi_streak_time);
 +		return;
 +	}
 +
-@@ -13665,70 +13680,65 @@ DCF(set_hull, "Change player ship hull strength")
+
 +	if(val >= 0){
 +		Multi_streak_time = val;
 +	} else {
 +		dc_printf("Ignoring invalid value (must be non-negative)\n");
 +	}
  }
 
 -DCF(lag_bad, "")
 +DCF(lag_bad, "Lag system shortcut - Sets for 'bad' lag simulation (Multiplayer)")
  {
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
 @@ -610,6 +731,11 @@
  		dc_printf("Lag System Not Initialized!\n");
  		return;
  	}
 +
 +	if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
 +	}
 
  	dc_printf("Setting bad lag/loss parameters\n");
 
 @@ -627,7 +753,7 @@
  	Multi_current_streak = -1;
  }
 
 -DCF(lag_avg, "")
 +DCF(lag_avg, "Lag system shortcut - Sets for 'average' lag simulation (Multiplayer)")
  {
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
 @@ -635,6 +761,11 @@
  		return;
  	}
 
 +	if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
 +	}
 +
  	dc_printf("Setting avg lag/loss parameters\n");
 
  	// set good lagloss parameters
 @@ -651,7 +782,7 @@
  	Multi_current_streak = -1;
  }
 
 -DCF(lag_good, "")
 +DCF(lag_good, "Lag system shortcut - Sets for 'good' lag simulation (Multiplayer)")
  {
  	// if the lag system isn't inited, don't do anything
  	if(!Multi_lag_inited){
 @@ -659,6 +790,11 @@
  		return;
  	}
 
 +	if (dc_optional_string_either("help", "--help")) {
 +		multi_lagloss_dcf();
 +		return;
 +	}
 +
  	dc_printf("Setting good lag/loss parameters\n");
 
  	// set good lagloss parameters
 Index: network/multiui.cpp
 ===================================================================
 --- network/multiui.cpp	(Revision 10462)
 +++ network/multiui.cpp	(Arbeitskopie)
 @@ -64,6 +64,7 @@
  #include "cfile/cfile.h"
  #include "fs2netd/fs2netd_client.h"
  #include "menuui/mainhallmenu.h"
 +#include "debugconsole/console.h"
 
  #include <algorithm>
 
 @@ -754,13 +755,20 @@
  int multi_join_warn_pxo();
  void multi_join_blit_protocol();
 
 -DCF(mj_make, "")
 +DCF(mj_make, "Makes a multijoin game? (Multiplayer)")
  {
  	active_game ag, *newitem;
  	int idx;
 +	int idx_max;
 
 -	dc_get_arg(ARG_INT);
 -	for(idx=0; idx<Dc_arg_int; idx++){
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: mj_make <num_games>\n");
 +		return;
 +	}
 +
 +	dc_stuff_int(&idx_max);
 +
 +	for(idx = 0; idx < idx_max; idx++){
  		// stuff some fake info
  		memset(&ag, 0, sizeof(active_game));
  		sprintf(ag.name, "Game %d", idx);
 @@ -776,7 +784,7 @@
  		if(newitem != NULL){
  			// newitem->heard_from_timer = timestamp((int)frand_range(500.0f, 10000.0f));
  		}
-+		dc_printf("Erro: Unknown argument '%s'\n", arg);
+
 +	}
  }
 
  void multi_join_notify_new_game()
-+		dc_printf("Subsystem '%s' is at %f strength\n", arg, ship_get_subsystem_strength(Player_ship, subsystem));
+Index: network/multiutil.cpp
 ===================================================================
 --- network/multiutil.cpp	(Revision 10462)
 +++ network/multiutil.cpp	(Arbeitskopie)
 @@ -77,6 +77,7 @@
  #include "network/multi_rate.h"
  #include "fs2netd/fs2netd_client.h"
  #include "parse/parselo.h"
 +#include "debugconsole/console.h"
 
  extern int ascii_table[];
  extern int shifted_ascii_table[];
 @@ -3198,65 +3199,73 @@
  // ------------------------------------
 
  //XSTR:OFF
-@@ -16419,11 +16429,11 @@ int ship_get_texture(int bitmap)
+
 +DCF(multi,"changes multiplayer settings (Multiplayer)")
  {
 -	if(Dc_command){
 -		dc_get_arg(ARG_STRING);
 -
 -		if(strcmp(Dc_arg, "kick")==0){				// kick a player
 -			multi_dcf_kick();
 +	if (dc_optional_string("kick")) {
 +		// kick a player
 +		multi_dcf_kick();
 +
  #ifndef NDEBUG
 -		} else if(strcmp(Dc_arg, "stats")==0) {
 -			// multi_toggle_stats();
-Index: code/ship/shipfx.cpp
+
 -			// multi_show_basic_stats(0);
---- code/ship/shipfx.cpp	(revision 10462)
+
-+++ code/ship/shipfx.cpp	(working copy)
+
 +	} else if (dc_optional_string("stats")) {
 +		// multi_toggle_stats();
 +
 +	} else if (dc_optional_string("show_stats")) {
 +		// multi_show_basic_stats(0);
 +
 +	} else if (dc_optional_string("dump_stats")) {
 +		// multi_show_basic_stats(1);
-@@ -1355,42 +1356,58 @@ void shipfx_flash_do_frame(float frametime)
+
 -		} else if(strcmp(Dc_arg, "voice")==0){				// settings for multiplayer voice
 -			multi_voice_dcf();
 -		} else if(strcmp(Dc_arg, "respawn_chump")==0){	// set a really large # of respawns
 -			if((Net_player != NULL) && (Net_player->flags & NETINFO_FLAG_GAME_HOST)){
 -				Netgame.respawn = 9999;
 -				Netgame.options.respawn = 9999;
 
 -				// if i'm the server, send a netgame update
 -				if(Net_player->flags & NETINFO_FLAG_AM_MASTER){
 -					send_netgame_update_packet();
 -				}
 -			}
 -		} else if(strcmp(Dc_arg, "ss_leaders")==0){		// only host or team captains can modify ships
 -			if((Net_player != NULL) && (Net_player->flags & NETINFO_FLAG_GAME_HOST)){
 -				Netgame.options.flags |= MSO_FLAG_SS_LEADERS;
 -				multi_options_update_netgame();
 -			}
 -		} else if(strcmp(Dc_arg, "make_players")==0){
 +	} else if (dc_optional_string("voice")) {
 +		// settings for multiplayer voice
 +		multi_voice_dcf();
 +
 +	} else if (dc_optional_string("respawn_chump")){
 +		// set a really large # of respawns
 +		if((Net_player != NULL) && (Net_player->flags & NETINFO_FLAG_GAME_HOST)) {
 +			Netgame.respawn = 9999;
 +			Netgame.options.respawn = 9999;
 +
 +			// if i'm the server, send a netgame update
 +			if(Net_player->flags & NETINFO_FLAG_AM_MASTER){
 +				send_netgame_update_packet();
 +			}
 +		}
 +
 +	} else if (dc_optional_string("ss_leaders")) {
 +		// only host or team captains can modify ships
 +		if((Net_player != NULL) && (Net_player->flags & NETINFO_FLAG_GAME_HOST)) {
 +			Netgame.options.flags |= MSO_FLAG_SS_LEADERS;
 +			multi_options_update_netgame();
 +		}
 +
 +	} else if (dc_optional_string("make_players")) {
  #ifndef NDEBUG
 -			multi_make_fake_players(MAX_PLAYERS);
 +		multi_make_fake_players(MAX_PLAYERS);
  #endif
 -		} else if(strcmp(Dc_arg, "givecd")==0){
 -			extern int Multi_has_cd;
 -			Multi_has_cd = 1;
 -		} else if(strcmp(Dc_arg, "oo")==0){
 -			int new_flags = -1;
 
 -			dc_get_arg(ARG_INT);
 -			if(Dc_arg_type & ARG_INT){
 -				new_flags = Dc_arg_int;
 -			}
 +	} else if (dc_optional_string("givecd")) {
 +		extern int Multi_has_cd;
 +		Multi_has_cd = 1;
 
 -			dc_printf("Interesting flags\nPos : %d\nVelocity : %d\nDesired vel : %d\nOrient : %d\nRotvel : %d\nDesired rotvel %d\n",
 -						 1<<0, 1<<7, 1<<8, 1<<1, 1<<9, 1<<10);
 -		} else if(strcmp(Dc_arg, "oo_sort")==0){
 -			extern int OO_sort;
 +	} else if (dc_optional_string("oo")) {
 +		int new_flags = -1;
 
 -			OO_sort = !OO_sort;
 -			if(OO_sort){
 -				dc_printf("Network object sorting ENABLED\n");
 -			} else {
 -				dc_printf("Network object sorting DISABLED\n");
 -			}
 -		}
 +		dc_maybe_stuff_int(&new_flags);
 +
 +		dc_printf("Interesting flags\n");
 +		dc_printf("Pos : %d\n", 1 << 0);
 +		dc_printf("Velocity    : %d\n", 1 << 7);
 +		dc_printf("Desired vel : %d\n", 1 << 8);
 +		dc_printf("Orient : %d\n", 1 << 1);
-@@ -1602,16 +1619,20 @@ int	Bs_exp_fire_low = 1;
+
 +		dc_printf("Desired rotvel : %d\n", 1 << 10);
 +
 +	} else if (dc_optional_string("oo_sort")) {
 +		extern int OO_sort;
 +
 +		OO_sort = !OO_sort;
 +		dc_printf("Network object sorting %s\n", OO_sort ? "ENABLED" : "DISABLED");
  	}
  }
 
 @@ -3447,19 +3456,20 @@
  }
  */
 
 -DCF(pxospew,"spew PXO 32 bit checksums for all visible mission files")
 +DCF(pxospew,"spew PXO 32 bit checksums for all visible mission files (Multiplayer)")
  {
  	int max_files;
 +	char file_str[MAX_NAME_LEN];
 
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -		max_files = Dc_arg_int;
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: pxospew <max_files> <filename>\n");
 +		return;
 +	}
 
-Index: code/sound/sound.cpp
+
 -		if(Dc_arg_type & ARG_STRING){
---- code/sound/sound.cpp	(revision 10462)
+
-+++ code/sound/sound.cpp	(working copy)
+
 -	}
 +	dc_stuff_int(&max_files);
 +	dc_stuff_string_white(file_str, MAX_NAME_LEN);
 +
 +	multi_spew_pxo_checksums(max_files, file_str);
  }
 
 
-@@ -200,14 +201,15 @@ void snd_spew_info()
+Index: object/collideshipship.cpp
 ===================================================================
 --- object/collideshipship.cpp	(Revision 10462)
 +++ object/collideshipship.cpp	(Arbeitskopie)
 @@ -27,6 +27,7 @@
  #include "object/objectdock.h"
  #include "object/objectshield.h"
--	Sound_spew = !Sound_spew;
+
 +#include "debugconsole/console.h"
 
 
  #define COLLIDE_DEBUG
 Index: object/object.cpp
 ===================================================================
 --- object/object.cpp	(Revision 10462)
 +++ object/object.cpp	(Arbeitskopie)
 @@ -41,6 +41,7 @@
-+	Sound_spew = !Sound_spew;
+
  #include "weapon/swarm.h"
  #include "weapon/weapon.h"
 +#include "debugconsole/console.h"
 
-Index: code/starfield/nebula.cpp
+
 
---- code/starfield/nebula.cpp	(revision 10462)
+Index: object/objectsnd.cpp
-+++ code/starfield/nebula.cpp	(working copy)
+
-@@ -15,7 +15,7 @@
+--- object/objectsnd.cpp	(Revision 10462)
 +++ object/objectsnd.cpp	(Arbeitskopie)
 @@ -22,9 +22,9 @@
  #include "render/3d.h"
  #include "io/joy_ff.h"
  #include "species_defs/species_defs.h"
 +#include "debugconsole/console.h"
 
 
-@@ -215,17 +215,19 @@ void nebula_render()
+
  //  // --mharris port hack--
  //  int ds_using_ds3d();
  //  int ds_get_channel(int);
 @@ -96,63 +96,66 @@
  //XSTR:OFF
  DCF(objsnd, "Persistent sound stuff" )
  {
 -	char		buf1[16], buf2[64];
 -	obj_snd	*osp;
 +	char buf1[4];
 +	char buf2[MAX_NAME_LEN];
 +	obj_snd *osp;
 +	SCP_string arg;
 
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_STRING|ARG_NONE);
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf ("Usage: objsnd [-list]\n");
 +		dc_printf ("[-list] --  displays status of all objects with linked sounds\n");
 +		dc_printf ("with no parameters, object sounds are toggled on/off\n");
 +		return;
 +	}
 
 -		if ( Dc_arg_type & ARG_NONE ) {
 -			if ( Obj_snd_enabled == TRUE ) {
 -				obj_snd_stop_all();
 -				Obj_snd_enabled = FALSE;
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf( "Object sounds are: %s\n", (Obj_snd_enabled?"ON":"OFF") );
-Index: code/starfield/starfield.cpp
+
 +
---- code/starfield/starfield.cpp	(revision 10462)
+
-+++ code/starfield/starfield.cpp	(working copy)
+
 +			vec3d source_pos;
 +			float distance;
 +
 +			Assert(osp != NULL);
 +			if ( osp->instance == -1 ) {
 +				continue;
 +				//sprintf(buf1,"OFF");
 +			} else {
-@@ -865,75 +866,11 @@ uint Star_flags = STAR_FLAG_DEFAULT;
+
  			}
 +
 +			if ( Objects[osp->objnum].type == OBJ_SHIP ) {
 +				strcpy_s(buf2, Ships[Objects[osp->objnum].instance].ship_name);
 +			}
 +			else if ( Objects[osp->objnum].type == OBJ_DEBRIS ) {
 +				sprintf(buf2, "Debris");
 +			}
  			else {
 -				Obj_snd_enabled = TRUE;
 +				sprintf(buf2, "Unknown");
  			}
 -		}
 -		if ( !stricmp( Dc_arg, "list" ))	{
 -			for ( osp = GET_FIRST(&obj_snd_list); osp !=END_OF_LIST(&obj_snd_list); osp = GET_NEXT(osp) ) {
 -				Assert(osp != NULL);
 -				if ( osp->instance == -1 ) {
 -					continue;
 -					//sprintf(buf1,"OFF");
 -				} else {
 -					sprintf(buf1,"ON");
 -				}
 
 -				if ( Objects[osp->objnum].type == OBJ_SHIP ) {
 -					strcpy_s(buf2, Ships[Objects[osp->objnum].instance].ship_name);
 -				}
 -				else if ( Objects[osp->objnum].type == OBJ_DEBRIS ) {
 -					sprintf(buf2, "Debris");
 -				}
 -				else {
 -					sprintf(buf2, "Unknown");
 -				}
 +			obj_snd_source_pos(&source_pos, osp);
 +			distance = vm_vec_dist_quick( &source_pos, &View_position );
 
 -				vec3d source_pos;
 -				float distance;
 +			dc_printf("Object %d => name: %s vol: %.2f pan: %.2f dist: %.2f status: %s\n", osp->objnum, buf2, osp->vol, osp->pan, distance, buf1);
 +		} // end for
 
 -				obj_snd_source_pos(&source_pos, osp);
 -				distance = vm_vec_dist_quick( &source_pos, &View_position );
 +		dc_printf("Number object-linked sounds playing: %d\n", Num_obj_sounds_playing);
 +		return;
 +	}
 
 -				dc_printf("Object %d => name: %s vol: %.2f pan: %.2f dist: %.2f status: %s\n", osp->objnum, buf2, osp->vol, osp->pan, distance, buf1);
 -			} // end for
 -				dc_printf("Number object-linked sounds playing: %d\n", Num_obj_sounds_playing);
 +	if (!dc_maybe_stuff_string_white(arg)) {
 +		// No arguments, toggle snd on/off
 +		if ( Obj_snd_enabled == TRUE ) {
 +				obj_snd_stop_all();
 +				Obj_snd_enabled = FALSE;
 +			} else {
 +				Obj_snd_enabled = TRUE;
  		}
 +	} else {
 +		dc_printf("Unknown argument '%s'\n", arg.c_str());
  	}
 -
 -	if ( Dc_help ) {
 -		dc_printf ("Usage: objsnd [list]\n");
 -		dc_printf ("[list] --  displays status of all objects with linked sounds\n");
 -		dc_printf ("with no parameters, object sounds are toggled on/off\n");
 -		Dc_status = 0;
 -	}
 -
 -	if ( Dc_status )	{
 -		dc_printf( "Object sounds are: %s\n", (Obj_snd_enabled?"ON":"OFF") );
 -	}
  }
  //XSTR:ON
 
 Index: palman/palman.cpp
 ===================================================================
 --- palman/palman.cpp	(Revision 10462)
 +++ palman/palman.cpp	(Arbeitskopie)
 @@ -11,6 +11,7 @@
-@@ -948,21 +885,105 @@ DCF(stars,"Set parameters for starfield")
+
  #include "palman/palman.h"
  #include "bmpman/bmpman.h"
 +#include "debugconsole/console.h"
  #include "pcxutils/pcxutils.h"
  #include "parse/parselo.h"
  #include "graphics/grinternal.h"
 @@ -165,17 +166,14 @@
 
  DCF(palette,"Loads a new palette")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_STRING|ARG_NONE);
 -		if ( Dc_arg_type == ARG_NONE )	{
 -		} else {
 -			palette_load_table( Dc_arg );
 -		}
 +	char palette_file[MAX_FILENAME_LEN];
 +
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: palette <filename>\nLoads the palette file.\n" );
  	}
 -	if ( Dc_help )	{
 -		dc_printf( "Usage: palette filename\nLoads the palette file.\n" );
 -	}
 
 +	dc_stuff_string_white(palette_file, MAX_FILENAME_LEN);
 +	palette_load_table(palette_file);
  }
 
  int Palman_allow_any_color = 0;
 Index: parse/sexp.cpp
 ===================================================================
 --- parse/sexp.cpp	(Revision 10462)
 +++ parse/sexp.cpp	(Arbeitskopie)
 @@ -96,6 +96,7 @@
  #include "mod_table/mod_table.h"
  #include "ship/afterburner.h"
  #include "globalincs/alphacolors.h"
 +#include "debugconsole/console.h"
 
  #ifndef NDEBUG
  #include "hud/hudmessage.h"
 @@ -24487,40 +24488,38 @@
  	return sexp_val;
  }
 
 -DCF(sexpc, "Always runs the given sexp command ")
 +DCF(sexpc, "Always runs the given sexp command (Warning! There is no undo for this!)")
  {
 -	if ( Dc_command )       {
 -		if (Dc_command_line != NULL) {
 -			char buf[8192];
 -			snprintf(buf, 8191, "( when ( true ) ( %s ) )", Dc_command_line);
 -
 -			int sexp_val = run_sexp( buf );
 -			dc_printf("SEXP '%s' run, sexp_val = %d\n", buf, sexp_val);
 -			do {
 -				dc_get_arg(ARG_ANY);
 -			} while (Dc_arg_type != ARG_NONE);
 -		}
 -	}
 -	if ( Dc_help )  {
 +	SCP_string sexp;
 +	SCP_string sexp_always;
 +
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: sexpc sexpression\n. Always runs the given sexp as '( when ( true ) ( sexp ) )' .\n" );
 +		return;
  	}
 +
 +	dc_stuff_string(sexp);
 +
 +	sprintf(sexp_always, "( when ( true ) ( %s ) )", sexp.c_str());
 +
 +	int sexp_val = run_sexp(sexp_always.c_str());
 +	dc_printf("SEXP '%s' run, sexp_val = %d\n", sexp_always.c_str(), sexp_val);
  }
 
 
  DCF(sexp,"Runs the given sexp")
  {
 -	if ( Dc_command )       {
 -		if (Dc_command_line != NULL) {
 -			int sexp_val = run_sexp( Dc_command_line );
 -			dc_printf("SEXP '%s' run, sexp_val = %d\n", Dc_command_line, sexp_val);
 -			do {
 -				dc_get_arg(ARG_ANY);
 -			} while (Dc_arg_type != ARG_NONE);
 -		}
 -	}
 -	if ( Dc_help )  {
 +	SCP_string sexp;
 +
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: sexp 'sexpression'\n. Runs the given sexp.\n");
 +		return;
  	}
 +
 +	dc_stuff_string(sexp);
 +
 +	int sexp_val = run_sexp(sexp.c_str());
 +	dc_printf("SEXP '%s' run, sexp_val = %d\n", dc_command_str.c_str(), sexp_val);
  }
-+			dc_printf("Error: unknown flag argument '%s'\n", arg);
+
 
 Index: particle/particle.cpp
 ===================================================================
-+		dc_printf("Error: Unknown argument '%s'", arg);
+--- particle/particle.cpp	(Revision 10462)
 +++ particle/particle.cpp	(Arbeitskopie)
 @@ -17,6 +17,7 @@
  #include "object/object.h"
-@@ -1283,39 +1304,44 @@ float Subspace_glow_rate = 1.0f;
+
  #include "graphics/grbatch.h"
 +#include "debugconsole/console.h"
 
  #ifndef NDEBUG
  #include "io/timer.h"
 @@ -90,19 +91,8 @@
  	bm_page_in_texture( Anim_bitmap_id_smoke2 );
  }
 
 -DCF(particles,"Turns particles on/off")
 -{
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_TRUE|ARG_FALSE|ARG_NONE);
 -		if ( Dc_arg_type & ARG_TRUE )	Particles_enabled = 1;
 -		else if ( Dc_arg_type & ARG_FALSE ) Particles_enabled = 0;
 -		else if ( Dc_arg_type & ARG_NONE ) Particles_enabled ^= 1;
 -	}
 -	if ( Dc_help )	dc_printf( "Usage: particles [bool]\nTurns particle system on/off.  If nothing passed, then toggles it.\n" );
 -	if ( Dc_status )	dc_printf( "particles are %s\n", (Particles_enabled?"ON":"OFF") );
 -}
 +DCF_BOOL2(particles, Particles_enabled, "Turns particles on/off", "Usage: particles [bool]\nTurns particle system on/off.  If nothing passed, then toggles it.\n");
 
 -
  int Num_particles_hwm = 0;
 
  // Creates a single particle. See the PARTICLE_?? defines for types.
 Index: playerman/playercontrol.cpp
 ===================================================================
 --- playerman/playercontrol.cpp	(Revision 10462)
 +++ playerman/playercontrol.cpp	(Arbeitskopie)
 @@ -34,6 +34,7 @@
  #include "network/multiutil.h"
  #include "network/multi_obj.h"
  #include "parse/parselo.h"
 +#include "debugconsole/console.h"
 
  #ifndef NDEBUG
  #include "io/key.h"
 @@ -286,10 +287,16 @@
 
  float camera_zoom_scale = 1.0f;
 
 -DCF(camera_speed, "")
 +DCF(camera_speed, "Sets the camera zoom scale")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	camera_zoom_scale = Dc_arg_float;
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Camera zoom scale is %f\n", camera_zoom_scale);
 +		return;
 +	}
 +
 +	dc_stuff_float(&camera_zoom_scale);
 +
 +	dc_printf("Camera zoom scale set to %f\n", camera_zoom_scale);
  }
 
  void do_view_external(float frame_time)
 Index: radar/radarsetup.cpp
 ===================================================================
 --- radar/radarsetup.cpp	(Revision 10462)
 +++ radar/radarsetup.cpp	(Arbeitskopie)
 @@ -31,6 +31,7 @@
  #include "radar/radarsetup.h"
  #include "iff_defs/iff_defs.h"
  #include "globalincs/linklist.h"
 +#include "debugconsole/console.h"
 
  int Radar_static_looping = -1;
-+		dc_printf("Error: Unknown axis '%s'", arg);
+
 @@ -84,7 +85,7 @@
 
  int See_all = 0;
-Index: code/starfield/supernova.cpp
+
 -DCF_BOOL(see_all, See_all)
---- code/starfield/supernova.cpp	(revision 10462)
+
-+++ code/starfield/supernova.cpp	(working copy)
+
  static const char radar_default_filenames[2][16]=
  {
 Index: render/3dlaser.cpp
 ===================================================================
 --- render/3dlaser.cpp	(Revision 10462)
 +++ render/3dlaser.cpp	(Arbeitskopie)
 @@ -14,6 +14,7 @@
  #include "globalincs/systemvars.h"
-@@ -116,11 +117,8 @@ void supernova_stop()
+
  #include "cmdline/cmdline.h"
 +#include "debugconsole/console.h"
 
 
 
 Index: ship/ship.cpp
 ===================================================================
 --- ship/ship.cpp	(Revision 10462)
 +++ ship/ship.cpp	(Arbeitskopie)
 @@ -80,6 +80,7 @@
  #include "graphics/gropenglshader.h"
  #include "model/model.h"
  #include "mod_table/mod_table.h"
-@@ -181,11 +179,7 @@ void supernova_do_particles()
+
 
 
  #define NUM_SHIP_SUBSYSTEM_SETS			20		// number of subobject sets to use (because of the fact that it's a linked list,
 @@ -8356,10 +8357,14 @@
  }
 
  float Decay_rate = 1.0f / 120.0f;
 -DCF(lethality_decay, "time in sec to return from 100 to 0")
 +DCF(lethality_decay, "Sets ship lethality_decay, or the time in sec to go from 100 to 0 health (default is 1/120)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	Decay_rate = Dc_arg_float;
-@@ -318,17 +312,10 @@ int supernova_camera_cut()
+
 +		dc_printf("Decay rate is currently %f\n", Decay_rate);
 +		return;
 +	}
 +
 +	dc_stuff_float(&Decay_rate);
  }
 
  float min_lethality = 0.0f;
 @@ -9865,31 +9870,44 @@
  float t_vel = 0.2f;
  float t_min = 150.0f;
  float t_max = 300.0f;
 -DCF(t_rad, "")
 +DCF(t_rad, "Sets weapon tracer radius")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	t_rad = Dc_arg_float;
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("t_rad : %f\n", t_rad);
 +		return;
-Index: code/stats/medals.cpp
+
 +
---- code/stats/medals.cpp	(revision 10462)
+
-+++ code/stats/medals.cpp	(working copy)
+
 -DCF(t_len, "")
 +DCF(t_len, "Sets weapon tracer length")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	t_len = Dc_arg_float;
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("t_len : %f\n", t_len);
 +		return;
-@@ -437,78 +438,17 @@ void parse_medal_tbl()
+
 +
 +	dc_stuff_float(&t_len);
  }
 -DCF(t_vel, "")
 +DCF(t_vel, "Sets weapon tracer velocity")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	t_vel = Dc_arg_float;
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("t_vel : %f\n", t_vel);
 +		return;
 +	}
 +
 +	dc_stuff_float(&t_vel);
  }
 +/*
 + TODO: These two DCF's (and variables) are unused
  DCF(t_min, "")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	t_min = Dc_arg_float;
 +	dc_stuff_float(&t_min);
  }
  DCF(t_max, "")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	t_max = Dc_arg_float;
 +	dc_stuff_float(&t_max);
  }
 +*/
  void ship_fire_tracer(int weapon_objnum)
  {
  	particle_info pinfo;
 @@ -13611,26 +13629,25 @@
   */
  DCF(set_shield,"Change player ship shield strength")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_FLOAT|ARG_NONE);
 +	float value;
 
 -		if ( Dc_arg_type & ARG_FLOAT ) {
 -            CLAMP(Dc_arg_float, 0.0f, 1.0f);
 -			shield_set_strength(Player_obj, Dc_arg_float * Player_ship->ship_max_shield_strength);
 -			dc_printf("Shields set to %.2f\n", shield_get_strength(Player_obj) );
 -		}
 -	}
 -
 -	if ( Dc_help ) {
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf ("Usage: set_shield [num]\n");
  		dc_printf ("[num] --  shield percentage 0.0 -> 1.0 of max\n");
 -		dc_printf ("with no parameters, displays shield strength\n");
 -		Dc_status = 0;
 +		return;
  	}
 
 -	if ( Dc_status )	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		dc_printf( "Shields are currently %.2f", shield_get_strength(Player_obj) );
 +		return;
  	}
 +
 +	dc_stuff_float(&value);
 +
 +	CLAMP(value, 0.0f, 1.0f);
 +
 +	shield_set_strength(Player_obj, value * Player_ship->ship_max_shield_strength);
 +	dc_printf("Shields set to %.2f\n", shield_get_strength(Player_obj) );
  }
 
  /**
- 		dc_printf ("       [index] --  index of medal to grant\n");
+@@ -13638,26 +13655,24 @@
- 		dc_printf ("       with no parameters, displays the available medals\n");
+
  DCF(set_hull, "Change player ship hull strength")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_FLOAT|ARG_NONE);
 -
 -		if ( Dc_arg_type & ARG_FLOAT ) {
 -			CLAMP(Dc_arg_float, 0.0f, 1.0f);
- 		dc_printf("You have the following medals:\n");
+
 -			dc_printf("Hull set to %.2f\n", Player_obj->hull_strength );
-@@ -518,6 +458,53 @@ DCF(medals, "Grant or revoke medals")
+
- 				dc_printf("%d %s\n", Player->stats.medal_counts[i], Medals[i].name);
+
 -
- 		dc_printf("%s\n", Ranks[Player->stats.rank].name);
+
 +	float value;
 +
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf ("Usage: set_hull [num]\n");
  		dc_printf ("[num] --  hull percentage 0.0 -> 1.0 of max\n");
 -		dc_printf ("with no parameters, displays hull strength\n");
 -		Dc_status = 0;
 +		return;
  	}
 
 -	if ( Dc_status )	{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		dc_printf( "Hull is currently %.2f", Player_obj->hull_strength );
 +		return;
  	}
 +
 +	dc_stuff_float(&value);
 +
 +	CLAMP(value, 0.0f, 1.0f);
 +	Player_obj->hull_strength = value * Player_ship->ship_max_hull_strength;
 +	dc_printf("Hull set to %.2f\n", Player_obj->hull_strength );
  }
 
  /**
 @@ -13666,71 +13681,66 @@
  //XSTR:OFF
  DCF(set_subsys, "Set the strength of a particular subsystem on player ship" )
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_STRING);
 -		if ( !subsystem_stricmp( Dc_arg, "weapons" ))	{
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) )	{
 -				Dc_help = 1;
-+		{
+
 -				ship_set_subsystem_strength( Player_ship, SUBSYSTEM_WEAPONS, Dc_arg_float );
 -			}
 -		} else if ( !subsystem_stricmp( Dc_arg, "engine" ))	{
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) )	{
 -				Dc_help = 1;
 -			} else {
 -				ship_set_subsystem_strength( Player_ship, SUBSYSTEM_ENGINE, Dc_arg_float );
 -				if ( Dc_arg_float < ENGINE_MIN_STR )	{
 -					Player_ship->flags |= SF_DISABLED;				// add the disabled flag
 -				} else {
 -					Player_ship->flags &= (~SF_DISABLED);				// add the disabled flag
 -				}
 -			}
 -		} else if ( !subsystem_stricmp( Dc_arg, "sensors" ))	{
-Index: code/stats/scoring.cpp
+
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) )	{
---- code/stats/scoring.cpp	(revision 10462)
+
-+++ code/stats/scoring.cpp	(working copy)
+
 -				ship_set_subsystem_strength( Player_ship, SUBSYSTEM_SENSORS, Dc_arg_float );
 -			}
 -		} else if ( !subsystem_stricmp( Dc_arg, "communication" ))	{
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) )	{
 -				Dc_help = 1;
 -			} else {
 -				ship_set_subsystem_strength( Player_ship, SUBSYSTEM_COMMUNICATION, Dc_arg_float );
-@@ -1509,20 +1510,42 @@ void scoring_bash_rank(player *pl,int rank)
+
 -		} else if ( !subsystem_stricmp( Dc_arg, "navigation" ))	{
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) )	{
 -				Dc_help = 1;
 -			} else {
 -				ship_set_subsystem_strength( Player_ship, SUBSYSTEM_NAVIGATION, Dc_arg_float );
 -			}
 -		} else if ( !subsystem_stricmp( Dc_arg, "radar" ))	{
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) )	{
 -				Dc_help = 1;
 -			} else {
 -				ship_set_subsystem_strength( Player_ship, SUBSYSTEM_RADAR, Dc_arg_float );
 -			}
 -		} else {
 -			// print usage
 -			Dc_help = 1;
 -		}
 +	SCP_string arg;
 +	int subsystem = SUBSYSTEM_NONE;
 +	float val_f;
 +
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: set_subsys <type> [--status] <strength>\n");
 +		dc_printf("<type> is any of the following:\n");
 +		dc_printf("\tweapons\n");
 +		dc_printf("\tengine\n");
 +		dc_printf("\tsensors\n");
 +		dc_printf("\tcommunication\n");
 +		dc_printf("\tnavigation\n");
 +		dc_printf("\tradar\n\n");
 +
 +		dc_printf("[--status] will display status of that subsystem\n\n");
 +
 +		dc_printf("<strength> is any value between 0 and 1.0\n");
 +		return;
  	}
 
 -	if ( Dc_help )	{
 -		dc_printf( "Usage: set_subsys type X\nWhere X is value between 0 and 1.0, and type can be:\n" );
 -		dc_printf( "weapons\n" );
 -		dc_printf( "engine\n" );
 -		dc_printf( "sensors\n" );
 -		dc_printf( "communication\n" );
 -		dc_printf( "navigation\n" );
 -		dc_printf( "radar\n" );
 -		Dc_status = 0;	// don't print status if help is printed.  Too messy.
 +	dc_stuff_string_white(arg);
 +
 +	if (arg == "weapons") {
 +		subsystem = SUBSYSTEM_WEAPONS;
 +
 +	} else if (arg == "engine") {
 +		subsystem = SUBSYSTEM_ENGINE;
-Index: code/weapon/beam.cpp
+
 +	} else if (arg == "sensors") {
---- code/weapon/beam.cpp	(revision 10462)
+
-+++ code/weapon/beam.cpp	(working copy)
+
-@@ -35,6 +35,7 @@
+
 +		subsystem = SUBSYSTEM_COMMUNICATION;
 +
 +	} else if (arg == "navigation") {
 +		subsystem = SUBSYSTEM_NAVIGATION;
 +
 +	} else if (arg == "radar") {
 +		subsystem = SUBSYSTEM_RADAR;
-@@ -119,20 +120,22 @@ float b_whack_small = 2000.0f;	// used to be 500.0f with the retail whack bug
+
 +	} else {
 +		dc_printf("Erro: Unknown argument '%s'\n", arg.c_str());
 +		return;
  	}
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Subsystem '%s' is at %f strength\n", arg.c_str(), ship_get_subsystem_strength(Player_ship, subsystem));
 +
 +	} else {
 +		// Set the subsystem strength
 +		dc_stuff_float(&val_f);
 +
 +		CLAMP(val_f, 0.0, 1.0);
 +		ship_set_subsystem_strength( Player_ship, subsystem, val_f );
 +
 +		if (subsystem == SUBSYSTEM_ENGINE) {
 +			// If subsystem is an engine, set/clear the disabled flag
 +			(val_f < ENGINE_MIN_STR) ? (Player_ship->flags |= SF_DISABLED) : (Player_ship->flags &= (~SF_DISABLED));
 +		}
 +	}
  }
  //XSTR:ON
 
 @@ -16420,11 +16430,11 @@
  // update artillery lock info
  #define CLEAR_ARTILLERY_AND_CONTINUE()	{ if(aip != NULL){ aip->artillery_objnum = -1; aip->artillery_sig = -1;	aip->artillery_lock_time = 0.0f;} continue; }
  float artillery_dist = 10.0f;
 -DCF(art, "")
 +DCF(art, "Sets artillery disance")
  {
 -	dc_get_arg(ARG_FLOAT);
-@@ -1254,10 +1257,9 @@ void beam_render(beam *b, float u_offset)
+
 +	dc_stuff_float(&artillery_dist);
  }
 +
  void ship_update_artillery_lock()
  {
  	ai_info *aip = NULL;
 Index: ship/shipfx.cpp
 ===================================================================
 --- ship/shipfx.cpp	(Revision 10462)
 +++ ship/shipfx.cpp	(Arbeitskopie)
 @@ -40,6 +40,7 @@
  #include "bmpman/bmpman.h"
-@@ -1479,10 +1481,9 @@ void beam_calc_facing_pts( vec3d *top, vec3d *bot, vec3d *fvec, vec3d *pos, floa
+
  #include "cmdline/cmdline.h"
 +#include "debugconsole/console.h"
 
 
  #ifndef NDEBUG
 @@ -1355,42 +1356,58 @@
  }
 
  float Particle_width = 1.2f;
 -DCF(particle_width, "Multiplier for angular width of the particle spew")
 +DCF(particle_width, "Sets multiplier for angular width of the particle spew ( 0 - 5)")
  {
-@@ -3355,12 +3356,11 @@ int beam_will_tool_target(beam *b, object *objp)
+
 -		dc_get_arg(ARG_FLOAT);
 -		if ( (Dc_arg_float >= 0 ) && (Dc_arg_float <= 5) ) {
 -			Particle_width = Dc_arg_float;
 -		} else {
 -			dc_printf( "Illegal value for particle width. (Must be from 0-5) \n\n");
 -		}
 +	float value;
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle_width : %f\n", Particle_width);
 +		return;
  	}
 +
 +	dc_stuff_float(&value);
 +
-Index: code/weapon/corkscrew.cpp
+
 +	Particle_width = value;
---- code/weapon/corkscrew.cpp	(revision 10462)
+
-+++ code/weapon/corkscrew.cpp	(working copy)
+
  }
 
  float Particle_number = 1.2f;
 -DCF(particle_num, "Multiplier for the number of particles created")
 +DCF(particle_num, "Sets multiplier for the number of particles created")
  {
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_FLOAT);
-@@ -293,41 +294,25 @@ DCF(cscrew, "Listing of corkscrew missile debug console functions")
+
 -			Particle_number = Dc_arg_float;
 -		} else {
 -			dc_printf( "Illegal value for particle num. (Must be from 0-5) \n\n");
 -		}
 +
 +	float value;
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle_number : %f\n", Particle_number);
 +		return;
  	}
 +
 +	dc_stuff_float(&value);
 +
 +	CLAMP(value, 0.0, 5.0);
 +	Particle_number = value;
 +
 +	dc_printf("Particle_number set to %f\n", Particle_number);
  }
 
  float Particle_life = 1.2f;
  DCF(particle_life, "Multiplier for the lifetime of particles created")
  {
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_FLOAT);
 -		if ( (Dc_arg_float >= 0 ) && (Dc_arg_float <= 5) ) {
 -			Particle_life = Dc_arg_float;
 -		} else {
 -			dc_printf( "Illegal value for particle life. (Must be from 0-5) \n\n");
 -		}
 +	float value;
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle_life : %f\n", Particle_life);
 +		return;
  	}
 +
 +	dc_stuff_float(&value);
 +
 +	CLAMP(value, 0.0, 5.0);
 +	Particle_life = value;
 +
 +	dc_printf("Particle_life set to %f\n", Particle_life);
  }
 
-@@ -354,11 +339,7 @@ DCF(cscrew_shrink, "Shrink the radius of every other missile")
+
 @@ -1602,16 +1619,20 @@
  float	Bs_exp_fire_time_mult = 1.0f;
 
  DCF_BOOL(bs_exp_fire_low, Bs_exp_fire_low)
 -DCF(bs_exp_fire_time_mult, "Multiplier time between fireball in big ship explosion")
 +DCF(bs_exp_fire_time_mult, "Sets multiplier time between fireball in big ship explosion")
  {
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_FLOAT);
 -		if ( (Dc_arg_float >= 0.1 ) && (Dc_arg_float <= 5) ) {
 -			Bs_exp_fire_time_mult = Dc_arg_float;
 -		} else {
-Index: code/weapon/emp.cpp
+
 -		}
---- code/weapon/emp.cpp	(revision 10462)
+
-+++ code/weapon/emp.cpp	(working copy)
+
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Bs_exp_fire_time_mult : %f\n", Bs_exp_fire_time_mult);
 +		return;
  	}
 +
 +	dc_stuff_float(&value);
 +
 +	CLAMP(value, 0.1f, 5.0f);
-@@ -637,13 +638,12 @@ float emp_current_intensity()
+
 +	dc_printf("Bs_exp_fire_time_mult set to %f\n", Bs_exp_fire_time_mult);
  }
 
 
 Index: sound/sound.cpp
 ===================================================================
 --- sound/sound.cpp	(Revision 10462)
 +++ sound/sound.cpp	(Arbeitskopie)
 @@ -15,6 +15,7 @@
  #include "cmdline/cmdline.h"
  #include "osapi/osapi.h"
  #include "globalincs/vmallocator.h"
 +#include "debugconsole/console.h"
 
  #include "gamesnd/gamesnd.h"
  #include "globalincs/alphacolors.h"
 @@ -200,14 +201,15 @@
  }
-Index: code/weapon/weapons.cpp
+
  int Sound_spew = 0;
---- code/weapon/weapons.cpp	(revision 10462)
+
-+++ code/weapon/weapons.cpp	(working copy)
+
  {
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Sound debug info is %s", (Sound_spew ? "ON" : "OFF"));
 +		return;
 +	}
 +
  	Sound_spew = !Sound_spew;
 -	if(Sound_spew){
-@@ -6470,75 +6471,137 @@ void weapon_maybe_spew_particle(object *obj)
+
 -	} else {
 -		dc_printf("Sound debug info OFF");
 -	}
 +	dc_printf("Sound debug info is %s", (Sound_spew ? "ON" : "OFF"));
  }
  void snd_spew_debug_info()
  {
 Index: starfield/nebula.cpp
 ===================================================================
 --- starfield/nebula.cpp	(Revision 10462)
 +++ starfield/nebula.cpp	(Arbeitskopie)
 @@ -15,9 +15,9 @@
  #include "mission/missionparse.h"
  #include "nebula/neb.h"
  #include "cfile/cfile.h"
 +#include "debugconsole/console.h"
 
 
 -
  #define MAX_TRIS 200
  #define MAX_POINTS 300
 
 @@ -215,17 +215,19 @@
 
  DCF(nebula,"Loads a different nebula")
  {
 -	if ( Dc_command )	{
 -		dc_get_arg(ARG_STRING|ARG_NONE);
 -		if ( Dc_arg_type == ARG_NONE )	{
 -			nebula_close();
 -		} else {
 -			nebula_init( Dc_arg );
 -		}
 +	char filename[MAX_NAME_LEN];
 +
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: nebula [filename]\n");
 +		dc_printf("Loads the nebula file. No filename takes away nebula\n" );
 +		return;
  	}
 -	if ( Dc_help )	{
 -		dc_printf( "Usage: nebula filename\nLoads the nebula file. No filename takes away nebula\n" );
 -	}
 +
 +	if (dc_maybe_stuff_string_white(filename, MAX_NAME_LEN)) {
 +			nebula_init(filename);
 +	} else {
 +		nebula_close();
 +	}
  }
 
 
 Index: starfield/starfield.cpp
 ===================================================================
 --- starfield/starfield.cpp	(Revision 10462)
 +++ starfield/starfield.cpp	(Arbeitskopie)
 @@ -25,6 +25,7 @@
  #include "parse/parselo.h"
  #include "hud/hud.h"
  #include "hud/hudtarget.h"
 +#include "debugconsole/console.h"
 
 
  #define MAX_DEBRIS_VCLIPS			4
 @@ -866,75 +867,11 @@
  //XSTR:OFF
  DCF(stars,"Set parameters for starfield")
  {
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_STRING);
 -		if ( !strcmp( Dc_arg, "tail" )) {
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 1.0f) ) {
 -				Dc_help = 1;
 -			} else {
 -				Star_amount = Dc_arg_float;
 -			}
 -		} else if ( !strcmp( Dc_arg, "len" )) {
 -			dc_get_arg(ARG_FLOAT);
 -			Star_max_length = Dc_arg_float;
 -		} else if ( !strcmp( Dc_arg, "dim" )) {
 -			dc_get_arg(ARG_FLOAT);
 -			if ( Dc_arg_float < 0.0f ) {
 -				Dc_help = 1;
 -			} else {
 -				Star_dim = Dc_arg_float;
 -			}
 -		} else if ( !strcmp( Dc_arg, "flag" )) {
 -			dc_get_arg(ARG_STRING);
 -			if ( !strcmp( Dc_arg, "tail" )) {
 -				Star_flags ^= STAR_FLAG_TAIL;
 -			} else if ( !strcmp( Dc_arg, "dim" )) {
 -				Star_flags ^= STAR_FLAG_DIM;
 -			} else if ( !strcmp( Dc_arg, "aa" )) {
 -				Star_flags ^= STAR_FLAG_ANTIALIAS;
 -			} else {
 -				Dc_help = 1;
 -			}
 -		} else if ( !strcmp( Dc_arg, "cap" )) {
 -			dc_get_arg(ARG_FLOAT);
 -			if ( (Dc_arg_float < 0.0f) || (Dc_arg_float > 255.0f) ) {
 -				Dc_help = 1;
 -			} else {
 -				Star_cap = Dc_arg_float;
 -			}
 -		} else if ( !strcmp( Dc_arg, "m0" )) {
 -			Star_amount = 0.0f;
 -			Star_dim = 0.0f;
 -			Star_cap = 0.0f;
 -			Star_flags = 0;
 -			Star_max_length = STAR_MAX_LENGTH_DEFAULT;
 -		} else if ( !strcmp( Dc_arg, "m1" ) || !strcmp( Dc_arg, "default" )) {
 -			Star_amount = STAR_AMOUNT_DEFAULT;
 -			Star_dim = STAR_DIM_DEFAULT;
 -			Star_cap = STAR_CAP_DEFAULT;
 -			Star_flags = STAR_FLAG_DEFAULT;
 -			Star_max_length = STAR_MAX_LENGTH_DEFAULT;
 -		} else if ( !strcmp( Dc_arg, "m2" )) {
 -			Star_amount = 0.75f;
 -			Star_dim = 20.0f;
 -			Star_cap = 75.0f;
 -			Star_flags = STAR_FLAG_TAIL|STAR_FLAG_DIM|STAR_FLAG_ANTIALIAS;
 -			Star_max_length = STAR_MAX_LENGTH_DEFAULT;
 -		} else if ( !strcmp( Dc_arg, "num" )) {
 -			dc_get_arg(ARG_INT);
 -			if ( (Dc_arg_int < 0) || (Dc_arg_int > MAX_STARS) ) {
 -				Dc_help = 1;
 -			} else {
 -				Num_stars = Dc_arg_int;
 -			}
 -		} else {
 -			// print usage, not stats
 -			Dc_help = 1;
 -		}
 -	}
 +	SCP_string arg;
 +	float val_f;
 +	int val_i;
 
 -	if ( Dc_help ) {
 +	if (dc_optional_string_either("help", "--help")) {
  		dc_printf( "Usage: stars keyword\nWhere keyword can be in the following forms:\n" );
  		dc_printf( "stars default   Resets stars to all default values\n" );
  		dc_printf( "stars num X     Sets number of stars to X.  Between 0 and %d.\n", MAX_STARS );
 @@ -949,22 +886,106 @@
  		dc_printf( "\nHINT: set cap to 0 to get dim rate and tail down, then use\n" );
  		dc_printf( "cap to keep the lines from going away when moving too fast.\n" );
  		dc_printf( "\nUse '? stars' to see current values.\n" );
 -		Dc_status = 0;	// don't print status if help is printed.  Too messy.
 +		return;	// don't print status if help is printed.  Too messy.
  	}
 
 -	if ( Dc_status ) {
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		dc_printf( "Num_stars: %d\n", Num_stars );
  		dc_printf( "Tail: %.2f\n", Star_amount );
 -		dc_printf( "Dim: %.2f\n", Star_dim );
 -		dc_printf( "Cap: %.2f\n", Star_cap );
 +		dc_printf( "Dim : %.2f\n", Star_dim );
 +		dc_printf( "Cap : %.2f\n", Star_cap );
  		dc_printf( "Max length: %.2f\n", Star_max_length );
  		dc_printf( "Flags:\n" );
 -		dc_printf( "  Tail: %s\n", (Star_flags&STAR_FLAG_TAIL?"On":"Off") );
 -		dc_printf( "  Dim: %s\n", (Star_flags&STAR_FLAG_DIM?"On":"Off") );
 +		dc_printf( "  Tail : %s\n", (Star_flags&STAR_FLAG_TAIL?"On":"Off") );
 +		dc_printf( "  Dim  : %s\n", (Star_flags&STAR_FLAG_DIM?"On":"Off") );
  		dc_printf( "  Antialias: %s\n", (Star_flags&STAR_FLAG_ANTIALIAS?"On":"Off") );
  		dc_printf( "\nTHESE AREN'T SAVED TO DISK, SO IF YOU TWEAK\n" );
  		dc_printf( "THESE AND LIKE THEM, WRITE THEM DOWN!!\n" );
 +		return;
  	}
 +
 +	dc_stuff_string_white(arg);
 +	// "stars default" is handled by "stars m1"
 +	if (arg == "num") {
 +		dc_stuff_int(&val_i);
 +
-Index: projects/MSVC_2011/Freespace2.sln
+
 +		Num_stars = val_i;
---- projects/MSVC_2011/Freespace2.sln	(revision 10462)
+
-+++ projects/MSVC_2011/Freespace2.sln	(working copy)
+
-@@ -1,6 +1,6 @@
+
- ?
+
- Microsoft Visual Studio Solution File, Format Version 12.00
+
--# Visual Studio 2012
+
-+# Visual Studio Express 2012 for Windows Desktop
+
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Freespace2", "Freespace2.vcxproj", "{A8030FA3-CEAB-4297-99E3-CD2CFB89830B}"
+
- EndProject
+
- Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libjpeg", "libjpeg.vcxproj", "{42A241F2-7996-4AAF-8491-FB885E2DC37D}"
+
-@@ -143,7 +143,6 @@ Global
+
- 		{92C8C611-75AA-4BD7-9B73-584822AAAEB5}.Debug SSE2|Win32.ActiveCfg = Debug SSE2|Win32
+
- 		{92C8C611-75AA-4BD7-9B73-584822AAAEB5}.Debug SSE2|Win32.Build.0 = Debug SSE2|Win32
+
- 		{92C8C611-75AA-4BD7-9B73-584822AAAEB5}.Debug|Win32.ActiveCfg = Debug|Win32
+
--		{92C8C611-75AA-4BD7-9B73-584822AAAEB5}.Debug|Win32.Build.0 = Debug|Win32
+
- 		{92C8C611-75AA-4BD7-9B73-584822AAAEB5}.Release AVX|Win32.ActiveCfg = Release AVX|Win32
+
- 		{92C8C611-75AA-4BD7-9B73-584822AAAEB5}.Release AVX|Win32.Build.0 = Release AVX|Win32
+
- 		{92C8C611-75AA-4BD7-9B73-584822AAAEB5}.Release SSE|Win32.ActiveCfg = Release SSE|Win32
+
-Index: projects/MSVC_2011/code.vcxproj
+
 +		}
---- projects/MSVC_2011/code.vcxproj	(revision 10462)
+
-+++ projects/MSVC_2011/code.vcxproj	(working copy)
+
-@@ -529,6 +529,9 @@
+
-     <ClCompile Include="..\..\code\cutscene\oggplayer.cpp" />
+
-     <ClCompile Include="..\..\code\Debris\debris.cpp" />
+
-     <ClCompile Include="..\..\code\DebugConsole\console.cpp" />
+
-+    <ClCompile Include="..\..\code\debugconsole\consolecmds.cpp" />
+
-+    <ClCompile Include="..\..\code\debugconsole\consoleparse.cpp" />
+
-+    <ClCompile Include="..\..\code\debugconsole\timerbar.cpp" />
+
-     <ClCompile Include="..\..\code\fireball\fireballs.cpp" />
+
-     <ClCompile Include="..\..\code\fireball\warpineffect.cpp" />
+
-     <ClCompile Include="..\..\code\gamehelp\contexthelp.cpp" />
+
-@@ -808,6 +811,9 @@
+
-     <ClInclude Include="..\..\code\cutscene\mvelib.h" />
+
-     <ClInclude Include="..\..\code\cutscene\oggplayer.h" />
+
-     <ClInclude Include="..\..\code\Debris\debris.h" />
+
-+    <ClInclude Include="..\..\code\debugconsole\console.h" />
+
-+    <ClInclude Include="..\..\code\debugconsole\consoleparse.h" />
+
-+    <ClInclude Include="..\..\code\debugconsole\timerbar.h" />
+
-     <ClInclude Include="..\..\code\DirectX\vasync.h" />
+
-     <ClInclude Include="..\..\code\DirectX\vdinput.h" />
+
-     <ClInclude Include="..\..\code\DirectX\vdplay.h" />
+
-Index: projects/MSVC_2011/code.vcxproj.filters
+
 +		Star_amount = STAR_AMOUNT_DEFAULT;
---- projects/MSVC_2011/code.vcxproj.filters	(revision 10462)
+
-+++ projects/MSVC_2011/code.vcxproj.filters	(working copy)
+
-@@ -1056,6 +1056,15 @@
+
-     <ClCompile Include="..\..\code\globalincs\profiling.cpp">
+
-       <Filter>GlobalIncs</Filter>
+
-     </ClCompile>
+
-+    <ClCompile Include="..\..\code\debugconsole\consolecmds.cpp">
+
-+      <Filter>DebugConsole</Filter>
+
-+    </ClCompile>
+
-+    <ClCompile Include="..\..\code\debugconsole\consoleparse.cpp">
+
-+      <Filter>DebugConsole</Filter>
+
-+    </ClCompile>
+
-+    <ClCompile Include="..\..\code\debugconsole\timerbar.cpp">
+
-+      <Filter>DebugConsole</Filter>
+
-+    </ClCompile>
+
-   </ItemGroup>
+
-   <ItemGroup>
+
-     <ClInclude Include="..\..\code\ai\ai.h">
+
-@@ -1856,6 +1865,15 @@
+
-     <ClInclude Include="..\..\code\PilotFile\pilotfile.h">
+
-       <Filter>PilotFile</Filter>
+
-     </ClInclude>
+
-+    <ClInclude Include="..\..\code\debugconsole\console.h">
+
-+      <Filter>DebugConsole</Filter>
+
-+    </ClInclude>
+
-+    <ClInclude Include="..\..\code\debugconsole\consoleparse.h">
++			dc_printf("Error: unknown flag argument '%s'\n", arg.c_str());
-+      <Filter>DebugConsole</Filter>
+
-+    </ClInclude>
+
-+    <ClInclude Include="..\..\code\debugconsole\timerbar.h">
+
-+      <Filter>DebugConsole</Filter>
++		dc_printf("Error: Unknown argument '%s'", arg.c_str());
-+    </ClInclude>
+
-   </ItemGroup>
+
-   <ItemGroup>
+
-     <Library Include="..\..\code\directx\dxguid.lib">
+
 @@ -1284,40 +1305,45 @@
-
+
-/* EOF - IGNORE *\
+
  {
 -	if ( Dc_command ) {
 -		dc_get_arg(ARG_STRING);
 -		if ( !strcmp( Dc_arg, "u" )) {
 -			dc_get_arg(ARG_FLOAT);
 -			if ( Dc_arg_float < 0.0f ) {
 -				Dc_help = 1;
 -			} else {
 -				subspace_u_speed = Dc_arg_float;
 -			}
 -		} else if ( !strcmp( Dc_arg, "v" )) {
 -			dc_get_arg(ARG_FLOAT);
 -			if ( Dc_arg_float < 0.0f ) {
 -				Dc_help = 1;
 -			} else {
 -				subspace_v_speed = Dc_arg_float;
 -			}
 -		} else {
 -			// print usage, not stats
 -			Dc_help = 1;
 -		}
 -	}
 +	SCP_string arg;
 +	float value;
 
 -	if ( Dc_help ) {
 -		dc_printf( "Usage: subspace keyword\nWhere keyword can be in the following forms:\n" );
 -		dc_printf( "subspace u X    Where X is how fast u moves.\n", MAX_STARS );
 -		dc_printf( "subspace v X    Where X is how fast v moves.\n" );
 -		dc_printf( "\nUse '? subspace' to see current values.\n" );
 -		Dc_status = 0;	// don't print status if help is printed.  Too messy.
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf( "Usage: subspace [--status] <axis> <speed>\n");
 +		dc_printf("[--status] -- Displays the current speeds for both axes\n");
 +		dc_printf("<axis>  -- May be either 'u' or 'v', and corresponds to the texture axis\n");
 +		dc_printf("<speed> -- is the speed along the axis that the texture is moved\n");
 +		return;
  	}
 
 -	if ( Dc_status ) {
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
  		dc_printf( "u: %.2f\n", subspace_u_speed );
  		dc_printf( "v: %.2f\n", subspace_v_speed );
 +		return;
  	}
 +
 +	dc_stuff_string_white(arg);
 +	if (arg == "u") {
 +		dc_stuff_float(&value);
 +
 +		if ( value < 0.0f ) {
 +			dc_printf("Error: speed must be non-negative");
 +			return;
 +		}
 +		subspace_u_speed = value;
 +
 +	} else if (arg == "v") {
 +		dc_stuff_float(&value);
 +
 +		if (value < 0.0f) {
 +			dc_printf("Error: speed must be non-negative");
 +			return;
 +		}
 +		subspace_v_speed = value;
 +
 +	} else {
 +		dc_printf("Error: Unknown axis '%s'", arg.c_str());
 +	}
  }
  //XSTR:ON
 
 Index: starfield/supernova.cpp
 ===================================================================
 --- starfield/supernova.cpp	(Revision 10462)
 +++ starfield/supernova.cpp	(Arbeitskopie)
 @@ -21,6 +21,7 @@
  #include "gamesequence/gamesequence.h"
  #include "gamesnd/gamesnd.h"
  #include "cmdline/cmdline.h"
 +#include "debugconsole/console.h"
 
  // --------------------------------------------------------------------------------------------------------------------------
  // SUPERNOVA DEFINES/VARS
 @@ -116,11 +117,8 @@
 
 
  int sn_particles = 100;
 -DCF(sn_part, "")
 -{
 -	dc_get_arg(ARG_INT);
 -	sn_particles = Dc_arg_int;
 -}
 +DCF_INT2(sn_part, sn_particles, 0, INT_MAX, "Sets number of supernova particles (default is 100)");
 +
  void supernova_do_particles()
  {
  	int idx;
 @@ -181,11 +179,7 @@
 
  // call once per frame
  float sn_shudder = 0.45f;
 -DCF(sn_shud, "")
 -{
 -	dc_get_arg(ARG_FLOAT);
 -	sn_shudder = Dc_arg_float;
 -}
 +DCF_FLOAT2(sn_shud, sn_shudder, 0.0, FLT_MAX, "Sets camera shudder rate for being in supernova shockwave (default is 0.45)");
 
  void supernova_process()
  {
 @@ -318,18 +312,11 @@
  // get view params from supernova
  float sn_distance = 300.0f;				// shockwave moving at 1000/ms ?
  float sn_cam_distance = 25.0f;
 -DCF(sn_dist, "")
 -{
 -	dc_get_arg(ARG_FLOAT);
 -	sn_distance = Dc_arg_float;
 -}
 +DCF_FLOAT2(sn_dist, sn_distance, 0.0, FLT_MAX, "Sets supernova shockwave distance (default is 300.0f)");
 
 -DCF(sn_cam_dist, "")
 -{
 -	dc_get_arg(ARG_FLOAT);
 -	sn_cam_distance = Dc_arg_float;
 -}
 
 +DCF_FLOAT2(sn_cam_dist, sn_cam_distance, 0.0, FLT_MAX, "Sets supernova camera distance (default is 25.0f)");
 +
  void supernova_get_eye(vec3d *eye_pos, matrix *eye_orient)
  {
  	// supernova camera pos
 Index: stats/medals.cpp
 ===================================================================
 --- stats/medals.cpp	(Revision 10462)
 +++ stats/medals.cpp	(Arbeitskopie)
 @@ -21,6 +21,7 @@
  #include "globalincs/alphacolors.h"
  #include "localization/localize.h"
  #include "parse/parselo.h"
 +#include "debugconsole/console.h"
 
  #ifndef NDEBUG
  #include "cmdline/cmdline.h"
 @@ -437,88 +438,74 @@
  DCF(medals, "Grant or revoke medals")
  {
  	int i;
 +	int idx;
 
 -	if (Dc_command)
 +	if (dc_optional_string_either("help", "--help"))
  	{
 -		dc_get_arg(ARG_STRING | ARG_INT | ARG_NONE);
 +		dc_printf ("Usage: medals all | clear | promote | demote | [index]\n");
 +		dc_printf ("       [index] --  index of medal to grant\n");
 +		dc_printf ("       with no parameters, displays the available medals\n");
 +		return;
 +	}
 
 -		if (Dc_arg_type & ARG_INT)
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?"))
 +	{
 +		dc_printf("You have the following medals:\n");
 +
 +		for (i = 0; i < Num_medals; i++)
  		{
 -			int idx = Dc_arg_int;
 +			if (Player->stats.medal_counts[i] > 0)
 +				dc_printf("%d %s\n", Player->stats.medal_counts[i], Medals[i].name);
 +		}
 +		dc_printf("%s\n", Ranks[Player->stats.rank].name);
 +		return;
 +	}
 
 -			if (idx < 0 || idx >= Num_medals)
 -			{
 -				dc_printf("Medal index %d is out of range\n", idx);
 -				return;
 -			}
 +	if (dc_optional_string("all")) {
 +		for (i = 0; i < Num_medals; i++) {
 +			Player->stats.medal_counts[i]++;
 +		}
 +		dc_printf("Granted all medals\n");
 +		return;
 
 -			dc_printf("Granted %s\n", Medals[idx].name);
 -			Player->stats.medal_counts[idx]++;
 +	} else if (dc_optional_string("clear")) {
 +		for (i = 0; i < Num_medals; i++) {
 +			Player->stats.medal_counts[i] = 0;
  		}
 -		else if (Dc_arg_type & ARG_STRING)
 -		{
 -			if (!strcmp(Dc_arg, "all"))
 -			{
 -				for (i = 0; i < Num_medals; i++)
 -					Player->stats.medal_counts[i]++;
 +		dc_printf("Cleared all medals\n");
 +		return;
 
 -				dc_printf("Granted all medals\n");
 -			}
 -			else if (!strcmp(Dc_arg, "clear"))
 -			{
 -				for (i = 0; i < Num_medals; i++)
 -					Player->stats.medal_counts[i] = 0;
 +	} else if (dc_optional_string("promote")) {
 +		if (Player->stats.rank < MAX_FREESPACE2_RANK) {
 +			Player->stats.rank++;
 +		}
 +		dc_printf("Promoted to %s\n", Ranks[Player->stats.rank].name);
 +		return;
 
 -				dc_printf("Cleared all medals\n");
 -			}
 -			else if (!strcmp(Dc_arg, "demote"))
 -			{
 -				if (Player->stats.rank > 0)
 -					Player->stats.rank--;
 +	} else if (dc_optional_string("demote")) {
 +		if (Player->stats.rank > 0) {
 +			Player->stats.rank--;
 +		}
 +		dc_printf("Demoted to %s\n", Ranks[Player->stats.rank].name);
 +		return;
 +	}
 
 -				dc_printf("Demoted to %s\n", Ranks[Player->stats.rank].name);
 -			}
 -			else if (!strcmp(Dc_arg, "promote"))
 -			{
 -				if (Player->stats.rank < MAX_FREESPACE2_RANK)
 -					Player->stats.rank++;
 -
 -				dc_printf("Promoted to %s\n", Ranks[Player->stats.rank].name);
 -			}
 -			else
 -			{
 -				Dc_help = 1;
 -			}
 -		}
 -		else
 +	if (dc_maybe_stuff_int(&idx)) {
 +		if (idx < 0 || idx >= Num_medals)
  		{
 -			dc_printf("The following medals are available:\n");
 -			for (i = 0; i < Num_medals; i++)
 -				dc_printf("%d: %s\n", i, Medals[i].name);
 +			dc_printf("Medal index %d is out of range\n", idx);
 +			return;
  		}
 
 -		Dc_status = 0;
 +		dc_printf("Granted %s\n", Medals[idx].name);
 +		Player->stats.medal_counts[idx]++;
 +		return;
  	}
 
 -	if (Dc_help)
 -	{
 -		dc_printf ("Usage: gimmemedals all | clear | promote | demote | [index]\n");
 -		dc_printf ("       [index] --  index of medal to grant\n");
 -		dc_printf ("       with no parameters, displays the available medals\n");
 -		Dc_status = 0;
 +	dc_printf("The following medals are available:\n");
 +	for (i = 0; i < Num_medals; i++) {
 +		dc_printf("%d: %s\n", i, Medals[i].name);
  	}
 -
 -	if (Dc_status)
 -	{
 -		dc_printf("You have the following medals:\n");
 -
 -		for (i = 0; i < Num_medals; i++)
 -		{
 -			if (Player->stats.medal_counts[i] > 0)
 -				dc_printf("%d %s\n", Player->stats.medal_counts[i], Medals[i].name);
 -		}
 -		dc_printf("%s\n", Ranks[Player->stats.rank].name);
 -	}
  }
 
 
 Index: stats/scoring.cpp
 ===================================================================
 --- stats/scoring.cpp	(Revision 10462)
 +++ stats/scoring.cpp	(Arbeitskopie)
 @@ -31,6 +31,7 @@
  #include "network/multi_pmsg.h"
  #include "ai/ai_profiles.h"
  #include "pilotfile/pilotfile.h"
 +#include "debugconsole/console.h"
 
  /*
  // uncomment to get extra debug messages when a player scores
 @@ -1509,20 +1510,42 @@
  	pl->stats.rank = rank;
  }
 
 -DCF(rank, "changes scoring vars")
 +DCF(rank, "changes player rank")
  {
 -	if(Dc_command){
 -		dc_get_arg(ARG_INT);
 -
 -		// parse the argument and change things around accordingly
 -		if((Dc_arg_type & ARG_INT) && (Player != NULL)){
 -			scoring_bash_rank(Player,Dc_arg_int);
 -		}
 +	int rank;
 +
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Usage: rank <index>\n");
 +		dc_printf(" <index> The rank index you wish to have. For retail ranks, these correspond to:\n");
 +		dc_printf("\t0 : Ensign\n");
 +		dc_printf("\t1 : Lieutenant Junior Grade\n");
 +		dc_printf("\t2 : Lietenant\n");
 +		dc_printf("\t3 : Lieutenant Commander\n");
 +		dc_printf("\t4 : Commander\n");
 +		dc_printf("\t5 : Captain\n");
 +		dc_printf("\t6 : Commodore\n");
 +		dc_printf("\t7 : Rear Admiral\n");
 +		dc_printf("\t8 : Vice Admiral\n");
 +		dc_printf("\t9 : Admiral\n\n");
 +		return;
  	}
 -	dc_printf("Usage\n0 : Ensign\n1 : Lieutenant Junior Grade\n");
 -	dc_printf("2 : Lietenant\n3 : Lieutenant Commander\n");
 -	dc_printf("4 : Commander\n5 : Captain\n6 : Commodore\n");
 -	dc_printf("7 : Rear Admiral\n8 : Vice Admiral\n9 : Admiral");
 +
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		if (Player != NULL) {
 +			dc_printf("Current rank is %i\n", Player->stats.rank);
 +		} else {
 +			dc_printf("Error! Current Player not active or loaded\n");
 +		}
 +	}
 +
 +	dc_stuff_int(&rank);
 +
 +	// parse the argument and change things around accordingly
 +	if (Player != NULL) {
 +			scoring_bash_rank(Player, rank);
 +	} else {
 +		dc_printf("Error! Current Player not active or loaded\n");
 +	}
  }
 
  void scoreing_close()
 Index: weapon/beam.cpp
 ===================================================================
 --- weapon/beam.cpp	(Revision 10462)
 +++ weapon/beam.cpp	(Arbeitskopie)
 @@ -36,6 +36,7 @@
  #include "globalincs/globals.h"
  #include "cmdline/cmdline.h"
  #include "parse/scripting.h"
 +#include "debugconsole/console.h"
 
  extern int Cmdline_nohtl;
  // ------------------------------------------------------------------------------------------------
 @@ -119,20 +120,22 @@
  float b_whack_big = 10000.0f;	// used to be 1500.0f with the retail whack bug
  float b_whack_damage = 150.0f;
 
 -DCF(b_whack_small, "")
 +DCF(b_whack_small, "Sets the whack factor for small whacks (Default is 2000f)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	b_whack_small = Dc_arg_float;
 +	dc_stuff_float(&b_whack_small);
  }
 -DCF(b_whack_big, "")
 +DCF(b_whack_big, "Sets the whack factor for big whacks (Default is 10000f)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	b_whack_big = Dc_arg_float;
 +	dc_stuff_float(&b_whack_big);
  }
 -DCF(b_whack_damage, "")
 +DCF(b_whack_damage, "Sets the whack damage threshold (Default is 150f)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	b_whack_damage = Dc_arg_float;
 +	if (dc_optional_string_either("help", "--help")) {
 +		dc_printf("Sets the threshold to determine whether a big whack or a small whack should be applied. Values equal or greater than this threshold will trigger a big whack, while smaller values will trigger a small whack\n");
 +		return;
 +	}
 +
 +	dc_stuff_float(&b_whack_damage);
  }
 
 
 @@ -1254,10 +1257,9 @@
 
  // generate particles for the muzzle glow
  int hack_time = 100;
 -DCF(h_time, "")
 +DCF(h_time, "Sets the hack time for beam muzzle glow (Default is 100)")
  {
 -	dc_get_arg(ARG_INT);
 -	hack_time = Dc_arg_int;
 +	dc_stuff_int(&hack_time);
  }
 
  void beam_generate_muzzle_particles(beam *b)
 @@ -1479,10 +1481,9 @@
 
  // light scale factor
  float blight = 25.5f;
 -DCF(blight, "")
 +DCF(blight, "Sets the beam light scale factor (Default is 25.5f)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	blight = Dc_arg_float;
 +	dc_stuff_float(&blight);
  }
 
  // call to add a light source to a small object
 @@ -3446,12 +3447,11 @@
  }
 
  float beam_accuracy = 1.0f;
 -DCF(b_aim, "")
 +DCF(b_aim, "Adjusts the beam accuracy factor (Default is 1.0f)")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	beam_accuracy = Dc_arg_float;
 +	dc_stuff_float(&beam_accuracy);
  }
 -DCF(beam_list, "")
 +DCF(beam_list, "Lists all beams")
  {
  	int idx;
  	int b_count = 0;
 Index: weapon/corkscrew.cpp
 ===================================================================
 --- weapon/corkscrew.cpp	(Revision 10462)
 +++ weapon/corkscrew.cpp	(Arbeitskopie)
 @@ -15,6 +15,7 @@
  #include "io/timer.h"
  #include "freespace2/freespace.h"	// for Missiontime
  #include "object/object.h"
 +#include "debugconsole/console.h"
 
 
 
 @@ -293,41 +294,25 @@
 
  DCF(cscrew_delay, "Change the delay between corkscrew firing")
  {
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -		Corkscrew_missile_delay = Dc_arg_int;
 -	}
 -
 +	dc_stuff_int(&Corkscrew_missile_delay);
  	cscrew_display_dcf();
  }
 
  DCF(cscrew_count, "Change the # of corkscrew missiles fired")
  {
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -		Corkscrew_num_missiles_fired = Dc_arg_int;
 -	}
 -
 +	dc_stuff_int(&Corkscrew_num_missiles_fired);
  	cscrew_display_dcf();
  }
 
  DCF(cscrew_radius, "Change the radius of corkscrew missiles")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	if(Dc_arg_type & ARG_FLOAT){
 -		Corkscrew_radius = Dc_arg_float;
 -	}
 -
 +	dc_stuff_float(&Corkscrew_radius);
  	cscrew_display_dcf();
  }
 
  DCF(cscrew_twist, "Change the rate of the corkscrew twist")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	if(Dc_arg_type & ARG_FLOAT){
 -		Corkscrew_twist = Dc_arg_float;
 -	}
 -
 +	dc_stuff_float(&Corkscrew_twist);
  	cscrew_display_dcf();
  }
 
 @@ -354,11 +339,7 @@
 
  DCF(cscrew_shrinkval, "Change the rate at which the radii shrink")
  {
 -	dc_get_arg(ARG_FLOAT);
 -	if(Dc_arg_type & ARG_FLOAT){
 -		Corkscrew_shrink_val = Dc_arg_float;
 -	}
 -
 +	dc_stuff_float(&Corkscrew_shrink_val);
  	cscrew_display_dcf();
  }
 
 Index: weapon/emp.cpp
 ===================================================================
 --- weapon/emp.cpp	(Revision 10462)
 +++ weapon/emp.cpp	(Arbeitskopie)
 @@ -26,6 +26,7 @@
  #include "iff_defs/iff_defs.h"
  #include "network/multimsgs.h"
  #include "network/multi.h"
 +#include "debugconsole/console.h"
 
 
 
 @@ -637,13 +638,12 @@
  DCF(zap, "zap a ship with an EMP effect")
  {
  	int shipnum;
 +	char ship_str[NAME_LENGTH];
 
 -	dc_get_arg(ARG_STRING);
 -	if(Dc_arg_type & ARG_STRING){
 -		 shipnum = ship_name_lookup(Dc_arg, 1);
 +	dc_stuff_string_white(ship_str, NAME_LENGTH);
 +	shipnum = ship_name_lookup(ship_str, 1);
 
 -		 if(shipnum >= 0){
 -			emp_start_ship(&Objects[Ships[shipnum].objnum], 500.0f, 10.0f);
 -		 }
 +	if(shipnum >= 0){
 +		emp_start_ship(&Objects[Ships[shipnum].objnum], 500.0f, 10.0f);
  	}
  }
 Index: weapon/weapons.cpp
 ===================================================================
 --- weapon/weapons.cpp	(Revision 10462)
 +++ weapon/weapons.cpp	(Arbeitskopie)
 @@ -47,6 +47,7 @@
  #include "parse/scripting.h"
  #include "stats/scoring.h"
  #include "mod_table/mod_table.h"
 +#include "debugconsole/console.h"
 
 
  #ifndef NDEBUG
 @@ -6657,77 +6658,139 @@
  /**
   * Debug console functionality
   */
 -void pspew_display_dcf()
 +void dcf_pspew();
 +DCF(pspew_count, "Number of particles spewed at a time")
  {
 -	dc_printf("Particle spew settings\n\n");
 -	dc_printf("Particle spew count (pspew_count) : %d\n", Weapon_particle_spew_count);
 -	dc_printf("Particle spew time (pspew_time) : %d\n", Weapon_particle_spew_time);
 -	dc_printf("Particle spew velocity (pspew_vel) : %f\n", Weapon_particle_spew_vel);
 -	dc_printf("Particle spew size (pspew_size) : %f\n", Weapon_particle_spew_radius);
 -	dc_printf("Particle spew lifetime (pspew_life) : %f\n", Weapon_particle_spew_lifetime);
 -	dc_printf("Particle spew scale (psnew_scale) : %f\n", Weapon_particle_spew_scale);
 -}
 +	if (dc_optional_string_either("help", "--help")) {
 +		dcf_pspew();
 +		return;
 +	}
 
 -DCF(pspew_count, "Number of particles spewed at a time")
 -{
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -		Weapon_particle_spew_count = Dc_arg_int;
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +			dc_printf("Partical count is %i\n", Weapon_particle_spew_count);
 +			return;
  	}
 
 -	pspew_display_dcf();
 +	dc_stuff_int(&Weapon_particle_spew_count);
 +
 +	dc_printf("Partical count set to %i\n", Weapon_particle_spew_count);
  }
 
  DCF(pspew_time, "Time between particle spews")
 -{
 -	dc_get_arg(ARG_INT);
 -	if(Dc_arg_type & ARG_INT){
 -		Weapon_particle_spew_time = Dc_arg_int;
 +{
 +	if (dc_optional_string_either("help", "--help")) {
 +		dcf_pspew();
 +		return;
  	}
 
 -	pspew_display_dcf();
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle spawn period is %i\n", Weapon_particle_spew_time);
 +		return;
 +	}
 +
 +	dc_stuff_int(&Weapon_particle_spew_time);
 +
 +	dc_printf("Particle spawn period set to %i\n", Weapon_particle_spew_time);
  }
 
  DCF(pspew_vel, "Relative velocity of particles (0.0 - 1.0)")
 -{
 -	dc_get_arg(ARG_FLOAT);
 -	if(Dc_arg_type & ARG_FLOAT){
 -		Weapon_particle_spew_vel = Dc_arg_float;
 +{
 +	if (dc_optional_string_either("help", "--help")) {
 +		dcf_pspew();
 +		return;
  	}
 
 -	pspew_display_dcf();
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle relative velocity is %f\n", Weapon_particle_spew_vel);
 +		return;
 +	}
 +
 +	dc_stuff_float(&Weapon_particle_spew_vel);
 +
 +	dc_printf("Particle relative velocity set to %f\n", Weapon_particle_spew_vel);
  }
 
  DCF(pspew_size, "Size of spewed particles")
 -{
 -	dc_get_arg(ARG_FLOAT);
 -	if(Dc_arg_type & ARG_FLOAT){
 -		Weapon_particle_spew_radius = Dc_arg_float;
 +{
 +	if (dc_optional_string_either("help", "--help")) {
 +		dcf_pspew();
 +		return;
  	}
 
 -	pspew_display_dcf();
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle size is %f\n", Weapon_particle_spew_radius);
 +		return;
 +	}
 +
 +	dc_stuff_float(&Weapon_particle_spew_radius);
 +
 +	dc_printf("Particle size set to %f\n", Weapon_particle_spew_radius);
  }
 
  DCF(pspew_life, "Lifetime of spewed particles")
 -{
 -	dc_get_arg(ARG_FLOAT);
 -	if(Dc_arg_type & ARG_FLOAT){
 -		Weapon_particle_spew_lifetime = Dc_arg_float;
 +{
 +	if (dc_optional_string_either("help", "--help")) {
 +		dcf_pspew();
 +		return;
  	}
 
 -	pspew_display_dcf();
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle lifetime is %f\n", Weapon_particle_spew_lifetime);
 +		return;
 +	}
 +
 +	dc_stuff_float(&Weapon_particle_spew_lifetime);
 +
 +	dc_printf("Particle lifetime set to %f\n", Weapon_particle_spew_lifetime);
  }
 
  DCF(pspew_scale, "How far away particles are from the weapon path")
 -{
 -	dc_get_arg(ARG_FLOAT);
 -	if(Dc_arg_type & ARG_FLOAT){
 -		Weapon_particle_spew_scale = Dc_arg_float;
 +{
 +	if (dc_optional_string_either("help", "--help")) {
 +		dcf_pspew();
 +		return;
  	}
 
 -	pspew_display_dcf();
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle scale is %f\n", Weapon_particle_spew_scale);
 +	}
 +
 +	dc_stuff_float(&Weapon_particle_spew_scale);
 +
 +	dc_printf("Particle scale set to %f\n", Weapon_particle_spew_scale);
  }
 
 +// Help and Status provider
 +DCF(pspew, "Particle spew help and status provider")
 +{
 +	if (dc_optional_string_either("status", "--status") || dc_optional_string_either("?", "--?")) {
 +		dc_printf("Particle spew settings\n\n");
 +
 +		dc_printf(" Count   (pspew_count) : %d\n", Weapon_particle_spew_count);
 +		dc_printf(" Time     (pspew_time) : %d\n", Weapon_particle_spew_time);
 +		dc_printf(" Velocity  (pspew_vel) : %f\n", Weapon_particle_spew_vel);
 +		dc_printf(" Size     (pspew_size) : %f\n", Weapon_particle_spew_radius);
 +		dc_printf(" Lifetime (pspew_life) : %f\n", Weapon_particle_spew_lifetime);
 +		dc_printf(" Scale   (psnew_scale) : %f\n", Weapon_particle_spew_scale);
 +		return;
 +	}
 +
 +	dc_printf("Available particlar spew commands:\n");
 +	dc_printf("pspew_count : %s\n", dcmd_pspew_count.help);
 +	dc_printf("pspew_time  : %s\n", dcmd_pspew_time.help);
 +	dc_printf("pspew_vel   : %s\n", dcmd_pspew_vel.help);
 +	dc_printf("pspew_size  : %s\n", dcmd_pspew_size.help);
 +	dc_printf("pspew_life  : %s\n", dcmd_pspew_life.help);
 +	dc_printf("pspew_scale : %s\n\n", dcmd_pspew_scale.help);
 +
 +	dc_printf("To view status of all pspew settings, type in 'pspew --status'.\n");
 +	dc_printf("Passing '--status' as an argument to any of the individual spew commands will show the status of that variable only.\n\n");
 +
 +	dc_printf("These commands adjust the various properties of the particle spew system, which is used by weapons when they are fired, are in-flight, and die (either by impact or by end of life time.\n");
 +	dc_printf("Generally, a large particle count with small size and scale will result in a nice dense particle spew.\n");
 +	dc_printf("Be advised, this effect is applied to _ALL_ weapons, and as such may drastically reduce framerates on lower powered platforms.\n");
 +}
 +
  /**
   * Return a scale factor for damage which should be applied for 2 collisions
   */
 Index: windows_stub/stubs.cpp
 ===================================================================
 --- windows_stub/stubs.cpp	(Revision 10462)
 +++ windows_stub/stubs.cpp	(Arbeitskopie)
 @@ -23,6 +23,7 @@
  #include "globalincs/pstypes.h"
  #include "parse/lua.h"
  #include "cmdline/cmdline.h"
 +#include "debugconsole/console.h"
 
  bool env_enabled = false;
  bool cell_enabled = false;
 @@ -402,7 +403,7 @@
  #endif
 
  int Watch_malloc = 0;
 -DCF_BOOL(watch_malloc, Watch_malloc )
 +DCF_BOOL(watch_malloc, Watch_malloc );
 
 
  #ifndef NDEBUG