X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fcl_turrets.qc;h=b2a0fe1b53bcc798b1421299487f63a619dbe835;hb=32ca966802c45c4c231210c2d8776bc3f4135dc2;hp=f083e80d619e780c9afd4d7f0999753717160457;hpb=75d8c631b71daf6ad2019d8139771f00ad426d33;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index f083e80d6..b2a0fe1b5 100644
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -1,5 +1,7 @@
+#include "all.qh"
+
 void turret_remove()
-{
+{SELFPARAM();
 	remove(self.tur_head);
 	//remove(self.enemy);
 	self.tur_head = world;
@@ -7,7 +9,7 @@ void turret_remove()
 
 .vector glowmod;
 void turret_changeteam()
-{
+{SELFPARAM();
 	self.glowmod = Team_ColorRGB(self.team - 1) * 2;
 	self.teamradar_color = Team_ColorRGB(self.team - 1);
 
@@ -20,12 +22,12 @@ void turret_changeteam()
 }
 
 void turret_head_draw()
-{
+{SELFPARAM();
 	self.drawmask = MASK_NORMAL;
 }
 
 void turret_draw()
-{
+{SELFPARAM();
 	float dt;
 
 	dt = time - self.move_time;
@@ -54,7 +56,7 @@ void turret_draw()
 }
 
 void turret_draw2d()
-{
+{SELFPARAM();
 	if(self.netname == "")
 		return;
 
@@ -202,7 +204,7 @@ void turret_draw2d()
 }
 
 void turret_construct()
-{
+{SELFPARAM();
 	entity tur = get_turretinfo(self.turretid);
 
 	if(self.tur_head == world)
@@ -211,12 +213,12 @@ void turret_construct()
 	self.netname = TUR_NAME(self.turretid);
 
 	setorigin(self, self.origin);
-	setmodel(self, tur.model);
-	setmodel(self.tur_head, tur.head_model);
+	_setmodel(self, tur.model);
+	_setmodel(self.tur_head, tur.head_model);
 	setsize(self, tur.mins, tur.maxs);
 	setsize(self.tur_head, '0 0 0', '0 0 0');
 
-	if(self.turretid == TUR_EWHEEL)
+	if(self.turretid == TUR_EWHEEL.m_id)
 		setattachment(self.tur_head, self, "");
 	else
 		setattachment(self.tur_head, self, "tag_head");
@@ -247,7 +249,7 @@ void turret_construct()
 entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, float _explode);
 void turret_gibboom();
 void turret_gib_draw()
-{
+{SELFPARAM();
 	Movetype_Physics_MatchTicrate(autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy);
 
 	self.drawmask = MASK_NORMAL;
@@ -269,10 +271,10 @@ void turret_gib_draw()
 }
 
 void turret_gibboom()
-{
+{SELFPARAM();
 	float i;
 
-	sound (self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM);
+	sound (self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
 	pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), self.origin, '0 0 0', 1);
 
 	for (i = 1; i < 5; i = i + 1)
@@ -289,7 +291,7 @@ entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, flo
 
 	gib = spawn();
 	setorigin(gib, _from);
-	setmodel(gib, _model);
+	_setmodel(gib, _model);
 	gib.colormod	= _cmod;
 	gib.solid	   = SOLID_CORPSE;
 	gib.draw		= turret_gib_draw;
@@ -317,17 +319,17 @@ entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, flo
 }
 
 void turret_die()
-{
-	sound (self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM);
+{SELFPARAM();
+	sound (self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
 	pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), self.origin, '0 0 0', 1);
 	if (!autocvar_cl_nogibs)
 	{
 		// Base
-		if(self.turretid == TUR_EWHEEL)
+		if(self.turretid == TUR_EWHEEL.m_id)
 			turret_gibtoss((get_turretinfo(self.turretid)).model, self.origin + '0 0 18', self.velocity + '0 0 400' + '0.1 0.1 1' * (random() * 400), '-1 -1 -1', true);
-		else if (self.turretid == TUR_WALKER)
+		else if (self.turretid == TUR_WALKER.m_id)
 			turret_gibtoss((get_turretinfo(self.turretid)).model, self.origin + '0 0 18', self.velocity + '0 0 300' + '0.1 0.1 1' * (random() * 200), '-1 -1 -1', true);
-		else if (self.turretid == TUR_TESLA)
+		else if (self.turretid == TUR_TESLA.m_id)
 			turret_gibtoss((get_turretinfo(self.turretid)).model, self.origin + '0 0 18', '0 0 200', '-1 -1 -1', false);
 		else
 		{
@@ -351,12 +353,12 @@ void turret_die()
 		}
 	}
 
-	setmodel(self, "null");
-	setmodel(self.tur_head, "null");
+	setmodel(self, MDL_Null);
+	setmodel(self.tur_head, MDL_Null);
 }
 
 void ent_turret()
-{
+{SELFPARAM();
 	float sf;
 	sf = ReadByte();