From f7ed8da8efec137a480aa75f5643407a16c9badd Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 7 Jan 2005 03:07:50 +0000 Subject: [PATCH] Changed gl->qgl. Preliminary csqc work. git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@760 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/gl/gl_screen.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/engine/gl/gl_screen.c b/engine/gl/gl_screen.c index 0e4051e01..99977634b 100644 --- a/engine/gl/gl_screen.c +++ b/engine/gl/gl_screen.c @@ -175,7 +175,7 @@ void SCR_DrawTwoDimensional(int uimenu, qboolean nohud) else SCR_DrawFPS (); SCR_CheckDrawCenterString (); - glTexEnvi ( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); + qglTexEnvi ( GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE ); #ifdef TEXTEDITOR if (editoractive) Editor_Draw(); @@ -342,6 +342,11 @@ void GLSCR_UpdateScreen (void) if (CG_Refresh()) nohud = true; else +#endif +#ifdef CSQC_DAT + if (CSQC_DrawView()) + nohud = true; + else #endif if (cl.worldmodel && uimenu != 1) V_RenderView (); @@ -372,7 +377,7 @@ char *GLVID_GetRGBInfo(int prepadbytes, int *truewidth, int *trueheight) int i, c; qbyte *ret = BZ_Malloc(prepadbytes + glwidth*glheight*3); - glReadPixels (glx, gly, glwidth, glheight, GL_RGB, GL_UNSIGNED_BYTE, ret + prepadbytes); + qglReadPixels (glx, gly, glwidth, glheight, GL_RGB, GL_UNSIGNED_BYTE, ret + prepadbytes); *truewidth = glwidth; *trueheight = glheight;