X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=gl_draw.c;h=4edff7b977654a26b15a4de3143a99168c21d1a2;hb=a1f6daea42fca6b37d92ca89ae7a9a18cb77588b;hp=f9d2229023fc2322905958c8ea3cf59476ddf5a9;hpb=2d7291c38de93454c6d55e56571dfdf3e1c47738;p=xonotic%2Fdarkplaces.git

diff --git a/gl_draw.c b/gl_draw.c
index f9d22290..4edff7b9 100644
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -30,6 +30,7 @@ static rtexture_t *char_texture;
 //=============================================================================
 /* Support Routines */
 
+#define FONT_FILESIZE 13468
 #define MAX_CACHED_PICS 256
 #define CACHEPICHASHSIZE 256
 static cachepic_t *cachepichash[CACHEPICHASHSIZE];
@@ -38,7 +39,7 @@ static int numcachepics;
 
 static rtexturepool_t *drawtexturepool;
 
-static qbyte concharimage[13396] =
+static qbyte concharimage[FONT_FILESIZE] =
 {
 #include "lhfont.h"
 };
@@ -49,43 +50,52 @@ static rtexture_t *draw_generateconchars(void)
 {
 	int i;
 	qbyte buffer[65536][4], *data = NULL;
+	double random;
 
-	fs_filesize = 13396;
+	fs_filesize = FONT_FILESIZE;
 	data = LoadTGA (concharimage, 256, 256);
 	fs_filesize = -1;
 // Gold numbers
 	for (i = 0;i < 8192;i++)
 	{
-		buffer[i][0] = 115;
-		buffer[i][1] = 87;
-		buffer[i][2] = 31;
+		random = lhrandom (0.0,1.0);
+		buffer[i][0] = 83 + (qbyte)(random * 64);
+		buffer[i][1] = 71 + (qbyte)(random * 32);
+		buffer[i][2] = 23 + (qbyte)(random * 16);
 		buffer[i][3] = data[i*4+0];
 	}
 // White chars
 	for (i = 8192;i < 32768;i++)
 	{
-		buffer[i][0] = 123;
-		buffer[i][1] = 123;
-		buffer[i][2] = 123;
+		random = lhrandom (0.0,1.0);
+		buffer[i][0] = 95 + (qbyte)(random * 64);
+		buffer[i][1] = 95 + (qbyte)(random * 64);
+		buffer[i][2] = 95 + (qbyte)(random * 64);
 		buffer[i][3] = data[i*4+0];
 	}
 // Gold numbers
 	for (i = 32768;i < 40960;i++)
 	{
-		buffer[i][0] = 115;
-		buffer[i][1] = 87;
-		buffer[i][2] = 31;
+		random = lhrandom (0.0,1.0);
+		buffer[i][0] = 83 + (qbyte)(random * 64);
+		buffer[i][1] = 71 + (qbyte)(random * 32);
+		buffer[i][2] = 23 + (qbyte)(random * 16);
 		buffer[i][3] = data[i*4+0];
 	}
 // Red chars
 	for (i = 40960;i < 65536;i++)
 	{
-		buffer[i][0] = 143;
-		buffer[i][1] = 67;
-		buffer[i][2] = 51;
+		random = lhrandom (0.0,1.0);
+		buffer[i][0] = 96 + (qbyte)(random * 64);
+		buffer[i][1] = 43 + (qbyte)(random * 32);
+		buffer[i][2] = 27 + (qbyte)(random * 32);
 		buffer[i][3] = data[i*4+0];
 	}
 
+#if 0
+	Image_WriteTGARGBA ("gfx/generated_conchars.tga", 256, 256, &buffer[0][0]);
+#endif
+
 	Mem_Free(data);
 	return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
 }
@@ -135,7 +145,7 @@ static rtexture_t *draw_generatemousepointer(void)
 }
 
 // must match NUMCROSSHAIRS in r_crosshairs.c
