From a64439c52a2e20803ab120d29052bf92e60a3f44 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Thu, 8 Nov 2001 10:19:52 +0000
Subject: [PATCH] use new d_realloc function, so mem manager doesn't die

---
 arch/ogl/gr.c    | 9 ++++++---
 arch/ogl/sdlgl.c | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c
index 6fe1aee7..d1696a85 100644
--- a/arch/ogl/gr.c
+++ b/arch/ogl/gr.c
@@ -1,12 +1,15 @@
 /*
  * $Source: /cvs/cvsroot/d2x/arch/ogl/gr.c,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  * $Author: bradleyb $
- * $Date: 2001-11-04 09:00:25 $
+ * $Date: 2001-11-08 10:19:52 $
  *
  * // OGL video functions. - Added 9/15/99 Matthew Mueller
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.3  2001/11/04 09:00:25  bradleyb
+ * Enable d1x-style hud_message
+ *
  * Revision 1.2  2001/10/31 07:35:47  bradleyb
  * Sync with d1x
  *
@@ -276,7 +279,7 @@ return 0;
 	grd_curscreen->sc_canvas.cv_bitmap.bm_type = BM_OGL;
 	//grd_curscreen->sc_canvas.cv_bitmap.bm_data = (unsigned char *)screen->pixels;
 //	mprintf((0,"ogl/gr.c: reallocing %p to %i\n",grd_curscreen->sc_canvas.cv_bitmap.bm_data,w*h));
-	grd_curscreen->sc_canvas.cv_bitmap.bm_data = realloc(gr_bm_data,w*h);
+	grd_curscreen->sc_canvas.cv_bitmap.bm_data = d_realloc(gr_bm_data,w*h);
 	gr_set_current_canvas(NULL);
 	//gr_enable_default_palette_loading();
 	
diff --git a/arch/ogl/sdlgl.c b/arch/ogl/sdlgl.c
index 77e4e289..9e80cf7f 100644
--- a/arch/ogl/sdlgl.c
+++ b/arch/ogl/sdlgl.c
@@ -1,12 +1,15 @@
 /*
  * $Source: /cvs/cvsroot/d2x/arch/ogl/sdlgl.c,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
  * $Author: bradleyb $
- * $Date: 2001-11-04 09:02:18 $
+ * $Date: 2001-11-08 10:19:52 $
  *
  * Graphics functions for SDL-GL.
  *
  * $Log: not supported by cvs2svn $
+ * Revision 1.3  2001/11/04 09:02:18  bradleyb
+ * Hack to keep SDL from screwing up X when it crashes
+ *
  * Revision 1.2  2001/10/31 07:35:48  bradleyb
  * Sync with d1x
  *
@@ -103,7 +106,7 @@ void ogl_init(void){
 }
 
 void ogl_close(void){
-#if 1  // shouldn't really be necessary...
+#if 0  // shouldn't really be necessary...
 	if (ogl_fullscreen){
 		ogl_fullscreen=0;
 		ogl_do_fullscreen_internal();
-- 
2.39.2