From 19a9a90c20f4a3669839614dbe44e82a63c28677 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Fri, 30 Aug 2002 00:57:06 +0000
Subject: [PATCH] move hoard stuff out of network

---
 main/gamesave.c | 10 +++-------
 main/hoard.c    | 26 ++++++++++++++++++++++++++
 main/hoard.h    |  8 ++++++++
 main/mission.c  |  6 ++----
 4 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 main/hoard.c
 create mode 100644 main/hoard.h

diff --git a/main/gamesave.c b/main/gamesave.c
index c819c308..27af2e74 100644
--- a/main/gamesave.c
+++ b/main/gamesave.c
@@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-char gamesave_rcsid[] = "$Id: gamesave.c,v 1.15 2002-08-15 07:17:39 btb Exp $";
+char gamesave_rcsid[] = "$Id: gamesave.c,v 1.16 2002-08-30 00:57:06 btb Exp $";
 #endif
 
 #include <stdio.h>
@@ -71,6 +71,7 @@ char gamesave_rcsid[] = "$Id: gamesave.c,v 1.15 2002-08-15 07:17:39 btb Exp $";
 #include "byteswap.h"
 #include "multi.h"
 #include "makesig.h"
+#include "hoard.h"
 
 char Gamesave_current_filename[128];
 
@@ -1380,8 +1381,6 @@ char *Level_being_loaded=NULL;
 extern void ncache_flush();
 #endif
 
-extern int HoardEquipped();
-
 extern int Slide_segs_computed;
 
 int no_old_level_file_error=0;
@@ -1465,7 +1464,6 @@ int load_level(char * filename_passed)
 	Assert(sig == MAKE_SIG('P','L','V','L'));
 
 	if (Gamesave_current_version >= 8) {    //read dummy data
-#ifdef NETWORK
 		if (HoardEquipped())
 		{
 			cfile_read_int(LoadFile);
@@ -1473,9 +1471,7 @@ int load_level(char * filename_passed)
 			cfile_read_byte(LoadFile);
 		}
 		else
-#endif
-			// NOTE LINK TO ABOVE!
-		      	Error("This level requires the Vertigo Enhanced version of D2.");
+			Error("This level requires the Vertigo Enhanced version of D2.");
 
 	}
 
diff --git a/main/hoard.c b/main/hoard.c
new file mode 100644
index 00000000..12f4b9bc
--- /dev/null
+++ b/main/hoard.c
@@ -0,0 +1,26 @@
+/* $Id: hoard.c,v 1.1 2002-08-30 00:55:57 btb Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include <conf.h>
+#endif
+
+#include "hoard.h"
+#include "cfile.h"
+
+int HoardEquipped()
+{
+	static int checked=-1;
+
+#ifdef WINDOWS
+		return 0;
+#endif
+
+	if (checked==-1)
+	{
+		if (cfexist("hoard.ham"))
+			checked=1;
+		else
+			checked=0;
+	}
+	return (checked);
+}
diff --git a/main/hoard.h b/main/hoard.h
new file mode 100644
index 00000000..7f209ec2
--- /dev/null
+++ b/main/hoard.h
@@ -0,0 +1,8 @@
+/* $Id: hoard.h,v 1.1 2002-08-30 00:55:57 btb Exp $ */
+
+#ifndef _HOARD_H
+#define _HOARD_H
+
+extern int HoardEquipped();
+
+#endif /* _HOARD_H */
diff --git a/main/mission.c b/main/mission.c
index 7266bf41..2fabb645 100644
--- a/main/mission.c
+++ b/main/mission.c
@@ -1,4 +1,4 @@
-/* $Id: mission.c,v 1.12 2002-08-27 08:02:51 btb Exp $ */
+/* $Id: mission.c,v 1.13 2002-08-30 00:57:06 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -41,6 +41,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "mono.h"
 #include "error.h"
 #include "findfile.h"
+#include "hoard.h"
 
 mle Mission_list[MAX_MISSIONS];
 
@@ -199,7 +200,6 @@ int ml_sort_func(mle *e0,mle *e1)
 }
 
 extern char CDROM_dir[];
-extern int HoardEquipped();
 
 //returns 1 if file read ok, else 0
 int read_mission_file(char *filename,int count,int location)
@@ -252,7 +252,6 @@ int read_mission_file(char *filename,int count,int location)
 			p = get_parm_value("xname",mfile);
 		}
 
-#ifdef NETWORK
 		if (HoardEquipped())
 		{
 			if (!p) {		//try super-enhanced mission!
@@ -260,7 +259,6 @@ int read_mission_file(char *filename,int count,int location)
 				p = get_parm_value("zname",mfile);
 			}
 		}
-#endif
 
 		if (p) {
 			char *t;
-- 
2.39.2