break the crosshair draw code into separate functions and give sw and sw32

crosshair 3

libs/video/renderer/gl/gl_draw.c

@@ -509,53 +509,81 @@ Draw_AltString (int x, int y, const char *str)
 	}
 }
 
-void
+static void
-Draw_Crosshair (void)
+crosshair_1 (int x, int y)
+{
+	Draw_Character (x - 4, y - 4, '+');
+}
+
+static void
+crosshair_2 (int x, int y)
 {
 	unsigned char *pColor;
-	int            x, y;
-
-	switch (crosshair->int_val) {
-		case 0:
-			break;
-		case 1:
-		default:
-			Draw_Character (scr_vrect.x + scr_vrect.width / 2 - 4 +
-							cl_crossx->int_val,
-							scr_vrect.y + scr_vrect.height / 2 - 4 +
-							cl_crossy->int_val, '+');
-			break;
-		case 2:
-		case 3:
-			x = scr_vrect.x + scr_vrect.width / 2 - 3 + cl_crossx->int_val;
-			y = scr_vrect.y + scr_vrect.height / 2 - 3 + cl_crossy->int_val;
 
 	pColor = (unsigned char *) &d_8to24table[crosshaircolor->int_val];
 	qfglColor4ubv (pColor);
 	qfglBindTexture (GL_TEXTURE_2D, cs_texture);
 
 	qfglBegin (GL_QUADS);
-			if (crosshair->int_val == 2) {
+
 	qfglTexCoord2f (0, 0);
-				qfglVertex2f (x - 4, y - 4);
+	qfglVertex2f (x - 6, y - 6);
 	qfglTexCoord2f (1, 0);
-				qfglVertex2f (x + 12, y - 4);
+	qfglVertex2f (x + 9, y - 6);
 	qfglTexCoord2f (1, 0.5);
-				qfglVertex2f (x + 12, y + 12);
+	qfglVertex2f (x + 9, y + 9);
 	qfglTexCoord2f (0, 0.5);
-				qfglVertex2f (x - 4, y + 12);
+	qfglVertex2f (x - 6, y + 9);
-			} else {
+
-				qfglTexCoord2f (0, 0.5);
-				qfglVertex2f (x - 4, y - 4);
-				qfglTexCoord2f (1, 0.5);
-				qfglVertex2f (x + 12, y - 4);
-				qfglTexCoord2f (1, 1);
-				qfglVertex2f (x + 12, y + 12);
-				qfglTexCoord2f (0, 1);
-				qfglVertex2f (x - 4, y + 12);
-			}
 	qfglEnd ();
 	qfglColor3ubv (color_white);
+}
+
+static void
+crosshair_3 (int x, int y)
+{
+	unsigned char *pColor;
+
+	pColor = (unsigned char *) &d_8to24table[crosshaircolor->int_val];
+	qfglColor4ubv (pColor);
+	qfglBindTexture (GL_TEXTURE_2D, cs_texture);
+
+	qfglBegin (GL_QUADS);
+
+	qfglTexCoord2f (0, 0.5);
+	qfglVertex2f (x - 6, y - 6);
+	qfglTexCoord2f (1, 0.5);
+	qfglVertex2f (x + 9, y - 6);
+	qfglTexCoord2f (1, 1);
+	qfglVertex2f (x + 9, y + 9);
+	qfglTexCoord2f (0, 1);
+	qfglVertex2f (x - 6, y + 9);
+
+	qfglEnd ();
+	qfglColor3ubv (color_white);
+}
+
+void
+Draw_Crosshair (void)
+{
+	int            x, y;
+
+	if (!crosshair->int_val)
+		return;
+
+	x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val;
+	y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val;
+
+	switch (crosshair->int_val) {
+		default:
+		case 1:
+			crosshair_1 (x, y);
+			break;
+		case 2:
+			crosshair_2 (x, y);
+			break;
+		case 3:
+			crosshair_3 (x, y);
 			break;
 	}
 }

libs/video/renderer/sw/draw.c

@@ -292,16 +292,17 @@ Draw_Pixel (int x, int y, byte color)
 	*dest = color;
 }
 
