X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=3c0619fbf1084bb80f0abfa90cd78f38b2aa1329;hb=4fe9164460ddbdc1077604bac5c418f02fd8fa2b;hp=968837bd5aa211f2029c7bd708363778920b2a0a;hpb=4bb90da7a98b741b4576099be6b89d324c8a80de;p=rocksndiamonds.git diff --git a/src/libgame/misc.h b/src/libgame/misc.h index 968837bd..3c0619fb 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -27,7 +27,7 @@ /* values for InitRND() */ #define NEW_RANDOMIZE -1 -#define InitRND(seed) init_random_number(0, seed) +#define InitEngineRND(seed) init_random_number(0, seed) #define InitSimpleRND(seed) init_random_number(1, seed) #define RND(max) get_random_number(0, max) #define SimpleRND(max) get_random_number(1, max) @@ -71,6 +71,7 @@ void fprintf_line(FILE *, char *, int); void printf_line(char *, int); char *int2str(int, int); char *i_to_a(unsigned int); +int log_2(unsigned int); void InitCounter(void); unsigned long Counter(void); @@ -87,7 +88,7 @@ unsigned int InitRND(long); #endif unsigned int init_random_number(int, long); -unsigned int get_random_number(int, unsigned int); +unsigned int get_random_number(int, int); char *getLoginName(void); char *getRealName(void); @@ -109,12 +110,13 @@ void Error(int, char *, ...); void *checked_malloc(unsigned long); void *checked_calloc(unsigned long); void *checked_realloc(void *, unsigned long); +void checked_free(void *); inline void swap_numbers(int *, int *); inline void swap_number_pairs(int *, int *, int *, int *); -short getFile16BitInteger(FILE *, int); -void putFile16BitInteger(FILE *, short, int); +int getFile16BitInteger(FILE *, int); +void putFile16BitInteger(FILE *, int, int); int getFile32BitInteger(FILE *, int); void putFile32BitInteger(FILE *, int, int); boolean getFileChunk(FILE *, char *, int *, int); @@ -164,7 +166,8 @@ int get_parameter_value(char *, char *, int); int get_auto_parameter_value(char *, char *); struct FileInfo *getFileListFromConfigList(struct ConfigInfo *, - struct ConfigInfo *, char **, int); + struct ConfigTypeInfo *, + char **, int); void LoadArtworkConfig(struct ArtworkListInfo *); void ReloadCustomArtworkList(struct ArtworkListInfo *); void FreeCustomArtworkLists(struct ArtworkListInfo *);