eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Support for valve-style lmps/qpics on the conback.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3128 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-02-22 13:47:49 +00:00
parent 02b182a260
commit af1ccb9333
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
engine/gl/gl_draw.c
View file

@ -769,6 +769,7 @@ void GLDraw_ReInit (void)
qpic_t *bigfont; qpic_t *bigfont;
int start; int start;
qbyte *ncdata; qbyte *ncdata;
qbyte *pal;
qbyte *tinyfont; qbyte *tinyfont;
extern int solidskytexture; extern int solidskytexture;
extern int alphaskytexture; extern int alphaskytexture;
@ -1085,15 +1086,24 @@ TRACE(("dbg: GLDraw_ReInit: Allocating upload buffers\n"));
} }
} }
} }
pal = NULL;
#else #else
conback->width = cb->width; conback->width = cb->width;
conback->height = cb->height; conback->height = cb->height;
ncdata = cb->data; ncdata = cb->data;
if (com_filesize == cb->width*cb->height+10 + 256*3)
{
pal = ncdata + cb->width*cb->height + 2;
}
else
pal = NULL;
#endif #endif
} }
else else
{ {
ncdata = NULL; ncdata = NULL;
pal = 0;
} }
TRACE(("dbg: GLDraw_ReInit: conback loaded\n")); TRACE(("dbg: GLDraw_ReInit: conback loaded\n"));
@ -1115,6 +1125,9 @@ TRACE(("dbg: GLDraw_ReInit: Allocating upload buffers\n"));
} }
else else
{ {
if (pal)
gl->texnum = GL_LoadTexture8Pal24("conback", conback->width, conback->height, ncdata, pal, false, false);
else
gl->texnum = GL_LoadTexture ("conback", conback->width, conback->height, ncdata, false, false); gl->texnum = GL_LoadTexture ("conback", conback->width, conback->height, ncdata, false, false);
} }
} }