From 6d2ae18a82c84dbcac105ed0b6cd5dcce6dccf5e Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <sezeroz@gmail.com>
Date: Thu, 30 Dec 2010 23:28:08 +0000
Subject: [PATCH] killed all references to Draw_BeginDisc

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@357 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Quake/common.c  |  3 ---
 Quake/draw.h    |  1 -
 Quake/gl_draw.c | 45 ---------------------------------------------
 Quake/wad.c     |  1 -
 4 files changed, 50 deletions(-)

diff --git a/Quake/common.c b/Quake/common.c
index dfb61311..dd31f6d6 100644
--- a/Quake/common.c
+++ b/Quake/common.c
@@ -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);
 
diff --git a/Quake/draw.h b/Quake/draw.h
index 82d109c0..071ac1b3 100644
--- a/Quake/draw.h
+++ b/Quake/draw.h
@@ -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);
diff --git a/Quake/gl_draw.c b/Quake/gl_draw.c
index 823630a5..c5714d9b 100644
--- a/Quake/gl_draw.c
+++ b/Quake/gl_draw.c
@@ -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
diff --git a/Quake/wad.c b/Quake/wad.c
index 36c4f15c..c3998031 100644
--- a/Quake/wad.c
+++ b/Quake/wad.c
@@ -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)