X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Farena.qc;h=5110d373b8a682e657e1a5f10201c2c91303dbba;hb=3188aedc78fc6c0f613adbfe8f1297ef5cb6a730;hp=41540280f3c982f888ded062fbe661560901264a;hpb=476be158d9817aad65331dfcc2514372a619eb05;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 41540280f..5110d373b 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -27,8 +27,10 @@ void target_assault_roundend_reset();
 float next_round;
 float stopalivecheck;
 float redalive, bluealive, yellowalive, pinkalive;
+float totalalive;
 .float redalive_stat, bluealive_stat, yellowalive_stat, pinkalive_stat;
 float redspawned, bluespawned, yellowspawned, pinkspawned;
+float totalspawned;
 
 /**
  * Resets the state of all clients, items, flags, runes, keys, weapons, waypoints, ... of the map.
@@ -39,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;
@@ -56,7 +58,7 @@ void reset_map(float dorespawn)
 	race_ReadyRestart();
 
 	for(self = world; (self = nextent(self)); )
-	if(clienttype(self) == CLIENTTYPE_NOTACLIENT)
+	if(clienttype(self) == CLIENTTYPE_NOTACLIENT && self.items != IT_STRENGTH && self.items != IT_INVINCIBLE) // don't respawn strength or shield, that will only lead to them spawning very early each match
 	{
 		if(self.reset)
 		{
@@ -135,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)
@@ -206,22 +208,11 @@ void Arena_Warmup()
 {
 	float f;
 	string msg;
+    entity e;
 
 	if((!g_arena && !g_ca && !g_freezetag) || (g_arena && !arena_roundbased) || (time < game_starttime))
 		return;
 
-	if(g_freezetag && time > game_starttime &&
-		!((redspawned >= 1 && bluespawned >= 1)
-		|| (redspawned >= 1 && yellowspawned >= 1)
-		|| (redspawned >= 1 && pinkspawned >= 1)
-		|| (bluespawned >= 1 && yellowspawned >= 1)
-		|| (bluespawned >= 1 && pinkspawned >= 1)
-		|| (yellowspawned >= 1 && pinkspawned >= 1)))
-	{ // no teams, or only one team has players
-		warmup = time + cvar("g_freezetag_warmup");
-		return;
-	}
-
 	f = ceil(warmup - time);
 	if(f > 0)
 		champion = world; // this is done because a if(champion) will not execute if champion = world
@@ -255,7 +246,8 @@ void Arena_Warmup()
 			else if(f == 1)
 				Announce("1");
 
-			centerprint(self, msg);
+            FOR_EACH_PLAYER(e)
+                centerprint(e, msg);
 		}
 
 		if (g_arena) {
@@ -278,38 +270,63 @@ void Arena_Warmup()
 		if(g_ca) {
 			ca_players = 0;
 
-			FOR_EACH_PLAYER(self)
+            FOR_EACH_PLAYER(e)
 				ca_players += 1;
 		}
-	}
 
-	if(self.classname == "player" && self.health > 0 && self.movetype == MOVETYPE_NONE)
-		self.movetype = MOVETYPE_WALK;
+        if(self.classname == "player" && self.health > 0 && self.movetype == MOVETYPE_NONE)
+            self.movetype = MOVETYPE_WALK;
+	}
 }
 
 void count_spawned_players()
 {
 	// TODO fix "*spawned" name, it should rather be "*players" or so
-	// not doing this not to prevent merge hell with Tag
+	// not doing this now to prevent merge hell with Tag
+	// fix after merging with Tag
 
 	// count amount of players in each team
-	redspawned = bluespawned = yellowspawned = pinkspawned = 0;
+	totalspawned = redspawned = bluespawned = yellowspawned = pinkspawned = 0;
 	FOR_EACH_PLAYER(self) {
-		if (self.team == COLOR_TEAM1) redspawned += 1;
-		else if (self.team == COLOR_TEAM2) bluespawned += 1;
-		else if (self.team == COLOR_TEAM3) yellowspawned += 1;
-		else if (self.team == COLOR_TEAM4) pinkspawned += 1;
+		if (self.team == COLOR_TEAM1)
+		{
+			redspawned += 1;
+			totalspawned += 1;
+		}
+		else if (self.team == COLOR_TEAM2)
+		{
+			bluespawned += 1;
+			totalspawned += 1;
+		}
+		else if (self.team == COLOR_TEAM3)
+		{
+			yellowspawned += 1;
+			totalspawned += 1;
+		}
+		else if (self.team == COLOR_TEAM4)
+		{
+			pinkspawned += 1;
+			totalspawned += 1;
+		}
 	}
 }
 
 void count_alive_players()
 {
-	redalive = bluealive = yellowalive = pinkalive = 0;
+	totalalive = redalive = bluealive = yellowalive = pinkalive = 0;
 	if(g_ca)
 	{
 		FOR_EACH_PLAYER(self) {
-			if (self.team == COLOR_TEAM1 && self.health >= 1) redalive += 1;
-			else if (self.team == COLOR_TEAM2 && self.health >= 1) bluealive += 1;
+			if (self.team == COLOR_TEAM1 && self.health >= 1)
+			{
+				redalive += 1;
+				totalalive += 1;
+			}
+			else if (self.team == COLOR_TEAM2 && self.health >= 1)
+			{
+				bluealive += 1;
+				totalalive += 1;
+			}
 		}
 		FOR_EACH_PLAYER(self) {
 			self.redalive_stat = redalive;
@@ -320,10 +337,26 @@ void count_alive_players()
 	{
 		// count amount of alive players in each team
 		FOR_EACH_PLAYER(self) {
-			if (self.team == COLOR_TEAM1 && self.freezetag_frozen == 0 && self.health >= 1) redalive += 1;
-			else if (self.team == COLOR_TEAM2 && self.freezetag_frozen == 0 && self.health >= 1) bluealive += 1;
-			else if (self.team == COLOR_TEAM3 && self.freezetag_frozen == 0 && self.health >= 1) yellowalive += 1;
-			else if (self.team == COLOR_TEAM4 && self.freezetag_frozen == 0 && self.health >= 1) pinkalive += 1;
+			if (self.team == COLOR_TEAM1 && self.freezetag_frozen == 0 && self.health >= 1)
+			{
+				redalive += 1;
+				totalalive += 1;
+			}
+			else if (self.team == COLOR_TEAM2 && self.freezetag_frozen == 0 && self.health >= 1)
+			{
+				bluealive += 1;
+				totalalive += 1;
+			}
+			else if (self.team == COLOR_TEAM3 && self.freezetag_frozen == 0 && self.health >= 1)
+			{
+				yellowalive += 1;
+				totalalive += 1;
+			}
+			else if (self.team == COLOR_TEAM4 && self.freezetag_frozen == 0 && self.health >= 1)
+			{
+				pinkalive += 1;
+				totalalive += 1;
+			}
 		}
 		FOR_EACH_PLAYER(self) {
 			self.redalive_stat = redalive;
@@ -353,7 +386,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);
@@ -371,7 +404,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;
 			}