projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added graphical panel values for time and health (mainly for MM engine)
[rocksndiamonds.git]
/
src
/
libgame
/
misc.c
diff --git
a/src/libgame/misc.c
b/src/libgame/misc.c
index 9582bdb397189765a69f88ee567dcba2c14062a6..72e4f051bf47a44f17b66d28be20fa693e151274 100644
(file)
--- 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);
}
if (GetUserName(login_name, &buffer_size) == 0)
strcpy(login_name, ANONYMOUS_NAME);
}
-#el
se
+#el
if defined(PLATFORM_UNIX) && !defined(PLATFORM_ANDROID)
if (login_name == NULL)
{
struct passwd *pwd;
if (login_name == NULL)
{
struct passwd *pwd;
@@
-581,6
+581,8
@@
char *getLoginName()
else
login_name = getStringCopy(pwd->pw_name);
}
else
login_name = getStringCopy(pwd->pw_name);
}
+#else
+ login_name = ANONYMOUS_NAME;
#endif
return login_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.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;
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
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)
#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.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)
{
}
else if (strncmp(option, "-levels", option_len) == 0)
{
@@
-1210,6
+1220,10
@@
void Error(int mode, char *format, ...)
ANDROID_LOG_UNKNOWN);
#endif
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;
/* display warnings only when running in verbose mode */
if (mode & ERR_WARN && !options.verbose)
return;
@@
-1611,8
+1625,14
@@
void translate_keyname(Key *keysym, char **x11name, char **name, int mode)
{ KSYM_Page_Down, "XK_Page_Down", "page down" },
#if defined(TARGET_SDL2)
{ KSYM_Page_Down, "XK_Page_Down", "page down" },
#if defined(TARGET_SDL2)
+ { KSYM_Select, "XK_Select", "select" },
{ KSYM_Menu, "XK_Menu", "menu" }, /* menu key */
{ KSYM_Back, "XK_Back", "back" }, /* back key */
{ KSYM_Menu, "XK_Menu", "menu" }, /* menu key */
{ KSYM_Back, "XK_Back", "back" }, /* back key */
+ { KSYM_PlayPause, "XK_PlayPause", "play/pause" },
+#if defined(PLATFORM_ANDROID)
+ { KSYM_Rewind, "XK_Rewind", "rewind" },
+ { KSYM_FastForward, "XK_FastForward", "fast forward" },
+#endif
#endif
/* ASCII 0x20 to 0x40 keys (except numbers) */
#endif
/* ASCII 0x20 to 0x40 keys (except numbers) */
@@
-2902,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, "inner_corners"))
result |= STYLE_INNER_CORNERS;
+
+ if (string_has_parameter(value, "reverse"))
+ result |= STYLE_REVERSE;
}
else if (strEqual(suffix, ".fade_mode"))
{
}
else if (strEqual(suffix, ".fade_mode"))
{