Merge branch 'master' into Mario/duel

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

diff --git a/qcsrc/server/compat/quake3.qc b/qcsrc/server/compat/quake3.qc
index db73a20c725c32347af1bd0f7b3047b876d8a105..65f231374f56a8053f23a2c2cce49f98df729c15 100644 (file)
--- a/qcsrc/server/compat/quake3.qc
+++ b/qcsrc/server/compat/quake3.qc
@@ -203,7 +203,7 @@ void fragsfilter_use(entity this, entity actor, entity trigger)
 {
        if(!IS_PLAYER(actor))
                return;
-       if(actor.fragsfilter_cnt == this.frags)
+       if(actor.fragsfilter_cnt >= this.frags)
                SUB_UseTargets(this, actor, trigger);
 }
 spawnfunc(target_fragsFilter)
@@ -265,6 +265,8 @@ bool DoesQ3ARemoveThisEntity(entity this)
                        gametypename = "team";
                if(g_ctf)
                        gametypename = "ctf";
+               if(g_duel)
+                       gametypename = "tournament";
                if(maxclients == 1)
                        gametypename = "single";
                // we do not have the other types (oneflag, obelisk, harvester, teamtournament)