X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Farena.qc;h=ef81fd92bad7db138edb2fa1e1067d252bae875b;hb=ed623712a6dfd191c610cbb7b599226811ed814d;hp=4f3150258e3c8e0c711b887c7166d0f2bad32760;hpb=a1cb0ad0451f298cee2a517b3b12788949a4f38f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 4f3150258..ef81fd92b 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -9,7 +9,6 @@ entity spawnqueue_first;
 entity spawnqueue_last;
 entity champion;
 float warmup;
-float ca_teams_ok;
 .float caplayer;
 
 void PutObserverInServer();
@@ -48,7 +47,7 @@ void reset_map(float dorespawn)
 	race_ReadyRestart();
 
 	for(self = world; (self = nextent(self)); )
-	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(clienttype(self) == CLIENTTYPE_NOTACLIENT)
 	{
 		if(self.reset)
 		{
@@ -198,9 +197,15 @@ void Arena_Warmup()
 
 	if(gameover)
 	{
+		if(warmup && time < warmup)
+		{
+			FOR_EACH_REALCLIENT(e)
+				Send_CSQC_Centerprint_Generic_Expire(e, CPID_ROUND_STARTING);
+			warmup = 0;
+		}
 		if(champion && g_arena)
 		{
-			FOR_EACH_CLIENT(e)
+			FOR_EACH_REALCLIENT(e)
 				centerprint(e, strcat("The Champion is ", champion.netname));
 			champion = world;
 		}
@@ -211,12 +216,10 @@ void Arena_Warmup()
 
 	f = ceil(warmup - time);
 
-	allowed_to_spawn = 0;
-
 	if(inWarmupStage)
 		allowed_to_spawn = 1;
-	if(g_ca && !ca_teams_ok)
-		allowed_to_spawn = 1;
+	else if(!g_ca)
+		allowed_to_spawn = 0;
 
 	if(time < warmup && !inWarmupStage)
 	{
@@ -224,51 +227,58 @@ void Arena_Warmup()
 			allowed_to_spawn = 1;
 		if(champion && g_arena)
 		{
-			FOR_EACH_PLAYER(e)
+			FOR_EACH_REALCLIENT(e)
 				centerprint(e, strcat("The Champion is ", champion.netname));
 		}
 
 		if(f != roundStartTime_prev) {
 			roundStartTime_prev = f;
-			if(f == 5)
-				Announce("prepareforbattle");
-			else if(f == 3)
-				Announce("3");
-			else if(f == 2)
-				Announce("2");
-			else if(f == 1)
-				Announce("1");
-
-			FOR_EACH_PLAYER(e)
-				Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "Round will start in %d", 1, f);
+			if(g_ca && !(red_players && blue_players)) {
+				FOR_EACH_REALCLIENT(self)
+					Send_CSQC_Centerprint_Generic(self, CPID_ROUND_STARTING, "^1Need at least 1 player in each team to play CA", 2, 0);
+				warmup = time + autocvar_g_ca_warmup;
+			} else {
+				if(f == 5)
+					Announce("prepareforbattle");
+				else if(f == 3)
+					Announce("3");
+				else if(f == 2)
+					Announce("2");
+				else if(f == 1)
+					Announce("1");
+
+				FOR_EACH_REALCLIENT(e)
+					Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "Round will start in %d", 1, f);
+			}
 		}
 
 		if (g_arena) {
 			FOR_EACH_CLIENT(e)
 			{
 				if(e.spawned && e.classname == "player")
-					e.movetype = MOVETYPE_NONE;
-				e.velocity = '0 0 0';
-				e.avelocity = '0 0 0';
-				e.movement = '0 0 0';
+					e.player_blocked = 1;
 			}
 		}
 	}
 	else if(f > -1 && f != roundStartTime_prev)
 	{
 		roundStartTime_prev = f;
-		Announce("begin");
-		FOR_EACH_PLAYER(e)
-			Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "^1Begin!", 1, 0);
-
-		if(g_ca)
-			ca_teams_ok = (red_players && blue_players); // teams are ok if there's at least 1 player in each team
+		if(g_ca) {
+			if(red_players && blue_players)
+				allowed_to_spawn = 0;
+			else
+				reset_map(TRUE);
+		} else {
+			Announce("begin");
+			FOR_EACH_REALCLIENT(e)
+				Send_CSQC_Centerprint_Generic(e, CPID_ROUND_STARTING, "^1Begin!", 1, 0);
+		}
 
 		if(g_arena) {
-			FOR_EACH_PLAYER(e)
+			FOR_EACH_CLIENT(e)
 			{
-				if(e.health > 0 && e.movetype == MOVETYPE_NONE)
-					e.movetype = MOVETYPE_WALK;
+				if(e.player_blocked)
+					e.player_blocked = 0;
 			}
 		}
 	}
@@ -370,26 +380,21 @@ void count_alive_players()
  *
  * Gets called in StartFrame()
  */
-float warntime;
 void Spawnqueue_Check()
 {
+	if(warmup == 0 && g_ca && !inWarmupStage)
+	{
+		if(red_players || blue_players)
+			reset_map(TRUE);
+		return;
+	}
 	if(time < warmup + 1 || inWarmupStage || intermission_running)
 		return;
 
 	if(g_ca) {
-		if(!ca_teams_ok && (red_players && blue_players)) {
-			reset_map(TRUE);
-		}
-		else if(!ca_teams_ok) {
-			if (time > warntime)
-			{
-				FOR_EACH_PLAYER(self)
-					Send_CSQC_Centerprint_Generic(self, CPID_ROUND_STARTING, "^1Need at least 1 player in each team to play CA", 2, 0);
-				warntime = time + 1;
-			}
+		if(allowed_to_spawn) // round is not started yet
 			return;
-		}
-		else if(!next_round) {
+		if(!next_round) {
 			if(!(redalive && bluealive)) {
 				// every player of (at least) one team is dead, round ends here
 				if(redalive) {