X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fvehicles%2Fcl_vehicles.qc;h=b24097c03303a11f7fa30168c155c4214b8a6999;hb=948c08402a7b9b7af36059104937650e343ecefe;hp=3472a7f1c7e7e76747e0b056ef22c31d12c589ca;hpb=9ae63d858415772fdb60bd549758825103c0ba17;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/vehicles/cl_vehicles.qc b/qcsrc/common/vehicles/cl_vehicles.qc
index 3472a7f1c..b24097c03 100644
--- a/qcsrc/common/vehicles/cl_vehicles.qc
+++ b/qcsrc/common/vehicles/cl_vehicles.qc
@@ -28,7 +28,7 @@ void vehicle_alarm(entity e, int ch, string s0und)
 
 void AuxiliaryXhair_Draw2D(entity this)
 {
-	if (scoreboard_showscores)
+	if (scoreboard_active)
 		return;
 
 	vector size = draw_getimagesize(self.axh_image) * autocvar_cl_vehicles_crosshair_size;
@@ -119,22 +119,14 @@ void Vehicles_drawHUD(
 	string iconAmmo1,
 	vector colorAmmo1,
 	string iconAmmo2,
-	vector colorAmmo2,
-	string crosshair)
-{SELFPARAM();
-	if(autocvar_r_letterbox)
-		return;
-
-	if(scoreboard_showscores)
-		return;
-
+	vector colorAmmo2)
+{
+	SELFPARAM();
 	// Initialize
-	vector hudSize = '0 0 0';
-	vector hudPos  = '0 0 0';
 	vector tmpSize = '0 0 0';
 	vector tmpPos  = '0 0 0';
 
-	float hudAlpha = autocvar_hud_panel_fg_alpha;
+	float hudAlpha = autocvar_hud_panel_fg_alpha * hud_fade_alpha;
 	float barAlpha = autocvar_hud_progressbar_alpha * hudAlpha;
 	float blinkValue = 0.55 + sin(time * 7) * 0.45;
 
@@ -154,29 +146,29 @@ void Vehicles_drawHUD(
 	if (precache_pic(frame) == "")
 		frame = "gfx/hud/default/vehicle_frame";
 
-	hudSize  = draw_getimagesize(frame) * autocvar_cl_vehicles_hudscale;
-	hudPos.x = (vid_conwidth - hudSize.x) / 2;
-	hudPos.y = vid_conheight - hudSize.y;
+	vehicleHud_Size  = draw_getimagesize(frame) * autocvar_cl_vehicles_hudscale;
+	vehicleHud_Pos.x = (vid_conwidth - vehicleHud_Size.x) / 2;
+	vehicleHud_Pos.y = vid_conheight - vehicleHud_Size.y;
 
 	if(teamplay && autocvar_hud_panel_bg_color_team)
-		drawpic(hudPos, frame, hudSize, myteamcolors * autocvar_hud_panel_bg_color_team, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL);
+		drawpic(vehicleHud_Pos, frame, vehicleHud_Size, myteamcolors * autocvar_hud_panel_bg_color_team, autocvar_hud_panel_bg_alpha * hud_fade_alpha, DRAWFLAG_NORMAL);
 	else
-		drawpic(hudPos, frame, hudSize, autocvar_hud_panel_bg_color, autocvar_hud_panel_bg_alpha, DRAWFLAG_NORMAL);
+		drawpic(vehicleHud_Pos, frame, vehicleHud_Size, autocvar_hud_panel_bg_color, autocvar_hud_panel_bg_alpha * hud_fade_alpha, DRAWFLAG_NORMAL);
 
 	if(!autocvar__vehicles_shownchasemessage && time < vh_notice_time)
 	{
 		float tmpblinkValue = 0.55 + sin(time * 3) * 0.45;
-		tmpPos.x = hudPos.x + hudSize.x * (96/256) - tmpSize.x;
-		tmpPos.y = hudPos.y;
+		tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (96/256) - tmpSize.x;
+		tmpPos.y = vehicleHud_Pos.y;
 		tmpSize = '1 1 1' * hud_fontsize;
 		drawstring(tmpPos, sprintf(_("Press %s"), getcommandkey("dropweapon", "dropweapon")), tmpSize, '1 0 0' + '0 1 1' * tmpblinkValue, hudAlpha, DRAWFLAG_NORMAL);
 	}
 
 	// Model
-	tmpSize.x = hudSize.x / 3;
-	tmpSize.y = hudSize.y;
-	tmpPos.x  = hudPos.x + hudSize.x / 3;
-	tmpPos.y  = hudPos.y;
+	tmpSize.x = vehicleHud_Size.x / 3;
+	tmpSize.y = vehicleHud_Size.y;
+	tmpPos.x  = vehicleHud_Pos.x + vehicleHud_Size.x / 3;
+	tmpPos.y  = vehicleHud_Pos.y;
 
 	if(health < 0.25)
 		drawpic_skin(tmpPos, vehicle, tmpSize, '1 0 0' + '0 1 1' * blinkValue, hudAlpha, DRAWFLAG_NORMAL);
@@ -191,22 +183,22 @@ void Vehicles_drawHUD(
 	drawpic_skin(tmpPos, "vehicle_shield", tmpSize, '1 1 1' * shield + '1 0 0' * (1 - shield), hudAlpha * shield, DRAWFLAG_NORMAL);
 
 	// Health bar
-	tmpSize.y = hudSize.y / 2;
-	tmpPos.x  = hudPos.x + hudSize.x * (32/768);
-	tmpPos.y  = hudPos.y;
+	tmpSize.y = vehicleHud_Size.y / 2;
+	tmpPos.x  = vehicleHud_Pos.x + vehicleHud_Size.x * (32/768);
+	tmpPos.y  = vehicleHud_Pos.y;
 
 	drawsetcliparea(tmpPos.x + (tmpSize.x * (1 - health)), tmpPos.y, tmpSize.x, tmpSize.y);
 	drawpic_skin(tmpPos, "vehicle_bar_northwest", tmpSize, autocvar_hud_progressbar_health_color, barAlpha, DRAWFLAG_NORMAL);
 
 	// Shield bar
-	tmpPos.y = hudPos.y + hudSize.y / 2;
+	tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y / 2;
 
 	drawsetcliparea(tmpPos.x + (tmpSize.x * (1 - shield)), tmpPos.y, tmpSize.x, tmpSize.y);
 	drawpic_skin(tmpPos, "vehicle_bar_southwest", tmpSize, autocvar_hud_progressbar_armor_color, barAlpha, DRAWFLAG_NORMAL);
 
 	// Ammo1 bar
-	tmpPos.x = hudPos.x + hudSize.x * (480/768);
-	tmpPos.y = hudPos.y;
+	tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (480/768);
+	tmpPos.y = vehicleHud_Pos.y;
 
 	if(ammo1)
 		drawsetcliparea(tmpPos.x, tmpPos.y, tmpSize.x * ammo1, tmpSize.y);
@@ -216,7 +208,7 @@ void Vehicles_drawHUD(
 	drawpic_skin(tmpPos, "vehicle_bar_northeast", tmpSize, colorAmmo1, barAlpha, DRAWFLAG_NORMAL);
 
 	// Ammo2 bar
-	tmpPos.y = hudPos.y + hudSize.y / 2;
+	tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y / 2;
 
 	if(ammo2)
 		drawsetcliparea(tmpPos.x, tmpPos.y, tmpSize.x * ammo2, tmpSize.y);
@@ -227,10 +219,10 @@ void Vehicles_drawHUD(
 	drawresetcliparea();
 
 	// Health icon
-	tmpSize.x = hudSize.x * (80/768);
-	tmpSize.y = hudSize.y * (80/256);
-	tmpPos.x  = hudPos.x + hudSize.x * (64/768);
-	tmpPos.y  = hudPos.y + hudSize.y * (48/256);
+	tmpSize.x = vehicleHud_Size.x * (80/768);
+	tmpSize.y = vehicleHud_Size.y * (80/256);
+	tmpPos.x  = vehicleHud_Pos.x + vehicleHud_Size.x * (64/768);
+	tmpPos.y  = vehicleHud_Pos.y + vehicleHud_Size.y * (48/256);
 
 	if(health < 0.25)
 	{
@@ -252,7 +244,7 @@ void Vehicles_drawHUD(
 	}
 
 	// Shield icon
-	tmpPos.y = hudPos.y + hudSize.y / 2;
+	tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y / 2;
 
 	if(shield < 0.25)
 	{
@@ -274,8 +266,8 @@ void Vehicles_drawHUD(
 	}
 
 	// Ammo1 icon
-	tmpPos.x = hudPos.x + hudSize.x * (624/768);
-	tmpPos.y = hudPos.y + hudSize.y * (48/256);
+	tmpPos.x = vehicleHud_Pos.x + vehicleHud_Size.x * (624/768);
+	tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y * (48/256);
 
 	if(iconAmmo1)
 	{
@@ -286,7 +278,7 @@ void Vehicles_drawHUD(
 	}
 
 	// Ammo2 icon
-	tmpPos.y = hudPos.y + hudSize.y / 2;
+	tmpPos.y = vehicleHud_Pos.y + vehicleHud_Size.y / 2;
 
 	if(iconAmmo2)
 	{
@@ -295,77 +287,13 @@ void Vehicles_drawHUD(
 		else
 			drawpic_skin(tmpPos, iconAmmo2, tmpSize, '1 1 1', hudAlpha * 0.2, DRAWFLAG_NORMAL);
 	}
+}
 
-	// Bumblebee gunner crosshairs
-	if(hud == VEH_BUMBLEBEE.vehicleid)
-	{
-		tmpSize = '1 1 1' * hud_fontsize;
-		tmpPos.x = hudPos.x + hudSize.x * (520/768);
-
-		if(!AuxiliaryXhair[1].draw2d)
-		{
-			tmpPos.y = hudPos.y + hudSize.y * (96/256) - tmpSize.y;
-			drawstring(tmpPos, _("No right gunner!"), tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL);
-		}
-
-		if(!AuxiliaryXhair[2].draw2d)
-		{
-			tmpPos.y = hudPos.y + hudSize.y * (160/256);
-			drawstring(tmpPos, _("No left gunner!"), tmpSize, '1 1 1', hudAlpha * blinkValue, DRAWFLAG_NORMAL);
-		}
-	}
-
-	// Raptor bomb crosshair
-	if(hud == VEH_RAPTOR.vehicleid && weapon2mode != RSM_FLARE)
-	{
-		vector where;
-
-		if(!dropmark)
-		{
-			dropmark = spawn();
-			dropmark.owner = self;
-			dropmark.gravity = 1;
-		}
-
-		if(reload2 == 1)
-		{
-			setorigin(dropmark, pmove_org);
-			dropmark.velocity = pmove_vel;
-			tracetoss(dropmark, self);
-
-			where = project_3d_to_2d(trace_endpos);
-
-			setorigin(dropmark, trace_endpos);
-			tmpSize = draw_getimagesize(vCROSS_DROP) * autocvar_cl_vehicles_crosshair_size;
-
-			if (!(where.z < 0 || where.x < 0 || where.y < 0 || where.x > vid_conwidth || where.y > vid_conheight))
-			{
-				where.x -= tmpSize.x * 0.5;
-				where.y -= tmpSize.y * 0.5;
-				where.z = 0;
-				drawpic(where, vCROSS_DROP, tmpSize, '0 1 0', autocvar_crosshair_alpha * 0.9, DRAWFLAG_ADDITIVE);
-				drawpic(where, vCROSS_DROP, tmpSize, '0 1 0', autocvar_crosshair_alpha * 0.6, DRAWFLAG_NORMAL); // Ensure visibility against bright bg
-			}
-			dropmark.cnt = time + 5;
-		}
-		else
-		{
-			if(dropmark.cnt > time)
-			{
-				where = project_3d_to_2d(dropmark.origin);
-				tmpSize = draw_getimagesize(vCROSS_DROP) * autocvar_cl_vehicles_crosshair_size * 1.25;
-
-				if (!(where.z < 0 || where.x < 0 || where.y < 0 || where.x > vid_conwidth || where.y > vid_conheight))
-				{
-					where.x -= tmpSize.x * 0.5;
-					where.y -= tmpSize.y * 0.5;
-					where.z = 0;
-					drawpic(where, vCROSS_DROP, tmpSize, '1 0 0', autocvar_crosshair_alpha * 0.9, DRAWFLAG_ADDITIVE);
-					drawpic(where, vCROSS_DROP, tmpSize, '1 0 0', autocvar_crosshair_alpha * 0.6, DRAWFLAG_NORMAL); // Ensure visibility against bright bg
-				}
-			}
-		}
-	}
+void Vehicles_drawCrosshair(string crosshair)
+{
+	SELFPARAM();
+	vector tmpSize = '0 0 0';
+	vector tmpPos  = '0 0 0';
 
 	// Crosshair
 	if(crosshair)