X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=9f75cc20136c0220d9eb3a5ef983ce037a88071a;hp=b2b0c0cfc62de30577f2e1ead356fab006a3938f;hb=3ff2e8a0b5c27b99a9920bdf5ed82bc41bf40181;hpb=7b447f4c902beff72ad385a99cd723eb7d1ea369 diff --git a/src/libgame/misc.h b/src/libgame/misc.h index b2b0c0cf..9f75cc20 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -1,15 +1,13 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* misc.h * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// misc.h +// ============================================================================ #ifndef MISC_H #define MISC_H @@ -52,11 +50,6 @@ #define ERR_EXIT_SOUND_SERVER (ERR_EXIT | ERR_SOUND_SERVER) #define ERR_EXIT_NETWORK_SERVER (ERR_EXIT | ERR_NETWORK_SERVER) #define ERR_EXIT_NETWORK_CLIENT (ERR_EXIT | ERR_NETWORK_CLIENT) -#if 0 -#define ERR_ERROR (ERR_UNKNOWN) -#define ERR_FATAL (ERR_EXIT) -#define ERR_VERBOSE (ERR_INFO) -#endif /* values for getFile...() and putFile...() */ #define BYTE_ORDER_BIG_ENDIAN 0 @@ -183,8 +176,6 @@ void clear_mem(void *, unsigned int); void swap_numbers(int *, int *); void swap_number_pairs(int *, int *, int *, int *); -#if 1 - int getFile8BitInteger(File *); int putFile8BitInteger(FILE *, int); int getFile16BitInteger(File *, int); @@ -203,28 +194,6 @@ void WriteBytesToFile(FILE *, byte *, unsigned int); void ReadUnusedBytesFromFile(File *, unsigned int); void WriteUnusedBytesToFile(FILE *, unsigned int); -#else - -int getFile8BitInteger(FILE *); -int putFile8BitInteger(FILE *, int); -int getFile16BitInteger(FILE *, int); -int putFile16BitInteger(FILE *, int, int); -int getFile32BitInteger(FILE *, int); -int putFile32BitInteger(FILE *, int, int); - -boolean getFileChunk(FILE *, char *, int *, int); -int putFileChunk(FILE *, char *, int, int); -int getFileVersion(FILE *); -int putFileVersion(FILE *, int); - -void ReadBytesFromFile(FILE *, byte *, unsigned int); -void WriteBytesToFile(FILE *, byte *, unsigned int); - -void ReadUnusedBytesFromFile(FILE *, unsigned int); -void WriteUnusedBytesToFile(FILE *, unsigned int); - -#endif - #define getFile8Bit(f) getFile8BitInteger(f) #define putFile8Bit(f,x) putFile8BitInteger(f,x) #define getFile16BitBE(f) getFile16BitInteger(f,BYTE_ORDER_BIG_ENDIAN)