From 502233452e0681f8eebaf0251fbfc9ca17d418aa Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Fri, 3 Dec 2004 10:06:22 +0000
Subject: [PATCH] disable call to reset_cockpit() which was causing the
 'letterbox' bug

---
 ChangeLog      | 3 +++
 main/kconfig.c | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55485db4..b2dcccb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 	I couldn't figure out why the previous code kept segfaulting under
 	linux.
 
+	* main/kconfig.c: disable call to reset_cockpit() which was
+	causing the "letterbox" bug
+
 2004-12-02  Martin Schaffner  <maschaffner@gmx.ch>
 
 	* configure.ac: require PhysicsFS header and library
diff --git a/main/kconfig.c b/main/kconfig.c
index 3c55218c..c8713387 100644
--- a/main/kconfig.c
+++ b/main/kconfig.c
@@ -1,4 +1,4 @@
-/* $Id: kconfig.c,v 1.33 2004-11-22 23:32:54 btb Exp $ */
+/* $Id: kconfig.c,v 1.34 2004-12-03 10:06:22 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: kconfig.c,v 1.33 2004-11-22 23:32:54 btb Exp $";
+static char rcsid[] = "$Id: kconfig.c,v 1.34 2004-12-03 10:06:22 btb Exp $";
 #endif
 
 #ifdef WINDOWS
@@ -1949,7 +1949,9 @@ void kconfig(int n, char * title)
 	WIN(DDGRUNLOCK(dd_grd_curcanv));
 	gr_free_bitmap(save_bm);
 
+#if 0 // set_screen_mode always calls this later... right?
 	reset_cockpit();		//force cockpit redraw next time
+#endif
 
 	// Update save values...
 	
-- 
2.39.2