Fix line endings. WHAMMY.

1 files changed, 122 insertions, 122 deletions

diff --git a/mp/src/public/loadcmdline.cpp b/mp/src/public/loadcmdline.cpp
index 59f40933..1df30efb 100644
--- a/mp/src/public/loadcmdline.cpp
+++ b/mp/src/public/loadcmdline.cpp
@@ -1,123 +1,123 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//

-//

-// Purpose: loads additional command line options from a config file

-//

-// $NoKeywords: $

-//=============================================================================//

-

-#include "KeyValues.h"

-#include "tier1/strtools.h"

-#include "FileSystem_Tools.h"

-#include "tier1/utlstring.h"

-

-// So we know whether or not we own argv's memory

-static bool sFoundConfigArgs = false;

-

-//-----------------------------------------------------------------------------

-// Purpose: Parses arguments and adds them to argv and argc

-//-----------------------------------------------------------------------------

-static void AddArguments( int &argc, char **&argv, const char *str )

-{

-	char  **args	 = 0;

-	char   *argList	 = 0;

-	int		argCt	 = argc;

-

-	argList = new char[ Q_strlen( str ) + 1 ];

-	Q_strcpy( argList, str );

-

-	// Parse the arguments out of the string

-	char *token = strtok( argList, " " );

-	while( token )

-	{

-		++argCt;

-		token = strtok( NULL, " " );

-	}

-

-	// Make sure someting was actually found in the file

-	if( argCt > argc )

-	{

-		sFoundConfigArgs = true;

-

-		// Allocate a new array for argv

-		args = new char*[ argCt ];

-

-		// Copy original arguments, up to the last one

-		int i;

-		for( i = 0; i < argc - 1; ++i )

-		{

-			args[ i ] = new char[ Q_strlen( argv[ i ] ) + 1 ];

-			Q_strcpy( args[ i ], argv[ i ] );

-		}

-

-		// copy new arguments

-		Q_strcpy( argList, str );

-		token = strtok( argList, " " );

-		for( ; i < argCt - 1; ++i )

-		{

-			args[ i ] = new char[ Q_strlen( token ) + 1 ];

-			Q_strcpy( args[ i ], token );

-			token = strtok( NULL, " " );

-		}

-

-		// Copy the last original argument

-		args[ i ] = new char[ Q_strlen( argv[ argc - 1 ] ) + 1 ];

-		Q_strcpy( args[ i ], argv[ argc - 1 ] );

-

-		argc = argCt;

-		argv = args;

-	}

-

-	delete [] argList;

-}

-

-//-----------------------------------------------------------------------------

-// Purpose: Loads additional commandline arguments from a config file for an app.

-//			Filesystem must be initialized before calling this function.

-// keyname: Name of the block containing the key/args pairs (ie map or model name)

-// appname: Keyname for the commandline arguments to be loaded - typically the exe name.

-//-----------------------------------------------------------------------------

-void LoadCmdLineFromFile( int &argc, char **&argv, const char *keyname, const char *appname )

-{

-	sFoundConfigArgs = false;

-

-	assert( g_pFileSystem );

-	if( !g_pFileSystem )

-		return;

-

-	// Load the cfg file, and find the keyname

-	KeyValues *kv = new KeyValues( "CommandLine" );

-

-	char filename[512];

-	Q_snprintf( filename, sizeof( filename ), "%s/cfg/commandline.cfg", gamedir );

-

-	if ( kv->LoadFromFile( g_pFileSystem, filename ) )

-	{

-		// Load the commandline arguments for this app

-		KeyValues  *appKey	= kv->FindKey( keyname );

-		if( appKey )

-		{

-			const char *str	= appKey->GetString( appname );

-			Msg( "Command Line found: %s\n", str );

-

-			AddArguments( argc, argv, str );

-		}

-	}

-

-	kv->deleteThis();

-}

-

-//-----------------------------------------------------------------------------

-// Purpose: Cleans up any memory allocated for the new argv.  Pass in the app's

-// argc and argv - this is safe even if no extra arguments were loaded.

-//-----------------------------------------------------------------------------

-void DeleteCmdLine( int argc, char **argv )

