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

fix cfile bugs from recent changes

Browse source
This commit is contained in:
Martin Schaffner 2004-12-02 16:27:29 +00:00
parent 7dce7ab24d
commit 88a14474d4
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2004-12-01 Chris Taylor <c.taylor@student.curtin.edu.au>
* main/bm.c, main/piggy.c: fix cfile bugs from recent changes
2004-12-02 Bradley Bell <btb@icculus.org>
* include/cfile.h, include/physfsx.h: fix RELEASE build, make sure

5
main/bm.c
View file

@ -1,4 +1,4 @@
/* $Id: bm.c,v 1.45 2004-12-01 08:24:55 btb Exp $ */
/* $Id: bm.c,v 1.46 2004-12-02 16:27:29 schaffner Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -694,9 +694,10 @@ int load_exit_models()
else if (cfexist(D1_PIGFILE))
{
int offset, offset2;
int hamsize = cfilelength(exit_hamfile);
int hamsize;
exit_hamfile = cfopen(D1_PIGFILE, "rb");
hamsize = cfilelength(exit_hamfile);
switch (hamsize) { //total hack for loading models
case D1_PIGSIZE:
offset = 91848; /* and 92582 */

7
main/piggy.c
View file

@ -1,4 +1,4 @@
/* $Id: piggy.c,v 1.58 2004-12-01 12:48:13 btb Exp $ */
/* $Id: piggy.c,v 1.59 2004-12-02 16:27:29 schaffner Exp $ */
/*
THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO
@ -24,7 +24,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#endif
#ifdef RCS
static char rcsid[] = "$Id: piggy.c,v 1.58 2004-12-01 12:48:13 btb Exp $";
static char rcsid[] = "$Id: piggy.c,v 1.59 2004-12-02 16:27:29 schaffner Exp $";
#endif
@ -2304,7 +2304,7 @@ bitmap_index read_extra_bitmap_d1_pig(char *name)
int i, N_bitmaps;
ubyte colormap[256];
ubyte d1_palette[256*3];
int pigsize = cfilelength(d1_Piggy_fp);
int pigsize;
d1_Piggy_fp = cfopen(D1_PIGFILE, "rb");
@ -2316,6 +2316,7 @@ bitmap_index read_extra_bitmap_d1_pig(char *name)
Assert( get_d1_colormap( d1_palette, colormap ) == 0 );
pigsize = cfilelength(d1_Piggy_fp);
switch (pigsize) {
case D1_SHARE_BIG_PIGSIZE:
case D1_SHARE_10_PIGSIZE: