4 files changed, 17 insertions, 18 deletions
diff --git a/src/engine/client/client.c b/src/engine/client/client.c
index 7a545988..646ca4b4 100644
--- a/src/engine/client/client.c
+++ b/src/engine/client/client.c
@@ -950,8 +950,8 @@ static void client_update()
 	}
 
 	/* STRESS TEST: join the server again */
-	if(client_state() == CLIENTSTATE_OFFLINE && config.stress && (frames%100) == 0)
-		client_connect(config.cl_stress_server);
+	if(client_state() == CLIENTSTATE_OFFLINE && config.dbg_stress && (frames%100) == 0)
+		client_connect(config.dbg_stress_server);
 	
 	/* pump the network */
 	client_pump_network();
@@ -996,8 +996,11 @@ static void client_run()
 	net = netclient_open(bindaddr, 0);
 	
 	/* connect to the server if wanted */
+	/*
 	if(config.cl_connect[0] != 0)
 		client_connect(config.cl_connect);
+	config.cl_connect[0] = 0;
+	*/
 		
 	inp_mouse_mode_relative();
 	
@@ -1073,7 +1076,7 @@ static void client_run()
 		{
 			client_update();
 			
-			if(config.stress)
+			if(config.dbg_stress)
 			{
 				if((frames%10) == 0)
 				{
@@ -1093,7 +1096,7 @@ static void client_run()
 			break;
 
 		/* be nice */
-		if(config.cpu_throttle || !gfx_window_active())
+		if(config.cl_cpu_throttle || !gfx_window_active())
 			thread_sleep(1);
 		
 		if(reporttime < time_get())
diff --git a/src/engine/client/gfx.c b/src/engine/client/gfx.c
index 31483224..c61f0cb1 100644
--- a/src/engine/client/gfx.c
+++ b/src/engine/client/gfx.c
@@ -185,7 +185,7 @@ int gfx_init()
 
 	glfwInit();
 
-	if(config.stress)
+	if(config.dbg_stress)
 	{
 		screen_width = 320;
 		screen_height = 240;
@@ -228,7 +228,7 @@ int gfx_init()
 	glfwSetWindowTitle("Teewars");
 	
 	/* We don't want to see the window when we run the stress testing */
-	if(config.stress)
+	if(config.dbg_stress)
 		glfwIconifyWindow();
 	
 	/* Init vertices */
@@ -408,7 +408,7 @@ int gfx_load_texture_raw(int w, int h, int format, const void *data)
 	int tex = 0;
 	
 	/* don't waste memory on texture if we are stress testing */
-	if(config.stress)
+	if(config.dbg_stress)
 		return -1;
 	
 	/* grab texture */
diff --git a/src/engine/client/snd.c b/src/engine/client/snd.c
index 9d851dcc..aa155c0c 100644
--- a/src/engine/client/snd.c
+++ b/src/engine/client/snd.c
@@ -350,7 +350,7 @@ int snd_load_wv(const char *filename)
 	WavpackContext *context;
 	
 	/* don't waste memory on sound when we are stress testing */
-	if(config.stress)
+	if(config.dbg_stress)
 		return -1;
 		
 	/* no need to load sound when we are running with no sound */
diff --git a/src/engine/config_variables.h b/src/engine/config_variables.h
index 49f2a0d9..9e3fb4d7 100644
--- a/src/engine/config_variables.h
+++ b/src/engine/config_variables.h
@@ -1,20 +1,14 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include "../game/game_variables.h"
 
-MACRO_CONFIG_INT(volume, 200, 0, 255)
-MACRO_CONFIG_INT(cpu_throttle, 0, 0, 1)
 
 MACRO_CONFIG_STR(player_name, 32, "nameless tee")
-
 MACRO_CONFIG_STR(clan_name, 32, "")
 MACRO_CONFIG_STR(password, 32, "")
-
 MACRO_CONFIG_STR(rcon_password, 32, "")
 
-MACRO_CONFIG_INT(debug, 0, 0, 1)
-MACRO_CONFIG_INT(stress, 0, 0, 0)
-MACRO_CONFIG_STR(cl_stress_server, 32, "localhost")
-MACRO_CONFIG_STR(cl_connect, 32, "")
+MACRO_CONFIG_INT(cl_cpu_throttle, 0, 0, 1)
+/*MACRO_CONFIG_STR(cl_connect, 32, "")*/
 MACRO_CONFIG_INT(cl_editor, 0, 0, 1)
 
 MACRO_CONFIG_STR(b_filter_string, 64, "")
@@ -52,8 +46,10 @@ MACRO_CONFIG_INT(sv_port, 8303, 0, 0)
 MACRO_CONFIG_INT(sv_sendheartbeats, 1, 0, 1)
 MACRO_CONFIG_STR(sv_map, 128, "dm1")
 MACRO_CONFIG_INT(sv_map_reload, 0, 0, 1)
-
 MACRO_CONFIG_INT(sv_max_clients, 8, 1, 12)
-
 MACRO_CONFIG_INT(sv_bandwidth_mode, 0, 0, 2)
 
+MACRO_CONFIG_INT(debug, 0, 0, 1)
+MACRO_CONFIG_INT(dbg_stress, 0, 0, 0)
+MACRO_CONFIG_STR(dbg_stress_server, 32, "localhost")
+