Merge branch 'master' into terencehill/welcome_dialog_simple

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / config.qc

diff --git a/qcsrc/common/weapons/config.qc b/qcsrc/common/weapons/config.qc
index f1cc349ca581668a4a2cf9bfac7a81f87a502f05..596540dd3940c64fe04eb22dfaaa98bf097e3ce1 100644 (file)
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -1,9 +1,10 @@
 #include "config.qh"
+
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
        #include <common/util.qh>
-       #include "all.qh"
+       #include <common/weapons/all.qh>
 #endif
 
 // ==========================
@@ -34,7 +35,7 @@ void Dump_Weapon_Settings()
        int wepcount = 1;
        #define WEP_CONFIG_WRITETOFILE(str) write_String_To_File(wep_config_file, str, wep_config_alsoprint)
        FOREACH(Weapons, it != WEP_Null, {
-               if((it.spawnflags & WEP_FLAG_HIDDEN) && (it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && !(it.spawnflags & WEP_FLAG_NORMAL))
+               if(it.spawnflags & WEP_FLAG_SPECIALATTACK)
                        continue; // never include the attacks
                // step 1: clear the queue
                WEP_CONFIG_COUNT = 0;