X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=console.c;h=e23de5bba4bed7e0d5a11f54692462f74a214e6a;hb=9bc2e636a2ab94ab7bdd1f7241e3cdc020e9283e;hp=332c6800449df1cab5214e8d4bfc5644a54b5497;hpb=9a6cc5c4aa4cfcc90d86050f91d684704698c872;p=xonotic%2Fdarkplaces.git

diff --git a/console.c b/console.c
index 332c6800..e23de5bb 100644
--- a/console.c
+++ b/console.c
@@ -1822,7 +1822,7 @@ The typing input line at the bottom should only be drawn if typing is allowed
 */
 void Con_DrawConsole (int lines)
 {
-	float alpha;
+	float alpha, alpha0;
 	double sx, sy;
 	int mask_must = 0;
 	int mask_mustnot = (developer.integer>0) ? 0 : CON_MASK_DEVELOPER;
@@ -1839,8 +1839,8 @@ void Con_DrawConsole (int lines)
 	r_draw2d_force = true;
 
 // draw the background
-	alpha = cls.signon == SIGNONS ? scr_conalpha.value : 1.0f; // always full alpha when not in game
-	if(alpha > 0)
+	alpha0 = cls.signon == SIGNONS ? scr_conalpha.value : 1.0f; // always full alpha when not in game
+	if((alpha = alpha0 * scr_conalphafactor.value) > 0)
 	{
 		sx = scr_conscroll_x.value;
 		sy = scr_conscroll_y.value;
@@ -1856,9 +1856,8 @@ void Con_DrawConsole (int lines)
 					0);
 		else
 			DrawQ_Fill(0, lines - vid_conheight.integer, vid_conwidth.integer, vid_conheight.integer, 0.0f, 0.0f, 0.0f, alpha, 0);
-		alpha *= scr_conalpha2factor.value;
 	}
-	if(alpha > 0)
+	if((alpha = alpha0 * scr_conalpha2factor.value) > 0)
 	{
 		sx = scr_conscroll2_x.value;
 		sy = scr_conscroll2_y.value;
@@ -1873,6 +1872,21 @@ void Con_DrawConsole (int lines)
 					1 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
 					0);
 	}
+	if((alpha = alpha0 * scr_conalpha3factor.value) > 0)
+	{
+		sx = scr_conscroll3_x.value;
+		sy = scr_conscroll3_y.value;
+		conbackpic = Draw_CachePic_Flags("gfx/conback3", (sx != 0 || sy != 0) ? CACHEPICFLAG_NOCLAMP : 0);
+		sx *= realtime; sy *= realtime;
+		sx -= floor(sx); sy -= floor(sy);
+		if(conbackpic && conbackpic->tex != r_texture_notexture)
+			DrawQ_SuperPic(0, lines - vid_conheight.integer, conbackpic, vid_conwidth.integer, vid_conheight.integer,
+					0 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+					1 + sx, 0 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+					0 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+					1 + sx, 1 + sy, scr_conbrightness.value, scr_conbrightness.value, scr_conbrightness.value, alpha,
+					0);
+	}
 	DrawQ_String(vid_conwidth.integer - DrawQ_TextWidth(engineversion, 0, con_textsize.value, con_textsize.value, false, FONT_CONSOLE), lines - con_textsize.value, engineversion, 0, con_textsize.value, con_textsize.value, 1, 0, 0, 1, 0, NULL, true, FONT_CONSOLE);
 
 // draw the text