projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved code to set changed player name to separate function
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index 8cb6ec6e3bb879214a56dccee9813f17db73645b..b2a6fb5c13f4976c8d23ffd8e3c942f69706ba4f 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-9177,10
+9177,9
@@
static struct TokenInfo options_setup_tokens[] =
static void setSetupInfoToDefaults(struct SetupInfo *si)
{
static void setSetupInfoToDefaults(struct SetupInfo *si)
{
- char *player_name = (user.nr == 0 ? getLoginName() : EMPTY_PLAYER_NAME);
int i;
int i;
- si->player_name = get
FixedUserName(player_name
);
+ si->player_name = get
StringCopy(getDefaultUserName(user.nr)
);
si->multiple_users = TRUE;
si->multiple_users = TRUE;
@@
-9674,7
+9673,7
@@
void LoadUserNames(void)
}
if (global.user_names[i] == NULL)
}
if (global.user_names[i] == NULL)
- global.user_names[i] = getStringCopy(
EMPTY_PLAYER_NAME
);
+ global.user_names[i] = getStringCopy(
getDefaultUserName(i)
);
}
user.nr = last_user_nr;
}
user.nr = last_user_nr;