diff --git a/ChangeLog b/ChangeLog index c46af381c..d3d269a3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-11-03 Bradley Bell + + * main/bm.h, main/piggy.c, main/piggy.h: added pigsize for + registered d1 v1.0 + 2003-10-31 Martin Schaffner * main/movie.c: when no movies are found, divide by six the diff --git a/main/bm.c b/main/bm.c index 91dafc4f7..c6c547adf 100644 --- a/main/bm.c +++ b/main/bm.c @@ -1,4 +1,4 @@ -/* $Id: bm.c,v 1.36 2003-10-10 21:04:43 btb Exp $ */ +/* $Id: bm.c,v 1.37 2003-11-03 10:19:40 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -720,6 +720,7 @@ int load_exit_models() default: case D1_SHAREWARE_10_PIGSIZE: case D1_SHAREWARE_PIGSIZE: + case D1_10_PIGSIZE: Int3(); /* exit models should be in .pofs */ case D1_OEM_PIGSIZE: case D1_MAC_PIGSIZE: diff --git a/main/piggy.c b/main/piggy.c index 049cb9140..f1de426d5 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -1,4 +1,4 @@ -/* $Id: piggy.c,v 1.41 2003-10-22 15:00:37 schaffner Exp $ */ +/* $Id: piggy.c,v 1.42 2003-11-03 10:19:40 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.41 2003-10-22 15:00:37 schaffner Exp $"; +static char rcsid[] = "$Id: piggy.c,v 1.42 2003-11-03 10:19:40 btb Exp $"; #endif @@ -2382,8 +2382,9 @@ void load_d1_bitmap_replacements() switch (cfilelength(d1_Piggy_fp)) { case D1_SHAREWARE_10_PIGSIZE: case D1_SHAREWARE_PIGSIZE: + case D1_10_PIGSIZE: pig_data_start = 0; - Warning(D1_PIG_LOAD_FAILED ". descent.pig of descent 1 PC shareware not supported."); + Warning(D1_PIG_LOAD_FAILED ". descent.pig of v1.0 and all PC shareware versions not supported."); return; break; default: @@ -2485,6 +2486,7 @@ bitmap_index read_extra_bitmap_d1_pig(char *name) switch (cfilelength(d1_Piggy_fp)) { case D1_SHAREWARE_10_PIGSIZE: case D1_SHAREWARE_PIGSIZE: + case D1_10_PIGSIZE: pig_data_start = 0; break; default: diff --git a/main/piggy.h b/main/piggy.h index 310aecd43..971a1fa05 100644 --- a/main/piggy.h +++ b/main/piggy.h @@ -1,4 +1,4 @@ -/* $Id: piggy.h,v 1.18 2003-10-10 09:36:35 btb Exp $ */ +/* $Id: piggy.h,v 1.19 2003-11-03 10:19:40 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -75,7 +75,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #define D1_SHAREWARE_10_PIGSIZE 2529454 // v1.0 - 1.2 #define D1_SHAREWARE_PIGSIZE 5092871 // v1.4 // was: 2509799 -#define D1_PIGSIZE 4920305 +#define D1_10_PIGSIZE 4520145 // v1.0 +#define D1_PIGSIZE 4920305 // v1.4 - 1.5 #define D1_OEM_PIGSIZE 5039735 // Destination: Saturn #define D1_MAC_PIGSIZE 3975533 #define D1_MAC_SHARE_PIGSIZE 2714487