X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_quake3.qc;h=f415e1fd1d397ad2a632c78648054d70c1f3ffaa;hb=bbc51e613e22eafdd915b549e0946fec7f09d1f7;hp=8cc7e479791b6a3fc8bec91c48383355953f2563;hpb=c5ebde8d94010d71635def61abf89f69fa892b15;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 8cc7e4797..f415e1fd1 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -23,7 +23,7 @@ void spawnfunc_weapon_plasmagun()    { spawnfunc_weapon_hagar();        }
 void spawnfunc_ammo_cells()          { spawnfunc_item_rockets();        }
 
 // Rail -> Rifle
-void spawnfunc_weapon_railgun()      { spawnfunc_weapon_sniperrifle();  }
+void spawnfunc_weapon_railgun()      { spawnfunc_weapon_rifle();  }
 void spawnfunc_ammo_slugs()          { spawnfunc_item_bullets();        }
 
 // BFG -> Crylink
@@ -142,11 +142,11 @@ float DoesQ3ARemoveThisEntity()
 	// Q3 style filters (DO NOT USE, THIS IS COMPAT ONLY)
 
 	if(self.notq3a)
-		if(!teams_matter || g_tdm || g_ctf)
+		if(!teamplay || g_tdm || g_ctf)
 			return 1;
 
 	if(self.notta)
-		if not(!teams_matter || g_tdm || g_ctf)
+		if not(!teamplay || g_tdm || g_ctf)
 			return 1;
 
 	if(self.notsingle)
@@ -154,19 +154,19 @@ float DoesQ3ARemoveThisEntity()
 			return 1;
 
 	if(self.notteam)
-		if(teams_matter)
+		if(teamplay)
 			return 1;
 
 	if(self.notfree)
-		if(!teams_matter)
+		if(!teamplay)
 			return 1;
 
 	if(self.gametype)
 	{
 		string gametypename;
-		// static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"};
+		// static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"}
 		gametypename = "ffa";
-		if(teams_matter)
+		if(teamplay)
 			gametypename = "team";
 		if(g_arena)
 			gametypename = "tournament";