From 0b4d2e38efe78384a8452b177106f93f2e08e046 Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Wed, 14 Nov 2001 09:34:32 +0000 Subject: [PATCH] use MAKE_SIG --- 2d/font.c | 21 +++++++++++++-------- main/bm.c | 10 +++++++--- main/gamesave.c | 28 +++++++++++++++++++++------- main/gameseq.c | 11 +++++------ main/piggy.c | 43 ++++++++++++++++++++----------------------- 5 files changed, 66 insertions(+), 47 deletions(-) diff --git a/2d/font.c b/2d/font.c index e53fcdae..259f012c 100644 --- a/2d/font.c +++ b/2d/font.c @@ -12,13 +12,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ /* $Source: /cvs/cvsroot/d2x/2d/font.c,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * $Author: bradleyb $ - * $Date: 2001-11-08 10:37:25 $ + * $Date: 2001-11-14 09:34:32 $ * * Graphical routines for drawing fonts. * * $Log: not supported by cvs2svn $ + * Revision 1.9 2001/11/08 10:37:25 bradleyb + * free OGL font data when rereading + * * Revision 1.8 2001/11/04 03:58:25 bradleyb * re-init ogl fonts after remapping colors. * @@ -59,6 +62,8 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "poly_acc.h" #endif +#include "makesig.h" + #define MAX_OPEN_FONTS 50 #define FILENAME_LEN 13 @@ -413,7 +418,7 @@ int gr_internal_string0m(int x, int y, char *s ) return 0; } -#ifdef __ENV_MSDOS__ +#ifdef __MSDOS__ int gr_internal_string2(int x, int y, char *s ) { unsigned char * fp; @@ -806,7 +811,7 @@ int gr_internal_string2m(int x, int y, char *s ) return 0; } -#endif // __ENV_MSDOS__ +#endif // __MSDOS__ #if defined(POLY_ACC) int gr_internal_string5(int x, int y, char *s ) @@ -1450,13 +1455,13 @@ int gr_ustring(int x, int y, char *s ) return gr_internal_string0m(x,y,s); else return gr_internal_string0(x,y,s); -#ifdef __ENV_MSDOS__ +#ifdef __MSDOS__ case BM_SVGA: if ( BG_COLOR == -1) return gr_internal_string2m(x,y,s); else return gr_internal_string2(x,y,s); -#endif // __ENV_MSDOS__ +#endif // __MSDOS__ #if defined(POLY_ACC) case BM_LINEAR15: if ( BG_COLOR == -1) @@ -1629,7 +1634,7 @@ grs_font * gr_init_font( char * fontname ) cfread(&datasize,sizeof(datasize),1,fontfile); datasize=swapint(datasize); - if (file_id != 0x4e465350) /* 'NFSP' */ + if (file_id != MAKE_SIG('N','F','S','P')) Error( "File %s is not a font file", fontname ); font = (old_grs_font *) d_malloc(datasize); @@ -1763,7 +1768,7 @@ void gr_remap_font( grs_font *font, char * fontname ) file_id = cfile_read_int(fontfile); datasize = cfile_read_int(fontfile); - if (file_id != 0x4e465350) /* 'NFSP' */ + if (file_id != MAKE_SIG('N','F','S','P')) Error( "File %s is not a font file", fontname ); nchars = font->ft_maxchar-font->ft_minchar+1; diff --git a/main/bm.c b/main/bm.c index 15690ff8..7fc7660d 100644 --- a/main/bm.c +++ b/main/bm.c @@ -13,13 +13,16 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. /* * $Source: /cvs/cvsroot/d2x/main/bm.c,v $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * $Author: bradleyb $ - * $Date: 2001-11-02 02:22:25 $ + * $Date: 2001-11-14 09:34:32 $ * * Bitmap and palette loading functions. * * $Log: not supported by cvs2svn $ + * Revision 1.6 2001/11/02 02:22:25 bradleyb + * formatting + * * Revision 1.5 2001/10/25 02:15:55 bradleyb * conditionalize including multi.h and network.h, fix backslashes * @@ -66,6 +69,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #include "endlevel.h" #include "cntrlcen.h" #include "byteswap.h" +#include "makesig.h" ubyte Sounds[MAX_SOUNDS]; ubyte AltSounds[MAX_SOUNDS]; @@ -765,7 +769,7 @@ void bm_read_extra_robots(char *fname,int type) int sig; sig = cfile_read_int(fp); - if (sig != 0x5848414d) /* 'XHAM' */ + if (sig != MAKE_SIG('X','H','A','M')) return; version = cfile_read_int(fp); } diff --git a/main/gamesave.c b/main/gamesave.c index b5ac273b..d45eba3a 100644 --- a/main/gamesave.c +++ b/main/gamesave.c @@ -11,12 +11,27 @@ AND AGREES TO THE TERMS HEREIN AND ACCEPTS THE SAME BY USE OF THIS FILE. COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. */ +/* + * $Source: /cvs/cvsroot/d2x/main/gamesave.c,v $ + * $Revision: 1.6 $ + * $Author: bradleyb $ + * $Date: 2001-11-14 09:34:32 $ + * + * Save game information + * + * $Log: not supported by cvs2svn $ + * + */ + +#ifdef HAVE_CONFIG_H +#include +#endif #ifdef HAVE_CONFIG_H #include #endif #ifdef RCS -char gamesave_rcsid[] = "$Id: gamesave.c,v 1.5 2001-10-25 02:19:31 bradleyb Exp $"; +char gamesave_rcsid[] = "$Id: gamesave.c,v 1.6 2001-11-14 09:34:32 bradleyb Exp $"; #endif #include @@ -62,6 +77,7 @@ char gamesave_rcsid[] = "$Id: gamesave.c,v 1.5 2001-10-25 02:19:31 bradleyb Exp #include "laser.h" #include "byteswap.h" #include "multi.h" +#include "makesig.h" char Gamesave_current_filename[128]; @@ -1650,12 +1666,11 @@ int load_level(char * filename_passed) #endif CFILE * LoadFile; char filename[128]; - int version,minedata_offset,gamedata_offset; + int sig,version,minedata_offset,gamedata_offset; int mine_err,game_err; #ifdef NETWORK int i; #endif - char sig[4]; Slide_segs_computed = 0; @@ -1713,12 +1728,12 @@ int load_level(char * filename_passed) // newdemo_record_start_demo(); // #endif - cfread(sig, 1, 4, LoadFile); + sig = read_int(LoadFile); version = read_int(LoadFile); minedata_offset = read_int(LoadFile); gamedata_offset = read_int(LoadFile); - Assert((sig[0] == 'L') && (sig[1] == 'V') && (sig[2]=='L') && (sig[3] == 'P')); + Assert(sig == MAKE_SIG('P','L','V','L')); if (version >= 8) { //read dummy data #ifdef NETWORK @@ -2078,8 +2093,7 @@ int save_level_sub(char * filename, int compiled_version) { FILE * SaveFile; char temp_filename[128]; - u_int32_t sig = 0x504c564c; /* 'PLVL' */ - int version=LEVEL_FILE_VERSION; + int sig = MAKE_SIG('P','L','V','L'),version=LEVEL_FILE_VERSION; int minedata_offset=0,gamedata_offset=0; if ( !compiled_version ) { diff --git a/main/gameseq.c b/main/gameseq.c index e5dd8101..19298606 100644 --- a/main/gameseq.c +++ b/main/gameseq.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -char gameseq_rcsid[] = "$Id: gameseq.c,v 1.6 2001-11-08 10:30:27 bradleyb Exp $"; +char gameseq_rcsid[] = "$Id: gameseq.c,v 1.7 2001-11-14 09:34:32 bradleyb Exp $"; #endif #ifdef WINDOWS @@ -120,7 +120,7 @@ char gameseq_rcsid[] = "$Id: gameseq.c,v 1.6 2001-11-08 10:30:27 bradleyb Exp $" #ifdef EDITOR #include "editor/editor.h" #endif - +#include "makesig.h" void StartNewLevelSecret(int level_num, int page_in_textures); void InitPlayerPosition(int random_flag); @@ -846,15 +846,14 @@ void load_bitmap_replacements(char *level_name) ifile = cfopen(ifile_name,"rb"); if (ifile) { - int version,n_bitmaps; + int id,version,n_bitmaps; int bitmap_data_size; ushort *indices; - char id[4]; - cfread(&id, 1, 4, ifile); + id = cfile_read_int(ifile); version = cfile_read_int(ifile); - if (memcmp(id, "GOPD",4) || version != 1) { + if (id != MAKE_SIG('G','O','P','D') || version != 1) { cfclose(ifile); return; } diff --git a/main/piggy.c b/main/piggy.c index 1bcda451..86d0d6b8 100644 --- a/main/piggy.c +++ b/main/piggy.c @@ -16,7 +16,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: piggy.c,v 1.6 2001-11-08 10:30:28 bradleyb Exp $"; +static char rcsid[] = "$Id: piggy.c,v 1.7 2001-11-14 09:34:32 bradleyb Exp $"; #endif @@ -50,6 +50,7 @@ static char rcsid[] = "$Id: piggy.c,v 1.6 2001-11-08 10:30:28 bradleyb Exp $"; #include "newmenu.h" #include "byteswap.h" #include "findfile.h" +#include "makesig.h" #ifndef MACINTOSH // #include "unarj.h" @@ -295,7 +296,7 @@ void piggy_close_file() int Pigfile_initialized=0; -#define PIGFILE_ID "PPIG" //PPIG +#define PIGFILE_ID MAKE_SIG('G','I','P','P') //PPIG #define PIGFILE_VERSION 2 extern char CDROM_dir[]; @@ -571,12 +572,11 @@ void piggy_init_pigfile(char *filename) } if (Piggy_fp) { //make sure pig is valid type file & is up-to-date - int pig_version; - char pig_id[4]; + int pig_id,pig_version; - cfread(&pig_id, 1, 4, Piggy_fp); + pig_id = cfile_read_int(Piggy_fp); pig_version = cfile_read_int(Piggy_fp); - if (memcmp(pig_id, PIGFILE_ID, 4) || pig_version != PIGFILE_VERSION) { + if (pig_id != PIGFILE_ID || pig_version != PIGFILE_VERSION) { cfclose(Piggy_fp); //out of date pig Piggy_fp = NULL; //..so pretend it's not here } @@ -725,12 +725,11 @@ void piggy_new_pigfile(char *pigname) #endif if (Piggy_fp) { //make sure pig is valid type file & is up-to-date - int pig_version; - char pig_id[4]; + int pig_id,pig_version; - cfread(&pig_id, 1, 4, Piggy_fp); + pig_id = cfile_read_int(Piggy_fp); pig_version = cfile_read_int(Piggy_fp); - if (memcmp(pig_id, PIGFILE_ID, 4) || pig_version != PIGFILE_VERSION) { + if (pig_id != PIGFILE_ID || pig_version != PIGFILE_VERSION) { cfclose(Piggy_fp); //out of date pig Piggy_fp = NULL; //..so pretend it's not here } @@ -962,7 +961,7 @@ digi_sound bogus_sound; extern void bm_read_all(CFILE * fp); -#define HAMFILE_ID "HAM!" //HAM! +#define HAMFILE_ID MAKE_SIG('!','M','A','H') //HAM! #ifdef SHAREWARE #define HAMFILE_VERSION 2 #else @@ -971,14 +970,13 @@ extern void bm_read_all(CFILE * fp); //version 1 -> 2: save marker_model_num //version 2 -> 3: removed sound files -#define SNDFILE_ID "DSND" //DSND +#define SNDFILE_ID MAKE_SIG('D','N','S','D') //DSND #define SNDFILE_VERSION 1 int read_hamfile() { CFILE * ham_fp = NULL; - int ham_version; - char ham_id[4]; + int ham_id,ham_version; #ifdef MACINTOSH char name[255]; #endif @@ -996,9 +994,9 @@ int read_hamfile() } //make sure ham is valid type file & is up-to-date - cfread( &ham_id, 1, 4, ham_fp ); + ham_id = cfile_read_int(ham_fp); ham_version = cfile_read_int(ham_fp); - if (memcmp(ham_id, HAMFILE_ID, 4) || ham_version != HAMFILE_VERSION) { + if (ham_id != HAMFILE_ID || ham_version != HAMFILE_VERSION) { Must_write_hamfile = 1; cfclose(ham_fp); //out of date ham return 0; @@ -1031,8 +1029,7 @@ int read_hamfile() int read_sndfile() { CFILE * snd_fp = NULL; - int snd_version; - char snd_id[4]; + int snd_id,snd_version; int N_sounds; int sound_start; int header_size; @@ -1056,9 +1053,9 @@ int read_sndfile() return 0; //make sure soundfile is valid type file & is up-to-date - cfread( &snd_id, 1, 4, snd_fp ); + snd_id = cfile_read_int(snd_fp); snd_version = cfile_read_int(snd_fp); - if (memcmp(snd_id, SNDFILE_ID, 4) || snd_version != SNDFILE_VERSION) { + if (snd_id != SNDFILE_ID || snd_version != SNDFILE_VERSION) { cfclose(snd_fp); //out of date sound file return 0; } @@ -1424,7 +1421,7 @@ void piggy_write_pigfile(char *filename) pig_fp = fopen( filename, "wb" ); //open PIG file Assert( pig_fp!=NULL ); - write_int((int)PIGFILE_ID,pig_fp); + write_int(PIGFILE_ID,pig_fp); write_int(PIGFILE_VERSION,pig_fp); Num_bitmap_files--; @@ -1553,7 +1550,7 @@ void piggy_dump_all() ham_fp = fopen( DEFAULT_HAMFILE, "wb" ); //open HAM file Assert( ham_fp!=NULL ); - write_int((int)HAMFILE_ID,ham_fp); + write_int(HAMFILE_ID,ham_fp); write_int(HAMFILE_VERSION,ham_fp); bm_write_all(ham_fp); @@ -1583,7 +1580,7 @@ void piggy_dump_all() ham_fp = fopen( DEFAULT_SNDFILE, "wb" ); Assert( ham_fp!=NULL ); - write_int((int)SNDFILE_ID,ham_fp); + write_int(SNDFILE_ID,ham_fp); write_int(SNDFILE_VERSION,ham_fp); fwrite( &Num_sound_files, sizeof(int), 1, ham_fp ); -- 2.39.2