X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_screen.c;h=722dfa60b403d09ed3e941db95be22d0478380c5;hb=caf79fb7fe3c49595a4116821e9d8921d681c51f;hp=09e5ae0346bf637610fa1e6691d2681db2f52c8f;hpb=a4107d729cd599a854f238a79c038094127fad20;p=xonotic%2Fdarkplaces.git

diff --git a/gl_screen.c b/gl_screen.c
index 09e5ae03..722dfa60 100644
--- a/gl_screen.c
+++ b/gl_screen.c
@@ -583,11 +583,11 @@ void SCR_DrawConsole (void)
 ============================================================================== 
 */ 
 
-/* 
+/*
 ================== 
 SCR_ScreenShot_f
 ================== 
-*/  
+*/
 void SCR_ScreenShot_f (void) 
 {
 	byte		*buffer;
@@ -621,7 +621,7 @@ void SCR_ScreenShot_f (void)
 
 	free (buffer);
 	Con_Printf ("Wrote %s\n", filename);
-} 
+}
 
 
 //=============================================================================
@@ -750,7 +750,7 @@ int SCR_ModalMessage (char *text)
 ===============
 SCR_BringDownConsole
 
-Brings the console down and fades the palettes back to normal
+Brings the console down and fades the blends back to normal
 ================
 */
 void SCR_BringDownConsole (void)
@@ -762,7 +762,7 @@ void SCR_BringDownConsole (void)
 	for (i=0 ; i<20 && scr_conlines != scr_con_current ; i++)
 		SCR_UpdateScreen ();
 
-	cl.cshifts[0].percent = 0;		// no area contents palette on next frame
+	cl.cshifts[0].percent = 0;		// no area contents blend on next frame
 }
 
 void DrawCrosshair(int num);
@@ -916,7 +916,7 @@ void SCR_UpdateScreen (void)
 	else
 	{
 		if (crosshair.value)
-			DrawCrosshair(crosshair.value);
+			DrawCrosshair(crosshair.value - 1);
 		
 		SCR_DrawRam ();
 		SCR_DrawNet ();
@@ -942,7 +942,7 @@ void SCR_UpdateScreen (void)
 		Draw_String(vid.width - (12*8), 0, temp, 9999);
 	}
 
-	V_UpdatePalette ();
+	V_UpdateBlends ();
 
 	GL_BrightenScreen();