From 422d006e6f267561eb1f6ff80babcb64a8b10eb2 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Sat, 11 Jan 2003 02:58:33 +0000
Subject: [PATCH] attempt to support d1 for mac mission

---
 main/mission.c | 36 +++++++++++++++++++++++++++---------
 main/mission.h |  4 +++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/main/mission.c b/main/mission.c
index 915a4610..3cdb69cb 100644
--- a/main/mission.c
+++ b/main/mission.c
@@ -1,4 +1,4 @@
-/* $Id: mission.c,v 1.17 2003-01-07 03:10:20 btb Exp $ */
+/* $Id: mission.c,v 1.18 2003-01-11 02:58:33 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -187,6 +187,17 @@ int load_mission_d1(int mission_num)
 		Last_level = 7;
 		Last_secret_level = 0;
 
+		//build level names
+		for (i=0;i<Last_level;i++)
+			sprintf(Level_names[i], "level%02d.sdl", i+1);
+
+		break;
+	case D1_MAC_SHARE_MISSION_HOGSIZE:
+		N_secret_levels = 0;
+
+		Last_level = 3;
+		Last_secret_level = 0;
+
 		//build level names
 		for (i=0;i<Last_level;i++)
 			sprintf(Level_names[i], "level%02d.sdl", i+1);
@@ -195,6 +206,7 @@ int load_mission_d1(int mission_num)
 	default:
 		Int3(); // fall through
 	case D1_MISSION_HOGSIZE:
+	case D1_MAC_MISSION_HOGSIZE:
 		N_secret_levels = 3;
 
 		Last_level = BIM_LAST_LEVEL;
@@ -450,16 +462,18 @@ void add_d1_builtin_mission_to_list(int *count)
 	D1_Builtin_mission_hogsize = cfile_size("descent.hog");
 
 	switch (D1_Builtin_mission_hogsize) {
-	default:
-		Warning("Unknown D1 hogsize %d\n", D1_Builtin_mission_hogsize);
-		Int3();
-		// fall through
 	case D1_SHAREWARE_MISSION_HOGSIZE:
+	case D1_MAC_SHARE_MISSION_HOGSIZE:
 		strcpy(Mission_list[*count].filename, D1_MISSION_FILENAME);
 		strcpy(Mission_list[*count].mission_name, D1_SHAREWARE_MISSION_NAME);
 		Mission_list[*count].anarchy_only_flag = 0;
 		break;
+	default:
+		Warning("Unknown D1 hogsize %d\n", D1_Builtin_mission_hogsize);
+		Int3();
+		// fall through
 	case D1_MISSION_HOGSIZE:
+	case D1_MAC_MISSION_HOGSIZE:
 		strcpy(Mission_list[*count].filename, D1_MISSION_FILENAME);
 		strcpy(Mission_list[*count].mission_name, D1_MISSION_NAME);
 		Mission_list[*count].anarchy_only_flag = 0;
@@ -636,12 +650,14 @@ int load_mission(int mission_num)
 	if (mission_num == D1_Builtin_mission_num) {
 		cfile_use_descent1_hogfile("descent.hog");
 		switch (D1_Builtin_mission_hogsize) {
+		default:
+			Int3(); // fall through
 		case D1_MISSION_HOGSIZE:
+		case D1_MAC_MISSION_HOGSIZE:
 		case D1_SHAREWARE_MISSION_HOGSIZE:
+		case D1_MAC_SHARE_MISSION_HOGSIZE:
 			return load_mission_d1(mission_num);
 			break;
-		default:
-			// continue on...
 		}
 	}
 
@@ -654,9 +670,11 @@ int load_mission(int mission_num)
 		case OEM_MISSION_HOGSIZE:
 			return load_mission_oem(mission_num);
 			break;
-		case FULL_MISSION_HOGSIZE:
 		default:
-			// continue on...
+			Int3(); // fall through
+		case FULL_MISSION_HOGSIZE:
+			// continue on... (use d2.mn2 from hogfile)
+			break;
 		}
 	}
 
diff --git a/main/mission.h b/main/mission.h
index 543cb85a..1eea5353 100644
--- a/main/mission.h
+++ b/main/mission.h
@@ -1,4 +1,4 @@
-/* $Id: mission.h,v 1.7 2003-01-07 03:10:20 btb Exp $ */
+/* $Id: mission.h,v 1.8 2003-01-11 02:58:33 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -59,8 +59,10 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #define D1_MISSION_FILENAME             "descent"
 #define D1_MISSION_NAME                 "Descent: First Strike"
 #define D1_MISSION_HOGSIZE              6856701
+#define D1_MAC_MISSION_HOGSIZE          7456179
 #define D1_SHAREWARE_MISSION_NAME       "Descent Demo"
 #define D1_SHAREWARE_MISSION_HOGSIZE    2339773
+#define D1_MAC_SHARE_MISSION_HOGSIZE    3370339
 
 #define SHAREWARE_MISSION_FILENAME  "d2demo"
 #define SHAREWARE_MISSION_NAME      "Descent 2 Demo"
-- 
2.39.2