X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=40146424c1f108b4f39179df95ffd156ab09e3cd;hb=890d4c00928b263763b460cb6f5b6a828fd4afc7;hp=41836e13a3199864547c879cfb6868359d82b4c4;hpb=1a42d6d8a1fb480a11058480d2e3451614550e0f;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index 41836e13..40146424 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -303,7 +303,7 @@ Draw_CachePic
 // FIXME: move this to client somehow
 cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 {
-	int i, crc, hashkey;
+	int crc, hashkey;
 	cachepic_t *pic;
 	qpic_t *p;
 	int flags;
@@ -353,16 +353,11 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 		{
 			if (!strcmp(path, "gfx/conchars"))
 			{
-				unsigned char *pix;
-				// conchars is a raw image and with the wrong transparent color
-				pix = (unsigned char *)p;
-				for (i = 0;i < 128 * 128;i++)
-					if (pix[i] == 0)
-						pix[i] = 255;
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, flags, palette_complete);
+				// conchars is a raw image and with color 0 as transparent instead of 255
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, (unsigned char *)p, TEXTYPE_PALETTE, flags, palette_font);
 			}
 			else
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_transparent);
 		}
 	}
 
@@ -535,8 +530,6 @@ void R_DrawQueue(void)
 	r_view_x = bound(0, r_refdef.x, vid.width - r_refdef.width);
 	r_view_y = bound(0, r_refdef.y, vid.height - r_refdef.height);
 	r_view_z = 0;
-	r_view_fov_x = bound(0.1, r_refdef.fov_x, 170);
-	r_view_fov_y = bound(0.1, r_refdef.fov_y, 170);
 	r_view_matrix = r_refdef.viewentitymatrix;
 	GL_ColorMask(r_refdef.colormask[0], r_refdef.colormask[1], r_refdef.colormask[2], 1);
 
@@ -664,6 +657,17 @@ void R_DrawQueue(void)
 		case DRAWQUEUE_RESETCLIP:
 			GL_ScissorTest(false);
 			break;
+		case DRAWQUEUE_LINEWIDTH:
+			qglLineWidth(x);
+			break;
+		case DRAWQUEUE_LINES:
+			mesh = (drawqueuemesh_t *)(dq + 1);
+			GL_Color(c[0], c[1], c[2], c[3]);
+			qglBegin(GL_LINE_LOOP);
+			for (num = 0;num < mesh->num_vertices;num++)
+				qglVertex2f(mesh->data_vertex3f[num*3+0], mesh->data_vertex3f[num*3+1]);
+			qglEnd();
+			break;
 		}
 	}