X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fnades.qc;h=d750871257ab2c4ef5b8ed0d0cbd239b8a154d54;hb=38921a0d68b46eb7a70551355d24886139adc20c;hp=fcdc5533e4c1be7b9f94902074c62761b119c4d1;hpb=9c09a961b8674e3a808889d3f34d71855018d3bc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/nades.qc b/qcsrc/common/nades.qc
index fcdc5533e..d75087125 100644
--- a/qcsrc/common/nades.qc
+++ b/qcsrc/common/nades.qc
@@ -4,7 +4,6 @@
 	#include "nades.qh"
 	#include "buffs.qh"
 	#include "../common/movetypes/movetypes.qh"
-	#include "../server/tturrets/include/turrets_early.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,10 +75,10 @@ void healer_setup()
 }
 
 void ent_healer()
-{
+{SELFPARAM();
 	int sf = ReadByte();
 
-	if(sf & TNSF_SETUP)
+	if(sf & 1)
 	{
 		self.origin_x = ReadCoord();
 		self.origin_y = ReadCoord();