X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=6d858c475be133ebbe2e54027677bbdbb63c9db7;hb=38c26472a6e9f0f037ddfe535d3919c00772b26f;hp=bdd8b54319ae9c94b82876953d10d7a9760f01d9;hpb=21c25c56356db2138816a0716d73934ac3893e89;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index bdd8b543..6d858c47 100644 --- a/src/files.c +++ b/src/files.c @@ -1,301 +1,753 @@ /*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * +* Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-98 Artsoft Entertainment * -* Holger Schemel * -* Oststrasse 11a * -* 33604 Bielefeld * -* phone: ++49 +521 290471 * -* email: aeglos@valinor.owl.de * +* (c) 1995-2002 Artsoft Entertainment * +* Holger Schemel * +* Detmolder Strasse 189 * +* 33604 Bielefeld * +* Germany * +* e-mail: info@artsoft.org * *----------------------------------------------------------* -* files.h * +* files.c * ***********************************************************/ #include +#include + +#include "libgame/libgame.h" #include "files.h" #include "tools.h" -#include "misc.h" #include "tape.h" -#include "joystick.h" -static char *getUserdataDir() + +#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ +#define CHUNK_SIZE_UNDEFINED 0 /* undefined chunk size == 0 */ +#define CHUNK_SIZE_NONE -1 /* do not write chunk size */ +#define FILE_VERS_CHUNK_SIZE 8 /* size of file version chunk */ +#define LEVEL_HEADER_SIZE 80 /* size of level file header */ +#define LEVEL_HEADER_UNUSED 14 /* unused level header bytes */ +#define LEVEL_CHUNK_CNT2_SIZE 160 /* size of level CNT2 chunk */ +#define LEVEL_CHUNK_CNT2_UNUSED 11 /* unused CNT2 chunk bytes */ +#define TAPE_HEADER_SIZE 20 /* size of tape file header */ +#define TAPE_HEADER_UNUSED 3 /* unused tape header bytes */ + +/* file identifier strings */ +#define LEVEL_COOKIE_TMPL "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_x.x" +#define TAPE_COOKIE_TMPL "ROCKSNDIAMONDS_TAPE_FILE_VERSION_x.x" +#define SCORE_COOKIE "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2" + + +/* ========================================================================= */ +/* level file functions */ +/* ========================================================================= */ + +static void setLevelInfoToDefaults() { - static char *userdata_dir = NULL; + int i, x, y; + + level.file_version = FILE_VERSION_ACTUAL; + level.game_version = GAME_VERSION_ACTUAL; + + level.encoding_16bit_field = FALSE; /* default: only 8-bit elements */ + level.encoding_16bit_yamyam = FALSE; /* default: only 8-bit elements */ + level.encoding_16bit_amoeba = FALSE; /* default: only 8-bit elements */ + + lev_fieldx = level.fieldx = STD_LEV_FIELDX; + lev_fieldy = level.fieldy = STD_LEV_FIELDY; + + for(x=0; xauthor, ANONYMOUS_NAME) != 0) { - char *home_dir = getHomeDir(); - char *data_dir = USERDATA_DIRECTORY; + strncpy(level.author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN); + level.author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + } + else + { + switch (LEVELCLASS(leveldir_current)) + { + case LEVELCLASS_TUTORIAL: + strcpy(level.author, PROGRAM_AUTHOR_STRING); + break; + + case LEVELCLASS_CONTRIBUTION: + strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN); + level.author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + break; + + case LEVELCLASS_USER: + strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN); + level.author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + break; - userdata_dir = checked_malloc(strlen(home_dir) + strlen(data_dir) + 2); - sprintf(userdata_dir, "%s/%s", home_dir, data_dir); + default: + /* keep default value */ + break; + } } +} - return userdata_dir; +static int checkLevelElement(int element) +{ + if (element >= NUM_FILE_ELEMENTS) + { + Error(ERR_WARN, "invalid level element %d", element); + element = EL_CHAR_QUESTION; + } + else if (element == EL_PLAYER_OBSOLETE) + element = EL_PLAYER1; + else if (element == EL_KEY_OBSOLETE) + element = EL_KEY1; + + return element; } -static char *getSetupDir() +static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level) { - return getUserdataDir(); + level->file_version = getFileVersion(file); + level->game_version = getFileVersion(file); + + return chunk_size; } -static char *getTapeDir(char *level_subdir) +static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) { - static char *tape_dir = NULL; - char *data_dir = getUserdataDir(); - char *tape_subdir = TAPEDATA_DIRECTORY; + int i, x, y; - if (tape_dir) - free(tape_dir); + lev_fieldx = level->fieldx = fgetc(file); + lev_fieldy = level->fieldy = fgetc(file); - tape_dir = checked_malloc(strlen(data_dir) + strlen(tape_subdir) + - strlen(level_subdir) + 3); - sprintf(tape_dir, "%s/%s%s%s", data_dir, tape_subdir, - (strlen(level_subdir) > 0 ? "/" : ""), level_subdir); + level->time = getFile16BitBE(file); + level->gems_needed = getFile16BitBE(file); - return tape_dir; -} + for(i=0; iname[i] = fgetc(file); + level->name[MAX_LEVEL_NAME_LEN] = 0; -static void createDirectory(char *dir, char *text) -{ - if (access(dir, F_OK) != 0) - if (mkdir(dir, USERDATA_DIR_MODE) != 0) - Error(ERR_WARN, "cannot create %s directory '%s'", text, dir); -} + for(i=0; iscore[i] = fgetc(file); -void InitUserdataDirectory() -{ - createDirectory(getUserdataDir(), "user data"); + level->num_yam_contents = STD_ELEMENT_CONTENTS; + for(i=0; iyam_content[i][x][y] = checkLevelElement(fgetc(file)); + + level->amoeba_speed = fgetc(file); + level->time_magic_wall = fgetc(file); + level->time_wheel = fgetc(file); + level->amoeba_content = checkLevelElement(fgetc(file)); + level->double_speed = (fgetc(file) == 1 ? TRUE : FALSE); + level->gravity = (fgetc(file) == 1 ? TRUE : FALSE); + level->encoding_16bit_field = (fgetc(file) == 1 ? TRUE : FALSE); + level->em_slippery_gems = (fgetc(file) == 1 ? TRUE : FALSE); + + ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED); + + return chunk_size; } -static void InitTapeDirectory(char *level_subdir) +static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level) { - createDirectory(getTapeDir(""), "main tape data"); - createDirectory(getTapeDir(level_subdir), "level tape data"); + int i; + + for(i=0; iauthor[i] = fgetc(file); + level->author[MAX_LEVEL_NAME_LEN] = 0; + + return chunk_size; } -boolean LoadLevelInfo() +static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level) { - int i; - char filename[MAX_FILENAME_LEN]; - char cookie[MAX_FILENAME_LEN]; - FILE *file; + int i, x, y; + int header_size = 4; + int content_size = MAX_ELEMENT_CONTENTS * 3 * 3; + int chunk_size_expected = header_size + content_size; + + /* Note: "chunk_size" was wrong before version 2.0 when elements are + stored with 16-bit encoding (and should be twice as big then). + Even worse, playfield data was stored 16-bit when only yamyam content + contained 16-bit elements and vice versa. */ - sprintf(filename,"%s/%s",level_directory,LEVDIR_FILENAME); + if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0) + chunk_size_expected += content_size; - if (!(file=fopen(filename,"r"))) + if (chunk_size_expected != chunk_size) { - Error(ERR_WARN, "cannot read level info '%s'", filename); - return(FALSE); + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; } - fscanf(file,"%s\n",cookie); - if (strcmp(cookie,LEVELDIR_COOKIE)) /* ungültiges Format? */ + fgetc(file); + level->num_yam_contents = fgetc(file); + fgetc(file); + fgetc(file); + + /* correct invalid number of content fields -- should never happen */ + if (level->num_yam_contents < 1 || + level->num_yam_contents > MAX_ELEMENT_CONTENTS) + level->num_yam_contents = STD_ELEMENT_CONTENTS; + + for(i=0; iyam_content[i][x][y] = + checkLevelElement(level->encoding_16bit_field ? + getFile16BitBE(file) : fgetc(file)); + return chunk_size; +} + +static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level) +{ + int x, y; + int chunk_size_expected = level->fieldx * level->fieldy; + + /* Note: "chunk_size" was wrong before version 2.0 when elements are + stored with 16-bit encoding (and should be twice as big then). + Even worse, playfield data was stored 16-bit when only yamyam content + contained 16-bit elements and vice versa. */ + + if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0) + chunk_size_expected *= 2; + + if (chunk_size_expected != chunk_size) { - Error(ERR_WARN, "wrong format of level info file"); - fclose(file); - return(FALSE); + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; } - num_leveldirs = 0; - leveldir_nr = 0; - for(i=0;ifieldy; y++) + for(x=0; xfieldx; x++) + Feld[x][y] = Ur[x][y] = + checkLevelElement(level->encoding_16bit_field ? + getFile16BitBE(file) : fgetc(file)); + return chunk_size; +} + +static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level) +{ + int i, x, y; + int element; + int num_contents, content_xsize, content_ysize; + int content_array[MAX_ELEMENT_CONTENTS][3][3]; + + element = checkLevelElement(getFile16BitBE(file)); + num_contents = fgetc(file); + content_xsize = fgetc(file); + content_ysize = fgetc(file); + ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED); + + for(i=0; i MAX_ELEMENT_CONTENTS) + num_contents = STD_ELEMENT_CONTENTS; + + if (element == EL_YAMYAM) { - fscanf(file,"%s",leveldir[i].filename); - fscanf(file,"%s",leveldir[i].name); - fscanf(file,"%d",&leveldir[i].levels); - fscanf(file,"%d",&leveldir[i].readonly); - if (feof(file)) - break; + level->num_yam_contents = num_contents; - num_leveldirs++; + for(i=0; iyam_content[i][x][y] = content_array[i][x][y]; } - - if (!num_leveldirs) + else if (element == EL_BD_AMOEBA) { - Error(ERR_WARN, "empty level info '%s'", filename); - return(FALSE); + level->amoeba_content = content_array[0][0][0]; + } + else + { + Error(ERR_WARN, "cannot load content for element '%d'", element); } - return(TRUE); + return chunk_size; } -void LoadLevel(int level_nr) +void LoadLevelFromFilename(char *filename) { - int i,x,y; - char filename[MAX_FILENAME_LEN]; - char cookie[MAX_FILENAME_LEN]; + char cookie[MAX_LINE_LEN]; + char chunk_name[CHUNK_ID_LEN + 1]; + int chunk_size; FILE *file; - sprintf(filename,"%s/%s/%d", - level_directory,leveldir[leveldir_nr].filename,level_nr); + /* always start with reliable default values */ + setLevelInfoToDefaults(); + + if (!(file = fopen(filename, MODE_READ))) + { + level.no_level_file = TRUE; - if (!(file = fopen(filename,"r"))) Error(ERR_WARN, "cannot read level '%s' - creating new level", filename); - else + return; + } + + getFileChunkBE(file, chunk_name, NULL); + if (strcmp(chunk_name, "RND1") == 0) { - fgets(cookie,LEVEL_COOKIE_LEN,file); - fgetc(file); + getFile32BitBE(file); /* not used */ - if (strcmp(cookie,LEVEL_COOKIE)) /* ungültiges Format? */ + getFileChunkBE(file, chunk_name, NULL); + if (strcmp(chunk_name, "CAVE") != 0) { - Error(ERR_WARN, "wrong format of level file '%s'", filename); + Error(ERR_WARN, "unknown format of level file '%s'", filename); fclose(file); - file = NULL; + return; } } + else /* check for pre-2.0 file format with cookie string */ + { + strcpy(cookie, chunk_name); + fgets(&cookie[4], MAX_LINE_LEN - 4, file); + if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') + cookie[strlen(cookie) - 1] = '\0'; - if (file) + if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL)) + { + Error(ERR_WARN, "unknown format of level file '%s'", filename); + fclose(file); + return; + } + + if ((level.file_version = getFileVersionFromCookieString(cookie)) == -1) + { + Error(ERR_WARN, "unsupported version of level file '%s'", filename); + fclose(file); + return; + } + + /* pre-2.0 level files have no game version, so use file version here */ + level.game_version = level.file_version; + } + + if (level.file_version < FILE_VERSION_1_2) { - 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;ifile_version); + putFileVersion(file, level->game_version); +} + +static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level) +{ + int i, x, y; + + fputc(level->fieldx, file); + fputc(level->fieldy, file); + + putFile16BitBE(file, level->time); + putFile16BitBE(file, level->gems_needed); + + for(i=0; iname[i], file); + + for(i=0; iscore[i], file); + + for(i=0; iencoding_16bit_yamyam ? EL_EMPTY : + level->yam_content[i][x][y]), + file); + fputc(level->amoeba_speed, file); + fputc(level->time_magic_wall, file); + fputc(level->time_wheel, file); + fputc((level->encoding_16bit_amoeba ? EL_EMPTY : level->amoeba_content), + file); + fputc((level->double_speed ? 1 : 0), file); + fputc((level->gravity ? 1 : 0), file); + fputc((level->encoding_16bit_field ? 1 : 0), file); + fputc((level->em_slippery_gems ? 1 : 0), file); + + WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED); +} + +static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level) +{ + int i; + + for(i=0; iauthor[i], file); +} + +#if 0 +static void SaveLevel_CONT(FILE *file, struct LevelInfo *level) +{ + int i, x, y; + + fputc(EL_YAMYAM, file); + fputc(level->num_yam_contents, file); + fputc(0, file); + fputc(0, file); + + for(i=0; iencoding_16bit_field) + putFile16BitBE(file, level->yam_content[i][x][y]); + else + fputc(level->yam_content[i][x][y], file); +} +#endif + +static void SaveLevel_BODY(FILE *file, struct LevelInfo *level) +{ + int x, y; + + for(y=0; yfieldy; y++) + for(x=0; xfieldx; x++) + if (level->encoding_16bit_field) + putFile16BitBE(file, Ur[x][y]); + else + fputc(Ur[x][y], file); +} + +static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) +{ + int i, x, y; + int num_contents, content_xsize, content_ysize; + int content_array[MAX_ELEMENT_CONTENTS][3][3]; + + if (element == EL_YAMYAM) { - Error(ERR_WARN, "cannot save level file '%s'", filename); + num_contents = level->num_yam_contents; + content_xsize = 3; + content_ysize = 3; + + for(i=0; iyam_content[i][x][y]; + } + else if (element == EL_BD_AMOEBA) + { + num_contents = 1; + content_xsize = 1; + content_ysize = 1; + + for(i=0; iamoeba_content; + } + else + { + /* chunk header already written -- write empty chunk data */ + WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_SIZE); + + Error(ERR_WARN, "cannot save content for element '%d'", element); 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 255) + level.encoding_16bit_field = TRUE; + + /* check yamyam content for 16-bit elements */ + level.encoding_16bit_yamyam = FALSE; + for(i=0; i 255) + level.encoding_16bit_yamyam = TRUE; + + /* check amoeba content for 16-bit elements */ + level.encoding_16bit_amoeba = FALSE; + if (level.amoeba_content > 255) + level.encoding_16bit_amoeba = TRUE; + + body_chunk_size = + level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1); + + putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED); + putFileChunkBE(file, "CAVE", CHUNK_SIZE_NONE); + + putFileChunkBE(file, "VERS", FILE_VERS_CHUNK_SIZE); + SaveLevel_VERS(file, &level); - if ((file = fopen(filename, "r"))) + putFileChunkBE(file, "HEAD", LEVEL_HEADER_SIZE); + SaveLevel_HEAD(file, &level); + + putFileChunkBE(file, "AUTH", MAX_LEVEL_AUTHOR_LEN); + SaveLevel_AUTH(file, &level); + + putFileChunkBE(file, "BODY", body_chunk_size); + SaveLevel_BODY(file, &level); + + if (level.encoding_16bit_yamyam || + level.num_yam_contents != STD_ELEMENT_CONTENTS) { - 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 format of level recording file '%s'", filename); - fclose(file); - file = NULL; - } + putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE); + SaveLevel_CNT2(file, &level, EL_YAMYAM); } - if (!file) - return; + if (level.encoding_16bit_amoeba) + { + putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE); + SaveLevel_CNT2(file, &level, EL_BD_AMOEBA); + } - tape.random_seed = - (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); - tape.date = - (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); - tape.length = - (fgetc(file)<<24) | (fgetc(file)<<16) | (fgetc(file)<<8) | fgetc(file); + fclose(file); + + SetFilePermissions(filename, PERMS_PRIVATE); +} + +void DumpLevel(struct LevelInfo *level) +{ + printf_line('-', 79); + printf("Level xxx (file version %06d, game version %06d)\n", + level->file_version, level->game_version); + printf_line('-', 79); + + printf("Level Author: '%s'\n", level->author); + printf("Level Title: '%s'\n", level->name); + printf("\n"); + printf("Playfield Size: %d x %d\n", level->fieldx, level->fieldy); + printf("\n"); + printf("Level Time: %d seconds\n", level->time); + printf("Gems needed: %d\n", level->gems_needed); + printf("\n"); + printf("Time for Magic Wall: %d seconds\n", level->time_magic_wall); + printf("Time for Wheel: %d seconds\n", level->time_wheel); + printf("Time for Light: %d seconds\n", level->time_light); + printf("Time for Timegate: %d seconds\n", level->time_timegate); + printf("\n"); + printf("Amoeba Speed: %d\n", level->amoeba_speed); + printf("\n"); + printf("Gravity: %s\n", (level->gravity ? "yes" : "no")); + printf("Double Speed Movement: %s\n", (level->double_speed ? "yes" : "no")); + printf("EM style slippery gems: %s\n", (level->em_slippery_gems ? "yes" : "no")); + + printf_line('-', 79); +} + + +/* ========================================================================= */ +/* tape file functions */ +/* ========================================================================= */ + +static void setTapeInfoToDefaults() +{ + int i; + + /* always start with reliable default values (empty tape) */ + TapeErase(); + + /* default values (also for pre-1.2 tapes) with only the first player */ + tape.player_participates[0] = TRUE; + for(i=1; ifile_version = getFileVersion(file); + tape->game_version = getFileVersion(file); + + return chunk_size; +} - for(i=0; irandom_seed = getFile32BitBE(file); + tape->date = getFile32BitBE(file); + tape->length = getFile32BitBE(file); + + /* read header fields that are new since version 1.2 */ + if (tape->file_version >= FILE_VERSION_1_2) { - int j; + byte store_participating_players = fgetc(file); + int engine_version; + + /* since version 1.2, tapes store which players participate in the tape */ + tape->num_participating_players = 0; + for(i=0; iplayer_participates[i] = FALSE; + + if (store_participating_players & (1 << i)) + { + tape->player_participates[i] = TRUE; + tape->num_participating_players++; + } + } + ReadUnusedBytesFromFile(file, TAPE_HEADER_UNUSED); + + engine_version = getFileVersion(file); + if (engine_version > 0) + tape->engine_version = engine_version; + } + + return chunk_size; +} + +static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) +{ + int i, j; + int chunk_size_expected = + (tape->num_participating_players + 1) * tape->length; + + if (chunk_size_expected != chunk_size) + { + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; + } + + for(i=0; ilength; i++) + { if (i >= MAX_TAPELEN) break; for(j=0; j 0) - { - 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); + tape->pos[i].delay = fgetc(file); - if (levelrec_10) + if (tape->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]; + 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]; + tape->pos[i + num_moves].action[0] = joy_dir[k]; if (num_moves > 0) - tape.pos[i + num_moves].delay = 0; + tape->pos[i + num_moves].delay = 0; num_moves++; } } @@ -348,7 +854,26 @@ void LoadLevelTape(int level_nr) { num_moves--; i += num_moves; - tape.length += num_moves; + tape->length += num_moves; + } + } + else if (tape->file_version < FILE_VERSION_2_0) + { + /* convert pre-2.0 tapes to new tape format */ + + if (tape->pos[i].delay > 1) + { + /* action part */ + tape->pos[i + 1] = tape->pos[i]; + tape->pos[i + 1].delay = 1; + + /* delay part */ + for(j=0; jpos[i].action[j] = MV_NO_MOVING; + tape->pos[i].delay--; + + i++; + tape->length++; } } @@ -356,571 +881,559 @@ void LoadLevelTape(int level_nr) break; } - fclose(file); + if (i != tape->length) + chunk_size = (tape->num_participating_players + 1) * i; - if (i != tape.length) - Error(ERR_WARN, "level recording file '%s' corrupted", filename); - - tape.length_seconds = GetTapeLength(); + return chunk_size; } -void SaveLevelTape(int level_nr) +void LoadTapeFromFilename(char *filename) { - int i; - char filename[MAX_FILENAME_LEN]; + char cookie[MAX_LINE_LEN]; + char chunk_name[CHUNK_ID_LEN + 1]; FILE *file; - boolean new_tape = TRUE; + int chunk_size; - sprintf(filename, "%s/%d.%s", - getTapeDir(leveldir[leveldir_nr].filename), - level_nr, TAPEFILE_EXTENSION); + /* always start with reliable default values */ + setTapeInfoToDefaults(); - InitTapeDirectory(leveldir[leveldir_nr].filename); + if (!(file = fopen(filename, MODE_READ))) + return; - /* Testen, ob bereits eine Aufnahme existiert */ - if ((file = fopen(filename, "r"))) + getFileChunkBE(file, chunk_name, NULL); + if (strcmp(chunk_name, "RND1") == 0) { - new_tape = FALSE; - fclose(file); + getFile32BitBE(file); /* not used */ - if (!Request("Replace old tape ?", REQ_ASK)) + getFileChunkBE(file, chunk_name, NULL); + if (strcmp(chunk_name, "TAPE") != 0) + { + Error(ERR_WARN, "unknown format of tape file '%s'", filename); + fclose(file); return; + } } - - if (!(file = fopen(filename, "w"))) + else /* check for pre-2.0 file format with cookie string */ { - Error(ERR_WARN, "cannot save level recording file '%s'", filename); - return; - } - - fputs(LEVELREC_COOKIE, file); /* Formatkennung */ - fputc(0x0a, file); + strcpy(cookie, chunk_name); + fgets(&cookie[4], MAX_LINE_LEN - 4, file); + if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') + cookie[strlen(cookie) - 1] = '\0'; - 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 (!checkCookieString(cookie, TAPE_COOKIE_TMPL)) + { + Error(ERR_WARN, "unknown format of tape file '%s'", filename); + fclose(file); + return; + } - fputc((tape.date >> 24) & 0xff,file); - fputc((tape.date >> 16) & 0xff,file); - fputc((tape.date >> 8) & 0xff,file); - fputc((tape.date >> 0) & 0xff,file); + if ((tape.file_version = getFileVersionFromCookieString(cookie)) == -1) + { + Error(ERR_WARN, "unsupported version of tape file '%s'", filename); + fclose(file); + return; + } - fputc((tape.length >> 24) & 0xff,file); - fputc((tape.length >> 16) & 0xff,file); - fputc((tape.length >> 8) & 0xff,file); - fputc((tape.length >> 0) & 0xff,file); + /* pre-2.0 tape files have no game version, so use file version here */ + tape.game_version = tape.file_version; + } - for(i=0; ifile_version); + putFileVersion(file, tape->game_version); +} - sprintf(filename,"%s/%s/%s", - level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME); +static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape) +{ + int i; + byte store_participating_players = 0; - if (!(file=fopen(filename,"w"))) - return(FALSE); + /* set bits for participating players for compact storage */ + for(i=0; iplayer_participates[i]) + store_participating_players |= (1 << i); - for(i=0;irandom_seed); + putFile32BitBE(file, tape->date); + putFile32BitBE(file, tape->length); - fputs(SCORE_COOKIE,file); /* Formatkennung */ - for(i=0;iengine_version); } -void LoadScore(int level_nr) +static void SaveTape_BODY(FILE *file, struct TapeInfo *tape) { - int i,j; - char filename[MAX_FILENAME_LEN]; - char cookie[MAX_FILENAME_LEN]; - FILE *file; - - sprintf(filename,"%s/%s/%s", - level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME); - - if (!(file = fopen(filename,"r"))) - { - 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); - } + int i, j; - if (file) + for(i=0; ilength; i++) { - fgets(cookie,SCORE_COOKIE_LEN,file); - if (strcmp(cookie,SCORE_COOKIE)) /* ungültiges Format? */ - { - Error(ERR_WARN, "wrong format of score file '%s'", filename); - fclose(file); - file = NULL; - } - } + for(j=0; jplayer_participates[j]) + fputc(tape->pos[i].action[j], file); - if (file) - { - fseek(file, - SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)), - SEEK_SET); - for(i=0;ipos[i].delay, file); } } -void SaveScore(int level_nr) +void SaveTape(int level_nr) { - int i,j; - char filename[MAX_FILENAME_LEN]; + int i; + char *filename = getTapeFilename(level_nr); FILE *file; + boolean new_tape = TRUE; + int num_participating_players = 0; + int body_chunk_size; - sprintf(filename,"%s/%s/%s", - level_directory,leveldir[leveldir_nr].filename,SCORE_FILENAME); + InitTapeDirectory(leveldir_current->filename); - if (!(file=fopen(filename,"r+"))) + /* if a tape still exists, ask to overwrite it */ + if (access(filename, F_OK) == 0) { - Error(ERR_WARN, "cannot save score for level %d", level_nr); - return; + new_tape = FALSE; + if (!Request("Replace old tape ?", REQ_ASK)) + return; } - fseek(file, - SCORE_COOKIE_LEN-1+level_nr*(MAX_SCORE_ENTRIES*(MAX_NAMELEN+2)), - SEEK_SET); - for(i=0;i= 100) - return s; + body_chunk_size = (num_participating_players + 1) * tape.length; - strcpy(s_lower, s); + putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED); + putFileChunkBE(file, "TAPE", CHUNK_SIZE_NONE); - for (i=0; ilevel_nr); return; + } - if (setup_file_list->token) - free(setup_file_list->token); - if (setup_file_list->value) - free(setup_file_list->value); - if (setup_file_list->next) - freeSetupFileList(setup_file_list->next); - free(setup_file_list); -} + printf_line('-', 79); + printf("Tape of Level %03d (file version %06d, game version %06d)\n", + tape->level_nr, tape->file_version, tape->game_version); + printf_line('-', 79); -static struct SetupFileList *newSetupFileList(char *token, char *value) -{ - struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList)); + for(i=0; ilength; i++) + { + if (i >= MAX_TAPELEN) + break; - new->token = checked_malloc(strlen(token) + 1); - strcpy(new->token, token); + printf("%03d: ", i); - new->value = checked_malloc(strlen(value) + 1); - strcpy(new->value, value); + for(j=0; jplayer_participates[j]) + { + int action = tape->pos[i].action[j]; + + printf("%d:%02x ", j, action); + printf("[%c%c%c%c|%c%c] - ", + (action & JOY_LEFT ? '<' : ' '), + (action & JOY_RIGHT ? '>' : ' '), + (action & JOY_UP ? '^' : ' '), + (action & JOY_DOWN ? 'v' : ' '), + (action & JOY_BUTTON_1 ? '1' : ' '), + (action & JOY_BUTTON_2 ? '2' : ' ')); + } + } - new->next = NULL; + printf("(%03d)\n", tape->pos[i].delay); + } - return new; + printf_line('-', 79); } -static char *getTokenValue(struct SetupFileList *setup_file_list, - char *token) -{ - if (!setup_file_list) - return NULL; - if (strcmp(setup_file_list->token, token) == 0) - return setup_file_list->value; - else - return getTokenValue(setup_file_list->next, token); -} +/* ========================================================================= */ +/* score file functions */ +/* ========================================================================= */ -static void setTokenValue(struct SetupFileList *setup_file_list, - char *token, char *value) +void LoadScore(int level_nr) { - if (!setup_file_list) - return; + int i; + char *filename = getScoreFilename(level_nr); + char cookie[MAX_LINE_LEN]; + char line[MAX_LINE_LEN]; + char *line_ptr; + FILE *file; - if (strcmp(setup_file_list->token, token) == 0) + /* always start with reliable default values */ + for(i=0; ivalue); - setup_file_list->value = checked_malloc(strlen(value) + 1); - strcpy(setup_file_list->value, value); + strcpy(highscore[i].Name, EMPTY_PLAYER_NAME); + highscore[i].Score = 0; } - else if (setup_file_list->next == NULL) - setup_file_list->next = newSetupFileList(token, value); - else - setTokenValue(setup_file_list->next, token, value); -} -#ifdef DEBUG -static void printSetupFileList(struct SetupFileList *setup_file_list) -{ - if (!setup_file_list) + if (!(file = fopen(filename, MODE_READ))) return; - printf("token: '%s'\n", setup_file_list->token); - printf("value: '%s'\n", setup_file_list->value); - - printSetupFileList(setup_file_list->next); -} -#endif - -static struct SetupFileList *loadSetupFileList(char *filename) -{ - int line_len; - char line[MAX_LINE_LEN]; - char *token, *value, *line_ptr; - struct SetupFileList *setup_file_list = newSetupFileList("", ""); - struct SetupFileList *first_valid_list_entry; - - FILE *file; + /* check file identifier */ + fgets(cookie, MAX_LINE_LEN, file); + if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') + cookie[strlen(cookie) - 1] = '\0'; - if (!(file = fopen(filename, "r"))) + if (!checkCookieString(cookie, SCORE_COOKIE)) { - Error(ERR_WARN, "cannot open setup file '%s'", filename); - return NULL; + Error(ERR_WARN, "unknown format of score file '%s'", filename); + fclose(file); + return; } - while(!feof(file)) + for(i=0; i line; line_ptr--) - if ((*line_ptr == ' ' || *line_ptr == '\t') && line_ptr[1] == '\0') - *line_ptr = '\0'; - - /* ignore empty lines */ - if (*line == '\0') - continue; - - line_len = strlen(line); + fclose(file); +} - /* cut leading whitespaces from token */ - for (token = line; *token; token++) - if (*token != ' ' && *token != '\t') - break; +void SaveScore(int level_nr) +{ + int i; + char *filename = getScoreFilename(level_nr); + FILE *file; - /* find end of token */ - for (line_ptr = token; *line_ptr; line_ptr++) - { - if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':') - { - *line_ptr = '\0'; - break; - } - } + InitScoreDirectory(leveldir_current->filename); - if (line_ptr < line + line_len) - value = line_ptr + 1; - else - value = "\0"; + if (!(file = fopen(filename, MODE_WRITE))) + { + Error(ERR_WARN, "cannot save score for level %d", level_nr); + return; + } - /* cut leading whitespaces from value */ - for (; *value; value++) - if (*value != ' ' && *value != '\t') - break; + fprintf(file, "%s\n\n", SCORE_COOKIE); - if (*token && *value) - setTokenValue(setup_file_list, token, value); - } + for(i=0; inext; + SetFilePermissions(filename, PERMS_PUBLIC); +} - /* free empty list header */ - setup_file_list->next = NULL; - freeSetupFileList(setup_file_list); - if (!first_valid_list_entry) - Error(ERR_WARN, "setup file is empty"); +/* ========================================================================= */ +/* setup file functions */ +/* ========================================================================= */ + +#define TOKEN_STR_PLAYER_PREFIX "player_" + +/* 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_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_TEAM_MODE 11 +#define SETUP_TOKEN_HANDICAP 12 +#define SETUP_TOKEN_TIME_LIMIT 13 +#define SETUP_TOKEN_FULLSCREEN 14 +#define SETUP_TOKEN_ASK_ON_ESCAPE 15 +#define SETUP_TOKEN_GRAPHICS_SET 16 +#define SETUP_TOKEN_SOUNDS_SET 17 +#define SETUP_TOKEN_MUSIC_SET 18 +#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 19 +#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 20 +#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 21 + +#define NUM_GLOBAL_SETUP_TOKENS 22 + +/* editor setup */ +#define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 +#define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE 1 +#define SETUP_TOKEN_EDITOR_EL_MORE 2 +#define SETUP_TOKEN_EDITOR_EL_SOKOBAN 3 +#define SETUP_TOKEN_EDITOR_EL_SUPAPLEX 4 +#define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES 5 +#define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH 6 +#define SETUP_TOKEN_EDITOR_EL_CHARS 7 +#define SETUP_TOKEN_EDITOR_EL_CUSTOM 8 + +#define NUM_EDITOR_SETUP_TOKENS 9 + +/* shortcut setup */ +#define SETUP_TOKEN_SHORTCUT_SAVE_GAME 0 +#define SETUP_TOKEN_SHORTCUT_LOAD_GAME 1 +#define SETUP_TOKEN_SHORTCUT_TOGGLE_PAUSE 2 + +#define NUM_SHORTCUT_SETUP_TOKENS 3 + +/* player setup */ +#define SETUP_TOKEN_PLAYER_USE_JOYSTICK 0 +#define SETUP_TOKEN_PLAYER_JOY_DEVICE_NAME 1 +#define SETUP_TOKEN_PLAYER_JOY_XLEFT 2 +#define SETUP_TOKEN_PLAYER_JOY_XMIDDLE 3 +#define SETUP_TOKEN_PLAYER_JOY_XRIGHT 4 +#define SETUP_TOKEN_PLAYER_JOY_YUPPER 5 +#define SETUP_TOKEN_PLAYER_JOY_YMIDDLE 6 +#define SETUP_TOKEN_PLAYER_JOY_YLOWER 7 +#define SETUP_TOKEN_PLAYER_JOY_SNAP 8 +#define SETUP_TOKEN_PLAYER_JOY_BOMB 9 +#define SETUP_TOKEN_PLAYER_KEY_LEFT 10 +#define SETUP_TOKEN_PLAYER_KEY_RIGHT 11 +#define SETUP_TOKEN_PLAYER_KEY_UP 12 +#define SETUP_TOKEN_PLAYER_KEY_DOWN 13 +#define SETUP_TOKEN_PLAYER_KEY_SNAP 14 +#define SETUP_TOKEN_PLAYER_KEY_BOMB 15 + +#define NUM_PLAYER_SETUP_TOKENS 16 - return first_valid_list_entry; -} +static struct SetupInfo si; +static struct SetupEditorInfo sei; +static struct SetupShortcutInfo ssi; +static struct SetupInputInfo sii; -static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, - char *identifier) +static struct TokenInfo global_setup_tokens[] = { - if (!setup_file_list) - return; + /* 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.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" }, + { TYPE_SWITCH, &si.handicap, "handicap" }, + { TYPE_SWITCH, &si.time_limit, "time_limit" }, + { TYPE_SWITCH, &si.fullscreen, "fullscreen" }, + { TYPE_SWITCH, &si.ask_on_escape, "ask_on_escape" }, + { TYPE_STRING, &si.graphics_set, "graphics_set" }, + { TYPE_STRING, &si.sounds_set, "sounds_set" }, + { TYPE_STRING, &si.music_set, "music_set" }, + { TYPE_SWITCH, &si.override_level_graphics, "override_level_graphics" }, + { TYPE_SWITCH, &si.override_level_sounds, "override_level_sounds" }, + { TYPE_SWITCH, &si.override_level_music, "override_level_music" }, +}; - if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0) - { - if (strcmp(setup_file_list->value, identifier) != 0) - { - Error(ERR_WARN, "setup file has wrong version"); - return; - } - else - return; - } +static struct TokenInfo editor_setup_tokens[] = +{ + /* shortcut setup */ + { TYPE_SWITCH, &sei.el_boulderdash, "editor.el_boulderdash" }, + { TYPE_SWITCH, &sei.el_emerald_mine, "editor.el_emerald_mine" }, + { TYPE_SWITCH, &sei.el_more, "editor.el_more" }, + { TYPE_SWITCH, &sei.el_sokoban, "editor.el_sokoban" }, + { TYPE_SWITCH, &sei.el_supaplex, "editor.el_supaplex" }, + { TYPE_SWITCH, &sei.el_diamond_caves, "editor.el_diamond_caves" }, + { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash" }, + { TYPE_SWITCH, &sei.el_chars, "editor.el_chars" }, + { TYPE_SWITCH, &sei.el_custom, "editor.el_custom" }, +}; - if (setup_file_list->next) - checkSetupFileListIdentifier(setup_file_list->next, identifier); - else - { - Error(ERR_WARN, "setup file has no version information"); - return; - } -} +static struct TokenInfo shortcut_setup_tokens[] = +{ + /* shortcut setup */ + { TYPE_KEY_X11, &ssi.save_game, "shortcut.save_game" }, + { TYPE_KEY_X11, &ssi.load_game, "shortcut.load_game" }, + { TYPE_KEY_X11, &ssi.toggle_pause, "shortcut.toggle_pause" } +}; + +static struct TokenInfo player_setup_tokens[] = +{ + /* 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_KEY_X11, &sii.key.left, ".key.move_left" }, + { TYPE_KEY_X11, &sii.key.right, ".key.move_right" }, + { TYPE_KEY_X11, &sii.key.up, ".key.move_up" }, + { TYPE_KEY_X11, &sii.key.down, ".key.move_down" }, + { TYPE_KEY_X11, &sii.key.snap, ".key.snap_field" }, + { TYPE_KEY_X11, &sii.key.bomb, ".key.place_bomb" } +}; static void setSetupInfoToDefaults(struct SetupInfo *si) { int i; + si->player_name = getStringCopy(getLoginName()); + si->sound = TRUE; - si->sound_loops = FALSE; - si->sound_music = FALSE; - si->sound_simple = FALSE; + 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 = FALSE; + si->scroll_delay = TRUE; si->soft_scrolling = TRUE; si->fading = FALSE; - si->autorecord = FALSE; + si->autorecord = TRUE; 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'; + si->team_mode = FALSE; + si->handicap = TRUE; + si->time_limit = TRUE; + si->fullscreen = FALSE; + si->ask_on_escape = TRUE; + + si->graphics_set = getStringCopy(GRAPHICS_SUBDIR); + si->sounds_set = getStringCopy(SOUNDS_SUBDIR); + si->music_set = getStringCopy(MUSIC_SUBDIR); + si->override_level_graphics = FALSE; + si->override_level_sounds = FALSE; + si->override_level_music = FALSE; + + si->editor.el_boulderdash = TRUE; + si->editor.el_emerald_mine = TRUE; + si->editor.el_more = TRUE; + si->editor.el_sokoban = TRUE; + si->editor.el_supaplex = TRUE; + si->editor.el_diamond_caves = TRUE; + si->editor.el_dx_boulderdash = TRUE; + si->editor.el_chars = TRUE; + si->editor.el_custom = FALSE; + + si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME; + si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME; + si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE; for (i=0; iinput[i].use_joystick = FALSE; - strcpy(si->input[i].joy.device_name, joystick_device_name[i]); + si->input[i].joy.device_name=getStringCopy(getDeviceNameFromJoystickNr(i)); si->input[i].joy.xleft = JOYSTICK_XLEFT; si->input[i].joy.xmiddle = JOYSTICK_XMIDDLE; si->input[i].joy.xright = JOYSTICK_XRIGHT; @@ -929,45 +1442,12 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) 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); - } -} - -static void setSetupInfo(int token_nr, char *token_value) -{ - int token_type = token_info[token_nr].type; - void *setup_value = token_info[token_nr].value; - - if (token_value == NULL) - return; - - /* set setup field to corresponding token value */ - switch (token_type) - { - case TYPE_BOOLEAN: - case TYPE_SWITCH: - *(boolean *)setup_value = get_string_boolean_value(token_value); - break; - - case TYPE_KEYSYM: - *(KeySym *)setup_value = getKeySymFromX11KeyName(token_value); - break; - - case TYPE_INTEGER: - *(int *)setup_value = get_string_integer_value(token_value); - break; - - case TYPE_STRING: - strcpy((char *)setup_value, token_value); - break; - - default: - break; + si->input[i].key.left = (i == 0 ? DEFAULT_KEY_LEFT : KSYM_UNDEFINED); + si->input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KSYM_UNDEFINED); + si->input[i].key.up = (i == 0 ? DEFAULT_KEY_UP : KSYM_UNDEFINED); + si->input[i].key.down = (i == 0 ? DEFAULT_KEY_DOWN : KSYM_UNDEFINED); + si->input[i].key.snap = (i == 0 ? DEFAULT_KEY_SNAP : KSYM_UNDEFINED); + si->input[i].key.bomb = (i == 0 ? DEFAULT_KEY_BOMB : KSYM_UNDEFINED); } } @@ -978,13 +1458,28 @@ static void decodeSetupFileList(struct SetupFileList *setup_file_list) if (!setup_file_list) return; - /* handle global setup values */ + /* global setup */ si = setup; - for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++) - setSetupInfo(i, getTokenValue(setup_file_list, token_info[i].text)); + for (i=0; i highest_level_nr) - last_level_nr = highest_level_nr; - } - - return last_level_nr; -} - void LoadSetup() { - char filename[MAX_FILENAME_LEN]; + char *filename = getSetupFilename(); struct SetupFileList *setup_file_list = NULL; - /* always start with reliable default setup values */ + /* always start with reliable default values */ setSetupInfoToDefaults(&setup); - sprintf(filename, "%s/%s", getSetupDir(), SETUP_FILENAME); - setup_file_list = loadSetupFileList(filename); if (setup_file_list) { - checkSetupFileListIdentifier(setup_file_list, SETUP_COOKIE); + checkSetupFileListIdentifier(setup_file_list, getCookie("SETUP")); decodeSetupFileList(setup_file_list); setup.direct_draw = !setup.double_buffering; freeSetupFileList(setup_file_list); - } - else - Error(ERR_WARN, "using default setup values"); -} - -static char *getSetupLine(char *prefix, int token_nr) -{ - 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; - - /* start with the prefix, token and some spaces to format output line */ - sprintf(entry, "%s%s:", prefix, token_text); - for (i=strlen(entry); i MAX_PLAYER_NAME_LEN) + setup.player_name[MAX_PLAYER_NAME_LEN] = '\0'; + else if (strlen(setup.player_name) < MAX_PLAYER_NAME_LEN) + { + char *new_name = checked_malloc(MAX_PLAYER_NAME_LEN + 1); - default: - break; + strcpy(new_name, setup.player_name); + free(setup.player_name); + setup.player_name = new_name; + } } - - return entry; + else + Error(ERR_WARN, "using default setup values"); } void SaveSetup() { - int i, pnr; - char filename[MAX_FILENAME_LEN]; + char *filename = getSetupFilename(); FILE *file; + int i, pnr; - sprintf(filename, "%s/%s", getSetupDir(), SETUP_FILENAME); + InitUserDataDirectory(); - if (!(file = fopen(filename, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot write setup file '%s'", filename); return; } - fprintf(file, "%s\n", - getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, SETUP_COOKIE)); + fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, + getCookie("SETUP"))); fprintf(file, "\n"); - /* handle global setup values */ + /* global setup */ si = setup; - for (i=FIRST_GLOBAL_SETUP_TOKEN; i<=LAST_GLOBAL_SETUP_TOKEN; i++) + for (i=0; itoken, TOKEN_STR_FILE_IDENTIFIER) != 0) - fprintf(file, "%s\n", - getFormattedSetupEntry(list_entry->token, list_entry->value)); - - /* just to make things nicer :) */ - if (strcmp(list_entry->token, TOKEN_STR_LAST_LEVEL_SERIES) == 0) - fprintf(file, "\n"); - - list_entry = list_entry->next; + for (i=0; i