projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100111-2-src
[rocksndiamonds.git]
/
src
/
libgame
/
misc.h
diff --git
a/src/libgame/misc.h
b/src/libgame/misc.h
index 1bafb463efe04bdd3a3661b7067075996b862079..6ac3d994c990a9fe74348168d3675b04b8b816bb 100644
(file)
--- a/
src/libgame/misc.h
+++ b/
src/libgame/misc.h
@@
-25,16
+25,19
@@
#define READ_COUNTER 1
/* values for InitRND() */
#define READ_COUNTER 1
/* values for InitRND() */
-#define NEW_RANDOMIZE
-1
+#define NEW_RANDOMIZE
0
-#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)
+#define RANDOM_ENGINE 0
+#define RANDOM_SIMPLE 1
+
+#define InitEngineRandom(seed) init_random_number(RANDOM_ENGINE, seed)
+#define InitSimpleRandom(seed) init_random_number(RANDOM_SIMPLE, seed)
+#define GetEngineRandom(max) get_random_number(RANDOM_ENGINE, max)
+#define GetSimpleRandom(max) get_random_number(RANDOM_SIMPLE, max)
/* values for Error() */
/* values for Error() */
-#define ERR_
RETURN
0
-#define ERR_
RETURN_LINE
(1 << 0)
+#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_WARN (1 << 1)
#define ERR_EXIT (1 << 2)
#define ERR_HELP (1 << 3)
@@
-74,6
+77,8
@@
char *int2str(int, int);
char *i_to_a(unsigned int);
int log_2(unsigned int);
char *i_to_a(unsigned int);
int log_2(unsigned int);
+boolean getTokenValueFromString(char *, char **, char **);
+
void InitCounter(void);
unsigned long Counter(void);
void Delay(unsigned long);
void InitCounter(void);
unsigned long Counter(void);
void Delay(unsigned long);
@@
-91,13
+96,22
@@
char *getBasePath(char *);
char *getBaseName(char *);
char *getBaseNamePtr(char *);
char *getBaseName(char *);
char *getBaseNamePtr(char *);
+char *getStringCat2WithSeparator(char *, char *, char *);
+char *getStringCat3WithSeparator(char *, char *, char *, char *);
+char *getStringCat2(char *, char *);
+char *getStringCat3(char *, char *, char *);
char *getPath2(char *, char *);
char *getPath3(char *, char *, char*);
char *getPath2(char *, char *);
char *getPath3(char *, char *, char*);
-char *getStringCat2(char *, char *);
char *getStringCopy(char *);
char *getStringCopy(char *);
+char *getStringCopyN(char *, int);
char *getStringToLower(char *);
void setString(char **, char *);
boolean strEqual(char *, char *);
char *getStringToLower(char *);
void setString(char **, char *);
boolean strEqual(char *, char *);
+boolean strEqualN(char *, char *, int);
+boolean strPrefix(char *, char *);
+boolean strSuffix(char *, char *);
+boolean strPrefixLower(char *, char *);
+boolean strSuffixLower(char *, char *);
void GetOptions(char **, void (*print_usage_function)(void));
void GetOptions(char **, void (*print_usage_function)(void));
@@
-109,6
+123,7
@@
void *checked_malloc(unsigned long);
void *checked_calloc(unsigned long);
void *checked_realloc(void *, unsigned long);
void checked_free(void *);
void *checked_calloc(unsigned long);
void *checked_realloc(void *, unsigned long);
void checked_free(void *);
+void clear_mem(void *, unsigned long);
void swap_numbers(int *, int *);
void swap_number_pairs(int *, int *, int *, int *);
void swap_numbers(int *, int *);
void swap_number_pairs(int *, int *, int *, int *);
@@
-152,9
+167,11
@@
char *getX11KeyNameFromKey(Key);
Key getKeyFromKeyName(char *);
Key getKeyFromX11KeyName(char *);
char getCharFromKey(Key);
Key getKeyFromKeyName(char *);
Key getKeyFromX11KeyName(char *);
char getCharFromKey(Key);
+char getValidConfigValueChar(char);
int get_integer_from_string(char *);
boolean get_boolean_from_string(char *);
int get_integer_from_string(char *);
boolean get_boolean_from_string(char *);
+int get_switch3_from_string(char *);
ListNode *newListNode(void);
void addNodeToList(ListNode **, char *, void *);
ListNode *newListNode(void);
void addNodeToList(ListNode **, char *, void *);
@@
-171,7
+188,6
@@
boolean FileIsArtworkType(char *, int);
char *get_mapped_token(char *);
int get_parameter_value(char *, char *, int);
char *get_mapped_token(char *);
int get_parameter_value(char *, char *, int);
-int get_auto_parameter_value(char *, char *);
struct ScreenModeInfo *get_screen_mode_from_string(char *);
void get_aspect_ratio_from_screen_mode(struct ScreenModeInfo *, int *x, int *y);
struct ScreenModeInfo *get_screen_mode_from_string(char *);
void get_aspect_ratio_from_screen_mode(struct ScreenModeInfo *, int *x, int *y);