X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=64f51d1304e512f67833db278b958417555ac9a7;hb=fe57866d9aa0cc2ebf48411eaf7bb4180cf85a84;hp=90a53154576f894e73fab3f24ab086d2096a00f9;hpb=c3e9cc5a7524e88ca789982a803b805272448c0b;p=rocksndiamonds.git

diff --git a/src/libgame/setup.h b/src/libgame/setup.h
index 90a53154..64f51d13 100644
--- a/src/libgame/setup.h
+++ b/src/libgame/setup.h
@@ -16,7 +16,7 @@
 #include "hash.h"
 
 
-/* values for setup file handling */
+// values for setup file handling
 #define TYPE_BOOLEAN			(1 << 0)
 #define TYPE_SWITCH			(1 << 1)
 #define TYPE_SWITCH3			(1 << 2)
@@ -31,33 +31,34 @@
 #define TYPE_ELEMENT			(1 << 11)
 #define TYPE_GRAPHIC			(1 << 12)
 
-/* additional values for setup screen */
+// additional values for setup screen
 #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_TEXT_INPUT			(1 << 19)
+#define TYPE_EMPTY			(1 << 20)
+#define TYPE_SKIPPABLE			(1 << 21)
+#define TYPE_KEYTEXT			(1 << 22)
 
-#define TYPE_GHOSTED			(1 << 22)
-#define TYPE_QUERY			(1 << 23)
+#define TYPE_GHOSTED			(1 << 23)
+#define TYPE_QUERY			(1 << 24)
 
-/* additional values for internal purposes */
-#define TYPE_BITFIELD			(1 << 24)
-#define TYPE_CONTENT			(1 << 25)
-#define TYPE_ELEMENT_LIST		(1 << 26)
-#define TYPE_CONTENT_LIST		(1 << 27)
+// additional values for internal purposes
+#define TYPE_BITFIELD			(1 << 25)
+#define TYPE_CONTENT			(1 << 26)
+#define TYPE_ELEMENT_LIST		(1 << 27)
+#define TYPE_CONTENT_LIST		(1 << 28)
 
-/* derived values for setup file handling */
+// derived values for setup file handling
 #define TYPE_BOOLEAN_STYLE		(TYPE_BOOLEAN | \
 					 TYPE_SWITCH  | \
 					 TYPE_YES_NO  | \
 					 TYPE_ECS_AGA )
 
-/* derived values for setup screen */
+// derived values for setup screen
 #define TYPE_VALUE			(TYPE_BOOLEAN_STYLE	| \
 					 TYPE_SWITCH3		| \
 					 TYPE_YES_NO_AUTO	| \
@@ -92,7 +93,7 @@ struct TokenInfo
   char *text;
 };
 
-/* some definitions for list and hash handling */
+// some definitions for list and hash handling
 typedef struct SetupFileList SetupFileList;
 typedef struct hashtable     SetupFileHash;
 
@@ -111,7 +112,7 @@ typedef struct hashtable     SetupFileHash;
   }								\
 
 
-/* sort priorities of level series (also used as level series classes) */
+// sort priorities of level series (also used as level series classes)
 #define LEVELCLASS_TUTORIAL_START	10
 #define LEVELCLASS_TUTORIAL_END		99
 #define LEVELCLASS_CLASSICS_START	100
@@ -188,7 +189,7 @@ typedef struct hashtable     SetupFileHash;
 			 IS_LEVELCLASS_SB(n) ? LEVELCLASS_SB :		   \
 			 LEVELCLASS_UNDEFINED)
 
-/* sort priorities of artwork */
+// sort priorities of artwork
 #define ARTWORKCLASS_CLASSICS_START	100
 #define ARTWORKCLASS_CLASSICS_END	199
 #define ARTWORKCLASS_CONTRIB_START	200
@@ -253,7 +254,7 @@ 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 *);
@@ -301,7 +302,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 *);
@@ -313,7 +314,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);
@@ -321,14 +322,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);
 
@@ -339,4 +340,4 @@ void LevelStats_setSolved(int, int);
 void LevelStats_incPlayed(int);
 void LevelStats_incSolved(int);
 
-#endif /* MISC_H */
+#endif // MISC_H