fixed compiler warnings (after adding "-Wstrict-prototypes")

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

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index bfaadc79a92289d2867f07a0eca6418d2a014a54..278269ab354acced5172a2b88cd9d0686aa9b02c 100644 (file)
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -27,28 +27,29 @@
 #define TYPE_KEY_X11                   (1 << 7)
 #define TYPE_INTEGER                   (1 << 8)
 #define TYPE_STRING                    (1 << 9)
-#define TYPE_ELEMENT                   (1 << 10)
-#define TYPE_GRAPHIC                   (1 << 11)
+#define TYPE_PLAYER                    (1 << 10)
+#define TYPE_ELEMENT                   (1 << 11)
+#define TYPE_GRAPHIC                   (1 << 12)
 
 /* additional values for setup screen */
-#define TYPE_ENTER_SCREEN              (1 << 12)
-#define TYPE_LEAVE_SCREEN              (1 << 13)
-#define TYPE_ENTER_MENU                        (1 << 14)
-#define TYPE_LEAVE_MENU                        (1 << 15)
-#define TYPE_ENTER_LIST                        (1 << 16)
-#define TYPE_LEAVE_LIST                        (1 << 17)
-#define TYPE_EMPTY                     (1 << 18)
-#define TYPE_SKIPPABLE                 (1 << 19)
-#define TYPE_KEYTEXT                   (1 << 20)
-
-#define TYPE_GHOSTED                   (1 << 21)
-#define TYPE_QUERY                     (1 << 22)
+#define TYPE_ENTER_SCREEN              (1 << 13)
+#define TYPE_LEAVE_SCREEN              (1 << 14)
+#define TYPE_ENTER_MENU                        (1 << 15)
+#define TYPE_LEAVE_MENU                        (1 << 16)
+#define TYPE_ENTER_LIST                        (1 << 17)
+#define TYPE_LEAVE_LIST                        (1 << 18)
+#define TYPE_EMPTY                     (1 << 19)
+#define TYPE_SKIPPABLE                 (1 << 20)
+#define TYPE_KEYTEXT                   (1 << 21)
+
+#define TYPE_GHOSTED                   (1 << 22)
+#define TYPE_QUERY                     (1 << 23)
 
 /* additional values for internal purposes */
-#define TYPE_BITFIELD                  (1 << 23)
-#define TYPE_CONTENT                   (1 << 24)
-#define TYPE_ELEMENT_LIST              (1 << 25)
-#define TYPE_CONTENT_LIST              (1 << 26)
+#define TYPE_BITFIELD                  (1 << 24)
+#define TYPE_CONTENT                   (1 << 25)
+#define TYPE_ELEMENT_LIST              (1 << 26)
+#define TYPE_CONTENT_LIST              (1 << 27)
 
 /* derived values for setup file handling */
 #define TYPE_BOOLEAN_STYLE             (TYPE_BOOLEAN | \
@@ -64,6 +65,7 @@
                                         TYPE_KEY_X11           | \
                                         TYPE_INTEGER           | \
                                         TYPE_STRING            | \
+                                        TYPE_PLAYER            | \
                                         TYPE_ELEMENT           | \
                                         TYPE_GRAPHIC)
 
@@ -248,9 +250,10 @@ char *getCustomMusicDirectory(void);
 void InitTapeDirectory(char *);
 void InitScoreDirectory(char *);
 void InitUserLevelDirectory(char *);
+void InitNetworkLevelDirectory(char *);
 void InitLevelSetupDirectory(char *);
 
-TreeInfo *newTreeInfo();
+TreeInfo *newTreeInfo(void);
 TreeInfo *newTreeInfo_setDefaults(int);
 void pushTreeInfo(TreeInfo **, TreeInfo *);
 int numTreeInfo(TreeInfo *);
@@ -274,6 +277,7 @@ char *getPersonalDataDir(void);
 char *getUserGameDataDir(void);
 char *getSetupDir(void);
 char *getUserLevelDir(char *);
+char *getNetworkLevelDir(char *);
 char *getCurrentLevelDir(void);
 char *getNewUserLevelSubdir(void);
 
@@ -297,7 +301,7 @@ SetupFileList *setListEntry(SetupFileList *, char *, char *);
 SetupFileList *addListEntry(SetupFileList *, char *, char *);
 SetupFileList *loadSetupFileList(char *);
 
-SetupFileHash *newSetupFileHash();
+SetupFileHash *newSetupFileHash(void);
 void freeSetupFileHash(SetupFileHash *);
 char *getHashEntry(SetupFileHash *, char *);
 void setHashEntry(SetupFileHash *, char *, char *);
@@ -309,7 +313,7 @@ char *getSetupLine(struct TokenInfo *, char *, int);
 
 unsigned int get_hash_from_key(void *);
 
-boolean AdjustGraphicsForEMC();
+boolean AdjustGraphicsForEMC(void);
 
 void LoadLevelInfo(void);
 void LoadArtworkInfo(void);
@@ -317,14 +321,14 @@ void LoadLevelArtworkInfo(void);
 
 char *getArtworkIdentifierForUserLevelSet(int);
 TreeInfo *getArtworkTreeInfoForUserLevelSet(int);
-boolean checkIfCustomArtworkExistsForCurrentLevelSet();
+boolean checkIfCustomArtworkExistsForCurrentLevelSet(void);
 void AddUserLevelSetToLevelInfo(char *);
 boolean UpdateUserLevelSet(char *, char *, char *, int);
 boolean CreateUserLevelSet(char *, char *, char *, int, boolean);
 
 void LoadLevelSetup_LastSeries(void);
 void SaveLevelSetup_LastSeries(void);
-void SaveLevelSetup_LastSeries_Deactivate();
+void SaveLevelSetup_LastSeries_Deactivate(void);
 void LoadLevelSetup_SeriesInfo(void);
 void SaveLevelSetup_SeriesInfo(void);