Merge remote-tracking branch 'origin/samual/no_dead_airshots'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / t_quake3.qc

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index b96599475871932968acaaeba50101afdf395d48..f2a1138d82e71ebcd5d9f644a8494645c92bea08 100644 (file)
--- 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
@@ -135,13 +135,19 @@ void spawnfunc_item_flight()         { spawnfunc_item_jetpack();       }
 .float notsingle;
 .float notfree;
 .float notq3a;
+.float notta;
 .string gametype;
 float DoesQ3ARemoveThisEntity()
 {
        // Q3 style filters (DO NOT USE, THIS IS COMPAT ONLY)
 
        if(self.notq3a)
-               return 1;
+               if(!teams_matter || g_tdm || g_ctf)
+                       return 1;
+
+       if(self.notta)
+               if not(!teams_matter || g_tdm || g_ctf)
+                       return 1;
 
        if(self.notsingle)
                if(maxclients == 1)