From da2ec855b8a163077dad8f91942668319b009069 Mon Sep 17 00:00:00 2001 From: Martin Schaffner Date: Fri, 19 Nov 2004 18:02:32 +0000 Subject: [PATCH] compile again on older C compilers --- ChangeLog | 4 ++++ main/gamemine.c | 6 ++++-- main/piggy.c | 8 +++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index c572ac00..7ee24bf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2004-11-19 Chris Taylor + + * main/gamemine.c, main/piggy.c: compile again on older C compilers + 2004-11-16 Chris Taylor * arch/carbon/findfile.c: fix Mac OS 9 bug with missions > 12 chars diff --git a/main/gamemine.c b/main/gamemine.c index 23c56118..19f354e4 100644 --- a/main/gamemine.c +++ b/main/gamemine.c @@ -1,4 +1,4 @@ -/* $Id: gamemine.c,v 1.30 2004-10-30 18:34:28 schaffner Exp $ */ +/* $Id: gamemine.c,v 1.31 2004-11-19 18:02:32 schaffner Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: gamemine.c,v 1.30 2004-10-30 18:34:28 schaffner Exp $"; +static char rcsid[] = "$Id: gamemine.c,v 1.31 2004-11-19 18:02:32 schaffner Exp $"; #endif #include @@ -942,6 +942,7 @@ int load_mine_data_compiled(CFILE *LoadFile) ubyte bit_mask; d1_pig_present = cfexist(D1_PIGFILE); +#if 0 // the following will be deleted once reading old pigfiles works reliably if (d1_pig_present) { CFILE * d1_Piggy_fp = cfopen( D1_PIGFILE, "rb" ); switch (cfilelength(d1_Piggy_fp)) { @@ -954,6 +955,7 @@ int load_mine_data_compiled(CFILE *LoadFile) } cfclose (d1_Piggy_fp); } +#endif if (!strcmp(strchr(Gamesave_current_filename, '.'), ".sdl")) New_file_format_load = 0; // descent 1 shareware diff --git a/main/piggy.c b/main/piggy.c index aa235a8e..a04b2890 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -1,4 +1,4 @@ -/* $Id: piggy.c,v 1.55 2004-10-30 18:34:28 schaffner Exp $ */ +/* $Id: piggy.c,v 1.56 2004-11-19 18:02:32 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.55 2004-10-30 18:34:28 schaffner Exp $"; +static char rcsid[] = "$Id: piggy.c,v 1.56 2004-11-19 18:02:32 schaffner Exp $"; #endif @@ -2114,6 +2114,8 @@ void read_d1_tmap_nums_from_hog(CFILE *d1_pig) atexit(free_d1_tmap_nums); while (cfgets (inputline, LINEBUF_SIZE, bitmaps)) { + char *arg; + if (bitmaps_tbl_is_binary) decode_text_line((inputline)); else @@ -2125,7 +2127,7 @@ void read_d1_tmap_nums_from_hog(CFILE *d1_pig) Warning("Possible line truncation in BITMAPS.TBL"); return; } - char *arg = strtok( inputline, space ); + arg = strtok( inputline, space ); if (arg && arg[0] == '@') { arg++; //Registered_only = 1; -- 2.39.2