From: terencehill <piuntn@gmail.com>
Date: Wed, 21 Sep 2016 15:12:13 +0000 (+0200)
Subject: Set Melee Only Arena as incompatible with Overkill
X-Git-Tag: xonotic-v0.8.2~553^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0923a52c1fe607b3dc823e911ec745e0d61a11a;p=xonotic%2Fxonotic-data.pk3dir.git

Set Melee Only Arena as incompatible with Overkill
---

diff --git a/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc b/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
index e07034baf..f41839559 100644
--- a/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
+++ b/qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc
@@ -1,6 +1,6 @@
 #include "sv_melee_only.qh"
 
-REGISTER_MUTATOR(melee_only, cvar("g_melee_only") && !cvar("g_instagib") && !g_nexball);
+REGISTER_MUTATOR(melee_only, cvar("g_melee_only") && !cvar("g_instagib") && !cvar("g_overkill") && !g_nexball);
 
 MUTATOR_HOOKFUNCTION(melee_only, SetStartItems)
 {