X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=21309b825bf505ea3fc4ba98271d55874a3f0fb0;hp=17bc45e5986691d8b773e6ad12dad24c7a29df79;hb=3d97e3d9c20a984e70dae5e63e7c5069fb136c91;hpb=c4b26cf489dcc65a00bfcc05f7898700d2f0c9e4 diff --git a/src/files.c b/src/files.c index 17bc45e5..21309b82 100644 --- a/src/files.c +++ b/src/files.c @@ -12,6 +12,9 @@ ***********************************************************/ #include +#include +#include +#include #include "files.h" #include "tools.h" @@ -19,237 +22,471 @@ #include "tape.h" #include "joystick.h" -boolean CreateNewScoreFile() -{ - int i,j,k; - char filename[MAX_FILENAME_LEN]; - char empty_alias[MAX_NAMELEN]; - FILE *file; +#define MAX_FILENAME_LEN 256 /* maximal filename length */ +#define MAX_LINE_LEN 1000 /* maximal input line length */ +#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ +#define LEVEL_HEADER_SIZE 80 /* size of level file header */ +#define LEVEL_HEADER_UNUSED 18 /* unused level header bytes */ +#define TAPE_HEADER_SIZE 20 /* size of tape file header */ +#define TAPE_HEADER_UNUSED 7 /* unused tape header bytes */ +#define FILE_VERSION_1_0 10 /* old 1.0 file version */ +#define FILE_VERSION_1_2 12 /* actual file version */ + +/* file identifier strings */ +#define LEVEL_COOKIE "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.2" +#define SCORE_COOKIE "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2" +#define TAPE_COOKIE "ROCKSNDIAMONDS_TAPE_FILE_VERSION_1.2" +#define SETUP_COOKIE "ROCKSNDIAMONDS_SETUP_FILE_VERSION_1.2" +#define LEVELSETUP_COOKIE "ROCKSNDIAMONDS_LEVELSETUP_FILE_VERSION_1.2" +#define LEVELINFO_COOKIE "ROCKSNDIAMONDS_LEVELINFO_FILE_VERSION_1.2" +/* old file identifiers for backward compatibility */ +#define LEVEL_COOKIE_10 "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.0" +#define TAPE_COOKIE_10 "ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0" + +/* file names and filename extensions */ +#ifndef MSDOS +#define USERDATA_DIRECTORY ".rocksndiamonds" +#define SETUP_FILENAME "setup.conf" +#define LEVELSETUP_FILENAME "levelsetup.conf" +#define LEVELINFO_FILENAME "levelinfo.conf" +#define LEVELFILE_EXTENSION "level" +#define TAPEFILE_EXTENSION "tape" +#define SCOREFILE_EXTENSION "score" +#else +#define USERDATA_DIRECTORY "userdata" +#define SETUP_FILENAME "setup.cnf" +#define LEVELSETUP_FILENAME "lvlsetup.cnf" +#define LEVELINFO_FILENAME "lvlinfo.cnf" +#define LEVELFILE_EXTENSION "lvl" +#define TAPEFILE_EXTENSION "tap" +#define SCOREFILE_EXTENSION "sco" +#define ERROR_FILENAME "error.out" +#endif + +/* file permissions for newly written files */ +#define MODE_R_ALL (S_IRUSR | S_IRGRP | S_IROTH) +#define MODE_W_ALL (S_IWUSR | S_IWGRP | S_IWOTH) +#define MODE_X_ALL (S_IXUSR | S_IXGRP | S_IXOTH) +#define USERDATA_DIR_MODE (MODE_R_ALL | MODE_X_ALL | S_IWUSR) +#define LEVEL_PERMS (MODE_R_ALL | MODE_W_ALL) +#define SCORE_PERMS LEVEL_PERMS +#define TAPE_PERMS LEVEL_PERMS +#define SETUP_PERMS LEVEL_PERMS - sprintf(filename,"%s/%s/%s", - level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME); +static void SaveUserLevelInfo(); /* for 'InitUserLevelDir()' */ +static char *getSetupLine(char *, int); /* for 'SaveUserLevelInfo()' */ - if (!(file=fopen(filename,"w"))) - return(FALSE); +static char *getGlobalDataDir() +{ + return GAME_DIR; +} - for(i=0;i 0) + userlevel_dir = getPath3(data_dir, userlevel_subdir, level_subdir); + else + userlevel_dir = getPath2(data_dir, userlevel_subdir); -#if 0 + return userlevel_dir; +} -boolean CreateNewNamesFile(int mode) +static char *getTapeDir(char *level_subdir) { - char filename[MAX_FILENAME_LEN]; - FILE *file; + static char *tape_dir = NULL; + char *data_dir = getUserDataDir(); + char *tape_subdir = TAPES_DIRECTORY; - if (mode==PLAYER_LEVEL) - sprintf(filename,"%s/%s/%s", - level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME); + if (tape_dir) + free(tape_dir); + + if (strlen(level_subdir) > 0) + tape_dir = getPath3(data_dir, tape_subdir, level_subdir); else - sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME); + tape_dir = getPath2(data_dir, tape_subdir); + + return tape_dir; +} + +static char *getScoreDir(char *level_subdir) +{ + static char *score_dir = NULL; + char *data_dir = getGlobalDataDir(); + char *score_subdir = SCORES_DIRECTORY; - if (!(file=fopen(filename,"w"))) - return(FALSE); + if (score_dir) + free(score_dir); - fputs(NAMES_COOKIE,file); /* Formatkennung */ - fclose(file); + if (strlen(level_subdir) > 0) + score_dir = getPath3(data_dir, score_subdir, level_subdir); + else + score_dir = getPath2(data_dir, score_subdir); - chmod(filename, NAMES_PERMS); - return(TRUE); + return score_dir; } -#endif +static char *getLevelFilename(int nr) +{ + static char *filename = NULL; + char basename[MAX_FILENAME_LEN]; + + if (filename != NULL) + free(filename); + sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); + filename = getPath3((leveldir[leveldir_nr].user_defined ? + getUserLevelDir("") : + options.level_directory), + leveldir[leveldir_nr].filename, + basename); -boolean LoadLevelInfo() + return filename; +} + +static char *getTapeFilename(int nr) { - int i; - char filename[MAX_FILENAME_LEN]; - char cookie[MAX_FILENAME_LEN]; - FILE *file; + static char *filename = NULL; + char basename[MAX_FILENAME_LEN]; - sprintf(filename,"%s/%s",level_directory,LEVDIR_FILENAME); + if (filename != NULL) + free(filename); - if (!(file=fopen(filename,"r"))) - { - Error(ERR_WARN, "cannot read level info '%s'", filename); - return(FALSE); - } + sprintf(basename, "%03d.%s", nr, TAPEFILE_EXTENSION); + filename = getPath2(getTapeDir(leveldir[leveldir_nr].filename), basename); - fscanf(file,"%s\n",cookie); - if (strcmp(cookie,LEVELDIR_COOKIE)) /* ungültiges Format? */ - { - Error(ERR_WARN, "wrong format of level info file"); - fclose(file); - return(FALSE); - } + return filename; +} - num_leveldirs = 0; - leveldir_nr = 0; - for(i=0;i 0 && cookie[strlen(cookie) - 1] == '\n') + cookie[strlen(cookie) - 1] = '\0'; + + if (strcmp(cookie, LEVEL_COOKIE_10) == 0) /* old 1.0 level format */ + file_version = FILE_VERSION_1_0; + else if (strcmp(cookie, LEVEL_COOKIE) != 0) /* unknown level format */ { - fgets(cookie,LEVEL_COOKIE_LEN,file); - fgetc(file); + Error(ERR_WARN, "wrong file identifier of level file '%s'", filename); + fclose(file); + return; + } - if (strcmp(cookie,LEVEL_COOKIE)) /* ungültiges Format? */ + /* read chunk "HEAD" */ + if (file_version >= FILE_VERSION_1_2) + { + /* first check header chunk identifier and chunk length */ + fgets(chunk, CHUNK_ID_LEN + 1, file); + chunk_length = + (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); + if (strcmp(chunk, "HEAD") || chunk_length != LEVEL_HEADER_SIZE) { - Error(ERR_WARN, "wrong format of level file '%s'", filename); + Error(ERR_WARN, "wrong 'HEAD' chunk of level file '%s'", filename); fclose(file); - file = NULL; + return; } } - if (file) - { - lev_fieldx = level.fieldx = fgetc(file); - lev_fieldy = level.fieldy = fgetc(file); - - level.time = (fgetc(file)<<8) | fgetc(file); - level.edelsteine = (fgetc(file)<<8) | fgetc(file); - for(i=0;i= FILE_VERSION_1_2) + { + /* next check body chunk identifier and chunk length */ + fgets(chunk, CHUNK_ID_LEN + 1, file); + chunk_length = + (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); + if (strcmp(chunk, "BODY") || chunk_length != lev_fieldx * lev_fieldy) + { + Error(ERR_WARN, "wrong 'BODY' chunk of level file '%s'", filename); + fclose(file); + return; + } } - else + + for(y=0; y> 24) & 0xff, file); + fputc((chunk_length >> 16) & 0xff, file); + fputc((chunk_length >> 8) & 0xff, file); + fputc((chunk_length >> 0) & 0xff, file); + + fputc(level.fieldx, file); + fputc(level.fieldy, file); + fputc(level.time / 256, file); + fputc(level.time % 256, file); + fputc(level.edelsteine / 256, file); + fputc(level.edelsteine % 256, file); + + for(i=0; i> 24) & 0xff, file); + fputc((chunk_length >> 16) & 0xff, file); + fputc((chunk_length >> 8) & 0xff, file); + fputc((chunk_length >> 0) & 0xff, file); + + for(y=0; y 0 && cookie[strlen(cookie) - 1] == '\n') + cookie[strlen(cookie) - 1] = '\0'; - if ((file=fopen(filename,"r"))) + if (strcmp(cookie, TAPE_COOKIE_10) == 0) /* old 1.0 tape format */ + file_version = FILE_VERSION_1_0; + else if (strcmp(cookie, TAPE_COOKIE) != 0) /* unknown tape format */ { - fgets(cookie,LEVELREC_COOKIE_LEN,file); - fgetc(file); - if (!strcmp(cookie,LEVELREC_COOKIE_10)) /* old 1.0 tape format */ - levelrec_10 = TRUE; - else if (strcmp(cookie,LEVELREC_COOKIE)) /* unknown tape format */ + Error(ERR_WARN, "wrong file identifier of tape file '%s'", filename); + fclose(file); + return; + } + + /* read chunk "HEAD" */ + if (file_version >= FILE_VERSION_1_2) + { + /* first check header chunk identifier and chunk length */ + fgets(chunk, CHUNK_ID_LEN + 1, file); + chunk_length = + (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); + + if (strcmp(chunk, "HEAD") || chunk_length != TAPE_HEADER_SIZE) { - Error(ERR_WARN, "wrong format of level recording file '%s'", filename); + Error(ERR_WARN, "wrong 'HEAD' chunk of tape file '%s'", filename); fclose(file); - file = NULL; + return; } } - if (!file) - return; - tape.random_seed = (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); tape.date = @@ -257,6 +494,28 @@ void LoadLevelTape(int level_nr) tape.length = (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); + /* read header fields that are new since version 1.2 */ + if (file_version >= FILE_VERSION_1_2) + { + byte store_participating_players = fgetc(file); + + for(i=0; i= FILE_VERSION_1_2) { - int j; + /* next check body chunk identifier and chunk length */ + fgets(chunk, CHUNK_ID_LEN + 1, file); + chunk_length = + (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); + if (strcmp(chunk, "BODY") || + chunk_length != (num_participating_players + 1) * tape.length) + { + Error(ERR_WARN, "wrong 'BODY' chunk of tape file '%s'", filename); + fclose(file); + return; + } + } + for(i=0; i= MAX_TAPELEN) break; for(j=0; j0) - { - tape.pos[i].action[j] = MV_NO_MOVING; - continue; - } - tape.pos[i].action[j] = fgetc(file); + tape.pos[i].action[j] = MV_NO_MOVING; + + if (tape.player_participates[j]) + tape.pos[i].action[j] = fgetc(file); } tape.pos[i].delay = fgetc(file); + if (file_version == FILE_VERSION_1_0) + { + /* 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; } @@ -296,584 +595,290 @@ void LoadLevelTape(int level_nr) tape.length_seconds = GetTapeLength(); } -void LoadScore(int level_nr) +void SaveTape(int level_nr) { - int i,j; - char filename[MAX_FILENAME_LEN]; - char cookie[MAX_FILENAME_LEN]; + int i; + char *filename = getTapeFilename(level_nr); FILE *file; + boolean new_tape = TRUE; + byte store_participating_players; + int num_participating_players; + int chunk_length; - sprintf(filename,"%s/%s/%s", - level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME); + InitTapeDirectory(leveldir[leveldir_nr].filename); - if (!(file = fopen(filename,"r"))) + /* if a tape still exists, ask to overwrite it */ + if (access(filename, F_OK) == 0) { - if (!CreateNewScoreFile()) - Error(ERR_WARN, "cannot create score file '%s'", filename); - else if (!(file = fopen(filename,"r"))) - Error(ERR_WARN, "cannot read score for level %d", level_nr); + new_tape = FALSE; + if (!Request("Replace old tape ?", REQ_ASK)) + return; } - if (file) + /* count number of players and set corresponding bits for compact storage */ + store_participating_players = 0; + num_participating_players = 0; + for(i=0; i> 24) & 0xff, file); + fputc((chunk_length >> 16) & 0xff, file); + fputc((chunk_length >> 8) & 0xff, file); + fputc((chunk_length >> 0) & 0xff, file); + fputc((tape.random_seed >> 24) & 0xff, file); + fputc((tape.random_seed >> 16) & 0xff, file); + fputc((tape.random_seed >> 8) & 0xff, file); + fputc((tape.random_seed >> 0) & 0xff, file); - if (mode == PLAYER_SETUP) - LoadSetup(); - else if (mode == PLAYER_LEVEL) - LoadLevelSetup(); + fputc((tape.date >> 24) & 0xff, file); + fputc((tape.date >> 16) & 0xff, file); + fputc((tape.date >> 8) & 0xff, file); + fputc((tape.date >> 0) & 0xff, file); + fputc((tape.length >> 24) & 0xff, file); + fputc((tape.length >> 16) & 0xff, file); + fputc((tape.length >> 8) & 0xff, file); + fputc((tape.length >> 0) & 0xff, file); + fputc(store_participating_players, file); - if (mode==PLAYER_LEVEL) - sprintf(filename,"%s/%s/%s", - level_directory,leveldir[leveldir_nr].filename,NAMES_FILENAME); - else - sprintf(filename,"%s/%s",CONFIG_PATH,NAMES_FILENAME); + for(i=0; i> 24) & 0xff, file); + fputc((chunk_length >> 16) & 0xff, file); + fputc((chunk_length >> 8) & 0xff, file); + fputc((chunk_length >> 0) & 0xff, file); - if (!(file = fopen(filename,"r"))) + for(i=0; i 0 && cookie[strlen(cookie) - 1] == '\n') + cookie[strlen(cookie) - 1] = '\0'; + + if (strcmp(cookie, SCORE_COOKIE) != 0) { - *local_player = default_player; - level_nr = default_player.level_nr; + Error(ERR_WARN, "wrong file identifier of score file '%s'", filename); + fclose(file); return; } - while(1) + for(i=0; ileveldir_nr < num_leveldirs) - leveldir_nr = local_player->leveldir_nr; - else - leveldir_nr = 0; - } - else - { - local_player->handicap = new_player.handicap; - local_player->level_nr = new_player.level_nr; } - level_nr = local_player->level_nr; - - if (file) - fclose(file); + fclose(file); } -#endif - - - -void SaveLevel(int level_nr) +void SaveScore(int level_nr) { - int i,x,y; - char filename[MAX_FILENAME_LEN]; + int i; + char *filename = getScoreFilename(level_nr); FILE *file; - sprintf(filename,"%s/%s/%d", - level_directory,leveldir[leveldir_nr].filename,level_nr); + InitScoreDirectory(leveldir[leveldir_nr].filename); - if (!(file=fopen(filename,"w"))) + if (!(file = fopen(filename, "w"))) { - Error(ERR_WARN, "cannot save level file '%s'", filename); + Error(ERR_WARN, "cannot save score for level %d", level_nr); return; } - fputs(LEVEL_COOKIE,file); /* Formatkennung */ - fputc(0x0a,file); - - fputc(level.fieldx,file); - fputc(level.fieldy,file); - fputc(level.time / 256,file); - fputc(level.time % 256,file); - fputc(level.edelsteine / 256,file); - fputc(level.edelsteine % 256,file); - - for(i=0;i> 24) & 0xff,file); - fputc((tape.random_seed >> 16) & 0xff,file); - fputc((tape.random_seed >> 8) & 0xff,file); - fputc((tape.random_seed >> 0) & 0xff,file); - - fputc((tape.date >> 24) & 0xff,file); - fputc((tape.date >> 16) & 0xff,file); - fputc((tape.date >> 8) & 0xff,file); - fputc((tape.date >> 0) & 0xff,file); - - fputc((tape.length >> 24) & 0xff,file); - fputc((tape.length >> 16) & 0xff,file); - fputc((tape.length >> 8) & 0xff,file); - fputc((tape.length >> 0) & 0xff,file); - - for(i=0;ilogin_name, MAX_NAMELEN-1)) - { - fseek(file,-(2*MAX_NAMELEN+1+2+1+(version_10_file ? 0 : 11)),SEEK_CUR); - break; - } - } - - local_player->level_nr = level_nr; - - for(i=0;ilogin_name[i],file); - for(i=0;ialias_name[i],file); - fputc(local_player->handicap,file); - fputc(local_player->setup / 256,file); - fputc(local_player->setup % 256,file); - fputc(local_player->leveldir_nr,file); - if (!version_10_file) - { - fputc(local_player->level_nr,file); - for(i=0;i<10;i++) /* currently unused bytes */ - fputc(0,file); - } - - fclose(file); -} - -#endif - - - -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 - + chmod(filename, SCORE_PERMS); } -/* ------------------------------------------------------------------------- */ -/* new setup functions */ -/* ------------------------------------------------------------------------- */ - #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 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_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 +/* global setup */ +#define SETUP_TOKEN_PLAYER_NAME 0 +#define SETUP_TOKEN_SOUND 1 +#define SETUP_TOKEN_SOUND_LOOPS 2 +#define SETUP_TOKEN_SOUND_MUSIC 3 +#define SETUP_TOKEN_SOUND_SIMPLE 4 +#define SETUP_TOKEN_TOONS 5 +#define SETUP_TOKEN_DOUBLE_BUFFERING 6 +#define SETUP_TOKEN_SCROLL_DELAY 7 +#define SETUP_TOKEN_SOFT_SCROLLING 8 +#define SETUP_TOKEN_FADING 9 +#define SETUP_TOKEN_AUTORECORD 10 +#define SETUP_TOKEN_QUICK_DOORS 11 +#define SETUP_TOKEN_TEAM_MODE 12 + +/* player setup */ +#define SETUP_TOKEN_USE_JOYSTICK 13 +#define SETUP_TOKEN_JOY_DEVICE_NAME 14 +#define SETUP_TOKEN_JOY_XLEFT 15 +#define SETUP_TOKEN_JOY_XMIDDLE 16 +#define SETUP_TOKEN_JOY_XRIGHT 17 +#define SETUP_TOKEN_JOY_YUPPER 18 +#define SETUP_TOKEN_JOY_YMIDDLE 19 +#define SETUP_TOKEN_JOY_YLOWER 20 +#define SETUP_TOKEN_JOY_SNAP 21 +#define SETUP_TOKEN_JOY_BOMB 22 +#define SETUP_TOKEN_KEY_LEFT 23 +#define SETUP_TOKEN_KEY_RIGHT 24 +#define SETUP_TOKEN_KEY_UP 25 +#define SETUP_TOKEN_KEY_DOWN 26 +#define SETUP_TOKEN_KEY_SNAP 27 +#define SETUP_TOKEN_KEY_BOMB 28 + +/* level directory info */ +#define LEVELINFO_TOKEN_NAME 29 +#define LEVELINFO_TOKEN_LEVELS 30 +#define LEVELINFO_TOKEN_SORT_PRIORITY 31 +#define LEVELINFO_TOKEN_READONLY 32 + +#define FIRST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_PLAYER_NAME +#define LAST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_TEAM_MODE + +#define FIRST_PLAYER_SETUP_TOKEN SETUP_TOKEN_USE_JOYSTICK +#define LAST_PLAYER_SETUP_TOKEN SETUP_TOKEN_KEY_BOMB + +#define FIRST_LEVELINFO_TOKEN LEVELINFO_TOKEN_NAME +#define LAST_LEVELINFO_TOKEN LEVELINFO_TOKEN_READONLY + +#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 LevelDirInfo ldi; 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" }, - - /* 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", "", "" } + /* global setup */ + { TYPE_STRING, &si.player_name, "player_name" }, + { 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_SWITCH, &si.team_mode, "team_mode" }, + + /* player setup */ + { 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" }, + + /* level directory info */ + { TYPE_STRING, &ldi.name, "name" }, + { TYPE_INTEGER, &ldi.levels, "levels" }, + { TYPE_INTEGER, &ldi.sort_priority, "sort_priority" }, + { TYPE_BOOLEAN, &ldi.readonly, "readonly" } }; static char *string_tolower(char *s) @@ -918,7 +923,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) @@ -932,19 +937,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; @@ -960,48 +952,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 @@ -1101,18 +1032,11 @@ 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"))) { - Error(ERR_WARN, "cannot open setup file '%s'", filename); + Error(ERR_WARN, "cannot open configuration file '%s'", filename); return NULL; } @@ -1169,20 +1093,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); @@ -1193,8 +1104,8 @@ static struct SetupFileList *loadSetupFileList(char *filename) setup_file_list->next = NULL; freeSetupFileList(setup_file_list); - if (!first_valid_list_entry) - Error(ERR_WARN, "setup file is empty"); + if (first_valid_list_entry == NULL) + Error(ERR_WARN, "configuration file '%s' is empty", filename); return first_valid_list_entry; } @@ -1209,7 +1120,7 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, { if (strcmp(setup_file_list->value, identifier) != 0) { - Error(ERR_WARN, "setup file has wrong version"); + Error(ERR_WARN, "configuration file has wrong version"); return; } else @@ -1220,395 +1131,528 @@ static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, checkSetupFileListIdentifier(setup_file_list->next, identifier); else { - Error(ERR_WARN, "setup file has no version information"); + Error(ERR_WARN, "configuration file has no version information"); return; } } -static void decodeSetupFileList(struct SetupFileList *setup_file_list) +static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi) { - 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; + ldi->name = getStringCopy("non-existing"); + ldi->levels = 0; + ldi->sort_priority = 999; /* default: least priority */ + ldi->readonly = TRUE; +} - 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); +static void setSetupInfoToDefaults(struct SetupInfo *si) +{ + int i; - token_player_prefix_len = strlen(TOKEN_STR_PLAYER_PREFIX); + si->player_name = getStringCopy(getLoginName()); + + si->sound = TRUE; + si->sound_loops = TRUE; + si->sound_music = TRUE; + si->sound_simple = TRUE; + si->toons = TRUE; + si->double_buffering = TRUE; + si->direct_draw = !si->double_buffering; + si->scroll_delay = TRUE; + si->soft_scrolling = TRUE; + si->fading = FALSE; + si->autorecord = TRUE; + si->quick_doors = FALSE; - 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; + si->input[i].joy.device_name = getStringCopy(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: + if (*(char **)setup_value != NULL) + free(*(char **)setup_value); + *(char **)setup_value = getStringCopy(token_value); break; - case TOKEN_IGNORE: default: break; } +} + +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; - decodeSetupFileList(setup_file_list->next); + /* handle player specific setup values */ + for (pnr=0; pnrlogin_name, GetLoginName(), MAX_NAMELEN-1); - local_player->login_name[MAX_NAMELEN-1] = '\0'; + return 0; +} - strncpy(local_player->alias_name, GetLoginName(), MAX_NAMELEN-1); - local_player->alias_name[MAX_NAMELEN-1] = '\0'; +int getLastPlayedLevelOfLevelSeries(char *level_series_name) +{ + char *token_value; + int level_series_nr = getLevelSeriesNrFromLevelSeriesName(level_series_name); + int last_level_nr = 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; + if (!level_series_name) + return 0; - for (i=0; i highest_level_nr) + last_level_nr = highest_level_nr; } - sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME); + return last_level_nr; +} - setup_file_list = loadSetupFileList(filename); +static int compareLevelDirInfoEntries(const void *object1, const void *object2) +{ + const struct LevelDirInfo *entry1 = object1; + const struct LevelDirInfo *entry2 = object2; + int compare_result; - if (setup_file_list) + if (entry1->sort_priority != entry2->sort_priority) + compare_result = entry1->sort_priority - entry2->sort_priority; + else { + char *name1 = getStringToLower(entry1->name); + char *name2 = getStringToLower(entry2->name); -#if 0 - printSetupFileList(setup_file_list); -#endif + compare_result = strcmp(name1, name2); - checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE); - decodeSetupFileList(setup_file_list); - - freeSetupFileList(setup_file_list); + free(name1); + free(name2); } - else - Error(ERR_RETURN, "using default setup values"); + + return compare_result; } -void LoadLevelSetup() +static int LoadLevelInfoFromLevelDir(char *level_directory, int start_entry) { - char filename[MAX_FILENAME_LEN]; + DIR *dir; + struct stat file_status; + char *directory = NULL; + char *filename = NULL; + struct SetupFileList *setup_file_list = NULL; + struct dirent *dir_entry; + int i, current_entry = start_entry; - /* always start with reliable default setup values */ + if ((dir = opendir(level_directory)) == NULL) + { + Error(ERR_WARN, "cannot read level directory '%s'", level_directory); + return current_entry; + } + while (current_entry < MAX_LEVDIR_ENTRIES) + { + if ((dir_entry = readdir(dir)) == NULL) /* last directory entry */ + break; + + /* skip entries for current and parent directory */ + if (strcmp(dir_entry->d_name, ".") == 0 || + strcmp(dir_entry->d_name, "..") == 0) + continue; + + /* find out if directory entry is itself a directory */ + directory = getPath2(level_directory, dir_entry->d_name); + if (stat(directory, &file_status) != 0 || /* cannot stat file */ + (file_status.st_mode & S_IFMT) != S_IFDIR) /* not a directory */ + { + free(directory); + continue; + } + + filename = getPath2(directory, LEVELINFO_FILENAME); + setup_file_list = loadSetupFileList(filename); + + if (setup_file_list) + { + checkSetupFileListIdentifier(setup_file_list, LEVELINFO_COOKIE); + setLevelDirInfoToDefaults(&leveldir[current_entry]); + + ldi = leveldir[current_entry]; + for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++) + setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text)); + leveldir[current_entry] = ldi; + + leveldir[current_entry].filename = getStringCopy(dir_entry->d_name); + leveldir[current_entry].user_defined = + (level_directory == options.level_directory ? FALSE : TRUE); + + freeSetupFileList(setup_file_list); + current_entry++; + } + else + Error(ERR_WARN, "ignoring level directory '%s'", directory); + + free(directory); + free(filename); + } + + if (current_entry == MAX_LEVDIR_ENTRIES) + Error(ERR_WARN, "using %d level directories -- ignoring the rest", + current_entry); + + closedir(dir); + + if (current_entry == start_entry) + Error(ERR_WARN, "cannot find any valid level series in directory '%s'", + level_directory); + + return current_entry; +} + +void LoadLevelInfo() +{ + InitUserLevelDirectory(getLoginName()); + + num_leveldirs = 0; leveldir_nr = 0; - level_nr = 0; - sprintf(filename, "%s/%s", SETUP_PATH, LEVELSETUP_FILENAME); + num_leveldirs = LoadLevelInfoFromLevelDir(options.level_directory, + num_leveldirs); + num_leveldirs = LoadLevelInfoFromLevelDir(getUserLevelDir(""), + num_leveldirs); - if (level_setup_list) - freeSetupFileList(level_setup_list); + if (num_leveldirs == 0) + Error(ERR_EXIT, "cannot find any valid level series in any directory"); - level_setup_list = loadSetupFileList(filename); + if (num_leveldirs > 1) + qsort(leveldir, num_leveldirs, sizeof(struct LevelDirInfo), + compareLevelDirInfoEntries); +} - if (level_setup_list) +static void SaveUserLevelInfo() +{ + char *filename; + FILE *file; + int i; + + filename = getPath2(getUserLevelDir(getLoginName()), LEVELINFO_FILENAME); + + if (!(file = fopen(filename, "w"))) { - int i; + Error(ERR_WARN, "cannot write level info file '%s'", filename); + free(filename); + return; + } - char *last_level_series = - getSetupFileListEntry(level_setup_list, TOKEN_STR_LAST_LEVEL_SERIES); + ldi.name = getLoginName(); + ldi.levels = 100; + ldi.sort_priority = 300; + ldi.readonly = FALSE; + + fprintf(file, "%s\n\n", + getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, LEVELINFO_COOKIE)); + + for (i=FIRST_LEVELINFO_TOKEN; i<=LAST_LEVELINFO_TOKEN; i++) + fprintf(file, "%s\n", getSetupLine("", i)); + + fclose(file); + free(filename); + + chmod(filename, SETUP_PERMS); +} + +void LoadSetup() +{ + char *filename; + struct SetupFileList *setup_file_list = NULL; + + /* always start with reliable default values */ + setSetupInfoToDefaults(&setup); + + filename = getPath2(getSetupDir(), SETUP_FILENAME); + + setup_file_list = loadSetupFileList(filename); + + if (setup_file_list) + { + checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE); + decodeSetupFileList(setup_file_list); + + setup.direct_draw = !setup.double_buffering; + + freeSetupFileList(setup_file_list); - if (last_level_series) + /* needed to work around problems with fixed length strings */ + if (strlen(setup.player_name) >= MAX_NAMELEN) + setup.player_name[MAX_NAMELEN - 1] = '\0'; + else if (strlen(setup.player_name) < MAX_NAMELEN - 1) { - for (i=0; i leveldir[leveldir_nr].levels - 1) - level_nr = leveldir[leveldir_nr].levels - 1; - } + case TYPE_KEYSYM: + { + KeySym keysym = *(KeySym *)setup_value; + char *keyname = getKeyNameFromKeySym(keysym); - break; + strcat(entry, getX11KeyNameFromKeySym(keysym)); + for (i=strlen(entry); i<50; i++) + strcat(entry, " "); + + /* 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; - char filename[MAX_FILENAME_LEN]; + int i, pnr; + char *filename; FILE *file; - sprintf(filename, "%s/%s", SETUP_PATH, SETUP_FILENAME); + InitUserDataDirectory(); + + filename = getPath2(getSetupDir(), SETUP_FILENAME); if (!(file = fopen(filename, "w"))) { Error(ERR_WARN, "cannot write setup file '%s'", filename); + free(filename); 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++) + { + fprintf(file, "%s\n", getSetupLine("", i)); - for (i=0; itoken, TOKEN_STR_FILE_IDENTIFIER) != 0) @@ -1623,6 +1667,67 @@ void SaveLevelSetup() } fclose(file); + free(filename); chmod(filename, SETUP_PERMS); } + +#ifdef MSDOS +static boolean initErrorFile() +{ + char *filename; + FILE *error_file; + + InitUserDataDirectory(); + + filename = getPath2(getUserDataDir(), ERROR_FILENAME); + error_file = fopen(filename, "w"); + free(filename); + + if (error_file == NULL) + return FALSE; + + fclose(error_file); + + return TRUE; +} + +FILE *openErrorFile() +{ + static boolean first_access = TRUE; + char *filename; + FILE *error_file; + + if (first_access) + { + if (!initErrorFile()) + return NULL; + + first_access = FALSE; + } + + filename = getPath2(getUserDataDir(), ERROR_FILENAME); + error_file = fopen(filename, "a"); + free(filename); + + return error_file; +} + +void dumpErrorFile() +{ + char *filename; + FILE *error_file; + + filename = getPath2(getUserDataDir(), ERROR_FILENAME); + error_file = fopen(filename, "r"); + free(filename); + + if (error_file != NULL) + { + while (!feof(error_file)) + fputc(fgetc(error_file), stderr); + + fclose(error_file); + } +} +#endif