Added dot crosshair (crosshair 6)

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5641 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/gl_draw.c b/gl_draw.c
index 6e6654631e09928e6089ec6dab015382376ead4f..048a46c1048ba8051b6878e28cd8d430d443e201 100644 (file)
--- a/gl_draw.c
+++ b/gl_draw.c
@@ -145,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] =
 {
@@ -195,10 +195,10 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
        ".......44......."
        ".......44......."
        "................"
+       "................"
        ".......77......."
        ".......77......."
        "................"
-       "................"
        ,
        "................"
        "................"
@@ -214,7 +214,7 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
        "........7......."
        "........7......."
        "........7......."
-       "................"
+       "........7......."
        "................"
        ,
        "................"
@@ -233,6 +233,23 @@ static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
        "................"
        "................"
        "................"
+       ,
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "........7......."
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
+       "................"
 };
 
 static rtexture_t *draw_generatecrosshair(int num)
@@ -368,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)

diff --git a/r_crosshairs.c b/r_crosshairs.c
index a6dca4b20bb3b90efd1e4c435a7cf3df15d0d1d8..316627134f1ea63fabe5bf03c6310ccac017714e 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -10,7 +10,7 @@ cvar_t crosshair_size = {CVAR_SAVE, "crosshair_size", "1"};
 cvar_t crosshair_static = {CVAR_SAVE, "crosshair_static", "1"};
 
 // must match NUMCROSSHAIRS in gl_draw.c
-#define NUMCROSSHAIRS 5
+#define NUMCROSSHAIRS 6
 
 void R_Crosshairs_Init(void)
 {

diff --git a/todo b/todo
index dffccf0b9b83005f8ded7b49244052a2e3b13008..7868a846235e206087c7cb699fa6a7fcb15efa51 100644 (file)
--- a/todo
+++ b/todo
@@ -2,6 +2,7 @@
 -d (Baalz) bug darkplaces input: figure out what's wrong with ctrl key in Linux, hitting character keys tends to do nothing, and holding a character key and then hitting ctrl tends to leave the character key stuck on, this sounds like a window manager issue, but somehow quake3 works around it (Baalz)
 -d (Gilgamesh) feature darkplaces protocol: add back colormod extension (FrikaC, Uffe, Gilgamesh, Wazat)
 -d (Gleeb) feature darkplaces server: add sv_playerphysicsqc cvar to allow engine to ignore SV_PlayerPhysics function, this would also have to change the reported extensions (Gleeb)
+-d (HellToupee) feature darkplaces client: add a dot crosshair texture (HellToupee)
 -d (Kinn, romi) bug darkplaces WGL client: default WGL input back to GDI, the DirectInput driver is malfunctioning, losing key release messages, stuttering mouse input, and lacks mouse wheel support (Wazat, Kinn)
 -d (Mabus) bug darkplaces loading: test zlib support with entirely pk3'd id1 data (should crash because of zlib not being setup early enough - fix this) (Mabus)
 d bug darkplaces renderer: fix q3bsp fogging (Sajt)
@@ -120,7 +121,6 @@ d feature darkplaces client: v_deathtilt cvar (Sajt, MauveBib)
 0 change darkplaces renderer: write rendering functions that take msurface_t * lists and migrate most of renderer to them (LordHavoc)
 0 change darkplaces server: make dedicated server not load images (maybe all fail?)
 0 cleanup darkplaces memory: add Mem_AllocNoClear function, and use it where possible, if developer is on it should clear with random garbage
-0 feature darkplaces client: add a dot crosshair texture (HellToupee)
 0 feature darkplaces client: add cvars to control lighting quality to allow performance tradeoffs; r_shadow_ options for use of dot3 shading, etc
 0 feature darkplaces client: add scr_showbrand cvar which would show gfx/brand.tga in the left/right top/bottom corner (depending on value of scr_showbrand) all the time, this would be useful for screenshots (Spirit_of_85)
 0 feature darkplaces client: cvar for console text size (Vermeulen)