From af1ccb93333b5707fd80a1ce15a474d528fc7221 Mon Sep 17 00:00:00 2001 From: Spoike Date: Sun, 22 Feb 2009 13:47:49 +0000 Subject: [PATCH] Support for valve-style lmps/qpics on the conback. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3128 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/gl_draw.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/engine/gl/gl_draw.c b/engine/gl/gl_draw.c index 58c79cc3b..69cd88fcc 100644 --- a/engine/gl/gl_draw.c +++ b/engine/gl/gl_draw.c @@ -769,6 +769,7 @@ void GLDraw_ReInit (void) qpic_t *bigfont; int start; qbyte *ncdata; + qbyte *pal; qbyte *tinyfont; extern int solidskytexture; extern int alphaskytexture; @@ -1085,15 +1086,24 @@ TRACE(("dbg: GLDraw_ReInit: Allocating upload buffers\n")); } } } + pal = NULL; #else conback->width = cb->width; conback->height = cb->height; ncdata = cb->data; + + if (com_filesize == cb->width*cb->height+10 + 256*3) + { + pal = ncdata + cb->width*cb->height + 2; + } + else + pal = NULL; #endif } else { ncdata = NULL; + pal = 0; } TRACE(("dbg: GLDraw_ReInit: conback loaded\n")); @@ -1115,7 +1125,10 @@ TRACE(("dbg: GLDraw_ReInit: Allocating upload buffers\n")); } else { - gl->texnum = GL_LoadTexture ("conback", conback->width, conback->height, ncdata, false, false); + 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->sl = 0;