major cleanup of preprocessor hell

[rocksndiamonds.git] / src / libgame / misc.h

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 465d30ebae992f7c6568c32d134109df0c71dd9b..9f75cc20136c0220d9eb3a5ef983ce037a88071a 100644 (file)
--- 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
@@ -154,9 +147,10 @@ char *getStringCat2(char *, char *);
 char *getStringCat3(char *, char *, char *);
 char *getPath2(char *, char *);
 char *getPath3(char *, char *, char*);
-char *getStringCopy(char *);
-char *getStringCopyN(char *, int);
-char *getStringToLower(char *);
+char *getStringCopy(const char *);
+char *getStringCopyN(const char *, int);
+char *getStringCopyNStatic(const char *, int);
+char *getStringToLower(const char *);
 void setString(char **, char *);
 boolean strEqual(char *, char *);
 boolean strEqualN(char *, char *, int);
@@ -165,7 +159,9 @@ boolean strSuffix(char *, char *);
 boolean strPrefixLower(char *, char *);
 boolean strSuffixLower(char *, char *);
 
-void GetOptions(char **, void (*print_usage_function)(void));
+void GetOptions(char **,
+               void (*print_usage_function)(void),
+               void (*print_version_function)(void));
 
 void SetError(char *, ...);
 char *GetError(void);
@@ -180,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);
@@ -200,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)
@@ -297,11 +269,10 @@ void NotifyUserAboutErrorFile();
 
 #if DEBUG
 void debug_print_timestamp(int, char *);
+#endif
 void print_timestamp_init(char *);
 void print_timestamp_time(char *);
 void print_timestamp_done(char *);
-#endif /* DEBUG */
-
 
 
 #endif /* MISC_H */