Added dot crosshair (crosshair 6)

[xonotic/darkplaces.git] / gl_draw.c

diff --git a/gl_draw.c b/gl_draw.c
index 3c1c394bda53ebc37fe5738f9aa5769d26c31304..048a46c1048ba8051b6878e28cd8d430d443e201 100644 (file)
--- 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[13468] =
+static qbyte concharimage[FONT_FILESIZE] =
 {
 #include "lhfont.h"
 };
@@ -51,7 +52,7 @@ static rtexture_t *draw_generateconchars(void)
        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
@@ -144,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] =
 {
@@ -194,10 +195,10 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
        ".......44......."
        ".......44......."
        "................"
+       "................"
        ".......77......."
        ".......77......."
        "................"
-       "................"
        ,
        "................"
        "................"
@@ -213,7 +214,7 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
        "........7......."
        "........7......."
        "........7......."
-       "................"
+       "........7......."
        "................"
        ,
        "................"
@@ -232,6 +233,23 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
        "................"
        "................"
        "................"
+       ,
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "........7......."
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
 };
 
 static rtexture_t *draw_generatecrosshair(int num)
@@ -310,7 +328,11 @@ 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
@@ -363,6 +385,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)
@@ -400,7 +424,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