X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fcl_vehicles.qc;h=e2187290d97910574b1b51a2537e2eefd42538ac;hb=0dfab05543fdd478b6f420b96eceeaaac2feaef2;hp=1733a63cc39c8bfcad8cf52e6fa3180c6c76a570;hpb=a665cd1434481e14b353c3a1bec9030b2ceede4f;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc
index 1733a63cc..e2187290d 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,18 +32,18 @@ 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;
 }
 
 NET_HANDLE(ENT_CLIENT_AUXILIARYXHAIR, bool isnew)
@@ -231,7 +232,7 @@ void Vehicles_drawHUD(
 		if(alarm1time < time)
 		{
 			alarm1time = time + 2;
-			vehicle_alarm(self, CH_PAIN_SINGLE, SND(VEH_ALARM));
+			vehicle_alarm(self, CH_PAIN_SINGLE, SND_VEH_ALARM);
 		}
 		drawpic_skin(tmpPos, "vehicle_icon_health", tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL);
 	}
@@ -239,7 +240,7 @@ void Vehicles_drawHUD(
 	{
 		if(alarm1time)
 		{
-			vehicle_alarm(self, CH_PAIN_SINGLE, SND(Null));
+			vehicle_alarm(self, CH_PAIN_SINGLE, SND_Null);
 			alarm1time = 0;
 		}
 		drawpic_skin(tmpPos, "vehicle_icon_health", tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL);
@@ -253,7 +254,7 @@ void Vehicles_drawHUD(
 		if(alarm2time < time)
 		{
 			alarm2time = time + 1;
-			vehicle_alarm(self, CH_TRIGGER_SINGLE, SND(VEH_ALARM_SHIELD));
+			vehicle_alarm(self, CH_TRIGGER_SINGLE, SND_VEH_ALARM_SHIELD);
 		}
 		drawpic_skin(tmpPos, "vehicle_icon_shield", tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL);
 	}
@@ -261,7 +262,7 @@ void Vehicles_drawHUD(
 	{
 		if(alarm2time)
 		{
-			vehicle_alarm(self, CH_TRIGGER_SINGLE, SND(Null));
+			vehicle_alarm(self, CH_TRIGGER_SINGLE, SND_Null);
 			alarm2time = 0;
 		}
 		drawpic_skin(tmpPos, "vehicle_icon_shield", tmpSize, '1 1 1', hudAlpha, DRAWFLAG_NORMAL);
@@ -293,7 +294,6 @@ void Vehicles_drawHUD(
 
 void Vehicles_drawCrosshair(string crosshair)
 {
-	SELFPARAM();
 	vector tmpSize = '0 0 0';
 	vector tmpPos  = '0 0 0';
 
@@ -304,6 +304,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);
 	}
 }