projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added new automatically saved config file for level editor zoom tile size
[rocksndiamonds.git]
/
src
/
libgame
/
misc.c
diff --git
a/src/libgame/misc.c
b/src/libgame/misc.c
index 271a8dfbb884946c0f3acfcba022b40d9ba0fa84..3e7719e1da6a32292a6a1339784f5ed27024150e 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;
@@
-1003,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)
@@
-1212,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;