added delay counter data type and adjusted related functions

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

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index a8eaa335972b2655f27408333b232c6cf79bd316..23c30e0801ac781a386ef81810f861eabae36d68 100644 (file)
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -28,11 +28,14 @@
 
 #define RANDOM_ENGINE                  0
 #define RANDOM_SIMPLE                  1
+#define RANDOM_BETTER                  2
 
 #define InitEngineRandom(seed)         init_random_number(RANDOM_ENGINE, seed)
 #define InitSimpleRandom(seed)         init_random_number(RANDOM_SIMPLE, seed)
+#define InitBetterRandom(seed)         init_random_number(RANDOM_BETTER, seed)
 #define GetEngineRandom(max)           get_random_number(RANDOM_ENGINE, max)
 #define GetSimpleRandom(max)           get_random_number(RANDOM_SIMPLE, max)
+#define GetBetterRandom(max)           get_random_number(RANDOM_BETTER, max)
 
 // values for getFile...() and putFile...()
 #define BYTE_ORDER_BIG_ENDIAN          0
@@ -42,6 +45,11 @@
 #define BIT_ORDER_MSB                  0
 #define BIT_ORDER_LSB                  1
 
+// values for character encoding
+#define TEXT_ENCODING_UNKNOWN          0
+#define TEXT_ENCODING_ASCII            1
+#define TEXT_ENCODING_UTF_8            2
+
 // values for createDirectory()
 #define PERMS_PRIVATE                  0
 #define PERMS_PUBLIC                   1
@@ -120,17 +128,21 @@ int log_2(unsigned int);
 
 boolean getTokenValueFromString(char *, char **, char **);
 
+char *getUUIDExt(unsigned int (*function)(int));
+char *getUUID(void);
+
 void InitCounter(void);
 unsigned int Counter(void);
 void Delay(unsigned int);
-boolean DelayReachedExt(unsigned int *, unsigned int, unsigned int);
-boolean FrameReached(unsigned int *, unsigned int);
-boolean DelayReached(unsigned int *, unsigned int);
-void ResetDelayCounterExt(unsigned int *, unsigned int);
-void ResetFrameCounter(unsigned int *);
-void ResetDelayCounter(unsigned int *);
-int WaitUntilDelayReached(unsigned int *, unsigned int);
-void SkipUntilDelayReached(unsigned int *, unsigned int, int *, int);
+boolean DelayReachedExt2(unsigned int *, unsigned int, unsigned int);
+boolean DelayReachedExt(DelayCounter *, unsigned int);
+boolean FrameReached(DelayCounter *);
+boolean DelayReached(DelayCounter *);
+void ResetDelayCounterExt(DelayCounter *, unsigned int);
+void ResetFrameCounter(DelayCounter *);
+void ResetDelayCounter(DelayCounter *);
+int WaitUntilDelayReached(DelayCounter *);
+void SkipUntilDelayReached(DelayCounter *, int *, int);
 
 unsigned int init_random_number(int, int);
 unsigned int get_random_number(int, int);
@@ -177,6 +189,7 @@ boolean strPrefix(char *, char *);
 boolean strSuffix(char *, char *);
 boolean strPrefixLower(char *, char *);
 boolean strSuffixLower(char *, char *);
+boolean isURL(char *);
 
 void GetOptions(int, char **,
                void (*print_usage_function)(void),
@@ -227,6 +240,9 @@ void WriteUnusedBytesToFile(FILE *, unsigned int);
 
 char *getUTF8FromLatin1(char *);
 char *getLatin1FromUTF8(char *);
+int getTextEncoding(char *);
+
+char *getEscapedJSON(char *);
 
 char *getKeyNameFromKey(Key);
 char *getX11KeyNameFromKey(Key);
@@ -255,6 +271,7 @@ int seekFile(File *, long, int);
 int getByteFromFile(File *);
 char *getStringFromFile(File *, char *, int);
 int copyFile(char *, char *);
+boolean touchFile(char *);
 
 Directory *openDirectory(char *);
 int closeDirectory(Directory *);