From d038b22379824f57fa4ed7cf41d3519c9ed6bd0e Mon Sep 17 00:00:00 2001
From: Chris Taylor <chris@icculus.org>
Date: Sat, 26 Feb 2005 07:04:47 +0000
Subject: [PATCH] remove the need for BITMAPS.TBL, with EDITOR defined

---
 ChangeLog      |  3 +++
 main/bmread.c  | 22 +++++++++++-----------
 main/inferno.c |  7 +++----
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c05aacd4..d334f3b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
 	* main/editor/eswitch.c: add remove_trigger_num
 	(used by gamesave.c)
 
+	* main/bmread.c, main/inferno.c: if EDITOR is defined, game 
+	still works if there's no BITMAPS.TBL in a PhysicsFS search path
+
 2005-02-25  Chris Taylor  <chris@icculus.org>
 
 	* arch/carbon/conf.h, D2X.make: no defining OGL in conf.h,
diff --git a/main/bmread.c b/main/bmread.c
index 0b1e89be..0fc1672d 100644
--- a/main/bmread.c
+++ b/main/bmread.c
@@ -1,4 +1,4 @@
-/* $Id: bmread.c,v 1.13 2005-01-25 20:02:58 schaffner Exp $ */
+/* $Id: bmread.c,v 1.14 2005-02-26 07:04:47 chris Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -413,6 +413,16 @@ int bm_init_use_tbl()
 	char	inputline[LINEBUF_SIZE];
 	int	i, have_bin_tbl;
 
+	// Open BITMAPS.TBL for reading.
+	have_bin_tbl = 0;
+	InfoFile = cfopen( "BITMAPS.TBL", "rb" );
+	if (InfoFile == NULL) {
+		InfoFile = cfopen("BITMAPS.BIN", "rb");
+		if (InfoFile == NULL)
+			return 0;	//missing BITMAPS.TBL and BITMAPS.BIN file
+		have_bin_tbl = 1;
+	}
+
 	gr_use_palette_table(DEFAULT_PIG_PALETTE);
 
 	load_palette(DEFAULT_PIG_PALETTE,-2,0);		//special: tell palette code which pig is loaded
@@ -473,16 +483,6 @@ int bm_init_use_tbl()
 //		piggy_read_sounds();
 //		return 0;
 //	}
-
-	// Open BITMAPS.TBL for reading.
-	have_bin_tbl = 0;
-	InfoFile = cfopen( "BITMAPS.TBL", "rb" );
-	if (InfoFile == NULL) {
-		InfoFile = cfopen("BITMAPS.BIN", "rb");
-		if (InfoFile == NULL)
-			Error("Missing BITMAPS.TBL and BITMAPS.BIN file\n");
-		have_bin_tbl = 1;
-	}
 	linenum = 0;
 	
 	cfseek( InfoFile, 0L, SEEK_SET);
diff --git a/main/inferno.c b/main/inferno.c
index c0faefa6..7b964193 100644
--- a/main/inferno.c
+++ b/main/inferno.c
@@ -1,4 +1,4 @@
-/* $Id: inferno.c,v 1.98 2005-02-25 07:19:33 btb Exp $ */
+/* $Id: inferno.c,v 1.99 2005-02-26 07:04:47 chris Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -959,10 +959,9 @@ int main(int argc, char *argv[])
 
 	con_printf( CON_DEBUG , "\nDoing bm_init..." );
 	#ifdef EDITOR
-		bm_init_use_tbl();
-	#else
-		bm_init();
+	if (!bm_init_use_tbl())
 	#endif
+		bm_init();
 
 	#ifdef EDITOR
 	if (FindArg("-hoarddata") != 0) {
-- 
2.39.2