-
+static void
-void
+crosshair_1 (int x, int y)
-Draw_Crosshair (void)
+{
+	Draw_Character (x - 4, y - 4, '+');
+}
+
+static void
+crosshair_2 (int x, int y)
 {
-	int         x, y;
 	byte        c = crosshaircolor->int_val;
 
-	if (crosshair->int_val == 2) {
-		x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val;
-		y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val;
 	Draw_Pixel (x - 1, y, c);
 	Draw_Pixel (x - 3, y, c);
 	Draw_Pixel (x + 1, y, c);
@@ -310,11 +311,45 @@ Draw_Crosshair (void)
 	Draw_Pixel (x, y - 3, c);
 	Draw_Pixel (x, y + 1, c);
 	Draw_Pixel (x, y + 3, c);
-	} else if (crosshair->int_val)
+}
-		Draw_Character (scr_vrect.x + scr_vrect.width / 2 - 4 +
+
-						cl_crossx->int_val,
+static void
-						scr_vrect.y + scr_vrect.height / 2 - 4 +
+crosshair_3 (int x, int y)
-						cl_crossy->int_val, '+');
+{
+	byte        c = crosshaircolor->int_val;
+
+	Draw_Pixel (x - 3, y - 3, c);
+	Draw_Pixel (x + 3, y - 3, c);
+	Draw_Pixel (x - 2, y - 2, c);
+	Draw_Pixel (x + 2, y - 2, c);
+	Draw_Pixel (x - 3, y + 3, c);
+	Draw_Pixel (x + 2, y + 2, c);
+	Draw_Pixel (x - 2, y + 2, c);
+	Draw_Pixel (x + 3, y + 3, c);
+}
+
+void
+Draw_Crosshair (void)
+{
+	int         x, y;
+
+	if (!crosshair->int_val)
+		return;
+
+	x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val;
+	y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val;
+	switch (crosshair->int_val) {
+		default:
+		case 1:
+			crosshair_1 (x, y);
+			break;
+		case 2:
+			crosshair_2 (x, y);
+			break;
+		case 3:
+			crosshair_3 (x, y);
+			break;
+	}
 }
 
 

libs/video/renderer/sw32/draw.c

@@ -366,16 +366,17 @@ Draw_Pixel (int x, int y, byte color)
 	}
 }
 
-
+static void
-void
+crosshair_1 (int x, int y)
-Draw_Crosshair (void)
+{
+	Draw_Character (x - 4, y - 4, '+');
+}   
+
+static void
+crosshair_2 (int x, int y)
 {
-	int         x, y;
 	byte        c = crosshaircolor->int_val;
 
-	if (crosshair->int_val == 2) {
-		x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val;
-		y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val;
 	Draw_Pixel (x - 1, y, c);
 	Draw_Pixel (x - 3, y, c);
 	Draw_Pixel (x + 1, y, c);
@@ -384,11 +385,45 @@ Draw_Crosshair (void)
 	Draw_Pixel (x, y - 3, c);
 	Draw_Pixel (x, y + 1, c);
 	Draw_Pixel (x, y + 3, c);
-	} else if (crosshair->int_val)
+}
-		Draw_Character (scr_vrect.x + scr_vrect.width / 2 - 4 +
+
-						cl_crossx->int_val,
+static void
-						scr_vrect.y + scr_vrect.height / 2 - 4 +
+crosshair_3 (int x, int y)
-						cl_crossy->int_val, '+');
+{
+	byte        c = crosshaircolor->int_val;
+
+	Draw_Pixel (x - 3, y - 3, c);
+	Draw_Pixel (x + 3, y - 3, c);
+	Draw_Pixel (x - 2, y - 2, c);
+	Draw_Pixel (x + 2, y - 2, c);
+	Draw_Pixel (x - 3, y + 3, c);
+	Draw_Pixel (x + 2, y + 2, c);
+	Draw_Pixel (x - 2, y + 2, c);
+	Draw_Pixel (x + 3, y + 3, c);
+}
+
+void
+Draw_Crosshair (void)
+{
+	int         x, y;
+
+	if (!crosshair->int_val)
+		return;
+
+	x = scr_vrect.x + scr_vrect.width / 2 + cl_crossx->int_val;
+	y = scr_vrect.y + scr_vrect.height / 2 + cl_crossy->int_val;
+	switch (crosshair->int_val) {
+		default:
+		case 1:
+			crosshair_1 (x, y);
+			break;
+		case 2:
+			crosshair_2 (x, y);
+			break;
+		case 3:
+			crosshair_3 (x, y);
+			break;
+	}
 }