X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fmisc.h;h=4b9ead4ffbece22431baadfe2d069d84090c7e3e;hb=c6b89ec21b03182c40ae2eda40d861c09f179daf;hp=a42a75846b8184ab05aceb5f816e7fde42d4ceda;hpb=f3ab1f12fc514251aad3f8efcb30b7f1620fffdb;p=rocksndiamonds.git diff --git a/src/libgame/misc.h b/src/libgame/misc.h index a42a7584..4b9ead4f 100644 --- a/src/libgame/misc.h +++ b/src/libgame/misc.h @@ -36,8 +36,8 @@ #define GetSimpleRandom(max) get_random_number(RANDOM_SIMPLE, max) /* 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) @@ -77,6 +77,8 @@ char *int2str(int, 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); @@ -158,6 +160,7 @@ char *getX11KeyNameFromKey(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 *); @@ -177,7 +180,7 @@ boolean FileIsArtworkType(char *, int); char *get_mapped_token(char *); int get_parameter_value(char *, char *, int); -int get_auto_parameter_value(char *, char *); +int get_token_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);