X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fdomination.qc;h=0a2fe02b66fcf13c88c02240c0fb5b653f31ed88;hb=a6a1f0e6a1d9c6952cfe395c35bcd9983d10bfa4;hp=9e56023cb500ebb5425d08321fbff54d55d4a7e8;hpb=3a264e945a45a04f4566feb9e9a91e0d5266361e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/domination.qc b/qcsrc/server/domination.qc
index 9e56023cb..0a2fe02b6 100644
--- a/qcsrc/server/domination.qc
+++ b/qcsrc/server/domination.qc
@@ -395,196 +395,6 @@ void dom_controlpoint_setup()
 
 
 
-// player has joined game, get him on a team
-// depreciated
-/*void dom_player_join_team(entity pl)
-{
-	entity head;
-	float c1, c2, c3, c4, totalteams, smallestteam, smallestteam_count, selectedteam;
-	float balance_teams, force_balance, balance_type;
-
-	balance_teams = autocvar_g_balance_teams;
-	balance_teams = autocvar_g_balance_teams_force;
-
-	c1 = c2 = c3 = c4 = -1;
-	totalteams = 0;
-
-	// first find out what teams are allowed
-	head = find(world, classname, "dom_team");
-	while(head)
-	{
-		if(head.netname != "")
-		{
-			//if(head.team == pl.team)
-			//	selected = head;
-			if(head.team == COLOR_TEAM1)
-			{
-					c1 = 0;
-			}
-			if(head.team == COLOR_TEAM2)
-			{
-					c2 = 0;
-			}
-			if(head.team == COLOR_TEAM3)
-			{
-					c3 = 0;
-			}
-			if(head.team == COLOR_TEAM4)
-			{
-					c4 = 0;
-			}
-		}
-		head = find(head, classname, "dom_team");
-	}
-
-	// make sure there are at least 2 teams to join
-	if(c1 >= 0)
-		totalteams = totalteams + 1;
-	if(c2 >= 0)
-		totalteams = totalteams + 1;
-	if(c3 >= 0)
-		totalteams = totalteams + 1;
-	if(c4 >= 0)
-		totalteams = totalteams + 1;
-
-	if(totalteams <= 1)
-		error("dom_player_join_team: Too few teams available for domination\n");
-
-	// whichever teams that are available are set to 0 instead of -1
-
-	// if we don't care what team he ends up on, put him on whatever team he entered as.
-	// if he's not on a valid team, then put him on the smallest team
-	if(!balance_teams && !force_balance)
-	{
-		if(     c1 >= 0 && pl.team == COLOR_TEAM1)
-			selectedteam = pl.team;
-		else if(c2 >= 0 && pl.team == COLOR_TEAM2)
-			selectedteam = pl.team;
-		else if(c3 >= 0 && pl.team == COLOR_TEAM3)
-			selectedteam = pl.team;
-		else if(c4 >= 0 && pl.team == COLOR_TEAM4)
-			selectedteam = pl.team;
-		else
-			selectedteam = -1;
-		if(selectedteam > 0)
-		{
-			SetPlayerColors(pl, selectedteam - 1);
-			return;
-		}
-		// otherwise end up on the smallest team (handled below)
-	}
-
-	// now count how many players are on each team already
-
-	head = find(world, classname, "player");
-	while(head)
-	{
-		//if(head.netname != "")
-		{
-			if(head.team == COLOR_TEAM1)
-			{
-				if(c1 >= 0)
-					c1 = c1 + 1;
-			}
-			if(head.team == COLOR_TEAM2)
-			{
-				if(c2 >= 0)
-					c2 = c2 + 1;
-			}
-			if(head.team == COLOR_TEAM3)
-			{
-				if(c3 >= 0)
-					c3 = c3 + 1;
-			}
-			if(head.team == COLOR_TEAM4)
-			{
-				if(c4 >= 0)
-					c4 = c4 + 1;
-			}
-		}
-		head = find(head, classname, "player");
-	}
-
-	// c1...c4 now have counts of each team
-	// figure out which is smallest, giving priority to the team the player is already on as a tie-breaker
-
-	smallestteam = 0;
-	smallestteam_count = 999;
-
-	// 2 gives priority to what team you're already on, 1 goes in order
-	balance_type = 1;
-
-	if(balance_type == 1)
-	{
-		if(c1 >= 0 && c1 < smallestteam_count)
-		{
-			smallestteam = 1;
-			smallestteam_count = c1;
-		}
-		if(c2 >= 0 && c2 < smallestteam_count)
-		{
-			smallestteam = 2;
-			smallestteam_count = c2;
-		}
-		if(c3 >= 0 && c3 < smallestteam_count)
-		{
-			smallestteam = 3;
-			smallestteam_count = c3;
-		}
-		if(c4 >= 0 && c4 < smallestteam_count)
-		{
-			smallestteam = 4;
-			smallestteam_count = c4;
-		}
-	}
-	else
-	{
-		if(c1 >= 0 && (c1 < smallestteam_count ||
-					(c1 == smallestteam_count && self.team == COLOR_TEAM1) ) )
-		{
-			smallestteam = 1;
-			smallestteam_count = c1;
-		}
-		if(c2 >= 0 && c2 < (c2 < smallestteam_count ||
-					(c2 == smallestteam_count && self.team == COLOR_TEAM2) ) )
-		{
-			smallestteam = 2;
-			smallestteam_count = c2;
-		}
-		if(c3 >= 0 && c3 < (c3 < smallestteam_count ||
-					(c3 == smallestteam_count && self.team == COLOR_TEAM3) ) )
-		{
-			smallestteam = 3;
-			smallestteam_count = c3;
-		}
-		if(c4 >= 0 && c4 < (c4 < smallestteam_count ||
-					(c4 == smallestteam_count && self.team == COLOR_TEAM4) ) )
-		{
-			smallestteam = 4;
-			smallestteam_count = c4;
-		}
-	}
-
-	if(smallestteam == 1)
-	{
-		selectedteam = COLOR_TEAM1 - 1;
-	}
-	if(smallestteam == 2)
-	{
-		selectedteam = COLOR_TEAM2 - 1;
-	}
-	if(smallestteam == 3)
-	{
-		selectedteam = COLOR_TEAM3 - 1;
-	}
-	if(smallestteam == 4)
-	{
-		selectedteam = COLOR_TEAM4 - 1;
-	}
-
-	SetPlayerColors(pl, selectedteam);
-}
-*/
 /*QUAKED spawnfunc_dom_controlpoint (0 .5 .8) (-16 -16 -24) (16 16 32)
 Control point for Domination gameplay.
 */