Merge branch 'master' into Mario/vaporizer_damage

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

diff --git a/qcsrc/common/weapons/config.qh b/qcsrc/common/weapons/config.qh
index affba63a09fef4b252a3810621a7de4c4b05f264..410dbdfadeb8b1f7fe79e4eeacf63bdf1a7e14d0 100644 (file)
--- a/qcsrc/common/weapons/config.qh
+++ b/qcsrc/common/weapons/config.qh
@@ -1,39 +1,6 @@
 #ifndef WEAPONS_CONFIG_H
 #define WEAPONS_CONFIG_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../util-pre.qh"
-    #include "../../server/sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qc"
-    #include "../../dpdefs/dpextensions.qc"
-    #include "../../server/sys-post.qh"
-    #include "../../warpzonelib/anglestransform.qh"
-    #include "../../warpzonelib/mathlib.qh"
-    #include "../../warpzonelib/common.qh"
-    #include "../../warpzonelib/util_server.qh"
-    #include "../../warpzonelib/server.qh"
-    #include "../constants.qh"
-    #include "../stats.qh"
-    #include "../teams.qh"
-    #include "../util.qh"
-    #include "../nades.qh"
-    #include "../buffs.qh"
-    #include "../test.qh"
-    #include "../counting.qh"
-    #include "../urllib.qh"
-    #include "../command/markup.qh"
-    #include "../command/rpn.qh"
-    #include "../command/generic.qh"
-    #include "../command/shared_defs.qh"
-    #include "../net_notice.qh"
-    #include "../animdecide.qh"
-    #include "../monsters/monsters.qh"
-    #include "../monsters/sv_monsters.qh"
-    #include "../monsters/spawn.qh"
-#endif
-
 // ==========================
 //  Balance Config Generator
 // ==========================
@@ -52,7 +19,7 @@ string wep_config_queue[MAX_WEP_CONFIG];
 
 #define WEP_CONFIG_WRITETOFILE(a) do { \
        fputs(wep_config_file, a); \
-       if(wep_config_alsoprint) { print(a); } \
+       if(wep_config_alsoprint) { LOG_INFO(a); } \
 } while(0)
 
 #define WEP_CONFIG_WRITE_CVARS_NONE(wepname,name) \
@@ -65,7 +32,7 @@ string wep_config_queue[MAX_WEP_CONFIG];
 #define WEP_CONFIG_WRITE_CVARS_BOTH(wepname,name) \
        WEP_CONFIG_WRITE_CVARS_PRI(wepname, name) \
        WEP_CONFIG_WRITE_CVARS_SEC(wepname, name)
-       
+
 #define WEP_CONFIG_WRITE_CVARS(wepid,wepname,mode,name) WEP_CONFIG_WRITE_CVARS_##mode(wepname, name)
 
 #define WEP_CONFIG_WRITE_PROPS_string(wepname,name) \
@@ -79,4 +46,4 @@ string wep_config_queue[MAX_WEP_CONFIG];
                cvar(sprintf("g_balance_%s_%s", #wepname, #name)))) }
 
 #define WEP_CONFIG_WRITE_PROPS(wepid,wepname,type,prop,name) WEP_CONFIG_WRITE_PROPS_##type(wepname,name)
-#endif
\ No newline at end of file
+#endif