-#define NUMCROSSHAIRS 5
+#define NUMCROSSHAIRS 6
 
 static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
 {
@@ -185,10 +195,10 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
 	".......44......."
 	".......44......."
 	"................"
+	"................"
 	".......77......."
 	".......77......."
 	"................"
-	"................"
 	,
 	"................"
 	"................"
@@ -204,7 +214,7 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
 	"........7......."
 	"........7......."
 	"........7......."
-	"................"
+	"........7......."
 	"................"
 	,
 	"................"
@@ -223,6 +233,23 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
 	"................"
 	"................"
 	"................"
+	,
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"........7......."
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
+	"................"
 };
 
 static rtexture_t *draw_generatecrosshair(int num)
@@ -284,9 +311,10 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 	int i, crc, hashkey;
 	cachepic_t *pic;
 	qpic_t *p;
-	int persistentflag;
+	int flags;
 
-    if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+	if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
+	{
 		clvideo_t *video;
 
 		video = CL_GetVideo(path);
@@ -294,12 +322,6 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 			return &video->cpif;
 	}
 
-	if (persistent) {
-		persistentflag = TEXF_PRECACHE;
-	} else {
-		persistentflag = 0;
-	}
-
 	crc = CRC_Block(path, strlen(path));
 	hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
 	for (pic = cachepichash[hashkey];pic;pic = pic->chain)
@@ -307,19 +329,29 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 			return pic;
 
 	if (numcachepics == MAX_CACHED_PICS)
-		Sys_Error ("numcachepics == MAX_CACHED_PICS");
+	{
+		Con_Printf ("Draw_CachePic: numcachepics == MAX_CACHED_PICS");
+		// FIXME: support NULL in callers?
+		return cachepics; // return the first one
+	}
 	pic = cachepics + (numcachepics++);
 	strlcpy (pic->name, path, sizeof(pic->name));
 	// link into list
 	pic->chain = cachepichash[hashkey];
 	cachepichash[hashkey] = pic;
 
+	flags = TEXF_ALPHA;
+	if (persistent)
+		flags |= TEXF_PRECACHE;
+	if (!strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
+		flags |= TEXF_CLAMP;
+
 	// load the pic from disk
-	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, TEXF_ALPHA | persistentflag);
+	pic->tex = loadtextureimage(drawtexturepool, path, 0, 0, false, flags);
 	if (pic->tex == NULL && !strncmp(path, "gfx/", 4))
 	{
 		// compatibility with older versions
-		pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, TEXF_ALPHA | persistentflag);
+		pic->tex = loadtextureimage(drawtexturepool, path + 4, 0, 0, false, flags);
 		// failed to find gfx/whatever.tga or similar, try the wad
 		if (pic->tex == NULL && (p = W_GetLumpName (path + 4)))
 		{
@@ -331,10 +363,10 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 				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, TEXF_ALPHA | persistentflag, palette_complete);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, 128, 128, pix, TEXTYPE_PALETTE, flags, palette_complete);
 			}
 			else
-				pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, TEXF_ALPHA | persistentflag, palette_complete);
+				pic->tex = R_LoadTexture2D(drawtexturepool, path, p->width, p->height, p->data, TEXTYPE_PALETTE, flags, palette_complete);
 		}
 	}
 
@@ -354,6 +386,8 @@ cachepic_t	*Draw_CachePic (const char *path, qboolean persistent)
 		pic->tex = draw_generatecrosshair(3);
 	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair5.tga"))
 		pic->tex = draw_generatecrosshair(4);
+	if (pic->tex == NULL && !strcmp(path, "gfx/crosshair6.tga"))
+		pic->tex = draw_generatecrosshair(5);
 	if (pic->tex == NULL && !strcmp(path, "gfx/colorcontrol/ditherpattern.tga"))
 		pic->tex = draw_generateditherpattern();
 	if (pic->tex == NULL)
@@ -391,7 +425,11 @@ cachepic_t *Draw_NewPic(const char *picname, int width, int height, int alpha, q
 		if (pic == NULL)
 		{
 			if (numcachepics == MAX_CACHED_PICS)
-				Sys_Error ("numcachepics == MAX_CACHED_PICS");
+			{
+				Con_Printf ("Draw_NewPic: numcachepics == MAX_CACHED_PICS");
+				// FIXME: support NULL in callers?
+				return cachepics; // return the first one
+			}
 			pic = cachepics + (numcachepics++);
 			strcpy (pic->name, picname);
 			// link into list