-{

-	if( !sFoundConfigArgs )

-		return;

-

-	for( int i = 0; i < argc; ++i )

-	{

-		delete [] argv[i];

-	}

-	delete [] argv;

+//========= Copyright Valve Corporation, All rights reserved. ============//
+//
+// Purpose: loads additional command line options from a config file
+//
+// $NoKeywords: $
+//=============================================================================//
+
+#include "KeyValues.h"
+#include "tier1/strtools.h"
+#include "FileSystem_Tools.h"
+#include "tier1/utlstring.h"
+
+// So we know whether or not we own argv's memory
+static bool sFoundConfigArgs = false;
+
+//-----------------------------------------------------------------------------
+// Purpose: Parses arguments and adds them to argv and argc
+//-----------------------------------------------------------------------------
+static void AddArguments( int &argc, char **&argv, const char *str )
+{
+	char  **args	 = 0;
+	char   *argList	 = 0;
+	int		argCt	 = argc;
+
+	argList = new char[ Q_strlen( str ) + 1 ];
+	Q_strcpy( argList, str );
+
+	// Parse the arguments out of the string
+	char *token = strtok( argList, " " );
+	while( token )
+	{
+		++argCt;
+		token = strtok( NULL, " " );
+	}
+
+	// Make sure someting was actually found in the file
+	if( argCt > argc )
+	{
+		sFoundConfigArgs = true;
+
+		// Allocate a new array for argv
+		args = new char*[ argCt ];
+
+		// Copy original arguments, up to the last one
+		int i;
+		for( i = 0; i < argc - 1; ++i )
+		{
+			args[ i ] = new char[ Q_strlen( argv[ i ] ) + 1 ];
+			Q_strcpy( args[ i ], argv[ i ] );
+		}
+
+		// copy new arguments
+		Q_strcpy( argList, str );
+		token = strtok( argList, " " );
+		for( ; i < argCt - 1; ++i )
+		{
+			args[ i ] = new char[ Q_strlen( token ) + 1 ];
+			Q_strcpy( args[ i ], token );
+			token = strtok( NULL, " " );
+		}
+
+		// Copy the last original argument
+		args[ i ] = new char[ Q_strlen( argv[ argc - 1 ] ) + 1 ];
+		Q_strcpy( args[ i ], argv[ argc - 1 ] );
+
+		argc = argCt;
+		argv = args;
+	}
+
+	delete [] argList;
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Loads additional commandline arguments from a config file for an app.
+//			Filesystem must be initialized before calling this function.
+// keyname: Name of the block containing the key/args pairs (ie map or model name)
+// appname: Keyname for the commandline arguments to be loaded - typically the exe name.
+//-----------------------------------------------------------------------------
+void LoadCmdLineFromFile( int &argc, char **&argv, const char *keyname, const char *appname )
+{
+	sFoundConfigArgs = false;
+
+	assert( g_pFileSystem );
+	if( !g_pFileSystem )
+		return;
+
+	// Load the cfg file, and find the keyname
+	KeyValues *kv = new KeyValues( "CommandLine" );
+
+	char filename[512];
+	Q_snprintf( filename, sizeof( filename ), "%s/cfg/commandline.cfg", gamedir );
+
+	if ( kv->LoadFromFile( g_pFileSystem, filename ) )
+	{
+		// Load the commandline arguments for this app
+		KeyValues  *appKey	= kv->FindKey( keyname );
+		if( appKey )
+		{
+			const char *str	= appKey->GetString( appname );
+			Msg( "Command Line found: %s\n", str );
+
+			AddArguments( argc, argv, str );
+		}
+	}
+
+	kv->deleteThis();
+}
+
+//-----------------------------------------------------------------------------
+// Purpose: Cleans up any memory allocated for the new argv.  Pass in the app's
+// argc and argv - this is safe even if no extra arguments were loaded.
+//-----------------------------------------------------------------------------
+void DeleteCmdLine( int argc, char **argv )
+{
+	if( !sFoundConfigArgs )
+		return;
+
+	for( int i = 0; i < argc; ++i )
+	{
+		delete [] argv[i];
+	}
+	delete [] argv;
 }
\ No newline at end of file