TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

added D1_PIGFILE ("descent.pig") macro

Browse source
This commit is contained in:
Bradley Bell 2003-03-25 10:17:05 +00:00
parent 99abcef3b1
commit c87fb1f826
5 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2003-03-25 Bradley Bell <btb@icculus.org> 2003-03-25 Bradley Bell <btb@icculus.org>
* main/bm.c, main/piggy.c, main/piggy.h, main/gameseq.c: added
D1_PIGFILE ("descent.pig") macro
* main/bm.c, main/piggy.c, main/piggy.h: ability to load exit * main/bm.c, main/piggy.c, main/piggy.h: ability to load exit
models from d1 pig file models from d1 pig file

6
main/bm.c
View file

@ -1,4 +1,4 @@
/* $Id: bm.c,v 1.28 2003-03-25 09:54:12 btb Exp $ */ /* $Id: bm.c,v 1.29 2003-03-25 10:17:05 btb Exp $ */
/* /*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -273,11 +273,11 @@ int load_exit_models()
ogl_cache_polymodel_textures(destroyed_exit_modelnum); ogl_cache_polymodel_textures(destroyed_exit_modelnum);
#endif #endif
} }
else if (cfexist("descent.pig")) else if (cfexist(D1_PIGFILE))
{ {
int offset, offset2; int offset, offset2;
exit_hamfile = cfopen("descent.pig", "rb"); exit_hamfile = cfopen(D1_PIGFILE, "rb");
switch (cfilelength(exit_hamfile)) { //total hack for loading models switch (cfilelength(exit_hamfile)) { //total hack for loading models
case D1_PIGSIZE: case D1_PIGSIZE:
offset = 91848; /* and 92582 */ offset = 91848; /* and 92582 */

6
main/gameseq.c
View file

