From 88a14474d47dc9ec87e6394e28e4f1d671a38a28 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Thu, 2 Dec 2004 16:27:29 +0000 Subject: [PATCH] fix cfile bugs from recent changes --- ChangeLog | 4 ++++ main/bm.c | 5 +++-- main/piggy.c | 7 ++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e65b9cb8..f5fc449c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-12-01 Chris Taylor + + * main/bm.c, main/piggy.c: fix cfile bugs from recent changes + 2004-12-02 Bradley Bell * include/cfile.h, include/physfsx.h: fix RELEASE build, make sure diff --git a/main/bm.c b/main/bm.c index 47df465a..a9e584ae 100644 --- a/main/bm.c +++ b/main/bm.c @@ -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 */ diff --git a/main/piggy.c b/main/piggy.c index 523f5028..5e79a937 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -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: -- 2.39.2