X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fcl_vehicles.qc;h=57f5990bb77a3915f9296c4f530074dad7485af8;hb=edf01df130d0d1877461561178b8833a9ab6051c;hp=b24097c03303a11f7fa30168c155c4214b8a6999;hpb=21307f327df5609b82d90496c1c6156d636d1c8d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc
index b24097c03..57f5990bb 100644
--- a/qcsrc/common/vehicles/cl_vehicles.qc
+++ b/qcsrc/common/vehicles/cl_vehicles.qc
@@ -18,12 +18,13 @@ entity AuxiliaryXhair[MAX_AXH];
 float alarm1time;
 float alarm2time;
 
-void vehicle_alarm(entity e, int ch, string s0und)
+void vehicle_alarm(entity e, int ch, Sound s0und)
 {
+    TC(Sound, s0und);
 	if(!autocvar_cl_vehicles_alarm)
 		return;
 
-	_sound(e, ch, s0und, VOL_BASEVOICE, ATTEN_NONE);
+	sound(e, ch, s0und, VOL_BASEVOICE, ATTEN_NONE);
 }
 
 void AuxiliaryXhair_Draw2D(entity this)
@@ -31,26 +32,26 @@ void AuxiliaryXhair_Draw2D(entity this)
 	if (scoreboard_active)
 		return;
 
-	vector size = draw_getimagesize(self.axh_image) * autocvar_cl_vehicles_crosshair_size;
-	vector pos = project_3d_to_2d(self.move_origin) - 0.5 * size;
+	vector size = draw_getimagesize(this.axh_image) * autocvar_cl_vehicles_crosshair_size;
+	vector pos = project_3d_to_2d(this.move_origin) - 0.5 * size;
 
 	if (!(pos.z < 0 || pos.x < 0 || pos.y < 0 || pos.x > vid_conwidth || pos.y > vid_conheight))
 	{
 		pos.z = 0;
 		size.z = 0;
-		drawpic(pos, self.axh_image, size, self.colormod, autocvar_crosshair_alpha * self.alpha, self.axh_drawflag);
+		drawpic(pos, this.axh_image, size, this.colormod, autocvar_crosshair_alpha * this.alpha, this.axh_drawflag);
 	}
 
-	if(time - self.cnt > self.axh_fadetime)
-		self.draw2d = func_null;
+	if(time - this.cnt > this.axh_fadetime)
+		this.draw2d = func_null;
 }
 
-void Net_AuXair2(bool bIsNew)
+NET_HANDLE(ENT_CLIENT_AUXILIARYXHAIR, bool isnew)
 {
 	int axh_id	= bound(0, ReadByte(), MAX_AXH);
 	entity axh 		= AuxiliaryXhair[axh_id];
 
-	if(axh == world || wasfreed(axh))  // MADNESS? THIS IS QQQQCCCCCCCCC (wasfreed, why do you exsist?)
+	if(axh == NULL || wasfreed(axh))  // MADNESS? THIS IS QQQQCCCCCCCCC (wasfreed, why do you exsist?)
 	{
 		axh					= spawn();
 		axh.draw2d			= func_null;
@@ -70,17 +71,19 @@ void Net_AuXair2(bool bIsNew)
 	axh.colormod_z		= ReadByte() / 255;
 	axh.cnt 			= time;
 	axh.draw2d			= AuxiliaryXhair_Draw2D;
+	return true;
 }
 
-void Net_VehicleSetup()
-{SELFPARAM();
+NET_HANDLE(TE_CSQC_VEHICLESETUP, bool isnew)
+{
 	int hud_id = ReadByte();
+	return = true;
 
 	// hud_id == 0 means we exited a vehicle, so stop alarm sound/s
 	if(hud_id == 0)
 	{
-		sound(self, CH_TRIGGER_SINGLE, SND_Null, VOL_BASEVOICE, ATTEN_NONE);
-		sound(self, CH_PAIN_SINGLE, SND_Null, VOL_BASEVOICE, ATTEN_NONE);
+		sound(this, CH_TRIGGER_SINGLE, SND_Null, VOL_BASEVOICE, ATTEN_NONE);
+		sound(this, CH_PAIN_SINGLE, SND_Null, VOL_BASEVOICE, ATTEN_NONE);
 		return;
 	}
 
@@ -89,7 +92,7 @@ void Net_VehicleSetup()
 	{
 		entity axh = AuxiliaryXhair[i];
 
-		if(axh != world && !wasfreed(axh))  // MADNESS? THIS IS QQQQCCCCCCCCC (wasfreed, why do you exsist?)
+		if(axh != NULL && !wasfreed(axh))  // MADNESS? THIS IS QQQQCCCCCCCCC (wasfreed, why do you exsist?)
 			remove(axh);
 
 		axh              = spawn();
@@ -107,8 +110,8 @@ void Net_VehicleSetup()
 		AuxiliaryXhair[0].axh_image = vCROSS_BURST; // Plasma cannons
 		AuxiliaryXhair[1].axh_image = vCROSS_BURST; // Raygun
 	} else {
-		Vehicle info = get_vehicleinfo(hud_id);
-    	info.vr_setup(info);
+		Vehicle info = Vehicles_from(hud_id);
+    	info.vr_setup(info, NULL);
 	}
 }
 
@@ -121,7 +124,6 @@ void Vehicles_drawHUD(
 	string iconAmmo2,
 	vector colorAmmo2)
 {
-	SELFPARAM();
 	// Initialize
 	vector tmpSize = '0 0 0';
 	vector tmpPos  = '0 0 0';
@@ -130,13 +132,13 @@ void Vehicles_drawHUD(
 	float barAlpha = autocvar_hud_progressbar_alpha * hudAlpha;
 	float blinkValue = 0.55 + sin(time * 7) * 0.45;
 
-	float health  = getstati(STAT_VEHICLESTAT_HEALTH)  * 0.01;
-	float shield  = getstati(STAT_VEHICLESTAT_SHIELD)  * 0.01;
-	float energy  = getstati(STAT_VEHICLESTAT_ENERGY)  * 0.01;
-	float ammo1   = getstati(STAT_VEHICLESTAT_AMMO1)   * 0.01;
-	float reload1 = getstati(STAT_VEHICLESTAT_RELOAD1) * 0.01;
-	float ammo2   = getstati(STAT_VEHICLESTAT_AMMO2)   * 0.01;
-	float reload2 = getstati(STAT_VEHICLESTAT_RELOAD2) * 0.01;
+	float health  = STAT(VEHICLESTAT_HEALTH)  * 0.01;
+	float shield  = STAT(VEHICLESTAT_SHIELD)  * 0.01;
+	float energy  = STAT(VEHICLESTAT_ENERGY)  * 0.01;
+	float ammo1   = STAT(VEHICLESTAT_AMMO1)   * 0.01;
+	float reload1 = STAT(VEHICLESTAT_RELOAD1) * 0.01;
+	float ammo2   = STAT(VEHICLESTAT_AMMO2)   * 0.01;
+	float reload2 = STAT(VEHICLESTAT_RELOAD2) * 0.01;
 
 	// HACK to deal with the inconsistent use of the vehicle stats
 	ammo1 = (ammo1) ? ammo1 : energy;
@@ -229,7 +231,7 @@ void Vehicles_drawHUD(
 		if(alarm1time < time)
 		{
 			alarm1time = time + 2;
-			vehicle_alarm(self, CH_PAIN_SINGLE, SND(VEH_ALARM));
+			vehicle_alarm(NULL, CH_PAIN_SINGLE, SND_VEH_ALARM);
 		}
 		drawpic_skin(tmpPos, "vehicle_icon_health", tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL);
 	}
@@ -237,7 +239,7 @@ void Vehicles_drawHUD(
 	{
 		if(alarm1time)
 		{
-			vehicle_alarm(self, CH_PAIN_SINGLE, SND(Null));
+			vehicle_alarm(NULL, CH_PAIN_SINGLE, SND_Null);
 			alarm1time = 0;
 		}
 		drawpic_skin(tmpPos, "vehicle_icon_health", tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL);
@@ -251,7 +253,7 @@ void Vehicles_drawHUD(
 		if(alarm2time < time)
 		{
 			alarm2time = time + 1;
-			vehicle_alarm(self, CH_TRIGGER_SINGLE, SND(VEH_ALARM_SHIELD));
+			vehicle_alarm(NULL, CH_TRIGGER_SINGLE, SND_VEH_ALARM_SHIELD);
 		}
 		drawpic_skin(tmpPos, "vehicle_icon_shield", tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL);
 	}
@@ -259,7 +261,7 @@ void Vehicles_drawHUD(
 	{
 		if(alarm2time)
 		{
-			vehicle_alarm(self, CH_TRIGGER_SINGLE, SND(Null));
+			vehicle_alarm(NULL, CH_TRIGGER_SINGLE, SND_Null);
 			alarm2time = 0;
 		}
 		drawpic_skin(tmpPos, "vehicle_icon_shield", tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL);
@@ -291,7 +293,6 @@ void Vehicles_drawHUD(
 
 void Vehicles_drawCrosshair(string crosshair)
 {
-	SELFPARAM();
 	vector tmpSize = '0 0 0';
 	vector tmpPos  = '0 0 0';
 
@@ -302,6 +303,10 @@ void Vehicles_drawCrosshair(string crosshair)
 		tmpPos.x = (vid_conwidth - tmpSize.x) / 2;
 		tmpPos.y = (vid_conheight - tmpSize.y) / 2;
 
-		drawpic(tmpPos, crosshair, tmpSize, '1 1 1', autocvar_crosshair_alpha, DRAWFLAG_NORMAL);
+		vector wcross_color = '1 1 1';
+		if(autocvar_cl_vehicles_crosshair_colorize)
+			wcross_color = crosshair_getcolor(NULL, STAT(VEHICLESTAT_HEALTH));
+
+		drawpic(tmpPos, crosshair, tmpSize, wcross_color, autocvar_crosshair_alpha, DRAWFLAG_NORMAL);
 	}
 }