X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=13b513d8e23f6f8faf5f4a52d3bb4d8b4f96231b;hb=9f9e4ca920d37c88d3c6e15d645e18e8b56e662a;hp=32dc36c26abc90313ce3d4ba62192aff95cade32;hpb=de49192b75b9ff43a8c2ed6cb200efb4240d8d6d;p=rocksndiamonds.git

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 32dc36c2..13b513d8 100644
--- 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
@@ -106,6 +114,7 @@ void PrintNoLog(char *, ...);
 void PrintLine(char *, int);
 void PrintLineWithPrefix(char *, char *, int);
 
+void DebugContinued(char *, char *, ...);
 void Debug(char *, char *, ...);
 void Info(char *, ...);
 void Warn(char *, ...);
@@ -119,23 +128,38 @@ 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);
 
+#if defined(PLATFORM_UNIX)
+char *getUnixLoginName(void);
+char *getUnixRealName(void);
+char *getUnixHomeDir(void);
+#endif
+
 char *getLoginName(void);
 char *getRealName(void);
+char *getFixedUserName(char *);
+char *getDefaultUserName(int);
+
+char *getTimestampFromEpoch(time_t);
+char *getCurrentTimestamp(void);
 
 time_t getFileTimestampEpochSeconds(char *);
 
@@ -159,18 +183,18 @@ char *getStringToLower(const char *);
 void setString(char **, char *);
 boolean strEqual(char *, char *);
 boolean strEqualN(char *, char *, int);
+boolean strEqualCase(char *, char *);
+boolean strEqualCaseN(char *, char *, int);
 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),
 		void (*print_version_function)(void));
 
-void SetError(char *, ...);
-char *GetError(void);
-
 void *checked_malloc(unsigned int);
 void *checked_calloc(unsigned int);
 void *checked_realloc(void *, unsigned int);
@@ -214,6 +238,12 @@ void WriteUnusedBytesToFile(FILE *, unsigned int);
 #define putFileChunkBE(f,s,x) putFileChunk(f,s,x,BYTE_ORDER_BIG_ENDIAN)
 #define putFileChunkLE(f,s,x) putFileChunk(f,s,x,BYTE_ORDER_LITTLE_ENDIAN)
 
+char *getUTF8FromLatin1(char *);
+char *getLatin1FromUTF8(char *);
+int getTextEncoding(char *);
+
+char *getEscapedJSON(char *);
+
 char *getKeyNameFromKey(Key);
 char *getX11KeyNameFromKey(Key);
 Key getKeyFromKeyName(char *);
@@ -241,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 *);
@@ -264,9 +295,9 @@ void ReloadCustomArtworkList(struct ArtworkListInfo *);
 void FreeCustomArtworkLists(struct ArtworkListInfo *);
 
 char *getLogFilename(char *);
-void OpenLogFiles(void);
-void CloseLogFiles(void);
-void DumpLogFile(int);
+void OpenLogFile(void);
+void CloseLogFile(void);
+void DumpLogFile(void);
 
 void NotifyUserAboutErrorFile(void);