X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=72e4f051bf47a44f17b66d28be20fa693e151274;hp=8b37a47de807dd6dd5ff36f478fe654a927afad9;hb=4a1cf573aae3a92b4ca910482d425e8b789b32eb;hpb=d870b82d2c53def1ed6da9fdc46ce6bf3dd1bfae diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 8b37a47d..72e4f051 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -571,7 +571,7 @@ char *getLoginName() if (GetUserName(login_name, &buffer_size) == 0) strcpy(login_name, ANONYMOUS_NAME); } -#else +#elif defined(PLATFORM_UNIX) && !defined(PLATFORM_ANDROID) if (login_name == NULL) { struct passwd *pwd; @@ -581,6 +581,8 @@ char *getLoginName() else login_name = getStringCopy(pwd->pw_name); } +#else + login_name = ANONYMOUS_NAME; #endif return login_name; @@ -985,6 +987,7 @@ void GetOptions(int argc, char *argv[], options.sounds_directory = getPath2(ro_base_path, SOUNDS_DIRECTORY); options.music_directory = getPath2(ro_base_path, MUSIC_DIRECTORY); options.docs_directory = getPath2(ro_base_path, DOCS_DIRECTORY); + options.conf_directory = getPath2(ro_base_path, CONF_DIRECTORY); options.execute_command = NULL; options.special_flags = NULL; @@ -1002,6 +1005,12 @@ void GetOptions(int argc, char *argv[], if (*options_left == NULL) /* no options given -- enable verbose mode */ options.verbose = TRUE; #endif +#endif + +#if DEBUG +#if defined(PLATFORM_ANDROID) + options.debug = TRUE; +#endif #endif while (*options_left) @@ -1063,6 +1072,7 @@ void GetOptions(int argc, char *argv[], options.sounds_directory = getPath2(ro_base_path, SOUNDS_DIRECTORY); options.music_directory = getPath2(ro_base_path, MUSIC_DIRECTORY); options.docs_directory = getPath2(ro_base_path, DOCS_DIRECTORY); + options.conf_directory = getPath2(ro_base_path, CONF_DIRECTORY); } else if (strncmp(option, "-levels", option_len) == 0) { @@ -1210,6 +1220,10 @@ void Error(int mode, char *format, ...) ANDROID_LOG_UNKNOWN); #endif + /* display debug messages only when running in debug mode */ + if (mode & ERR_DEBUG && !options.debug) + return; + /* display warnings only when running in verbose mode */ if (mode & ERR_WARN && !options.verbose) return; @@ -2908,6 +2922,9 @@ int get_parameter_value(char *value_raw, char *suffix, int type) if (string_has_parameter(value, "inner_corners")) result |= STYLE_INNER_CORNERS; + + if (string_has_parameter(value, "reverse")) + result |= STYLE_REVERSE; } else if (strEqual(suffix, ".fade_mode")) {