X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=vg%2Fvg_console.h;fp=vg%2Fvg_console.h;h=23b4480c2b46a0fa1de59c8535ff83abf4d52662;hb=a6d22d2e369a955e85d03b1159d4ac02b103ea43;hp=94de7d205db4c8d46b65eeac44daddf4de837219;hpb=180732e57e4e684034a3b2df624dfb539707d892;p=fishladder.git

diff --git a/vg/vg_console.h b/vg/vg_console.h
index 94de7d2..23b4480 100644
--- a/vg/vg_console.h
+++ b/vg/vg_console.h
@@ -23,6 +23,13 @@ struct vg_console
 	} 
 	*convars;
 	
+	struct vg_cmd
+	{
+		void (*function)( int argc, char *argv[] );
+		const char *name;
+	}
+	*functions;
+	
 	char lines[16][512];
 	u32 current, len;
 	
@@ -44,6 +51,11 @@ static void vg_convar_push( struct vg_convar cv )
 	arrpush( vg_console.convars, cv ); 
 }
 
+static void vg_function_push( struct vg_cmd cmd )
+{
+	arrpush( vg_console.functions, cmd );
+}
+
 static void vg_console_draw( void )
 {
 	if( !vg_console.enabled )
@@ -121,61 +133,64 @@ static void vg_console_init(void)
 static void vg_console_free(void)
 {
 	arrfree( vg_console.convars );
+	arrfree( vg_console.functions );
 }
 
-// Returns advance amount
-static int console_token_read( char *buf, int buf_len, const char *src )
+static void execute_console_input( const char *cmd )
 {
-	int wait_for_next = 0;
-
-	for( int i = 0; i < buf_len; i ++ )
+	char temp[512];
+	char *args[9];
+	int arg_count = 0;
+	
+	int in_token = 0;
+	
+	// Split string into tokens
+	for( int i = 0; i < vg_list_size( temp ); i ++ )
 	{
-		if( src[i] )
+		if( cmd[i] )
 		{
-			if( isspace( src[i] ) )
+			if( isspace( cmd[i] ) )
 			{
-				buf[i] = '\0';
-				wait_for_next = 1;
+				temp[i] = '\0';
+				in_token = 0;
 			}
-			else 
+			else
 			{
-				if( wait_for_next )
-					return i;
+				temp[i] = cmd[i];
 				
-				buf[i] = src[i];
-			}	
+				if( !in_token )
+				{
+					args[ arg_count ++ ] = temp + i;
+					in_token = 1;
+				}
+			}
 		}
 		else
 		{
-			buf[i] = '\0';
-			return i;
+			temp[i] = '\0';
+			break;
 		}
 	}
 	
-	return 0;
-}
-
-static void execute_console_input( const char *cmd )
-{
-	char temp[512];
-	int cmd_pos = console_token_read( temp, 512, cmd );
+	if( arg_count == 0 )
+		return;
 	
 	int data_int;
 	
 	for( int i = 0; i < arrlen( vg_console.convars ); i ++ )
 	{
 		struct vg_convar *cv = &vg_console.convars[ i ];
-		if( !strcmp( cv->name, temp ) )
+		if( !strcmp( cv->name, args[0] ) )
 		{
-			// Matched, try get value
-			if( console_token_read( temp, 512, cmd+cmd_pos ) )
+			// Cvar Matched, try get value
+			if( arg_count >= 2 )
 			{
 				switch( cv->data_type )
 				{
 					case k_convar_dtype_u32:
 					case k_convar_dtype_i32: 
 						
-						data_int = atoi( temp ); 
+						data_int = atoi( args[1] ); 
 						*((int *)cv->data) = cv->opt_i32.clamp? VG_MIN( VG_MAX(data_int, cv->opt_i32.min), cv->opt_i32.max ): data_int;
 					
 					break;
@@ -196,7 +211,19 @@ static void execute_console_input( const char *cmd )
 		}
 	}
 	
-	vg_error( "No command/variable named '%s'\n", temp );
+	// Try commands
+	for( int i = 0; i < arrlen( vg_console.functions ); i ++ )
+	{
+		struct vg_cmd *cmd = &vg_console.functions[ i ];
+		if( !strcmp( cmd->name, args[0] ) )
+		{
+			// Call function
+			cmd->function( arg_count-1, args+1 );
+			return;
+		}
+	}
+	
+	vg_error( "No command/variable named '%s'\n", args[0] );
 }
 
 // =============================================================================================================================