cleaned up the console variables

2 files changed, 14 insertions, 14 deletions

diff --git a/src/game/client/game_client.cpp b/src/game/client/game_client.cpp
index c910014c..3621935d 100644
--- a/src/game/client/game_client.cpp
+++ b/src/game/client/game_client.cpp
@@ -892,7 +892,7 @@ extern "C" void modc_newsnapshot()
 {
 	process_events(SNAP_CURRENT);
 
-	if(config.stress)
+	if(config.dbg_stress)
 	{
 		if((client_tick()%250) == 0)
 		{
@@ -2294,7 +2294,7 @@ void render_game()
 
 			if(inp_key_presses(config.key_next_weapon) || inp_key_presses(config.key_prev_weapon))
 				input.wanted_weapon = 0;
-			else if (config.autoswitch_weapons && picked_up_weapon)
+			else if (config.cl_autoswitch_weapons && picked_up_weapon)
             {
                 input.wanted_weapon = picked_up_weapon;
             }
@@ -2312,7 +2312,7 @@ void render_game()
 		}
 
 		// stress testing
-		if(config.stress)
+		if(config.dbg_stress)
 		{
 			float t = client_localtime();
 			mem_zero(&input, sizeof(input));
@@ -2332,7 +2332,7 @@ void render_game()
 
 	// center at char but can be moved when mouse is far away
 	float offx = 0, offy = 0;
-	if (config.dynamic_camera)
+	if (config.cl_dynamic_camera)
 	{
 		int deadzone = 300;
 		if(mouse_pos.x > deadzone) offx = mouse_pos.x-deadzone;
@@ -2849,10 +2849,10 @@ extern "C" void modc_render()
 
 		// handle team switching
 		// TODO: FUGLY!!!
-		if(config.team != -10)
+		if(config.cl_team != -10)
 		{
 			msg_pack_start(MSG_SETTEAM, MSGFLAG_VITAL);
-			msg_pack_int(config.team);
+			msg_pack_int(config.cl_team);
 			msg_pack_end();
 			client_send_msg();
 		}
@@ -2863,7 +2863,7 @@ extern "C" void modc_render()
 	}
 
 	//
-	config.team = -10;
+	config.cl_team = -10;
 }
 
 
diff --git a/src/game/client/menu2.cpp b/src/game/client/menu2.cpp
index bc23173b..3483ecfe 100644
--- a/src/game/client/menu2.cpp
+++ b/src/game/client/menu2.cpp
@@ -1098,12 +1098,12 @@ static void menu2_render_settings_player(RECT main_view)
 		ui2_do_edit_box(config.player_name, &button, config.player_name, sizeof(config.player_name));
 
 		ui2_hsplit_t(&main_view, 20.0f, &button, &main_view);
-		if (ui2_do_button(&config.dynamic_camera, "Dynamic camera", config.dynamic_camera, &button, ui2_draw_checkbox, 0))
-			config.dynamic_camera ^= 1;
+		if (ui2_do_button(&config.cl_dynamic_camera, "Dynamic camera", config.cl_dynamic_camera, &button, ui2_draw_checkbox, 0))
+			config.cl_dynamic_camera ^= 1;
 			
 		ui2_hsplit_t(&main_view, 20.0f, &button, &main_view);
-		if (ui2_do_button(&config.autoswitch_weapons, "Switch weapon on pickup", config.autoswitch_weapons, &button, ui2_draw_checkbox, 0))
-			config.autoswitch_weapons ^= 1;
+		if (ui2_do_button(&config.cl_autoswitch_weapons, "Switch weapon on pickup", config.cl_autoswitch_weapons, &button, ui2_draw_checkbox, 0))
+			config.cl_autoswitch_weapons ^= 1;
 			
 		ui2_hsplit_t(&main_view, 20.0f, &button, &main_view);
 		if (ui2_do_button(&config.cl_nameplates, "Show name plates", config.cl_nameplates, &button, ui2_draw_checkbox, 0))
@@ -1541,7 +1541,7 @@ static void menu2_render_game(RECT main_view)
 			static int spectate_button = 0;
 			if(ui2_do_button(&spectate_button, "Spectate", 0, &button, ui2_draw_menu_button, 0))
 			{
-				config.team = -1;
+				config.cl_team = -1;
 				menu_active = false;
 			}
 		}
@@ -1553,7 +1553,7 @@ static void menu2_render_game(RECT main_view)
 			static int spectate_button = 0;
 			if(ui2_do_button(&spectate_button, "Join Red", 0, &button, ui2_draw_menu_button, 0))
 			{
-				config.team = 0;
+				config.cl_team = 0;
 				menu_active = false;
 			}
 		}
@@ -1565,7 +1565,7 @@ static void menu2_render_game(RECT main_view)
 			static int spectate_button = 0;
 			if(ui2_do_button(&spectate_button, "Join Blue", 0, &button, ui2_draw_menu_button, 0))
 			{
-				config.team = 1;
+				config.cl_team = 1;
 				menu_active = false;
 			}
 		}