X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Farena.qc;h=1e9b837d8c4d61a2b9311a7951218826f30e6ade;hb=f36464fbe3e44d957802d4fbced16b9280660ea2;hp=fbabbcf74ac6c4e5c0bfff4ae32ab41ec2fd734e;hpb=e78d58310d82e6cbd9543b1d06c1fd6ee8f195cd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index fbabbcf74..1e9b837d8 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -41,15 +41,15 @@ void reset_map(float dorespawn)
 	entity oldself;
 	oldself = self;
 
-	if(g_arena && cvar("g_arena_warmup"))
-		warmup = time + cvar("g_arena_warmup");
+	if(g_arena && autocvar_g_arena_warmup)
+		warmup = time + autocvar_g_arena_warmup;
 	else if(g_ca) {
-		warmup = time + cvar("g_ca_warmup");
+		warmup = time + autocvar_g_ca_warmup;
 		allowed_to_spawn = 1;
 	}
 	else if(g_freezetag)
 	{
-		warmup = time + cvar("g_freezetag_warmup");
+		warmup = time + autocvar_g_freezetag_warmup;
 	}
 
 	lms_lowest_lives = 999;
@@ -137,7 +137,7 @@ void reset_map(float dorespawn)
 	}
 
 	if(g_keyhunt)
-		kh_Controller_SetThink(cvar("g_balance_keyhunt_delay_round")+(game_starttime - time), "", kh_StartRound);
+		kh_Controller_SetThink(autocvar_g_balance_keyhunt_delay_round+(game_starttime - time), "", kh_StartRound);
 
 	if(g_arena)
 	if(champion && champion.classname == "player" && player_count > 1)
@@ -257,7 +257,6 @@ void Arena_Warmup()
 			self.velocity = '0 0 0';
 			self.avelocity = '0 0 0';
 			self.movement = '0 0 0';
-			//self.fixangle = TRUE;
 		}
 	}
 
@@ -328,7 +327,7 @@ void count_alive_players()
 				totalalive += 1;
 			}
 		}
-		FOR_EACH_PLAYER(self) {
+		FOR_EACH_REALCLIENT(self) {
 			self.redalive_stat = redalive;
 			self.bluealive_stat = bluealive;
 		}
@@ -358,7 +357,7 @@ void count_alive_players()
 				totalalive += 1;
 			}
 		}
-		FOR_EACH_PLAYER(self) {
+		FOR_EACH_REALCLIENT(self) {
 			self.redalive_stat = redalive;
 			self.bluealive_stat = bluealive;
 			self.yellowalive_stat = yellowalive;
@@ -386,7 +385,7 @@ void Spawnqueue_Check()
 		return;
 
 	if(g_ca) {
-		required_ca_players = max(2, fabs(cvar("bot_vs_human") + 1));
+		required_ca_players = max(2, fabs(autocvar_bot_vs_human + 1));
 
 		if(ca_players < required_ca_players && (redspawned && bluespawned)) {
 			reset_map(TRUE);
@@ -404,7 +403,7 @@ void Spawnqueue_Check()
 					strunzone(champion_name);
 				champion_name = strzone(champion.netname);
 			}
-			else if((!redspawned && !bluespawned) || time - warmup > cvar("g_ca_round_timelimit")) {
+			else if((!redspawned && !bluespawned) || time - warmup > autocvar_g_ca_round_timelimit) {
 				FOR_EACH_CLIENT(self) centerprint(self, strcat("^7Round tied.", "^7\n"));
 				next_round = time + 5;
 			}