From e823413ea46ac56173e148a553ae1891de1f9579 Mon Sep 17 00:00:00 2001
From: Bradley Bell <btb@icculus.org>
Date: Mon, 3 Nov 2003 12:03:44 +0000
Subject: [PATCH] big pigsize is same for all d1 shareware - even though files
 are different\!

---
 ChangeLog    | 3 +++
 main/bm.c    | 4 ++--
 main/piggy.c | 8 ++++----
 main/piggy.h | 6 +++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index beb1c2b4..a96c442c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-11-03  Bradley Bell  <btb@icculus.org>
 
+	* main/bm.h, main/piggy.c, main/piggy.h: big pigsize is same for
+	all d1 shareware - even though files are different!
+
 	* main/bm.h, main/piggy.c, main/piggy.h: added big pigsize for
 	shareware d1 v1.4
 
diff --git a/main/bm.c b/main/bm.c
index 3dd01174..3b40a49a 100644
--- a/main/bm.c
+++ b/main/bm.c
@@ -1,4 +1,4 @@
-/* $Id: bm.c,v 1.40 2003-11-03 11:08:35 btb Exp $ */
+/* $Id: bm.c,v 1.41 2003-11-03 12:03:43 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -718,8 +718,8 @@ int load_exit_models()
 			offset2 = 383390;   /* and 394022 */
 			break;
 		default:
-		case D1_SHAREWARE_10_PIGSIZE:
 		case D1_SHARE_BIG_PIGSIZE:
+		case D1_SHARE_10_PIGSIZE:
 		case D1_SHARE_PIGSIZE:
 		case D1_10_BIG_PIGSIZE:
 		case D1_10_PIGSIZE:
diff --git a/main/piggy.c b/main/piggy.c
index f060ce76..6d352b5f 100644
--- a/main/piggy.c
+++ b/main/piggy.c
@@ -1,4 +1,4 @@
-/* $Id: piggy.c,v 1.45 2003-11-03 11:08:35 btb Exp $ */
+/* $Id: piggy.c,v 1.46 2003-11-03 12:03:44 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -386,7 +386,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #endif
 
 #ifdef RCS
-static char rcsid[] = "$Id: piggy.c,v 1.45 2003-11-03 11:08:35 btb Exp $";
+static char rcsid[] = "$Id: piggy.c,v 1.46 2003-11-03 12:03:44 btb Exp $";
 #endif
 
 
@@ -2380,8 +2380,8 @@ void load_d1_bitmap_replacements()
 	Assert( get_d1_colormap( d1_palette, colormap ) == 0 );
 
 	switch (cfilelength(d1_Piggy_fp)) {
-	case D1_SHAREWARE_10_PIGSIZE:
 	case D1_SHARE_BIG_PIGSIZE:
+	case D1_SHARE_10_PIGSIZE:
 	case D1_SHARE_PIGSIZE:
 	case D1_10_BIG_PIGSIZE:
 	case D1_10_PIGSIZE:
@@ -2486,8 +2486,8 @@ bitmap_index read_extra_bitmap_d1_pig(char *name)
 		Assert( get_d1_colormap( d1_palette, colormap ) == 0 );
 
 		switch (cfilelength(d1_Piggy_fp)) {
-		case D1_SHAREWARE_10_PIGSIZE:
 		case D1_SHARE_BIG_PIGSIZE:
+		case D1_SHARE_10_PIGSIZE:
 		case D1_SHARE_PIGSIZE:
 		case D1_10_BIG_PIGSIZE:
 		case D1_10_PIGSIZE:
diff --git a/main/piggy.h b/main/piggy.h
index 0eaa3090..678481b6 100644
--- a/main/piggy.h
+++ b/main/piggy.h
@@ -1,4 +1,4 @@
-/* $Id: piggy.h,v 1.22 2003-11-03 11:08:36 btb Exp $ */
+/* $Id: piggy.h,v 1.23 2003-11-03 12:03:44 btb Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -73,8 +73,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 
 #define D1_PIGFILE              "descent.pig"
 
-#define D1_SHAREWARE_10_PIGSIZE 2529454 // v1.0 - 1.2
-#define D1_SHARE_BIG_PIGSIZE    5092871 // v1.4 before RLE compression
+#define D1_SHARE_BIG_PIGSIZE    5092871 // v1.0 - 1.4 before RLE compression
+#define D1_SHARE_10_PIGSIZE     2529454 // v1.0 - 1.2
 #define D1_SHARE_PIGSIZE        2509799 // v1.4
 #define D1_10_BIG_PIGSIZE       7640220 // v1.0 before RLE compression
 #define D1_10_PIGSIZE           4520145 // v1.0
-- 
2.39.2