From 182c77721e60c6a3b68cc3f1f83e485374d85096 Mon Sep 17 00:00:00 2001
From: Magnus Auvinen <magnus.auvinen@gmail.com>
Date: Tue, 11 Dec 2007 23:10:07 +0000
Subject: cleaned up the console variables

---
 src/engine/client/client.c | 11 +++++++----
 src/engine/client/gfx.c    |  6 +++---
 src/engine/client/snd.c    |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'src/engine/client')

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 */
-- 
cgit 1.4.1