Merge branch 'master' into TimePath/unified_weapons

[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 a314f036b3bb853cbc1b53251df380b6879f27e4..d932224e3a8bae0e990604ec19ed47410e05b517 100644 (file)
--- a/qcsrc/common/weapons/config.qc
+++ b/qcsrc/common/weapons/config.qc
@@ -5,7 +5,7 @@
     #include "../../dpdefs/dpextensions.qh"
     #include "../util.qh"
     #include "config.qh"
-    #include "weapons.qh"
+    #include "all.qh"
 #endif
 
 // ==========================
@@ -35,7 +35,8 @@ void Dump_Weapon_Settings(void)
                        { wep_config_queue[x] = string_null; }
 
                // step 2: build new queue
-               WEP_ACTION(i, WR_CONFIG);
+               Weapon w = get_weaponinfo(i);
+               w.wr_config(w);
 
                // step 3: sort queue
                heapsort(WEP_CONFIG_COUNT, W_Config_Queue_Swap, W_Config_Queue_Compare, world);
@@ -51,7 +52,7 @@ void Dump_Weapon_Settings(void)
                WEP_CONFIG_WRITETOFILE("// }}}\n");
 
                // step 5: debug info
-               print(sprintf("#%d: %s: %d settings...\n", i, WEP_NAME(i), WEP_CONFIG_COUNT));
+               LOG_INFO(sprintf("#%d: %s: %d settings...\n", i, WEP_NAME(i), WEP_CONFIG_COUNT));
                totalsettings += WEP_CONFIG_COUNT;
        }
 
@@ -61,5 +62,5 @@ void Dump_Weapon_Settings(void)
                { wep_config_queue[x] = string_null; }
 
        // extra information
-       print(sprintf("Totals: %d weapons, %d settings\n", (i - 1), totalsettings));
+       LOG_INFO(sprintf("Totals: %d weapons, %d settings\n", (i - 1), totalsettings));
 }