]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d9dd585)
Set Melee Only Arena as incompatible with Overkill
authorterencehill <piuntn@gmail.com>
Wed, 21 Sep 2016 15:12:13 +0000 (17:12 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 21 Sep 2016 15:12:13 +0000 (17:12 +0200)
qcsrc/common/mutators/mutator/melee_only/sv_melee_only.qc patch | blob | history

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 e07034bafa33c7d775d3a3e0cb134beb9edb1241..f418395590ed0bae36e0953d64ae48cb709bc739 100644 (file)
--- 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)
 {