X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flibgame%2Fmisc.h;h=84a3f1b27fb1d0b8adc0f2e434c5b727070b2cfb;hb=bcb3453f710b95ec98b188b95574bea9ab336e96;hp=978cb23b965ba5ed535c52919190db37beef716b;hpb=4311b2aed4570447d0e082334e8b8a6b7da6e9f9;p=rocksndiamonds.git

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 978cb23b..84a3f1b2 100644
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -20,12 +20,6 @@
 #include "system.h"
 
 
-/* functions for version handling */
-#define VERSION_IDENT(x,y,z)	((x) * 10000 + (y) * 100 + (z))
-#define VERSION_MAJOR(x)	((x) / 10000)
-#define VERSION_MINOR(x)	(((x) % 10000) / 100)
-#define VERSION_PATCH(x)	((x) % 100)
-
 /* values for InitCounter() and Counter() */
 #define INIT_COUNTER			0
 #define READ_COUNTER			1
@@ -59,24 +53,6 @@
 #define MAX_FILENAME_LEN		256
 #define MAX_LINE_LEN			1000
 
-/* values for setup file stuff */
-#define TYPE_BOOLEAN			1
-#define TYPE_SWITCH			2
-#define TYPE_KEY			3
-#define TYPE_INTEGER			4
-#define TYPE_STRING			5
-
-#define TOKEN_STR_FILE_IDENTIFIER	"file_identifier"
-
-#define TOKEN_VALUE_POSITION		30
-
-struct SetupFileList
-{
-  char *token;
-  char *value;
-  struct SetupFileList *next;
-};
-
 void InitCounter(void);
 unsigned long Counter(void);
 void Delay(unsigned long);
@@ -94,11 +70,19 @@ char *getPath2(char *, char *);
 char *getPath3(char *, char *, char*);
 char *getStringCopy(char *);
 char *getStringToLower(char *);
+
 void GetOptions(char **);
+
+void SetError(char *, ...);
+char *GetError(void);
 void Error(int, char *, ...);
+
 void *checked_malloc(unsigned long);
 void *checked_calloc(unsigned long);
 void *checked_realloc(void *, unsigned long);
+inline void swap_numbers(int *, int *);
+inline void swap_number_pairs(int *, int *, int *, int *);
+
 short getFile16BitInteger(FILE *, int);
 void putFile16BitInteger(FILE *, short, int);
 int getFile32BitInteger(FILE *, int);
@@ -110,44 +94,13 @@ void WriteUnusedBytesToFile(FILE *, unsigned long);
 
 char *getKeyNameFromKey(Key);
 char *getX11KeyNameFromKey(Key);
+Key getKeyFromKeyName(char *);
 Key getKeyFromX11KeyName(char *);
 char getCharFromKey(Key);
-char *getJoyNameFromJoySymbol(int);
-int getJoySymbolFromJoyName(char *);
-int getJoystickNrFromDeviceName(char *);
-
-struct LevelDirInfo *newLevelDirInfo();
-void pushLevelDirInfo(struct LevelDirInfo **, struct LevelDirInfo *);
-int numLevelDirInfo(struct LevelDirInfo *);
-boolean validLevelSeries(struct LevelDirInfo *);
-struct LevelDirInfo *getFirstValidLevelSeries(struct LevelDirInfo *);
-struct LevelDirInfo *getLevelDirInfoFirstGroupEntry(struct LevelDirInfo *);
-int numLevelDirInfoInGroup(struct LevelDirInfo *);
-int posLevelDirInfo(struct LevelDirInfo *);
-struct LevelDirInfo *getLevelDirInfoFromPos(struct LevelDirInfo *, int);
-struct LevelDirInfo *getLevelDirInfoFromFilename(char *);
-void dumpLevelDirInfo(struct LevelDirInfo *, int);
-void sortLevelDirInfo(struct LevelDirInfo **,
-		      int (*compare_function)(const void *, const void *));
-
-inline void swap_numbers(int *, int *);
-inline void swap_number_pairs(int *, int *, int *, int *);
 
-char *getUserDataDir(void);
-char *getSetupDir(void);
-void createDirectory(char *, char *, int);
-void InitUserDataDirectory(void);
-void SetFilePermissions(char *, int);
-int getFileVersionFromCookieString(const char *);
-boolean checkCookieString(const char *, const char *);
-
-int get_string_integer_value(char *);
-boolean get_string_boolean_value(char *);
-char *getFormattedSetupEntry(char *, char *);
-void freeSetupFileList(struct SetupFileList *);
-char *getTokenValue(struct SetupFileList *, char *);
-struct SetupFileList *loadSetupFileList(char *);
-void checkSetupFileListIdentifier(struct SetupFileList *, char *);
+boolean FileIsGraphic(char *);
+boolean FileIsSound(char *);
+boolean FileIsMusic(char *);
 
 #if !defined(PLATFORM_UNIX)
 void initErrorFile();