X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=31ef77420ab43b6313fa39ce2c5f80db45fb62dd;hb=39ea277283e3a9c633240733d553f1f1eec66f3c;hp=c3cb4b8ddaf769b0566f1f8a38da72a6aa7b7cea;hpb=82b1f76754f039e4ee151c7da7c49819c7310546;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index c3cb4b8d..31ef7742 100644 --- a/src/files.c +++ b/src/files.c @@ -262,7 +262,7 @@ void LoadLevelTape(int level_nr) for(j=0; j0) + if (levelrec_10 && j > 0) { tape.pos[i].action[j] = MV_NO_MOVING; continue; @@ -272,6 +272,34 @@ void LoadLevelTape(int level_nr) tape.pos[i].delay = fgetc(file); + if (levelrec_10) + { + /* eliminate possible diagonal moves in old tapes */ + /* this is only for backward compatibility */ + + byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN }; + byte action = tape.pos[i].action[0]; + int k, num_moves = 0; + + for (k=0; k<4; k++) + { + if (action & joy_dir[k]) + { + tape.pos[i + num_moves].action[0] = joy_dir[k]; + if (num_moves > 0) + tape.pos[i + num_moves].delay = 0; + num_moves++; + } + } + + if (num_moves > 1) + { + num_moves--; + i += num_moves; + tape.length += num_moves; + } + } + if (feof(file)) break; } @@ -467,150 +495,97 @@ void SaveScore(int level_nr) fclose(file); } -void LoadJoystickData() -{ - int i; - char cookie[256]; - FILE *file; - - if (joystick_status==JOYSTICK_OFF) - return; - -#ifndef MSDOS - if (!(file=fopen(JOYDAT_FILE,"r"))) - return; - - fscanf(file,"%s",cookie); - if (strcmp(cookie,JOYSTICK_COOKIE)) /* ungültiges Format? */ - { - Error(ERR_WARN, "wrong format of joystick file '%s'", JOYDAT_FILE); - fclose(file); - return; - } - - for(i=0;i<2;i++) - { - fscanf(file,"%s",cookie); - fscanf(file, "%d %d %d \n", - &joystick[i].xleft, &joystick[i].xmiddle, &joystick[i].xright); - fscanf(file, "%d %d %d \n", - &joystick[i].yupper, &joystick[i].ymiddle, &joystick[i].ylower); - } - fclose(file); - - CheckJoystickData(); -#else - load_joystick_data(JOYDAT_FILE); -#endif -} - -void SaveJoystickData() -{ - int i; - FILE *file; - - if (joystick_status==JOYSTICK_OFF) - return; - -#ifndef MSDOS - CheckJoystickData(); - - if (!(file=fopen(JOYDAT_FILE,"w"))) - { - Error(ERR_WARN, "cannot save joystick calibration data to file '%s'", - JOYDAT_FILE); - return; - } - - fprintf(file,"%s\n",JOYSTICK_COOKIE); /* Formatkennung */ - for(i=0;i<2;i++) - { - fprintf(file,"JOYSTICK_%d_DATA\n",i); - fprintf(file, "%d %d %d \n", - joystick[i].xleft, joystick[i].xmiddle, joystick[i].xright); - fprintf(file, "%d %d %d \n", - joystick[i].yupper, joystick[i].ymiddle, joystick[i].ylower); - } - fclose(file); - - chmod(JOYDAT_FILE, JOYDAT_PERMS); -#else - save_joystick_data(JOYDAT_FILE); -#endif - -} - -/* ------------------------------------------------------------------------- */ -/* new setup functions */ -/* ------------------------------------------------------------------------- */ - #define MAX_LINE_LEN 1000 -#define MAX_SETUP_TOKEN_LEN 100 -#define MAX_SETUP_VALUE_LEN 100 #define TOKEN_STR_FILE_IDENTIFIER "file_identifier" #define TOKEN_STR_LAST_LEVEL_SERIES "last_level_series" -#define TOKEN_STR_ALIAS_NAME "alias_name" - #define TOKEN_STR_PLAYER_PREFIX "player_" -#define TOKEN_VALUE_POSITION 30 -#define TOKEN_INVALID -1 -#define TOKEN_IGNORE -99 -#define SETUP_TOKEN_ALIAS_NAME 100 +#define TOKEN_VALUE_POSITION 30 #define SETUP_TOKEN_SOUND 0 #define SETUP_TOKEN_SOUND_LOOPS 1 #define SETUP_TOKEN_SOUND_MUSIC 2 #define SETUP_TOKEN_SOUND_SIMPLE 3 #define SETUP_TOKEN_TOONS 4 -#define SETUP_TOKEN_DIRECT_DRAW 5 +#define SETUP_TOKEN_DOUBLE_BUFFERING 5 #define SETUP_TOKEN_SCROLL_DELAY 6 #define SETUP_TOKEN_SOFT_SCROLLING 7 #define SETUP_TOKEN_FADING 8 #define SETUP_TOKEN_AUTORECORD 9 #define SETUP_TOKEN_QUICK_DOORS 10 -#define SETUP_TOKEN_USE_JOYSTICK 11 -#define SETUP_TOKEN_JOYSTICK_NR 12 -#define SETUP_TOKEN_JOY_SNAP 13 -#define SETUP_TOKEN_JOY_BOMB 14 -#define SETUP_TOKEN_KEY_LEFT 15 -#define SETUP_TOKEN_KEY_RIGHT 16 -#define SETUP_TOKEN_KEY_UP 17 -#define SETUP_TOKEN_KEY_DOWN 18 -#define SETUP_TOKEN_KEY_SNAP 19 -#define SETUP_TOKEN_KEY_BOMB 20 - -#define NUM_SETUP_TOKENS 21 - +#define SETUP_TOKEN_ALIAS_NAME 11 + +#define SETUP_TOKEN_USE_JOYSTICK 12 +#define SETUP_TOKEN_JOY_DEVICE_NAME 13 +#define SETUP_TOKEN_JOY_XLEFT 14 +#define SETUP_TOKEN_JOY_XMIDDLE 15 +#define SETUP_TOKEN_JOY_XRIGHT 16 +#define SETUP_TOKEN_JOY_YUPPER 17 +#define SETUP_TOKEN_JOY_YMIDDLE 18 +#define SETUP_TOKEN_JOY_YLOWER 19 +#define SETUP_TOKEN_JOY_SNAP 20 +#define SETUP_TOKEN_JOY_BOMB 21 +#define SETUP_TOKEN_KEY_LEFT 22 +#define SETUP_TOKEN_KEY_RIGHT 23 +#define SETUP_TOKEN_KEY_UP 24 +#define SETUP_TOKEN_KEY_DOWN 25 +#define SETUP_TOKEN_KEY_SNAP 26 +#define SETUP_TOKEN_KEY_BOMB 27 + +#define NUM_SETUP_TOKENS 28 + +#define FIRST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_SOUND +#define LAST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_ALIAS_NAME + +#define FIRST_PLAYER_SETUP_TOKEN SETUP_TOKEN_USE_JOYSTICK +#define LAST_PLAYER_SETUP_TOKEN SETUP_TOKEN_KEY_BOMB + +#define TYPE_BOOLEAN 1 +#define TYPE_SWITCH 2 +#define TYPE_KEYSYM 3 +#define TYPE_INTEGER 4 +#define TYPE_STRING 5 + +static struct SetupInfo si; +static struct SetupInputInfo sii; static struct { - char *token, *value_true, *value_false; -} setup_info[] = + int type; + void *value; + char *text; +} token_info[] = { - { "sound", "on", "off" }, - { "repeating_sound_loops", "on", "off" }, - { "background_music", "on", "off" }, - { "simple_sound_effects", "on", "off" }, - { "toons", "on", "off" }, - { "double_buffering", "off", "on" }, - { "scroll_delay", "on", "off" }, - { "soft_scrolling", "on", "off" }, - { "screen_fading", "on", "off" }, - { "automatic_tape_recording", "on", "off" }, - { "quick_doors", "on", "off" }, + { TYPE_SWITCH, &si.sound, "sound" }, + { TYPE_SWITCH, &si.sound_loops, "repeating_sound_loops" }, + { TYPE_SWITCH, &si.sound_music, "background_music" }, + { TYPE_SWITCH, &si.sound_simple, "simple_sound_effects" }, + { TYPE_SWITCH, &si.toons, "toons" }, + { TYPE_SWITCH, &si.double_buffering, "double_buffering" }, + { TYPE_SWITCH, &si.scroll_delay, "scroll_delay" }, + { TYPE_SWITCH, &si.soft_scrolling, "soft_scrolling" }, + { TYPE_SWITCH, &si.fading, "screen_fading" }, + { TYPE_SWITCH, &si.autorecord, "automatic_tape_recording" }, + { TYPE_SWITCH, &si.quick_doors, "quick_doors" }, + { TYPE_STRING, &si.alias_name, "alias_name" }, /* for each player: */ - { ".use_joystick", "true", "false" }, - { ".joystick_device", "second", "first" }, - { ".joy.snap_field", "", "" }, - { ".joy.place_bomb", "", "" }, - { ".key.move_left", "", "" }, - { ".key.move_right", "", "" }, - { ".key.move_up", "", "" }, - { ".key.move_down", "", "" }, - { ".key.snap_field", "", "" }, - { ".key.place_bomb", "", "" } + { TYPE_BOOLEAN, &sii.use_joystick, ".use_joystick" }, + { TYPE_STRING, &sii.joy.device_name, ".joy.device_name" }, + { TYPE_INTEGER, &sii.joy.xleft, ".joy.xleft" }, + { TYPE_INTEGER, &sii.joy.xmiddle, ".joy.xmiddle" }, + { TYPE_INTEGER, &sii.joy.xright, ".joy.xright" }, + { TYPE_INTEGER, &sii.joy.yupper, ".joy.yupper" }, + { TYPE_INTEGER, &sii.joy.ymiddle, ".joy.ymiddle" }, + { TYPE_INTEGER, &sii.joy.ylower, ".joy.ylower" }, + { TYPE_INTEGER, &sii.joy.snap, ".joy.snap_field" }, + { TYPE_INTEGER, &sii.joy.bomb, ".joy.place_bomb" }, + { TYPE_KEYSYM, &sii.key.left, ".key.move_left" }, + { TYPE_KEYSYM, &sii.key.right, ".key.move_right" }, + { TYPE_KEYSYM, &sii.key.up, ".key.move_up" }, + { TYPE_KEYSYM, &sii.key.down, ".key.move_down" }, + { TYPE_KEYSYM, &sii.key.snap, ".key.snap_field" }, + { TYPE_KEYSYM, &sii.key.bomb, ".key.place_bomb" } }; static char *string_tolower(char *s) @@ -655,7 +630,7 @@ static int get_string_integer_value(char *s) if (strcmp(string_tolower(s), number_text[i][j]) == 0) return i; - return -1; + return atoi(s); } static boolean get_string_boolean_value(char *s) @@ -669,19 +644,6 @@ static boolean get_string_boolean_value(char *s) return FALSE; } -static char *getSetupToken(int token_nr) -{ - return setup_info[token_nr].token; -} - -static char *getSetupValue(int token_nr, boolean token_value) -{ - if (token_value == TRUE) - return setup_info[token_nr].value_true; - else - return setup_info[token_nr].value_false; -} - static char *getFormattedSetupEntry(char *token, char *value) { int i; @@ -697,48 +659,6 @@ static char *getFormattedSetupEntry(char *token, char *value) return entry; } -static char *getSetupEntry(char *prefix, int token_nr, int token_value) -{ - int i; - static char entry[MAX_LINE_LEN]; - - sprintf(entry, "%s%s:", prefix, getSetupToken(token_nr)); - for (i=strlen(entry); itoken, token) == 0) return setup_file_list->value; else - return getSetupFileListEntry(setup_file_list->next, token); + return getTokenValue(setup_file_list->next, token); } -boolean setSetupFileListEntry(struct SetupFileList *setup_file_list, - char *token, char *value) +static void setTokenValue(struct SetupFileList *setup_file_list, + char *token, char *value) { if (!setup_file_list) - return FALSE; + return; if (strcmp(setup_file_list->token, token) == 0) { free(setup_file_list->value); setup_file_list->value = checked_malloc(strlen(value) + 1); strcpy(setup_file_list->value, value); - - return TRUE; } + else if (setup_file_list->next == NULL) + setup_file_list->next = newSetupFileList(token, value); else - return setSetupFileListEntry(setup_file_list->next, token, value); -} - -void updateSetupFileListEntry(struct SetupFileList *setup_file_list, - char *token, char *value) -{ - if (!setup_file_list) - return; - - if (getSetupFileListEntry(setup_file_list, token) != NULL) - setSetupFileListEntry(setup_file_list, token, value); - else - { - struct SetupFileList *list_entry = setup_file_list; - - while (list_entry->next) - list_entry = list_entry->next; - - list_entry->next = newSetupFileList(token, value); - } + setTokenValue(setup_file_list->next, token, value); } #ifdef DEBUG @@ -838,13 +739,6 @@ static struct SetupFileList *loadSetupFileList(char *filename) struct SetupFileList *setup_file_list = newSetupFileList("", ""); struct SetupFileList *first_valid_list_entry; - - - /* - struct SetupFileList **next_entry = &setup_file_list; - */ - - FILE *file; if (!(file = fopen(filename, "r"))) @@ -906,20 +800,7 @@ static struct SetupFileList *loadSetupFileList(char *filename) break; if (*token && *value) - updateSetupFileListEntry(setup_file_list, token, value); - - -#if 0 - { - /* allocate new token/value pair */ - - *next_entry = newSetupFileList(token, value); - next_entry = &((*next_entry)->next); - } -#endif - - - + setTokenValue(setup_file_list, token, value); } fclose(file); @@ -962,262 +843,245 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, } } -static void decodeSetupFileList(struct SetupFileList *setup_file_list) +static void setSetupInfoToDefaults(struct SetupInfo *si) { int i; - int token_nr = TOKEN_INVALID; - int player_nr = 0; - char *token; - char *token_value; - int token_integer_value; - boolean token_boolean_value; - int token_player_prefix_len; - - if (!setup_file_list) - return; - - token = setup_file_list->token; - token_value = setup_file_list->value; - token_integer_value = get_string_integer_value(token_value); - token_boolean_value = get_string_boolean_value(token_value); - token_player_prefix_len = strlen(TOKEN_STR_PLAYER_PREFIX); + si->sound = TRUE; + si->sound_loops = FALSE; + si->sound_music = FALSE; + si->sound_simple = FALSE; + si->toons = TRUE; + si->double_buffering = TRUE; + si->direct_draw = !si->double_buffering; + si->scroll_delay = FALSE; + si->soft_scrolling = TRUE; + si->fading = FALSE; + si->autorecord = FALSE; + si->quick_doors = FALSE; + + strncpy(si->login_name, GetLoginName(), MAX_NAMELEN-1); + si->login_name[MAX_NAMELEN-1] = '\0'; + strncpy(si->alias_name, GetLoginName(), MAX_NAMELEN-1); + si->alias_name[MAX_NAMELEN-1] = '\0'; - if (strncmp(token, TOKEN_STR_PLAYER_PREFIX, - token_player_prefix_len) == 0) + for (i=0; i= '0' && *token <= '9') - { - player_nr = ((int)(*token - '0') - 1 + MAX_PLAYERS) % MAX_PLAYERS; - token++; - } + si->input[i].use_joystick = FALSE; + strcpy(si->input[i].joy.device_name, joystick_device_name[i]); + si->input[i].joy.xleft = JOYSTICK_XLEFT; + si->input[i].joy.xmiddle = JOYSTICK_XMIDDLE; + si->input[i].joy.xright = JOYSTICK_XRIGHT; + si->input[i].joy.yupper = JOYSTICK_YUPPER; + si->input[i].joy.ymiddle = JOYSTICK_YMIDDLE; + si->input[i].joy.ylower = JOYSTICK_YLOWER; + si->input[i].joy.snap = (i == 0 ? JOY_BUTTON_1 : 0); + si->input[i].joy.bomb = (i == 0 ? JOY_BUTTON_2 : 0); + si->input[i].key.left = (i == 0 ? DEFAULT_KEY_LEFT : KEY_UNDEFINDED); + si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KEY_UNDEFINDED); + si->input[i].key.up = (i == 0 ? DEFAULT_KEY_UP : KEY_UNDEFINDED); + si->input[i].key.down = (i == 0 ? DEFAULT_KEY_DOWN : KEY_UNDEFINDED); + si->input[i].key.snap = (i == 0 ? DEFAULT_KEY_SNAP : KEY_UNDEFINDED); + si->input[i].key.bomb = (i == 0 ? DEFAULT_KEY_BOMB : KEY_UNDEFINDED); } +} - for (i=0; i 1) - token_integer_value = 1; - setup.input[player_nr].joystick_nr = token_integer_value - 1; - break; - case SETUP_TOKEN_JOY_SNAP: - setup.input[player_nr].joy.snap = getJoySymbolFromJoyName(token_value); - break; - case SETUP_TOKEN_JOY_BOMB : - setup.input[player_nr].joy.bomb = getJoySymbolFromJoyName(token_value); - break; - case SETUP_TOKEN_KEY_LEFT: - setup.input[player_nr].key.left = getKeySymFromX11KeyName(token_value); - break; - case SETUP_TOKEN_KEY_RIGHT: - setup.input[player_nr].key.right = getKeySymFromX11KeyName(token_value); - break; - case SETUP_TOKEN_KEY_UP: - setup.input[player_nr].key.up = getKeySymFromX11KeyName(token_value); - break; - case SETUP_TOKEN_KEY_DOWN: - setup.input[player_nr].key.down = getKeySymFromX11KeyName(token_value); - break; - case SETUP_TOKEN_KEY_SNAP: - setup.input[player_nr].key.snap = getKeySymFromX11KeyName(token_value); - break; - case SETUP_TOKEN_KEY_BOMB: - setup.input[player_nr].key.bomb = getKeySymFromX11KeyName(token_value); + case TYPE_KEYSYM: + *(KeySym *)setup_value = getKeySymFromX11KeyName(token_value); break; - case SETUP_TOKEN_ALIAS_NAME: - strncpy(local_player->alias_name, token_value, MAX_NAMELEN-1); - local_player->alias_name[MAX_NAMELEN-1] = '\0'; + case TYPE_INTEGER: + *(int *)setup_value = get_string_integer_value(token_value); break; - case TOKEN_INVALID: - Error(ERR_WARN, "unknown token '%s' not recognized", token); + case TYPE_STRING: + strcpy((char *)setup_value, token_value); break; - case TOKEN_IGNORE: default: break; } +} - decodeSetupFileList(setup_file_list->next); +static void decodeSetupFileList(struct SetupFileList *setup_file_list) +{ + int i, pnr; + + if (!setup_file_list) + return; + + /* handle global setup values */ + si = setup; + for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++) + setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text)); + setup = si; + + /* handle player specific setup values */ + for (pnr=0; pnrlogin_name, GetLoginName(), MAX_NAMELEN-1); - local_player->login_name[MAX_NAMELEN-1] = '\0'; + for (i=0; ialias_name, GetLoginName(), MAX_NAMELEN-1); - local_player->alias_name[MAX_NAMELEN-1] = '\0'; + return 0; +} - setup.sound_on = TRUE; - setup.sound_loops_on = FALSE; - setup.sound_music_on = FALSE; - setup.sound_simple_on = FALSE; - setup.toons_on = TRUE; - setup.direct_draw_on = FALSE; - setup.scroll_delay_on = FALSE; - setup.soft_scrolling_on = TRUE; - setup.fading_on = FALSE; - setup.autorecord_on = FALSE; - setup.quick_doors = FALSE; +int getLastPlayedLevelOfLevelSeries(char *level_series_name) +{ + char *token_value; + int level_series_nr = getLevelSeriesNrFromLevelSeriesName(level_series_name); + int last_level_nr = 0; - for (i=0; i highest_level_nr) + last_level_nr = highest_level_nr; } + return last_level_nr; +} + +void LoadSetup() +{ + char filename[MAX_FILENAME_LEN]; + struct SetupFileList *setup_file_list = NULL; + + /* always start with reliable default setup values */ + setSetupInfoToDefaults(&setup); + sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME); setup_file_list = loadSetupFileList(filename); if (setup_file_list) { - -#if 0 - printSetupFileList(setup_file_list); -#endif - checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE); decodeSetupFileList(setup_file_list); + setup.direct_draw = !setup.double_buffering; + freeSetupFileList(setup_file_list); } else - Error(ERR_RETURN, "using default setup values"); + Error(ERR_WARN, "using default setup values"); } -void LoadLevelSetup() +static char *getSetupLine(char *prefix, int token_nr) { - char filename[MAX_FILENAME_LEN]; - - /* always start with reliable default setup values */ - - leveldir_nr = 0; - level_nr = 0; - - sprintf(filename, "%s/%s", SETUP_PATH, LEVELSETUP_FILENAME); - - if (level_setup_list) - freeSetupFileList(level_setup_list); + int i; + static char entry[MAX_LINE_LEN]; + int token_type = token_info[token_nr].type; + void *setup_value = token_info[token_nr].value; + char *token_text = token_info[token_nr].text; - level_setup_list = loadSetupFileList(filename); + /* start with the prefix, token and some spaces to format output line */ + sprintf(entry, "%s%s:", prefix, token_text); + for (i=strlen(entry); i leveldir[leveldir_nr].levels - 1) - level_nr = leveldir[leveldir_nr].levels - 1; - } - - break; + /* add comment, if useful */ + if (strcmp(keyname, "(undefined)") != 0 && + strcmp(keyname, "(unknown)") != 0) + { + strcat(entry, "# "); + strcat(entry, keyname); } } - } + break; + case TYPE_INTEGER: + { + char buffer[MAX_LINE_LEN]; -#if 0 - printSetupFileList(level_setup_list); -#endif + sprintf(buffer, "%d", *(int *)setup_value); + strcat(entry, buffer); + } + break; - checkSetupFileListIdentifier(level_setup_list, LEVELSETUP_COOKIE); + case TYPE_STRING: + strcat(entry, (char *)setup_value); + break; + + default: + break; } - else - Error(ERR_RETURN, "using default setup values"); + + return entry; } void SaveSetup() { - int i; + int i, pnr; char filename[MAX_FILENAME_LEN]; FILE *file; @@ -1229,91 +1093,32 @@ void SaveSetup() return; } - fprintf(file, "%s: %s\n", - TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE); - - fprintf(file, "\n"); - - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_SOUND, - setup.sound_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_SOUND_LOOPS, - setup.sound_loops_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_SOUND_MUSIC, - setup.sound_music_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_SOUND_SIMPLE, - setup.sound_simple_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_TOONS, - setup.toons_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_DIRECT_DRAW, - setup.direct_draw_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_SCROLL_DELAY, - setup.scroll_delay_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_SOFT_SCROLLING, - setup.soft_scrolling_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_FADING, - setup.fading_on)); fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_AUTORECORD, - setup.autorecord_on)); - fprintf(file, "%s\n", - getSetupEntry("", SETUP_TOKEN_QUICK_DOORS, - setup.quick_doors)); - + getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE)); fprintf(file, "\n"); - fprintf(file, "%s\n", - getFormattedSetupEntry(TOKEN_STR_ALIAS_NAME, - local_player->alias_name)); + /* handle global setup values */ + si = setup; + for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++) + { + /* just to make things nicer :) */ + if (i == SETUP_TOKEN_ALIAS_NAME) + fprintf(file, "\n"); - for (i=0; i