fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

killed all references to Draw_BeginDisc

Browse source 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@357 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2010-12-30 23:28:08 +00:00
parent abf9a39ef4
commit 27aebd0608
4 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Quake/common.c
View file

@ -1677,9 +1677,6 @@ byte *COM_LoadFile (const char *path, int usehunk)
((byte *)buf)[len] = 0;
// Draw_BeginDisc causes core dumps when called excessively in big mods S.A.
// Draw_BeginDisc ();
Sys_FileRead (h, buf, len);
COM_CloseFile (h);

1
Quake/draw.h
View file

@ -33,7 +33,6 @@ void Draw_DebugChar (char num);
void Draw_Pic (int x, int y, qpic_t *pic);
void Draw_TransPicTranslate (int x, int y, qpic_t *pic, int top, int bottom); //johnfitz -- more parameters
void Draw_ConsoleBackground (void); //johnfitz -- removed parameter int lines
void Draw_BeginDisc (void);
void Draw_TileClear (int x, int y, int w, int h);
void Draw_Fill (int x, int y, int w, int h, int c, float alpha); //johnfitz -- added alpha
void Draw_FadeScreen (void);

45
Quake/gl_draw.c
View file

@ -725,51 +725,6 @@ void Draw_FadeScreen (void)
Sbar_Changed();
}
/*
================
Draw_BeginDisc
Draws the little blue disc in the corner of the screen.
Call before beginning any disc IO.
================
*/
void Draw_BeginDisc (void)
{
int viewport[4]; //johnfitz
canvastype oldcanvas; //johnfitz
if (!draw_disc)
return;
//johnfitz -- intel video workarounds from Baker
if (isIntelVideo)
return;
//johnfitz
//johnfitz -- canvas and matrix stuff
glGetIntegerv (GL_VIEWPORT, viewport);
glMatrixMode(GL_PROJECTION);
glPushMatrix ();
glMatrixMode(GL_MODELVIEW);
glPushMatrix ();
oldcanvas = currentcanvas;
GL_SetCanvas (CANVAS_TOPRIGHT);
currentcanvas = oldcanvas; // a bit of a hack, since GL_SetCanvas doesn't know we are going to pop the stack
//johnfitz
glDrawBuffer (GL_FRONT);
Draw_Pic (320 - 24, 0, draw_disc);
glDrawBuffer (GL_BACK);
//johnfitz -- restore everything so that 3d rendering isn't fucked up
glMatrixMode(GL_PROJECTION);
glPopMatrix ();
glMatrixMode(GL_MODELVIEW);
glPopMatrix ();
glViewport (viewport[0], viewport[1], viewport[2], viewport[3]);
//johnfitz
}
/*
================
GL_SetCanvas -- johnfitz -- support various canvas types

1
Quake/wad.c
View file

@ -76,7 +76,6 @@ void W_LoadWadFile (void) //johnfitz -- filename is now hard-coded for honesty
//TODO: use cache_alloc
int h, len;
Draw_BeginDisc ();
free (wad_base);
len = COM_OpenFile (filename, &h);
if (h == -1)