Port blaster

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

diff --git a/qcsrc/common/nades.qc b/qcsrc/common/nades.qc
index 4225a19f03cb76e98b5afa198312d94f2c575cfc..f361730ba16b29f5a9fe150e6272586e74afe0b3 100644 (file)
--- a/qcsrc/common/nades.qc
+++ b/qcsrc/common/nades.qc
@@ -3,8 +3,7 @@
        #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)
@@ -12,12 +11,13 @@
        #include "../dpdefs/progsdefs.qh"
     #include "constants.qh"
     #include "../server/constants.qh"
+       #include "../common/turrets/sv_turrets.qh"
 #endif
 
 
 #ifdef SVQC
 float healer_send(entity to, int sf)
-{
+{SELFPARAM();
        WriteByte(MSG_ENTITY, ENT_CLIENT_HEALING_ORB);
        WriteByte(MSG_ENTITY, sf);
 
@@ -41,7 +41,7 @@ float healer_send(entity to, int sf)
 #ifdef CSQC
 .float ltime;
 void healer_draw()
-{
+{SELFPARAM();
        float dt = time - self.move_time;
        self.move_time = time;
        if(dt <= 0)
@@ -53,8 +53,8 @@ void healer_draw()
 }
 
 void healer_setup()
-{
-       setmodel(self, "models/ctf/shield.md3");
+{SELFPARAM();
+       setmodel(self, MDL_NADE_HEAL);
 
        setorigin(self, self.origin);
 
@@ -75,7 +75,7 @@ void healer_setup()
 }
 
 void ent_healer()
-{
+{SELFPARAM();
        int sf = ReadByte();
 
        if(sf & TNSF_SETUP)