X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fturrets%2Fcl_turrets.qc;h=079d6b3f0dbc445577c8b95b1834f81d0e0d353e;hb=692cb758fe8f25fa078bfd5885333ee031885600;hp=b2a0fe1b53bcc798b1421299487f63a619dbe835;hpb=5607e279fe7b0dc9f92e15556ed6dc33f17f549c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/turrets/cl_turrets.qc b/qcsrc/common/turrets/cl_turrets.qc
index b2a0fe1b5..079d6b3f0 100644
--- a/qcsrc/common/turrets/cl_turrets.qc
+++ b/qcsrc/common/turrets/cl_turrets.qc
@@ -1,10 +1,8 @@
-#include "all.qh"
-
-void turret_remove()
-{SELFPARAM();
-	remove(self.tur_head);
-	//remove(self.enemy);
-	self.tur_head = world;
+void turret_remove(entity this)
+{
+	remove(this.tur_head);
+	//remove(this.enemy);
+	this.tur_head = world;
 }
 
 .vector glowmod;
@@ -26,38 +24,38 @@ void turret_head_draw()
 	self.drawmask = MASK_NORMAL;
 }
 
-void turret_draw()
-{SELFPARAM();
+void turret_draw(entity this)
+{
 	float dt;
 
-	dt = time - self.move_time;
-	self.move_time = time;
+	dt = time - this.move_time;
+	this.move_time = time;
 	if(dt <= 0)
 		return;
 
-	self.tur_head.angles += dt * self.tur_head.move_avelocity;
+	this.tur_head.angles += dt * this.tur_head.move_avelocity;
 
-	if (self.health < 127)
+	if (this.health < 127)
 	{
 		dt = random();
 
 		if(dt < 0.03)
-			te_spark(self.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16);
+			te_spark(this.origin + '0 0 40', randomvec() * 256 + '0 0 256', 16);
 	}
 
-	if(self.health < 85)
+	if(this.health < 85)
 	if(dt < 0.01)
-		pointparticles(particleeffectnum(EFFECT_SMOKE_LARGE), (self.origin + (randomvec() * 80)), '0 0 0', 1);
+		pointparticles(EFFECT_SMOKE_LARGE, (this.origin + (randomvec() * 80)), '0 0 0', 1);
 
-	if(self.health < 32)
+	if(this.health < 32)
 	if(dt < 0.015)
-		pointparticles(particleeffectnum(EFFECT_SMOKE_SMALL), (self.origin + (randomvec() * 80)), '0 0 0', 1);
+		pointparticles(EFFECT_SMOKE_SMALL, (this.origin + (randomvec() * 80)), '0 0 0', 1);
 
 }
 
-void turret_draw2d()
-{SELFPARAM();
-	if(self.netname == "")
+void turret_draw2d(entity this)
+{
+	if(this.netname == "")
 		return;
 
 	if(!autocvar_g_waypointsprite_turrets)
@@ -66,17 +64,17 @@ void turret_draw2d()
 	if(autocvar_cl_hidewaypoints)
 		return;
 
-	float dist = vlen(self.origin - view_origin);
-	float t = (GetPlayerColor(player_localnum) + 1);
+	float dist = vlen(this.origin - view_origin);
+	float t = (entcs_GetTeam(player_localnum) + 1);
 
 	vector o;
 	string txt;
 
 	if(autocvar_cl_vehicles_hud_tactical)
-	if(dist < 10240 && t != self.team)
+	if(dist < 10240 && t != this.team)
 	{
 		// TODO: Vehicle tactical hud
-		o = project_3d_to_2d(self.origin + '0 0 32');
+		o = project_3d_to_2d(this.origin + '0 0 32');
 		if(o_z < 0
 		|| o_x < (vid_conwidth * waypointsprite_edgeoffset_left)
 		|| o_y < (vid_conheight * waypointsprite_edgeoffset_top)
@@ -86,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(this.m_id)).spawnflags & TUR_FLAG_MOVE)
 				txt = "gfx/vehicles/turret_moving.tga";
 			else
 				txt = "gfx/vehicles/turret_stationary.tga";
@@ -96,40 +94,40 @@ void turret_draw2d()
 		}
 	}
 
-	if(dist > self.maxdistance)
+	if(dist > this.maxdistance)
 		return;
 
-	string spriteimage = self.netname;
-	float a = self.alpha * autocvar_hud_panel_fg_alpha;
-	vector rgb = spritelookupcolor(spriteimage, self.teamradar_color);
+	string spriteimage = this.netname;
+	float a = this.alpha * autocvar_hud_panel_fg_alpha;
+	vector rgb = spritelookupcolor(this, spriteimage, this.teamradar_color);
 
 
-	if(self.maxdistance > waypointsprite_normdistance)
-		a *= pow(bound(0, (self.maxdistance - dist) / (self.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
-	else if(self.maxdistance > 0)
+	if(this.maxdistance > waypointsprite_normdistance)
+		a *= pow(bound(0, (this.maxdistance - dist) / (this.maxdistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent);
+	else if(this.maxdistance > 0)
 		a *= pow(bound(0, (waypointsprite_fadedistance - dist) / (waypointsprite_fadedistance - waypointsprite_normdistance), 1), waypointsprite_distancealphaexponent) * (1 - waypointsprite_minalpha) + waypointsprite_minalpha;
 
 	if(rgb == '0 0 0')
 	{
-		self.teamradar_color = '1 0 1';
+		this.teamradar_color = '1 0 1';
 		LOG_INFOF("WARNING: sprite of name %s has no color, using pink so you notice it\n", spriteimage);
 	}
 
-	txt = self.netname;
+	txt = this.netname;
 	if(autocvar_g_waypointsprite_spam && waypointsprite_count >= autocvar_g_waypointsprite_spam)
 		txt = _("Spam");
 	else
-		txt = spritelookuptext(spriteimage);
+		txt = spritelookuptext(this, spriteimage);
 
-	if(time - floor(time) > 0.5 && t == self.team)
+	if(time - floor(time) > 0.5 && t == this.team)
 	{
-		if(self.helpme && time < self.helpme)
+		if(this.helpme && time < this.helpme)
 		{
 			a *= SPRITE_HELPME_BLINK;
 			txt = sprintf(_("%s under attack!"), txt);
 		}
 		else
-			a *= spritelookupblinkvalue(spriteimage);
+			a *= spritelookupblinkvalue(this, spriteimage);
 	}
 
 	if(autocvar_g_waypointsprite_uppercase)
@@ -146,7 +144,7 @@ void turret_draw2d()
 
 	rgb = fixrgbexcess(rgb);
 
-	o = project_3d_to_2d(self.origin + '0 0 64');
+	o = project_3d_to_2d(this.origin + '0 0 64');
 	if(o_z < 0
 	|| o_x < (vid_conwidth * waypointsprite_edgeoffset_left)
 	|| o_y < (vid_conheight * waypointsprite_edgeoffset_top)
@@ -187,7 +185,7 @@ void turret_draw2d()
 	drawhealthbar(
 			o,
 			0,
-			self.health / 255,
+			this.health / 255,
 			'0 0 0',
 			'0 0 0',
 			0.5 * SPRITE_HEALTHBAR_WIDTH * t,
@@ -205,12 +203,12 @@ 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);
@@ -218,7 +216,7 @@ void turret_construct()
 	setsize(self, tur.mins, tur.maxs);
 	setsize(self.tur_head, '0 0 0', '0 0 0');
 
-	if(self.turretid == TUR_EWHEEL.m_id)
+	if(self.m_id == TUR_EWHEEL.m_id)
 		setattachment(self.tur_head, self, "");
 	else
 		setattachment(self.tur_head, self, "tag_head");
@@ -243,42 +241,40 @@ 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_gibboom(entity this);
+void turret_gib_draw(entity this)
+{
+	Movetype_Physics_MatchTicrate(this, autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy);
 
-	self.drawmask = MASK_NORMAL;
+	this.drawmask = MASK_NORMAL;
 
-	if(self.cnt)
+	if(this.cnt)
 	{
-		if(time >= self.nextthink)
+		if(time >= this.nextthink)
 		{
-			turret_gibboom();
-			remove(self);
+			turret_gibboom(this);
+			remove(this);
 		}
 	}
 	else
 	{
-		self.alpha = bound(0, self.nextthink - time, 1);
-		if(self.alpha < ALPHA_MIN_VISIBLE)
-			remove(self);
+		this.alpha = bound(0, this.nextthink - time, 1);
+		if(this.alpha < ALPHA_MIN_VISIBLE)
+			remove(this);
 	}
 }
 
-void turret_gibboom()
-{SELFPARAM();
-	float i;
-
-	sound (self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
-	pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), self.origin, '0 0 0', 1);
+void turret_gibboom(entity this)
+{
+	sound (this, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
+	pointparticles(EFFECT_ROCKET_EXPLODE, this.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);
+	for (int j = 1; j < 5; j = j + 1)
+		turret_gibtoss(strcat("models/turrets/head-gib", ftos(j), ".md3"), this.origin + '0 0 2', this.velocity + randomvec() * 700, '0 0 0', false);
 }
 
 entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, float _explode)
@@ -289,7 +285,7 @@ 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);
 	gib.colormod	= _cmod;
@@ -313,7 +309,6 @@ 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;
 }
@@ -321,16 +316,16 @@ entity turret_gibtoss(string _model, vector _from, vector _to, vector _cmod, flo
 void turret_die()
 {SELFPARAM();
 	sound (self, CH_SHOTS, SND_ROCKET_IMPACT, VOL_BASE, ATTEN_NORM);
-	pointparticles(particleeffectnum(EFFECT_ROCKET_EXPLODE), self.origin, '0 0 0', 1);
+	pointparticles(EFFECT_ROCKET_EXPLODE, self.origin, '0 0 0', 1);
 	if (!autocvar_cl_nogibs)
 	{
 		// Base
-		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.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.m_id)
-			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)
@@ -342,7 +337,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;
@@ -357,14 +352,14 @@ void turret_die()
 	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();
@@ -444,4 +439,5 @@ void ent_turret()
 		self.health = _tmp;
 	}
 	//self.enemy.health = self.health / 255;
+	return true;
 }