},
};
-static char *get_corrected_login_name(char *login_name)
-{
- // needed because player name must be a fixed length string
- char *login_name_new = checked_malloc(MAX_PLAYER_NAME_LEN + 1);
-
- strncpy(login_name_new, login_name, MAX_PLAYER_NAME_LEN);
- login_name_new[MAX_PLAYER_NAME_LEN] = '\0';
-
- if (strlen(login_name) > MAX_PLAYER_NAME_LEN) // name has been cut
- if (strchr(login_name_new, ' '))
- *strchr(login_name_new, ' ') = '\0';
-
- return login_name_new;
-}
-
static void setSetupInfoToDefaults(struct SetupInfo *si)
{
- char *player_name = (user.nr == 0 ? getLoginName() : EMPTY_PLAYER_NAME);
int i;
- si->player_name = get_corrected_login_name(player_name);
+ si->player_name = getStringCopy(getDefaultUserName(user.nr));
si->multiple_users = TRUE;
{
char *player_name = getHashEntry(setup_file_hash, "player_name");
- global.user_names[i] = get_corrected_login_name(player_name);
+ global.user_names[i] = getFixedUserName(player_name);
freeSetupFileHash(setup_file_hash);
}
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;
char *player_name_new;
// needed to work around problems with fixed length strings
- player_name_new = get_corrected_login_name(setup.player_name);
+ player_name_new = getFixedUserName(setup.player_name);
free(setup.player_name);
setup.player_name = player_name_new;