Merge branch 'master' into terencehill/bot_fixes

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

diff --git a/qcsrc/common/nades.qc b/qcsrc/common/nades.qc
index b90ba4c2e8dc8dfc130deab75d11a32e81ffe5a4..f9ddb8e99153d0f60b06cea63ba491589d35a3c8 100644 (file)
--- a/qcsrc/common/nades.qc
+++ b/qcsrc/common/nades.qc
@@ -1,24 +1,22 @@
 #if defined(CSQC)
-       #include "../dpdefs/csprogsdefs.qc"
-       #include "../client/Defs.qc"
+       #include "../dpdefs/csprogsdefs.qh"
+       #include "../client/defs.qh"
        #include "nades.qh"
        #include "buffs.qh"
-       #include "../client/movetypes.qh"
-       #include "../server/tturrets/include/turrets_early.qh"
+       #include "../common/movetypes/movetypes.qh"
        #include "../client/main.qh"
        #include "../csqcmodellib/cl_model.qh"
 #elif defined(MENUQC)
 #elif defined(SVQC)
-       #include "../dpdefs/progsdefs.qc"
+       #include "../dpdefs/progsdefs.qh"
     #include "constants.qh"
     #include "../server/constants.qh"
+       #include "../common/turrets/sv_turrets.qh"
 #endif
 
-.float healer_lifetime;
-.float healer_radius;
 
 #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);
@@ -59,7 +57,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);
@@ -95,4 +93,4 @@ void ent_healer()
                healer_setup();
        }
 }
-#endif // CSQC
\ No newline at end of file
+#endif // CSQC