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_ammo_slugs() { spawnfunc_item_bullets(); }
+// Rail -> Nex
+void spawnfunc_weapon_railgun() { spawnfunc_weapon_nex(); }
+void spawnfunc_ammo_slugs() { spawnfunc_item_cells(); }
// BFG -> Crylink
void spawnfunc_weapon_bfg() { spawnfunc_weapon_crylink(); }
//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(); }
// 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 (!(!teamplay || g_tdm || g_ctf))
return 1;
if(self.notsingle)
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";
if(g_ctf)
gametypename = "ctf";
if(maxclients == 1)