X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=1e8f039d3274cc9e6e7472fa6ae1b317c8a63ec2;hp=431d59139850d925f7343340dc26dcdfeb06ff57;hb=00383dd409fde133c6738231abfcee662c03087c;hpb=142d88521dfcde187ea315279d79203c00e1b0f3 diff --git a/src/libgame/misc.h b/src/libgame/misc.h index 431d5913..1e8f039d 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -1,15 +1,13 @@ -/*********************************************************** -* Artsoft Retro-Game Library * -*----------------------------------------------------------* -* (c) 1994-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* misc.h * -***********************************************************/ +// ============================================================================ +// Artsoft Retro-Game Library +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// misc.h +// ============================================================================ #ifndef MISC_H #define MISC_H @@ -37,14 +35,16 @@ #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) @@ -114,8 +114,14 @@ typedef struct /* function definitions */ void fprintf_line(FILE *, char *, int); +void fprintf_line_with_prefix(FILE *, char *, char *, int); void printf_line(char *, int); void printf_line_with_prefix(char *, char *, int); + +void Print(char *, ...); +void PrintLine(char *, int); +void PrintLineWithPrefix(char *, char *, int); + char *int2str(int, int); char *i_to_a(unsigned int); int log_2(unsigned int); @@ -125,9 +131,14 @@ boolean getTokenValueFromString(char *, char **, char **); 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 WaitUntilDelayReached(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); unsigned int init_random_number(int, int); unsigned int get_random_number(int, int); @@ -140,6 +151,7 @@ time_t getFileTimestampEpochSeconds(char *); char *getBasePath(char *); char *getBaseName(char *); char *getBaseNamePtr(char *); +char *getBaseNameNoSuffix(char *); char *getStringCat2WithSeparator(char *, char *, char *); char *getStringCat3WithSeparator(char *, char *, char *, char *); @@ -147,9 +159,12 @@ char *getStringCat2(char *, char *); char *getStringCat3(char *, char *, char *); char *getPath2(char *, char *); char *getPath3(char *, char *, char*); -char *getStringCopy(char *); -char *getStringCopyN(char *, int); -char *getStringToLower(char *); +char *getImg2(char *, char *); +char *getImg3(char *, char *, char*); +char *getStringCopy(const char *); +char *getStringCopyN(const char *, int); +char *getStringCopyNStatic(const char *, int); +char *getStringToLower(const char *); void setString(char **, char *); boolean strEqual(char *, char *); boolean strEqualN(char *, char *, int); @@ -158,7 +173,9 @@ boolean strSuffix(char *, char *); boolean strPrefixLower(char *, char *); boolean strSuffixLower(char *, char *); -void GetOptions(char **, void (*print_usage_function)(void)); +void GetOptions(int, char **, + void (*print_usage_function)(void), + void (*print_version_function)(void)); void SetError(char *, ...); char *GetError(void); @@ -173,22 +190,22 @@ void clear_mem(void *, unsigned int); void swap_numbers(int *, int *); void swap_number_pairs(int *, int *, int *, int *); -int getFile8BitInteger(FILE *); +int getFile8BitInteger(File *); int putFile8BitInteger(FILE *, int); -int getFile16BitInteger(FILE *, int); +int getFile16BitInteger(File *, int); int putFile16BitInteger(FILE *, int, int); -int getFile32BitInteger(FILE *, int); +int getFile32BitInteger(File *, int); int putFile32BitInteger(FILE *, int, int); -boolean getFileChunk(FILE *, char *, int *, int); +boolean getFileChunk(File *, char *, int *, int); int putFileChunk(FILE *, char *, int, int); -int getFileVersion(FILE *); +int getFileVersion(File *); int putFileVersion(FILE *, int); -void ReadBytesFromFile(FILE *, byte *, unsigned int); +void ReadBytesFromFile(File *, byte *, unsigned int); void WriteBytesToFile(FILE *, byte *, unsigned int); -void ReadUnusedBytesFromFile(FILE *, unsigned int); +void ReadUnusedBytesFromFile(File *, unsigned int); void WriteUnusedBytesToFile(FILE *, unsigned int); #define getFile8Bit(f) getFile8BitInteger(f) @@ -227,6 +244,9 @@ int getNumNodes(ListNode *); File *openFile(char *, char *); int closeFile(File *); int checkEndOfFile(File *); +size_t readFile(File *, void *, size_t, size_t); +int seekFile(File *, long, int); +int getByteFromFile(File *); char *getStringFromFile(File *, char *, int); Directory *openDirectory(char *); @@ -234,6 +254,7 @@ int closeDirectory(Directory *); DirectoryEntry *readDirectory(Directory *); void freeDirectoryEntry(DirectoryEntry *); +boolean directoryExists(char *); boolean fileExists(char *); boolean FileIsGraphic(char *); boolean FileIsSound(char *); @@ -244,9 +265,6 @@ char *get_mapped_token(char *); int get_parameter_value(char *, char *, int); -struct ScreenModeInfo *get_screen_mode_from_string(char *); -void get_aspect_ratio_from_screen_mode(struct ScreenModeInfo *, int *x, int *y); - struct FileInfo *getFileListFromConfigList(struct ConfigInfo *, struct ConfigTypeInfo *, char **, int); @@ -254,12 +272,19 @@ void LoadArtworkConfig(struct ArtworkListInfo *); void ReloadCustomArtworkList(struct ArtworkListInfo *); void FreeCustomArtworkLists(struct ArtworkListInfo *); -char *getErrorFilename(char *); -void openErrorFile(); -void closeErrorFile(); -void dumpErrorFile(); +char *getLogFilename(char *); +void OpenLogFiles(); +void CloseLogFiles(); +void DumpLogFile(int); + void NotifyUserAboutErrorFile(); +#if DEBUG void debug_print_timestamp(int, char *); +#endif +void print_timestamp_init(char *); +void print_timestamp_time(char *); +void print_timestamp_done(char *); + #endif /* MISC_H */