X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fcl_turrets.qc;h=dbf1e9e33b7fde472184323cb1cf54bc339d5fe9;hb=2bb4c42f723576432bb2c80e0afe0a09ec7350f3;hp=174e0ea7d4337a6980e16dd5bda1342a04dace92;hpb=18302817d7f0cb0ba74398200da5e400ffc1b9a4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index 174e0ea7d..dbf1e9e33 100644
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -24,8 +24,8 @@ void turret_head_draw()
 	self.drawmask = MASK_NORMAL;
 }
 
-void turret_draw()
-{SELFPARAM();
+void turret_draw(entity this)
+{
 	float dt;
 
 	dt = time - self.move_time;
@@ -45,16 +45,16 @@ void turret_draw()
 
 	if(self.health < 85)
 	if(dt < 0.01)
-		pointparticles(particleeffectnum(EFFECT_SMOKE_LARGE), (self.origin + (randomvec() * 80)), '0 0 0', 1);
+		pointparticles(EFFECT_SMOKE_LARGE, (self.origin + (randomvec() * 80)), '0 0 0', 1);
 
 	if(self.health < 32)
 	if(dt < 0.015)
-		pointparticles(particleeffectnum(EFFECT_SMOKE_SMALL), (self.origin + (randomvec() * 80)), '0 0 0', 1);
+		pointparticles(EFFECT_SMOKE_SMALL, (self.origin + (randomvec() * 80)), '0 0 0', 1);
 
 }
 
-void turret_draw2d()
-{SELFPARAM();
+void turret_draw2d(entity this)
+{
 	if(self.netname == "")
 		return;
 
@@ -65,7 +65,7 @@ void turret_draw2d()
 		return;
 
 	float dist = vlen(self.origin - view_origin);
-	float t = (GetPlayerColor(player_localnum) + 1);
+	float t = (entcs_GetTeam(player_localnum) + 1);
 
 	vector o;
 	string txt;
@@ -84,7 +84,7 @@ void turret_draw2d()
 		o_z = 0;
 		if(hud != HUD_NORMAL)
 		{
-			if((get_turretinfo(self.turretid)).spawnflags & TUR_FLAG_MOVE)
+			if((get_turretinfo(self.m_id)).spawnflags & TUR_FLAG_MOVE)
 				txt = "gfx/vehicles/turret_moving.tga";
 			else
 				txt = "gfx/vehicles/turret_stationary.tga";
@@ -99,7 +99,7 @@ void turret_draw2d()
 
 	string spriteimage = self.netname;
 	float a = self.alpha * autocvar_hud_panel_fg_alpha;
-	vector rgb = spritelookupcolor(spriteimage, self.teamradar_color);
+	vector rgb = spritelookupcolor(self, spriteimage, self.teamradar_color);
 
 
 	if(self.maxdistance > waypointsprite_normdistance)
@@ -203,20 +203,20 @@ void turret_draw2d()
 
 void turret_construct()
 {SELFPARAM();
-	entity tur = get_turretinfo(self.turretid);
+	entity tur = get_turretinfo(self.m_id);
 
 	if(self.tur_head == world)
 		self.tur_head = spawn();
 
-	self.netname = TUR_NAME(self.turretid);
+	self.netname = tur.turret_name;
 
 	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.m_id == TUR_EWHEEL.m_id)
 		setattachment(self.tur_head, self, "");
 	else
 		setattachment(self.tur_head, self, "tag_head");
@@ -241,14 +241,14 @@ void turret_construct()
 	self.teamradar_color = '1 0 0';
 	self.alpha = 1;
 
-	TUR_ACTION(self.turretid, TR_SETUP);
+	tur.tr_setup(tur, self);
 }
 
 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);
+void turret_gib_draw(entity this)
+{
+	Movetype_Physics_MatchTicrate(self, autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy);
 
 	self.drawmask = MASK_NORMAL;
 
@@ -272,8 +272,8 @@ void turret_gibboom()
 {SELFPARAM();
 	float i;
 
-	sound (self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM);
-	pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), self.origin, '0 0 0', 1);
+	sound (self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
+	pointparticles(EFFECT_ROCKET_EXPLODE, self.origin, '0 0 0', 1);
 
 	for (i = 1; i < 5; i = i + 1)
 		turret_gibtoss(strcat("models/turrets/head-gib", ftos(i), ".md3"), self.origin + '0 0 2', self.velocity + randomvec() * 700, '0 0 0', false);
@@ -287,9 +287,9 @@ entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, flo
 	if(trace_startsolid)
 		return world;
 
-	gib = spawn();
+	gib = new(turret_gib);
 	setorigin(gib, _from);
-	setmodel(gib, _model);
+	_setmodel(gib, _model);
 	gib.colormod	= _cmod;
 	gib.solid	   = SOLID_CORPSE;
 	gib.draw		= turret_gib_draw;
@@ -311,24 +311,23 @@ entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, flo
 	gib.move_avelocity  = prandomvec() * 32;
 	gib.move_time	   = time;
 	gib.damageforcescale = 1;
-	gib.classname = "turret_gib";
 
 	return gib;
 }
 
 void turret_die()
 {SELFPARAM();
-	sound (self, CH_SHOTS, W_Sound("rocket_impact"), VOL_BASE, ATTEN_NORM);
-	pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), self.origin, '0 0 0', 1);
+	sound (self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
+	pointparticles(EFFECT_ROCKET_EXPLODE, self.origin, '0 0 0', 1);
 	if (!autocvar_cl_nogibs)
 	{
 		// Base
-		if(self.turretid == TUR_EWHEEL)
-			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)
-			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)
-			turret_gibtoss((get_turretinfo(self.turretid)).model, self.origin + '0 0 18', '0 0 200', '-1 -1 -1', false);
+		if(self.m_id == TUR_EWHEEL.m_id)
+			turret_gibtoss((get_turretinfo(self.m_id)).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.m_id == TUR_WALKER.m_id)
+			turret_gibtoss((get_turretinfo(self.m_id)).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.m_id == TUR_TESLA.m_id)
+			turret_gibtoss((get_turretinfo(self.m_id)).model, self.origin + '0 0 18', '0 0 200', '-1 -1 -1', false);
 		else
 		{
 			if (random() > 0.5)
@@ -340,7 +339,7 @@ void turret_die()
 			else
 				turret_gibtoss("models/turrets/base-gib1.md3", self.origin + '0 0 8', '0 0 0', '0 0 0', true);
 
-			entity headgib = turret_gibtoss((get_turretinfo(self.turretid)).head_model, self.origin + '0 0 32', '0 0 200' + randomvec() * 200, '-1 -1 -1', true);
+			entity headgib = turret_gibtoss((get_turretinfo(self.m_id)).head_model, self.origin + '0 0 32', '0 0 200' + randomvec() * 200, '-1 -1 -1', true);
 			if(headgib)
 			{
 				headgib.angles = headgib.move_angles = self.tur_head.angles;
@@ -351,18 +350,18 @@ 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();
+NET_HANDLE(ENT_CLIENT_TURRET, bool isnew)
+{
 	float sf;
 	sf = ReadByte();
 
 	if(sf & TNSF_SETUP)
 	{
-		self.turretid = ReadByte();
+		self.m_id = ReadByte();
 
 		self.origin_x = ReadCoord();
 		self.origin_y = ReadCoord();
@@ -442,4 +441,5 @@ void ent_turret()
 		self.health = _tmp;
 	}
 	//self.enemy.health = self.health / 255;
+	return true;
 }