From 0de4e1b5e6ed3e6f8b223edbed919c5e85a3a22c Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 14 Apr 2003 18:35:55 +0000
Subject: [PATCH] prefer files from d2 hog over d1 hog

---
 ChangeLog     |   4 ++
 NEWS          |   3 ++
 cfile/cfile.c | 134 +++++++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 128 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f230b336..9fd1b99f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-14  Bradley Bell  <btb@icculus.org>
+
+	* cfile/cfile.c: prefer files from d2 hog over d1 hog
+
 2003-04-11  Bradley Bell  <btb@icculus.org>
 
 	* main/automap.c, main/gamemine.c, main/menu.c: fix compiler
diff --git a/NEWS b/NEWS
index 2841f045..3ba36334 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+--- Version 0.2.1 ---
+- D1 Mac versions should now work.
+
 --- Version 0.2.0 ---
 - Movie support :-)
 - Bigendian linux/unix support, including OS X and Sparc/Solaris
diff --git a/cfile/cfile.c b/cfile/cfile.c
index 8cda0798..7d6c8b9b 100644
--- a/cfile/cfile.c
+++ b/cfile/cfile.c
@@ -1,4 +1,4 @@
-/* $Id: cfile.c,v 1.10 2002-10-04 07:19:59 btb Exp $ */
+/* $Id: cfile.c,v 1.11 2003-04-14 18:34:40 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -12,6 +12,113 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE.
 COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 */
 
+/*
+ *
+ * Functions for accessing compressed files.
+ *
+ * Old Log:
+ * Revision 1.7  1995/10/27  15:18:20  allender
+ * get back to descent directory before trying to read a hog file
+ *
+ * Revision 1.6  1995/10/21  23:48:24  allender
+ * hogfile(s) are now in :Data: folder
+ *
+ * Revision 1.5  1995/08/14  09:27:31  allender
+ * added byteswap header
+ *
+ * Revision 1.4  1995/05/12  11:54:33  allender
+ * changed memory stuff again
+ *
+ * Revision 1.3  1995/05/04  20:03:38  allender
+ * added code that was missing...use NewPtr instead of malloc
+ *
+ * Revision 1.2  1995/04/03  09:59:49  allender
+ * *** empty log message ***
+ *
+ * Revision 1.1  1995/03/30  10:25:02  allender
+ * Initial revision
+ *
+ *
+ * --- PC RCS Information ---
+ * Revision 1.24  1995/03/15  14:20:27  john
+ * Added critical error checker.
+ *
+ * Revision 1.23  1995/03/13  15:16:53  john
+ * Added alternate directory stuff.
+ *
+ * Revision 1.22  1995/02/09  23:08:47  matt
+ * Increased the max number of files in hogfile to 250
+ *
+ * Revision 1.21  1995/02/01  20:56:47  john
+ * Added cfexist function
+ *
+ * Revision 1.20  1995/01/21  17:53:48  john
+ * Added alternate pig file thing.
+ *
+ * Revision 1.19  1994/12/29  15:10:02  john
+ * Increased hogfile max files to 200.
+ *
+ * Revision 1.18  1994/12/12  13:20:57  john
+ * Made cfile work with fiellentth.
+ *
+ * Revision 1.17  1994/12/12  13:14:25  john
+ * Made cfiles prefer non-hog files.
+ *
+ * Revision 1.16  1994/12/09  18:53:26  john
+ * *** empty log message ***
+ *
+ * Revision 1.15  1994/12/09  18:52:56  john
+ * Took out mem, error checking.
+ *
+ * Revision 1.14  1994/12/09  18:10:31  john
+ * Speed up cfgets, which was slowing down the reading of
+ * bitmaps.tbl, which was making POF loading look slow.
+ *
+ * Revision 1.13  1994/12/09  17:53:51  john
+ * Added error checking to number of hogfiles..
+ *
+ * Revision 1.12  1994/12/08  19:02:55  john
+ * Added cfgets.
+ *
+ * Revision 1.11  1994/12/07  21:57:48  john
+ * Took out data dir.
+ *
+ * Revision 1.10  1994/12/07  21:38:02  john
+ * Made cfile not return error..
+ *
+ * Revision 1.9  1994/12/07  21:35:34  john
+ * Made it read from data directory.
+ *
+ * Revision 1.8  1994/12/07  21:33:55  john
+ * Stripped out compression stuff...
+ *
+ * Revision 1.7  1994/04/13  23:44:59  matt
+ * When file cannot be opened, free up the buffer for that file.
+ *
+ * Revision 1.6  1994/02/18  12:38:20  john
+ * Optimized a bit
+ *
+ * Revision 1.5  1994/02/15  18:13:20  john
+ * Fixed more bugs.
+ *
+ * Revision 1.4  1994/02/15  13:27:58  john
+ * Works ok...
+ *
+ * Revision 1.3  1994/02/15  12:51:57  john
+ * Crappy inbetween version
+ *
+ * Revision 1.2  1994/02/14  20:12:29  john
+ * First version working with new cfile stuff.
+ *
+ * Revision 1.1  1994/02/14  15:51:33  john
+ * Initial revision
+ *
+ * Revision 1.1  1994/02/10  15:45:12  john
+ * Initial revision
+ *
+ *
+ */
+
 #ifdef HAVE_CONFIG_H
 #include <conf.h>
 #endif
@@ -226,18 +333,6 @@ FILE * cfile_find_libfile(char * name, int * length)
 		}
 	}
 
-	if (D1Hogfile_initialized)	{
-		for (i = 0; i < D1Num_hogfiles; i++) {
-			if (!stricmp(D1HogFiles[i].name, name)) {
-				fp = cfile_get_filehandle(D1HogFilename, "rb");
-				if (fp == NULL) return NULL;
-				fseek(fp,  D1HogFiles[i].offset, SEEK_SET);
-				*length = D1HogFiles[i].length;
-				return fp;
-			}
-		}
-	}
-
 	if ( !Hogfile_initialized ) 	{
 		//@@cfile_init_hogfile( "DESCENT2.HOG", HogFiles, &Num_hogfiles );
 		//@@Hogfile_initialized = 1;
@@ -254,6 +349,19 @@ FILE * cfile_find_libfile(char * name, int * length)
 			return fp;
 		}
 	}
+
+	if (D1Hogfile_initialized)	{
+		for (i = 0; i < D1Num_hogfiles; i++) {
+			if (!stricmp(D1HogFiles[i].name, name)) {
+				fp = cfile_get_filehandle(D1HogFilename, "rb");
+				if (fp == NULL) return NULL;
+				fseek(fp,  D1HogFiles[i].offset, SEEK_SET);
+				*length = D1HogFiles[i].length;
+				return fp;
+			}
+		}
+	}
+
 	return NULL;
 }
 
-- 
2.39.2