Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / weapons / tracing.qh

diff --git a/qcsrc/server/weapons/tracing.qh b/qcsrc/server/weapons/tracing.qh
index 2f31f94439de94a33ab8526122dff60f8603dad8..b2ab7d08222d64b81be935e746e31fab99844766 100644 (file)
--- a/qcsrc/server/weapons/tracing.qh
+++ b/qcsrc/server/weapons/tracing.qh
@@ -1,48 +1,6 @@
 #ifndef TRACING_H
 #define TRACING_H
 
-#if defined(CSQC)
-#elif defined(MENUQC)
-#elif defined(SVQC)
-       #include "../../common/util-pre.qh"
-    #include "../sys-pre.qh"
-    #include "../../dpdefs/progsdefs.qc"
-    #include "../../dpdefs/dpextensions.qc"
-    #include "../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 "../../common/constants.qh"
-    #include "../../common/stats.qh"
-    #include "../../common/teams.qh"
-    #include "../../common/util.qh"
-    #include "../../common/nades.qh"
-    #include "../../common/buffs.qh"
-    #include "../../common/test.qh"
-    #include "../../common/counting.qh"
-    #include "../../common/urllib.qh"
-    #include "../../common/command/markup.qh"
-    #include "../../common/command/rpn.qh"
-    #include "../../common/command/generic.qh"
-    #include "../../common/command/shared_defs.qh"
-    #include "../../common/net_notice.qh"
-    #include "../../common/animdecide.qh"
-    #include "../../common/monsters/monsters.qh"
-    #include "../../common/monsters/sv_monsters.qh"
-    #include "../../common/monsters/spawn.qh"
-    #include "../../common/weapons/config.qh"
-    #include "../../common/weapons/weapons.qh"
-    #include "accuracy.qh"
-    #include "common.qh"
-    #include "csqcprojectile.qh"
-    #include "hitplot.qh"
-    #include "selection.qh"
-    #include "spawning.qh"
-    #include "throwing.qh"
-#endif
-
 vector w_shotorg;
 vector w_shotdir;
 vector w_shotend;
@@ -92,10 +50,10 @@ void W_SetupProjVelocity_Explicit(entity proj, vector dir, vector upDir, float p
 
 .float railgundistance;
 .vector railgunforce;
-void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, float mindist, float maxdist, float halflifedist, float forcehalflifedist, float deathtype);
+void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, float mindist, float maxdist, float halflifedist, float forcehalflifedist, int deathtype);
 
 float fireBullet_trace_callback_eff;
 entity fireBullet_last_hit;
 void fireBullet_trace_callback(vector start, vector hit, vector end);
-void fireBullet(vector start, vector dir, float spread, float max_solid_penetration, float damage, float force, float dtype, float tracereffects);
-#endif
\ No newline at end of file
+void fireBullet(vector start, vector dir, float spread, float max_solid_penetration, float damage, float force, float dtype, int tracereffects);
+#endif