X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fassault.qc;h=7a5662c9799fb51f738b7293a3e5ce04f9a99f44;hb=b0e4ebf4cf698adc8d6322fb366d0e6045d555e6;hp=425bbf77933892791bf46b5c96219b50daec758e;hpb=d7931068ce37d3f05c0f4e4f052ff8e43ac9f0e4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/assault.qc b/qcsrc/server/assault.qc
index 425bbf779..7a5662c97 100644
--- a/qcsrc/server/assault.qc
+++ b/qcsrc/server/assault.qc
@@ -9,7 +9,7 @@ void spawnfunc_info_player_attacker() {
 		remove(self);
 		return;
 	}
-	self.team = COLOR_TEAM1; // red, gets swapped every round
+	self.team = NUM_TEAM_1; // red, gets swapped every round
 	spawnfunc_info_player_deathmatch();
 }
 
@@ -19,7 +19,7 @@ void spawnfunc_info_player_defender() {
 		remove(self);
 		return;
 	}
-	self.team = COLOR_TEAM2; // blue, gets swapped every round
+	self.team = NUM_TEAM_2; // blue, gets swapped every round
 	spawnfunc_info_player_deathmatch();
 }
 
@@ -216,10 +216,10 @@ void spawnfunc_func_assault_destructible() {
 	}
 	self.spawnflags = 3;
 	self.classname = "func_assault_destructible";
-	if(assault_attacker_team == COLOR_TEAM1) {
-		self.team = COLOR_TEAM2;
+	if(assault_attacker_team == NUM_TEAM_1) {
+		self.team = NUM_TEAM_2;
 	} else {
-		self.team = COLOR_TEAM1;
+		self.team = NUM_TEAM_1;
 	}
 	spawnfunc_func_breakable();
 }
@@ -289,10 +289,10 @@ void assault_roundstart_use() {
 	ent = find(world, classname, "turret_main");
 	while(ent) {
 		// Swap turret teams
-		if(ent.team == COLOR_TEAM1)
-			ent.team = COLOR_TEAM2;
+		if(ent.team == NUM_TEAM_1)
+			ent.team = NUM_TEAM_2;
 		else
-			ent.team = COLOR_TEAM1;
+			ent.team = NUM_TEAM_1;
 
 		self = ent;
 
@@ -313,7 +313,7 @@ void spawnfunc_target_assault_roundstart() {
 		remove(self);
 		return;
 	}
-	assault_attacker_team = COLOR_TEAM1;
+	assault_attacker_team = NUM_TEAM_1;
 	self.classname = "target_assault_roundstart";
 	self.use = assault_roundstart_use;
 	self.reset2 = assault_roundstart_use;
@@ -351,10 +351,10 @@ void assault_new_round()
 	self.winning = self.winning + 1;
 
 	// swap attacker/defender roles
-	if(assault_attacker_team == COLOR_TEAM1) {
-		assault_attacker_team = COLOR_TEAM2;
+	if(assault_attacker_team == NUM_TEAM_1) {
+		assault_attacker_team = NUM_TEAM_2;
 	} else {
-		assault_attacker_team = COLOR_TEAM1;
+		assault_attacker_team = NUM_TEAM_1;
 	}
 
 
@@ -363,14 +363,14 @@ void assault_new_round()
 	{
 		if(clienttype(ent) == CLIENTTYPE_NOTACLIENT)
 		{
-			if(ent.team_saved == COLOR_TEAM1)
-				ent.team_saved = COLOR_TEAM2;
-			else if(ent.team_saved == COLOR_TEAM2)
-				ent.team_saved = COLOR_TEAM1;
+			if(ent.team_saved == NUM_TEAM_1)
+				ent.team_saved = NUM_TEAM_2;
+			else if(ent.team_saved == NUM_TEAM_2)
+				ent.team_saved = NUM_TEAM_1;
 		}
 	}
 
 	// reset the level with a countdown
 	cvar_set("timelimit", ftos(ceil(time - game_starttime) / 60));
-	ReadyRestartForce(); // sets game_starttime
+	ReadyRestart_force(); // sets game_starttime
 }