X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=582a6255f9ee4d2ad67a445e87f3956442409253;hp=8732a8cddf0a5c8ec500b13c66a937913475709d;hb=a8816d6e5319f9ec26a45346b08250f61e95c011;hpb=b6847742a0713d8ed21bb6104476db54f8c1a4b9

diff --git a/src/libgame/misc.h b/src/libgame/misc.h
index 8732a8cd..582a6255 100644
--- a/src/libgame/misc.h
+++ b/src/libgame/misc.h
@@ -16,6 +16,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <dirent.h>
 
 #include "system.h"
 
@@ -36,19 +37,26 @@
 #define GetSimpleRandom(max)		get_random_number(RANDOM_SIMPLE, max)
 
 /* values for Error() */
-#define ERR_INFO			0
-#define ERR_INFO_LINE			(1 << 0)
-#define ERR_WARN			(1 << 1)
-#define ERR_EXIT			(1 << 2)
-#define ERR_HELP			(1 << 3)
-#define ERR_SOUND_SERVER		(1 << 4)
-#define ERR_NETWORK_SERVER		(1 << 5)
-#define ERR_NETWORK_CLIENT		(1 << 6)
+#define ERR_UNKNOWN			0
+#define ERR_DEBUG			(1 << 0)
+#define ERR_INFO			(1 << 1)
+#define ERR_INFO_LINE			(1 << 2)
+#define ERR_WARN			(1 << 3)
+#define ERR_EXIT			(1 << 4)
+#define ERR_HELP			(1 << 5)
+#define ERR_SOUND_SERVER		(1 << 6)
+#define ERR_NETWORK_SERVER		(1 << 7)
+#define ERR_NETWORK_CLIENT		(1 << 8)
 #define ERR_FROM_SERVER			(ERR_SOUND_SERVER | ERR_NETWORK_SERVER)
 #define ERR_EXIT_HELP			(ERR_EXIT | ERR_HELP)
 #define ERR_EXIT_SOUND_SERVER		(ERR_EXIT | ERR_SOUND_SERVER)
 #define ERR_EXIT_NETWORK_SERVER		(ERR_EXIT | ERR_NETWORK_SERVER)
 #define ERR_EXIT_NETWORK_CLIENT		(ERR_EXIT | ERR_NETWORK_CLIENT)
+#if 0
+#define ERR_ERROR			(ERR_UNKNOWN)
+#define ERR_FATAL			(ERR_EXIT)
+#define ERR_VERBOSE			(ERR_INFO)
+#endif
 
 /* values for getFile...() and putFile...() */
 #define BYTE_ORDER_BIG_ENDIAN		0
@@ -69,6 +77,48 @@
 /* values for general username handling stuff */
 #define MAX_USERNAME_LEN		1024
 
+#if defined(PLATFORM_ANDROID)
+/* values for Android asset handling */
+#define ASSET_TOC_BASENAME		".toc"
+#endif
+
+
+/* structure definitions */
+
+typedef struct
+{
+  char *filename;
+  FILE *file;
+  boolean end_of_file;
+
+#if defined(PLATFORM_ANDROID)
+  boolean file_is_asset;
+  SDL_RWops *asset_file;
+#endif
+} File;
+
+typedef struct
+{
+  boolean is_directory;
+  char *basename;
+  char *filename;
+} DirectoryEntry;
+
+typedef struct
+{
+  char *filename;
+  DIR *dir;
+  DirectoryEntry *dir_entry;
+
+#if defined(PLATFORM_ANDROID)
+  boolean directory_is_asset;
+  SDL_RWops *asset_toc_file;
+  char *current_entry;
+#endif
+} Directory;
+
+
+/* function definitions */
 
 void fprintf_line(FILE *, char *, int);
 void printf_line(char *, int);
@@ -80,18 +130,20 @@ int log_2(unsigned int);
 boolean getTokenValueFromString(char *, char **, char **);
 
 void InitCounter(void);
-unsigned long Counter(void);
-void Delay(unsigned long);
-boolean FrameReached(unsigned long *, unsigned long);
-boolean DelayReached(unsigned long *, unsigned long);
-void WaitUntilDelayReached(unsigned long *, unsigned long);
+unsigned int Counter(void);
+void Delay(unsigned int);
+boolean FrameReached(unsigned int *, unsigned int);
+boolean DelayReached(unsigned int *, unsigned int);
+void WaitUntilDelayReached(unsigned int *, unsigned int);
 
-unsigned int init_random_number(int, long);
+unsigned int init_random_number(int, int);
 unsigned int get_random_number(int, int);
 
 char *getLoginName(void);
 char *getRealName(void);
 
+time_t getFileTimestampEpochSeconds(char *);
+
 char *getBasePath(char *);
 char *getBaseName(char *);
 char *getBaseNamePtr(char *);
@@ -113,18 +165,17 @@ boolean strSuffix(char *, char *);
 boolean strPrefixLower(char *, char *);
 boolean strSuffixLower(char *, char *);
 
-void GetOptions(char **, void (*print_usage_function)(void),
-		unsigned long (*get_cmd_switch_function)(char *));
+void GetOptions(char **, void (*print_usage_function)(void));
 
 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);
+void *checked_malloc(unsigned int);
+void *checked_calloc(unsigned int);
+void *checked_realloc(void *, unsigned int);
 void checked_free(void *);
-void clear_mem(void *, unsigned long);
+void clear_mem(void *, unsigned int);
 
 void swap_numbers(int *, int *);
 void swap_number_pairs(int *, int *, int *, int *);
@@ -141,11 +192,11 @@ int putFileChunk(FILE *, char *, int, int);
 int getFileVersion(FILE *);
 int putFileVersion(FILE *, int);
 
-void ReadBytesFromFile(FILE *, byte *, unsigned long);
-void WriteBytesToFile(FILE *, byte *, unsigned long);
+void ReadBytesFromFile(FILE *, byte *, unsigned int);
+void WriteBytesToFile(FILE *, byte *, unsigned int);
 
-void ReadUnusedBytesFromFile(FILE *, unsigned long);
-void WriteUnusedBytesToFile(FILE *, unsigned long);
+void ReadUnusedBytesFromFile(FILE *, unsigned int);
+void WriteUnusedBytesToFile(FILE *, unsigned int);
 
 #define getFile8Bit(f)        getFile8BitInteger(f)
 #define putFile8Bit(f,x)      putFile8BitInteger(f,x)
@@ -180,6 +231,16 @@ void deleteNodeFromList(ListNode **, char *, void (*function)(void *));
 ListNode *getNodeFromKey(ListNode *, char *);
 int getNumNodes(ListNode *);
 
+File *openFile(char *, char *);
+int closeFile(File *);
+int checkEndOfFile(File *);
+char *getStringFromFile(File *, char *, int);
+
+Directory *openDirectory(char *);
+int closeDirectory(Directory *);
+DirectoryEntry *readDirectory(Directory *);
+void freeDirectoryEntry(DirectoryEntry *);
+
 boolean fileExists(char *);
 boolean FileIsGraphic(char *);
 boolean FileIsSound(char *);
@@ -206,6 +267,13 @@ void closeErrorFile();
 void dumpErrorFile();
 void NotifyUserAboutErrorFile();
 
+#if DEBUG
 void debug_print_timestamp(int, char *);
+void print_timestamp_init(char *);
+void print_timestamp_time(char *);
+void print_timestamp_done(char *);
+#endif	/* DEBUG */
+
+
 
 #endif /* MISC_H */