rewrite of map texture loading (mainly to do with HL textures and wads)

[xonotic/darkplaces.git] / r_crosshairs.c

diff --git a/r_crosshairs.c b/r_crosshairs.c
index e2be86746516be0ed02e2e3ee77115123a5e8181..5416a693c05c42b3cff473651f6761d66fc837f4 100644 (file)
--- a/r_crosshairs.c
+++ b/r_crosshairs.c
@@ -5,11 +5,29 @@ cvar_t crosshair_alpha = {"crosshair_alpha", "1.0", true};
 cvar_t crosshair_flashspeed = {"crosshair_flashspeed", "2", true};
 cvar_t crosshair_flashrange = {"crosshair_flashrange", "0.1", true};
 
-#define NUMCROSSHAIRS 1
+#define NUMCROSSHAIRS 5
 
 int crosshairtex[NUMCROSSHAIRS];
 
-char crosshairtex1[16*16] =
+byte *crosshairtexdata[NUMCROSSHAIRS] =
+{
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0003300000033000"
+       "0003550000553000"
+       "0000577007750000"
+       "0000077007700000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000077007700000"
+       "0000577007750000"
+       "0003550000553000"
+       "0003300000033000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       ,
        "0000000000000000"
        "0000000000000000"
        "0000000000000000"
@@ -26,18 +44,77 @@ char crosshairtex1[16*16] =
        "0000000000000000"
        "0000000000000000"
        "0000000000000000"
-;
+       ,
+       "0000000000000000"
+       "0000000770000000"
+       "0000000770000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000440000000"
+       "0000000440000000"
+       "0770044004400770"
+       "0770044004400770"
+       "0000000440000000"
+       "0000000440000000"
+       "0000000000000000"
+       "0000000770000000"
+       "0000000770000000"
+       "0000000000000000"
+       "0000000000000000"
+       ,
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000077777770"
+       "0000000075200000"
+       "0000000072000000"
+       "0000000070000000"
+       "0000000070000000"
+       "0000000070000000"
+       "0000000000000000"
+       "0000000000000000"
+       ,
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000070000000"
+       "0000000000000000"
+       "0000000040000000"
+       "0000070404070000"
+       "0000000040000000"
+       "0000000000000000"
+       "0000000070000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+       "0000000000000000"
+};
 
-void r_crosshairs_start()
+void crosshairload(int num, byte *in)
 {
        int i;
-       byte data[64*64][4];
+       byte data[16*16][4];
        for (i = 0;i < 16*16;i++)
        {
                data[i][0] = data[i][1] = data[i][2] = 255;
-               data[i][3] = (crosshairtex1[i] - '0') * 255 / 7;
+               data[i][3] = (in[i] - '0') * 255 / 7;
        }
-       crosshairtex[0] = GL_LoadTexture("crosshair0", 16, 16, &data[0][0], false, true, 4);
+       crosshairtex[num] = GL_LoadTexture(va("crosshair%02d", num), 16, 16, &data[0][0], false, true, 4);
+}
+
+void r_crosshairs_start()
+{
+       int i;
+       for (i = 0;i < NUMCROSSHAIRS;i++)
+               crosshairload(i, crosshairtexdata[i]);
+//     crosshairtex[1] = crosshairload(crosshairtex2);
 }
 
 void r_crosshairs_shutdown()