@ -1,4 +1,4 @@
/* $Id: gameseq.c,v 1.24 2003-03-22 03:15:24 btb Exp $ */ /* $Id: gameseq.c,v 1.25 2003-03-25 10:17:05 btb Exp $ */
/* /*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -17,7 +17,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif #endif
#ifdef RCS #ifdef RCS
char gameseq_rcsid[] = "$Id: gameseq.c,v 1.24 2003-03-22 03:15:24 btb Exp $"; char gameseq_rcsid[] = "$Id: gameseq.c,v 1.25 2003-03-25 10:17:05 btb Exp $";
#endif #endif
#ifdef WINDOWS #ifdef WINDOWS
@ -839,7 +839,7 @@ void LoadLevel(int level_num,int page_in_textures)
level_name = Level_names[level_num-1]; level_name = Level_names[level_num-1];
undo_bm_read_all_d1(); undo_bm_read_all_d1();
d1_pig_loaded = cfexist("descent.pig"); d1_pig_loaded = cfexist(D1_PIGFILE);
#ifdef WINDOWS #ifdef WINDOWS
dd_gr_set_current_canvas(NULL); dd_gr_set_current_canvas(NULL);

21
main/piggy.c
View file

@ -1,4 +1,4 @@
/* $Id: piggy.c,v 1.28 2003-03-25 09:54:12 btb Exp $ */ /* $Id: piggy.c,v 1.29 2003-03-25 10:17:05 btb Exp $ */
/* /*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -386,7 +386,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif #endif
#ifdef RCS #ifdef RCS
static char rcsid[] = "$Id: piggy.c,v 1.28 2003-03-25 09:54:12 btb Exp $"; static char rcsid[] = "$Id: piggy.c,v 1.29 2003-03-25 10:17:05 btb Exp $";
#endif #endif
@ -441,6 +441,13 @@ static char rcsid[] = "$Id: piggy.c,v 1.28 2003-03-25 09:54:12 btb Exp $";
#define DEFAULT_HAMFILE (cfexist(DEFAULT_HAMFILE_REGISTERED)?DEFAULT_HAMFILE_REGISTERED:DEFAULT_HAMFILE_SHAREWARE) #define DEFAULT_HAMFILE (cfexist(DEFAULT_HAMFILE_REGISTERED)?DEFAULT_HAMFILE_REGISTERED:DEFAULT_HAMFILE_SHAREWARE)
#define DEFAULT_SNDFILE ((Piggy_hamfile_version < 3)?DEFAULT_HAMFILE_SHAREWARE:(digi_sample_rate==SAMPLE_RATE_22K)?"descent2.s22":"descent2.s11") #define DEFAULT_SNDFILE ((Piggy_hamfile_version < 3)?DEFAULT_HAMFILE_SHAREWARE:(digi_sample_rate==SAMPLE_RATE_22K)?"descent2.s22":"descent2.s11")
#define MAC_ALIEN1_PIGSIZE 5013035
#define MAC_ALIEN2_PIGSIZE 4909916
#define MAC_FIRE_PIGSIZE 4969035
#define MAC_GROUPA_PIGSIZE 4929684 // also used for mac shareware
#define MAC_ICE_PIGSIZE 4923425
#define MAC_WATER_PIGSIZE 4832403
ubyte *BitmapBits = NULL; ubyte *BitmapBits = NULL;
ubyte *SoundBits = NULL; ubyte *SoundBits = NULL;
@ -2244,11 +2251,7 @@ void load_d1_bitmap_replacements()
ubyte colormap[256]; ubyte colormap[256];
ubyte *next_bitmap; // to which address we write the next bitmap ubyte *next_bitmap; // to which address we write the next bitmap
#ifndef MACINTOSH d1_Piggy_fp = cfopen( D1_PIGFILE, "rb" );
d1_Piggy_fp = cfopen( "descent.pig", "rb" );
#else
d1_Piggy_fp = cfopen( "Data:Descent.pig", "rb" );
#endif // end of ifndef/else MACINTOSH
if (!d1_Piggy_fp) if (!d1_Piggy_fp)
return; // use d2 bitmaps instead... return; // use d2 bitmaps instead...
@ -2383,10 +2386,10 @@ bitmap_index read_extra_d1_bitmap(char *name)
int N_bitmaps, zsize; int N_bitmaps, zsize;
ubyte colormap[256]; ubyte colormap[256];
d1_Piggy_fp = cfopen("descent.pig", "rb"); d1_Piggy_fp = cfopen(D1_PIGFILE, "rb");
if (!d1_Piggy_fp) if (!d1_Piggy_fp)
{ {
con_printf(CON_DEBUG, "could not open descent.pig\n", name); con_printf(CON_DEBUG, "could not open %s\n", D1_PIGFILE);
return bitmap_num; return bitmap_num;
} }

10
main/piggy.h
View file

@ -1,4 +1,4 @@
/* $Id: piggy.h,v 1.14 2003-03-25 09:54:12 btb Exp $ */ /* $Id: piggy.h,v 1.15 2003-03-25 10:17:05 btb Exp $ */
/* /*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -20,18 +20,14 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "inferno.h" #include "inferno.h"
#include "cfile.h" #include "cfile.h"
#define D1_PIGFILE "descent.pig"
#define D1_SHAREWARE_10_PIGSIZE 2529454 // v1.0 - 1.2 #define D1_SHAREWARE_10_PIGSIZE 2529454 // v1.0 - 1.2
#define D1_SHAREWARE_PIGSIZE 2509799 // v1.4 #define D1_SHAREWARE_PIGSIZE 2509799 // v1.4
#define D1_PIGSIZE 4920305 #define D1_PIGSIZE 4920305
#define D1_OEM_PIGSIZE 5039735 // Destination: Saturn #define D1_OEM_PIGSIZE 5039735 // Destination: Saturn
#define D1_MAC_PIGSIZE 3975533 #define D1_MAC_PIGSIZE 3975533
#define D1_MAC_SHARE_PIGSIZE 2714487 #define D1_MAC_SHARE_PIGSIZE 2714487
#define MAC_ALIEN1_PIGSIZE 5013035
#define MAC_ALIEN2_PIGSIZE 4909916
#define MAC_FIRE_PIGSIZE 4969035
#define MAC_GROUPA_PIGSIZE 4929684 // also used for mac shareware
#define MAC_ICE_PIGSIZE 4923425
#define MAC_WATER_PIGSIZE 4832403
#define MAX_ALIASES 20 #define MAX_ALIASES 20