Merge branch 'master' into Mario/turrets

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / nades.qc

diff --git a/qcsrc/common/nades.qc b/qcsrc/common/nades.qc
index 12a86eedd4b9ea7e8ddaa4d1532e7b11d7e3333b..07a91a8ccdd7432d2fae81e76b85ced184efe8b6 100644 (file)
--- a/qcsrc/common/nades.qc
+++ b/qcsrc/common/nades.qc
@@ -4,7 +4,6 @@
        #include "nades.qh"
        #include "buffs.qh"
        #include "../client/movetypes.qh"
-       #include "../server/tturrets/include/turrets_early.qh"
        #include "../client/main.qh"
        #include "../csqcmodellib/cl_model.qh"
 #elif defined(MENUQC)
@@ -16,7 +15,7 @@
 
 
 #ifdef SVQC
-float healer_send(entity to, float sf)
+float healer_send(entity to, int sf)
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_HEALING_ORB);
        WriteByte(MSG_ENTITY, sf);
@@ -57,7 +56,7 @@ void healer_setup()
        setmodel(self, "models/ctf/shield.md3");
 
        setorigin(self, self.origin);
-       
+
        float model_radius = self.maxs.x;
        vector size = '1 1 1' * self.healer_radius / 2;
        setsize(self,-size,size);
@@ -93,4 +92,4 @@ void ent_healer()
                healer_setup();
        }
 }
-#endif // CSQC
\ No newline at end of file
+#endif // CSQC