X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qh;h=cee65e1643ad76bb00787468eeccb980d7115f14;hb=24bc9a5d1d7d5ca42e8ab5a5d8eea745bfd0e696;hp=b98693de6c9c5fa6b2652fbce1da9862ef52ab56;hpb=1a65f7bb6bae1bb6d1a40d3e2eda30c822052313;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qh b/qcsrc/server/g_damage.qh
index b98693de6..cee65e164 100644
--- a/qcsrc/server/g_damage.qh
+++ b/qcsrc/server/g_damage.qh
@@ -4,13 +4,11 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-	#include "../dpdefs/progsdefs.qh"
-    #include "../dpdefs/dpextensions.qh"
-    #include "../warpzonelib/common.qh"
+    #include "../lib/warpzone/common.qh"
     #include "../common/constants.qh"
     #include "../common/teams.qh"
     #include "../common/util.qh"
-    #include "../common/weapons/weapons.qh"
+    #include "../common/weapons/all.qh"
     #include "weapons/accuracy.qh"
     #include "weapons/csqcprojectile.qh"
     #include "weapons/selection.qh"
@@ -19,11 +17,11 @@
     #include "constants.qh"
     #include "defs.qh"
     #include "../common/notifications.qh"
-    #include "../common/deathtypes.qh"
-    #include "mutators/mutators_include.qh"
-    #include "tturrets/include/turrets_early.qh"
-    #include "vehicles/vehicles_def.qh"
-    #include "../csqcmodellib/sv_model.qh"
+    #include "../common/deathtypes/all.qh"
+    #include "mutators/all.qh"
+    #include "../common/turrets/sv_turrets.qh"
+    #include "../common/vehicles/all.qh"
+    #include "../lib/csqcmodel/sv_model.qh"
     #include "../common/playerstats.qh"
     #include "g_hook.qh"
     #include "scores.qh"
@@ -35,7 +33,7 @@
 .float dmg_force;
 .float dmg_radius;
 
-float Damage_DamageInfo_SendEntity(entity to, int sf);
+bool Damage_DamageInfo_SendEntity(entity this, entity to, int sf);
 
 void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad, vector force, int deathtype, float bloodtype, entity dmgowner);