cleaned up the console variables

3 files changed, 22 insertions, 22 deletions

diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index b91db050..353e4188 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -712,7 +712,7 @@ int player::handle_weapons()
 {
 	vec2 direction = normalize(vec2(input.target_x, input.target_y));
 
-	if(config.stress)
+	if(config.dbg_stress)
 	{
 		for(int i = 0; i < NUM_WEAPONS; i++)
 		{
@@ -1539,14 +1539,14 @@ void mods_tick()
 	if(world->paused) // make sure that the game object always updates
 		gameobj->tick();
 
-	if(config.restart)
+	if(config.sv_restart)
 	{
-		if(config.restart > 1)
-			gameobj->do_warmup(config.restart);
+		if(config.sv_restart > 1)
+			gameobj->do_warmup(config.sv_restart);
 		else
 			gameobj->startround();
 
-		config.restart = 0;
+		config.sv_restart = 0;
 	}
 
 	if(config.sv_msg[0] != 0)
@@ -1736,9 +1736,9 @@ void mods_init()
 	players = new player[MAX_CLIENTS];
 
 	// select gametype
-	if(strcmp(config.gametype, "ctf") == 0)
+	if(strcmp(config.sv_gametype, "ctf") == 0)
 		gameobj = new gameobject_ctf;
-	else if(strcmp(config.gametype, "tdm") == 0)
+	else if(strcmp(config.sv_gametype, "tdm") == 0)
 		gameobj = new gameobject_tdm;
 	else
 		gameobj = new gameobject_dm;
diff --git a/src/game/server/srv_common.cpp b/src/game/server/srv_common.cpp
index 14cabaf3..83754780 100644
--- a/src/game/server/srv_common.cpp
+++ b/src/game/server/srv_common.cpp
@@ -7,12 +7,12 @@ gameobject::gameobject()
 : entity(OBJTYPE_GAME)
 {
 	// select gametype
-	if(strcmp(config.gametype, "ctf") == 0)
+	if(strcmp(config.sv_gametype, "ctf") == 0)
 	{
 		gametype = GAMETYPE_CTF;
 		dbg_msg("game", "-- Capture The Flag --");
 	}
-	else if(strcmp(config.gametype, "tdm") == 0)
+	else if(strcmp(config.sv_gametype, "tdm") == 0)
 	{
 		gametype = GAMETYPE_TDM;
 		dbg_msg("game", "-- Team Death Match --");
@@ -24,7 +24,7 @@ gameobject::gameobject()
 	}
 		
 	//
-	do_warmup(config.warmup);
+	do_warmup(config.sv_warmup);
 	game_over_tick = -1;
 	sudden_death = 0;
 	round_start_tick = server_tick();
@@ -187,22 +187,22 @@ void gameobject::tick()
 	
 	// update browse info
 	int prog = -1;
-	if(config.timelimit > 0)
-		prog = max(prog, (server_tick()-round_start_tick) * 100 / (config.timelimit*server_tickspeed()*60));
+	if(config.sv_timelimit > 0)
+		prog = max(prog, (server_tick()-round_start_tick) * 100 / (config.sv_timelimit*server_tickspeed()*60));
 
-	if(config.scorelimit)
+	if(config.sv_scorelimit)
 	{
 		if(is_teamplay)
 		{
-			prog = max(prog, (teamscore[0]*100)/config.scorelimit);
-			prog = max(prog, (teamscore[1]*100)/config.scorelimit);
+			prog = max(prog, (teamscore[0]*100)/config.sv_scorelimit);
+			prog = max(prog, (teamscore[1]*100)/config.sv_scorelimit);
 		}
 		else
 		{
 			for(int i = 0; i < MAX_CLIENTS; i++)
 			{
 				if(players[i].client_id != -1)
-					prog = max(prog, (players[i].score*100)/config.scorelimit);
+					prog = max(prog, (players[i].score*100)/config.sv_scorelimit);
 			}
 		}
 	}
@@ -220,8 +220,8 @@ void gameobject::snap(int snapping_client)
 	game->game_over = game_over_tick==-1?0:1;
 	game->sudden_death = sudden_death;
 	
-	game->score_limit = config.scorelimit;
-	game->time_limit = config.timelimit;
+	game->score_limit = config.sv_scorelimit;
+	game->time_limit = config.sv_timelimit;
 	game->round_start_tick = round_start_tick;
 	game->gametype = gametype;
 	
@@ -250,8 +250,8 @@ void gameobject::do_team_wincheck()
 	if(game_over_tick == -1 && !warmup)
 	{
 		// check score win condition
-		if((config.scorelimit > 0 && (teamscore[0] >= config.scorelimit || teamscore[1] >= config.scorelimit)) ||
-			(config.timelimit > 0 && (server_tick()-round_start_tick) >= config.timelimit*server_tickspeed()*60))
+		if((config.sv_scorelimit > 0 && (teamscore[0] >= config.sv_scorelimit || teamscore[1] >= config.sv_scorelimit)) ||
+			(config.sv_timelimit > 0 && (server_tick()-round_start_tick) >= config.sv_timelimit*server_tickspeed()*60))
 		{
 			if(teamscore[0] != teamscore[1])
 				endround();
diff --git a/src/game/server/srv_dm.cpp b/src/game/server/srv_dm.cpp
index 1dd90874..d5720856 100644
--- a/src/game/server/srv_dm.cpp
+++ b/src/game/server/srv_dm.cpp
@@ -27,8 +27,8 @@ void gameobject_dm::tick()
 		}
 		
 		// check score win condition
-		if((config.scorelimit > 0 && topscore >= config.scorelimit) ||
-			(config.timelimit > 0 && (server_tick()-round_start_tick) >= config.timelimit*server_tickspeed()*60))
+		if((config.sv_scorelimit > 0 && topscore >= config.sv_scorelimit) ||
+			(config.sv_timelimit > 0 && (server_tick()-round_start_tick) >= config.sv_timelimit*server_tickspeed()*60))
 		{
 			if(topscore_count == 1)
 				endround();