#include "lhfont.h"
};
-extern qbyte *LoadTGA (qbyte *f, int matchwidth, int matchheight);
-
static rtexture_t *draw_generateconchars(void)
{
int i;
return R_LoadTexture2D(drawtexturepool, "conchars", 256, 256, &buffer[0][0], TEXTYPE_RGBA, TEXF_ALPHA | TEXF_PRECACHE, NULL);
}
-static qbyte pointerimage[256] =
-{
+static char *pointerimage =
"333333332......."
"26777761........"
"2655541........."
"................"
"................"
"................"
-};
+;
static rtexture_t *draw_generatemousepointer(void)
{
}
// must match NUMCROSSHAIRS in r_crosshairs.c
-#define NUMCROSSHAIRS 5
+#define NUMCROSSHAIRS 6
-static qbyte *crosshairtexdata[NUMCROSSHAIRS] =
+static char *crosshairtexdata[NUMCROSSHAIRS] =
{
"................"
"................"
".......44......."
".......44......."
"................"
+ "................"
".......77......."
".......77......."
"................"
- "................"
,
"................"
"................"
"........7......."
"........7......."
"........7......."
- "................"
+ "........7......."
"................"
,
"................"
"................"
"................"
"................"
+ ,
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ ".......55......."
+ ".......55......."
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
+ "................"
};
static rtexture_t *draw_generatecrosshair(int num)
qpic_t *p;
int flags;
- if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1)) {
+ if (!strncmp(CLVIDEOPREFIX, path, sizeof(CLVIDEOPREFIX) - 1))
+
+ {
clvideo_t *video;
video = CL_GetVideo(path);
return &video->cpif;
}
- crc = CRC_Block(path, strlen(path));
+ crc = CRC_Block((qbyte *)path, strlen(path));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
if (!strcmp (path, pic->name))
// compatibility with older versions
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)))
+ if (pic->tex == NULL && (p = (qpic_t *)W_GetLumpName (path + 4)))
{
if (!strcmp(path, "gfx/conchars"))
{
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)
int crc, hashkey;
cachepic_t *pic;
- crc = CRC_Block(picname, strlen(picname));
+ crc = CRC_Block((qbyte *)picname, strlen(picname));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
if (!strcmp (picname, pic->name))
int hashkey;
cachepic_t *pic;
// this doesn't really free the pic, but does free it's texture
- crc = CRC_Block(picname, strlen(picname));
+ crc = CRC_Block((qbyte *)picname, strlen(picname));
hashkey = ((crc >> 8) ^ crc) % CACHEPICHASHSIZE;
for (pic = cachepichash[hashkey];pic;pic = pic->chain)
{
}
break;
case DRAWQUEUE_MESH:
- mesh = (void *)(dq + 1);
+ mesh = (drawqueuemesh_t *)(dq + 1);
m.pointer_vertex = mesh->data_vertex3f;
m.pointer_color = mesh->data_color4f;
m.pointer_texcoord[0] = mesh->data_texcoord2f;