Merge branch 'master' into Mario/hagar_notfixed

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

diff --git a/qcsrc/server/weapons/throwing.qh b/qcsrc/server/weapons/throwing.qh
index b5d9ca0547088abb8435340a34ec69d1a4f0030b..488791295b59bf8ed52df983ed949c6164abb2a6 100644 (file)
--- a/qcsrc/server/weapons/throwing.qh
+++ b/qcsrc/server/weapons/throwing.qh
@@ -1,46 +1,4 @@
-#ifndef THROWING_H
-#define THROWING_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"
-#endif
+#pragma once
 
 .float savenextthink;
 void thrown_wep_think();
@@ -53,5 +11,4 @@ float W_IsWeaponThrowable(float w);
 // toss current weapon
 void W_ThrowWeapon(vector velo, vector delta, float doreduce);
 
-void SpawnThrownWeapon(vector org, float w);
-#endif
\ No newline at end of file
+void SpawnThrownWeapon(entity this, vector org, float w);