X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_quake3.qc;h=bb1128bd60e8c532c217de9d8f9d99f9c0404d27;hb=04ab0ff7c3c5fcfe9780eadccfd5abd03d25b181;hp=82b5f4457a9b8c5aeea05b5e185085a72fb5160b;hpb=6c4aca14b76d71f2ebabb059cd1ee30f6cb7c790;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 82b5f4457..bb1128bd6 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -122,12 +122,8 @@ void spawnfunc_target_give()
 //void spawnfunc_item_health_mega()  /* handled in t_items.qc */
 //void spawnfunc_item_invis()        /* not supported */
 //void spawnfunc_item_regen()        /* not supported */
-void spawnfunc_team_CTF_redflag()    { spawnfunc_item_flag_team1();    }
-void spawnfunc_team_CTF_blueflag()   { spawnfunc_item_flag_team2();    }
-void spawnfunc_team_CTF_redplayer()  { spawnfunc_info_player_team1();  }
-void spawnfunc_team_CTF_blueplayer() { spawnfunc_info_player_team2();  }
-void spawnfunc_team_CTF_redspawn()   { spawnfunc_info_player_team1();  }
-void spawnfunc_team_CTF_bluespawn()  { spawnfunc_info_player_team2();  }
+
+// CTF spawnfuncs handled in mutators/gamemode_ctf.qc now
 
 void spawnfunc_item_flight()         { spawnfunc_item_jetpack();       }
 
@@ -146,7 +142,7 @@ float DoesQ3ARemoveThisEntity()
 			return 1;
 
 	if(self.notta)
-		if not(!teamplay || g_tdm || g_ctf)
+		if (!(!teamplay || g_tdm || g_ctf))
 			return 1;
 
 	if(self.notsingle)
@@ -168,8 +164,6 @@ float DoesQ3ARemoveThisEntity()
 		gametypename = "ffa";
 		if(teamplay)
 			gametypename = "team";
-		if(g_arena)
-			gametypename = "tournament";
 		if(g_ctf)
 			gametypename = "ctf";
 		if(maxclients == 1)