X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_quake3.qc;h=7f8cb82921ee3ae2a3b068ac331bbff891a13949;hb=9a199db20227fab8dd8d446f2ef59f74b8178f06;hp=f2a1138d82e71ebcd5d9f644a8494645c92bea08;hpb=a417525a41a93eb6df571b00c13a32d36a8e93cd;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc index f2a1138d8..7f8cb8292 100644 --- a/qcsrc/server/t_quake3.qc +++ b/qcsrc/server/t_quake3.qc @@ -22,9 +22,9 @@ void spawnfunc_ammo_lightning() { spawnfunc_item_cells(); } void spawnfunc_weapon_plasmagun() { spawnfunc_weapon_hagar(); } void spawnfunc_ammo_cells() { spawnfunc_item_rockets(); } -// Rail -> Rifle -void spawnfunc_weapon_railgun() { spawnfunc_weapon_rifle(); } -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(); } @@ -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(); } @@ -142,11 +138,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 +150,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";