From fd96167e0a67843c14e234821762e6dacb8b9910 Mon Sep 17 00:00:00 2001
From: sezero <sezero@af15c1b1-3010-417e-b628-4374ebc0bcbd>
Date: Sat, 20 Feb 2010 09:55:32 +0000
Subject: [PATCH] made loading of embedded custom conback friendly with dynamic
 gamedirs: gl_draw.c (Draw_CheckConback): new proc.  (Draw_Init): moved
 mod-provided gfx/conback.lmp check form here to Draw_CheckConback(). draw.h
 (Draw_CheckConback): added prototype. gl_texmgr.c (TexMgr_NewGame): call
 Draw_CheckConback().

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@78 af15c1b1-3010-417e-b628-4374ebc0bcbd
---
 Quake/draw.h      | 2 ++
 Quake/gl_draw.c   | 6 +++++-
 Quake/gl_texmgr.c | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Quake/draw.h b/Quake/draw.h
index 0d66d40f..02b65f37 100644
--- a/Quake/draw.h
+++ b/Quake/draw.h
@@ -41,3 +41,5 @@ void Draw_NewGame (void);
 
 void GL_SetCanvas (canvastype newcanvas); //johnfitz
 
+void Draw_CheckConback (void); // QuakeSpasm customization
+
diff --git a/Quake/gl_draw.c b/Quake/gl_draw.c
index 41850d20..6b06e6dc 100644
--- a/Quake/gl_draw.c
+++ b/Quake/gl_draw.c
@@ -320,6 +320,10 @@ Draw_ConbackPic -- QuakeSpasm custom conback drawing.
 */
 extern char *get_conback(void);
 static qboolean have_mod_conback;
+void Draw_CheckConback (void)
+{
+	have_mod_conback = (COM_LoadTempFile("gfx/conback.lmp") != NULL);
+}
 qpic_t *Draw_ConbackPic (void)
 {
     if (fitzmode) {
@@ -463,7 +467,7 @@ void Draw_Init (void)
 	Draw_LoadPics ();
 
 	/* QuakeSpasm customization: */
-	have_mod_conback = (COM_LoadTempFile("gfx/conback.lmp") != NULL);
+	Draw_CheckConback ();
 }
 
 //==============================================================================
diff --git a/Quake/gl_texmgr.c b/Quake/gl_texmgr.c
index e7429548..ce668b81 100644
--- a/Quake/gl_texmgr.c
+++ b/Quake/gl_texmgr.c
@@ -488,6 +488,8 @@ void TexMgr_NewGame (void)
 {
 	TexMgr_FreeTextures (0, TEXPREF_PERSIST); //deletes all textures where TEXPREF_PERSIST is unset
 	TexMgr_LoadPalette ();
+	/* QuakeSpasm customization: */
+	Draw_CheckConback ();
 }
 
 /*