From: Mario <zacjardine@y7mail.com>
Date: Sun, 30 Aug 2015 11:37:10 +0000 (+1000)
Subject: Move team player spawn functions into the spawnpoints file
X-Git-Tag: xonotic-v0.8.2~1964
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3c315b3f7597d4a4807d16cc0817612e527dd441;p=xonotic%2Fxonotic-data.pk3dir.git

Move team player spawn functions into the spawnpoints file
---

diff --git a/qcsrc/server/mutators/gamemode_ctf.qc b/qcsrc/server/mutators/gamemode_ctf.qc
index 2b9cf0215..0df123e3a 100644
--- a/qcsrc/server/mutators/gamemode_ctf.qc
+++ b/qcsrc/server/mutators/gamemode_ctf.qc
@@ -2243,52 +2243,6 @@ MUTATOR_HOOKFUNCTION(ctf_SpectateCopy)
 // Spawnfuncs
 // ==========
 
-/*QUAKED spawnfunc_info_player_team1 (1 0 0) (-16 -16 -24) (16 16 24)
-CTF Starting point for a player in team one (Red).
-Keys: "angle" viewing angle when spawning. */
-void spawnfunc_info_player_team1()
-{
-	if(g_assault) { remove(self); return; }
-
-	self.team = NUM_TEAM_1; // red
-	spawnfunc_info_player_deathmatch();
-}
-
-
-/*QUAKED spawnfunc_info_player_team2 (1 0 0) (-16 -16 -24) (16 16 24)
-CTF Starting point for a player in team two (Blue).
-Keys: "angle" viewing angle when spawning. */
-void spawnfunc_info_player_team2()
-{
-	if(g_assault) { remove(self); return; }
-
-	self.team = NUM_TEAM_2; // blue
-	spawnfunc_info_player_deathmatch();
-}
-
-/*QUAKED spawnfunc_info_player_team3 (1 0 0) (-16 -16 -24) (16 16 24)
-CTF Starting point for a player in team three (Yellow).
-Keys: "angle" viewing angle when spawning. */
-void spawnfunc_info_player_team3()
-{
-	if(g_assault) { remove(self); return; }
-
-	self.team = NUM_TEAM_3; // yellow
-	spawnfunc_info_player_deathmatch();
-}
-
-
-/*QUAKED spawnfunc_info_player_team4 (1 0 0) (-16 -16 -24) (16 16 24)
-CTF Starting point for a player in team four (Purple).
-Keys: "angle" viewing angle when spawning. */
-void spawnfunc_info_player_team4()
-{
-	if(g_assault) { remove(self); return; }
-
-	self.team = NUM_TEAM_4; // purple
-	spawnfunc_info_player_deathmatch();
-}
-
 /*QUAKED spawnfunc_item_flag_team1 (0 0.5 0.8) (-48 -48 -37) (48 48 37)
 CTF flag for team one (Red).
 Keys:
diff --git a/qcsrc/server/spawnpoints.qc b/qcsrc/server/spawnpoints.qc
index 4cad88664..6caba7c7d 100644
--- a/qcsrc/server/spawnpoints.qc
+++ b/qcsrc/server/spawnpoints.qc
@@ -157,6 +157,52 @@ void spawnfunc_info_player_deathmatch (void)
 	relocate_spawnpoint();
 }
 
+/*QUAKED spawnfunc_info_player_team1 (1 0 0) (-16 -16 -24) (16 16 24)
+Starting point for a player in team one (Red).
+Keys: "angle" viewing angle when spawning. */
+void spawnfunc_info_player_team1()
+{
+	if(g_assault) { remove(self); return; }
+
+	self.team = NUM_TEAM_1; // red
+	spawnfunc_info_player_deathmatch();
+}
+
+
+/*QUAKED spawnfunc_info_player_team2 (1 0 0) (-16 -16 -24) (16 16 24)
+Starting point for a player in team two (Blue).
+Keys: "angle" viewing angle when spawning. */
+void spawnfunc_info_player_team2()
+{
+	if(g_assault) { remove(self); return; }
+
+	self.team = NUM_TEAM_2; // blue
+	spawnfunc_info_player_deathmatch();
+}
+
+/*QUAKED spawnfunc_info_player_team3 (1 0 0) (-16 -16 -24) (16 16 24)
+Starting point for a player in team three (Yellow).
+Keys: "angle" viewing angle when spawning. */
+void spawnfunc_info_player_team3()
+{
+	if(g_assault) { remove(self); return; }
+
+	self.team = NUM_TEAM_3; // yellow
+	spawnfunc_info_player_deathmatch();
+}
+
+
+/*QUAKED spawnfunc_info_player_team4 (1 0 0) (-16 -16 -24) (16 16 24)
+Starting point for a player in team four (Purple).
+Keys: "angle" viewing angle when spawning. */
+void spawnfunc_info_player_team4()
+{
+	if(g_assault) { remove(self); return; }
+
+	self.team = NUM_TEAM_4; // purple
+	spawnfunc_info_player_deathmatch();
+}
+
 // Returns:
 //   _x: prio (-1 if unusable)
 //   _y: weight