X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=6d858c475be133ebbe2e54027677bbdbb63c9db7;hb=38c26472a6e9f0f037ddfe535d3919c00772b26f;hp=46671d4631c18ca86423f370eb81c7a3a01dbc70;hpb=d82356191574038684ec15bb2e13fe803de52b53;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 46671d46..6d858c47 100644 --- a/src/files.c +++ b/src/files.c @@ -1,327 +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 -#include + +#include "libgame/libgame.h" #include "files.h" #include "tools.h" -#include "misc.h" #include "tape.h" -#include "joystick.h" -#define MAX_LINE_LEN 1000 -static void SaveUserLevelInfo(); /* for 'InitUserLevelDir()' */ -static char *getSetupLine(char *, int); /* for 'SaveUserLevelInfo()' */ +#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" -static char *getGlobalDataDir() -{ - return GAME_DIR; -} -static char *getUserDataDir() +/* ========================================================================= */ +/* level file functions */ +/* ========================================================================= */ + +static void setLevelInfoToDefaults() { - static char *userdata_dir = NULL; + int i, x, y; - if (!userdata_dir) - { - char *home_dir = getHomeDir(); - char *data_dir = USERDATA_DIRECTORY; + 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) + { + 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; - return userdata_dir; -} + case LEVELCLASS_CONTRIBUTION: + strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN); + level.author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + break; -static char *getSetupDir() -{ - return getUserDataDir(); + case LEVELCLASS_USER: + strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN); + level.author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + break; + + default: + /* keep default value */ + break; + } + } } -static char *getUserLevelDir(char *level_subdir) +static int checkLevelElement(int element) { - static char *userlevel_dir = NULL; - char *data_dir = getUserDataDir(); - char *userlevel_subdir = LEVELS_DIRECTORY; + 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; - if (userlevel_dir) - free(userlevel_dir); + return element; +} - userlevel_dir = checked_malloc(strlen(data_dir) + strlen(userlevel_subdir) + - strlen(level_subdir) + 3); - sprintf(userlevel_dir, "%s/%s%s%s", data_dir, userlevel_subdir, - (strlen(level_subdir) > 0 ? "/" : ""), level_subdir); +static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level) +{ + level->file_version = getFileVersion(file); + level->game_version = getFileVersion(file); - return userlevel_dir; + 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 = TAPES_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 char *getScoreDir(char *level_subdir) -{ - static char *score_dir = NULL; - char *data_dir = getGlobalDataDir(); - char *score_subdir = SCORES_DIRECTORY; + for(i=0; iscore[i] = fgetc(file); - if (score_dir) - free(score_dir); + level->num_yam_contents = STD_ELEMENT_CONTENTS; + for(i=0; iyam_content[i][x][y] = checkLevelElement(fgetc(file)); - score_dir = checked_malloc(strlen(data_dir) + strlen(score_subdir) + - strlen(level_subdir) + 3); - sprintf(score_dir, "%s/%s%s%s", data_dir, score_subdir, - (strlen(level_subdir) > 0 ? "/" : ""), level_subdir); + 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); - return score_dir; -} + ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED); -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); + return chunk_size; } -static void InitUserDataDirectory() +static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level) { - createDirectory(getUserDataDir(), "user data"); + int i; + + for(i=0; iauthor[i] = fgetc(file); + level->author[MAX_LEVEL_NAME_LEN] = 0; + + return chunk_size; } -static void InitTapeDirectory(char *level_subdir) +static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level) { - createDirectory(getTapeDir(""), "main tape"); - createDirectory(getTapeDir(level_subdir), "level tape"); + 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. */ + + if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0) + chunk_size_expected += content_size; + + if (chunk_size_expected != chunk_size) + { + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; + } + + 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 void InitScoreDirectory(char *level_subdir) +static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level) { - createDirectory(getScoreDir(""), "main score"); - createDirectory(getScoreDir(level_subdir), "level score"); + 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) + { + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; + } + + for(y=0; yfieldy; 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 void InitUserLevelDirectory(char *level_subdir) +static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level) { - if (access(getUserLevelDir(level_subdir), F_OK) != 0) + 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) { - createDirectory(getUserLevelDir(""), "main user level"); - createDirectory(getUserLevelDir(level_subdir), "user level"); + level->num_yam_contents = num_contents; - SaveUserLevelInfo(); + for(i=0; iyam_content[i][x][y] = content_array[i][x][y]; + } + else if (element == EL_BD_AMOEBA) + { + level->amoeba_content = content_array[0][0][0]; } + else + { + Error(ERR_WARN, "cannot load content for element '%d'", element); + } + + 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; - if (leveldir[leveldir_nr].user_defined) - sprintf(filename, "%s/%s/%d", - getUserLevelDir(""), leveldir[leveldir_nr].filename, level_nr); - else - sprintf(filename, "%s/%s/%d", - options.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) + { + getFile32BitBE(file); /* not used */ + + getFileChunkBE(file, chunk_name, NULL); + if (strcmp(chunk_name, "CAVE") != 0) + { + Error(ERR_WARN, "unknown format of level file '%s'", filename); + fclose(file); + return; + } + } + else /* check for pre-2.0 file format with cookie string */ { - fgets(cookie, LEVEL_COOKIE_LEN, file); - fgetc(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'; - if (strcmp(cookie,LEVEL_COOKIE)) + if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL)) { - 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; + } + + 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 (file) + 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) + { + 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; } + + putFile16BitBE(file, element); + fputc(num_contents, file); + fputc(content_xsize, file); + fputc(content_ysize, file); + + WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED); + + 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); + + putFileChunkBE(file, "HEAD", LEVEL_HEADER_SIZE); + SaveLevel_HEAD(file, &level); + + putFileChunkBE(file, "AUTH", MAX_LEVEL_AUTHOR_LEN); + SaveLevel_AUTH(file, &level); - for(i=0; ifile_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); +} - sprintf(filename, "%s/%d.%s", - getTapeDir(leveldir[leveldir_nr].filename), - level_nr, TAPEFILE_EXTENSION); - if ((file = fopen(filename, "r"))) - { - 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; - } - } +/* ========================================================================= */ +/* tape file functions */ +/* ========================================================================= */ - if (!file) - return; +static void setTapeInfoToDefaults() +{ + int i; + + /* always start with reliable default values (empty tape) */ + TapeErase(); - 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); + /* 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; +} + +static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape) +{ + int i; + + tape->random_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) + { + 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; - for(i=0; iplayer_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) { - int j; + 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++; } } @@ -374,7 +854,26 @@ void LoadTape(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++; } } @@ -382,535 +881,509 @@ void LoadTape(int level_nr) break; } - fclose(file); - - if (i != tape.length) - Error(ERR_WARN, "level recording file '%s' corrupted", filename); + if (i != tape->length) + chunk_size = (tape->num_participating_players + 1) * i; - tape.length_seconds = GetTapeLength(); + return chunk_size; } -void SaveTape(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; - InitTapeDirectory(leveldir[leveldir_nr].filename); + /* always start with reliable default values */ + setTapeInfoToDefaults(); - sprintf(filename, "%s/%d.%s", - getTapeDir(leveldir[leveldir_nr].filename), - level_nr, TAPEFILE_EXTENSION); + if (!(file = fopen(filename, MODE_READ))) + return; - /* if a tape still exists, ask to overwrite it */ - 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); +} + +static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape) { int i; - char filename[MAX_FILENAME_LEN]; - char cookie[MAX_FILENAME_LEN]; - char line[MAX_LINE_LEN]; - char *line_ptr; - FILE *file; + byte store_participating_players = 0; - /* start with empty score table */ - for(i=0; iplayer_participates[i]) + store_participating_players |= (1 << i); - sprintf(filename, "%s/%d.%s", - getScoreDir(leveldir[leveldir_nr].filename), - level_nr, SCOREFILE_EXTENSION); + putFile32BitBE(file, tape->random_seed); + putFile32BitBE(file, tape->date); + putFile32BitBE(file, tape->length); - if (!(file = fopen(filename, "r"))) - return; + fputc(store_participating_players, file); - fgets(cookie, SCORE_COOKIE_LEN, file); + /* unused bytes not at the end here for 4-byte alignment of engine_version */ + WriteUnusedBytesToFile(file, TAPE_HEADER_UNUSED); - if (strcmp(cookie, SCORE_COOKIE) != 0) - { - Error(ERR_WARN, "wrong format of score file '%s'", filename); - fclose(file); - return; - } + putFileVersion(file, tape->engine_version); +} - for(i=0; ilength; i++) + { + for(j=0; jplayer_participates[j]) + fputc(tape->pos[i].action[j], file); - for (line_ptr = line; *line_ptr; line_ptr++) - { - if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != '\0') - { - strncpy(highscore[i].Name, line_ptr, MAX_NAMELEN - 1); - highscore[i].Name[MAX_NAMELEN - 1] = '\0'; - break; - } - } + fputc(tape->pos[i].delay, file); } - - fclose(file); } -void SaveScore(int level_nr) +void SaveTape(int level_nr) { int i; - char filename[MAX_FILENAME_LEN]; + char *filename = getTapeFilename(level_nr); FILE *file; + boolean new_tape = TRUE; + int num_participating_players = 0; + int body_chunk_size; - InitScoreDirectory(leveldir[leveldir_nr].filename); + InitTapeDirectory(leveldir_current->filename); - sprintf(filename, "%s/%d.%s", - getScoreDir(leveldir[leveldir_nr].filename), - level_nr, SCOREFILE_EXTENSION); + /* if a tape still exists, ask to overwrite it */ + if (access(filename, F_OK) == 0) + { + new_tape = FALSE; + if (!Request("Replace old tape ?", REQ_ASK)) + return; + } - if (!(file = fopen(filename, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { - Error(ERR_WARN, "cannot save score for level %d", level_nr); + Error(ERR_WARN, "cannot save level recording file '%s'", filename); return; } - fprintf(file, "%s\n\n", SCORE_COOKIE); - - for(i=0; i= 100) - return s; + fclose(file); - strcpy(s_lower, s); + SetFilePermissions(filename, PERMS_PRIVATE); - 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); + /* check file identifier */ + fgets(cookie, MAX_LINE_LEN, file); + if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') + cookie[strlen(cookie) - 1] = '\0'; - 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; - - if (!(file = fopen(filename, "r"))) + if (!checkCookieString(cookie, SCORE_COOKIE)) { - Error(ERR_WARN, "cannot open setup/info 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'; + fclose(file); +} - /* ignore empty lines */ - if (*line == '\0') - continue; +void SaveScore(int level_nr) +{ + int i; + char *filename = getScoreFilename(level_nr); + FILE *file; - line_len = strlen(line); + InitScoreDirectory(leveldir_current->filename); - /* cut leading whitespaces from token */ - for (token = line; *token; token++) - if (*token != ' ' && *token != '\t') - break; + if (!(file = fopen(filename, MODE_WRITE))) + { + Error(ERR_WARN, "cannot save score for level %d", level_nr); + return; + } - /* find end of token */ - for (line_ptr = token; *line_ptr; line_ptr++) - { - if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':') - { - *line_ptr = '\0'; - break; - } - } + fprintf(file, "%s\n\n", SCORE_COOKIE); - if (line_ptr < line + line_len) - value = line_ptr + 1; - else - value = "\0"; + for(i=0; inext; +/* ========================================================================= */ +/* setup file functions */ +/* ========================================================================= */ - /* free empty list header */ - setup_file_list->next = NULL; - freeSetupFileList(setup_file_list); +#define TOKEN_STR_PLAYER_PREFIX "player_" - if (first_valid_list_entry == NULL) - Error(ERR_WARN, "setup/info file '%s' is empty", filename); +/* 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 - return first_valid_list_entry; -} +/* 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 + +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/info 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/info 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 void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi) +static struct TokenInfo player_setup_tokens[] = { - ldi->name = getStringCopy("non-existing"); - ldi->levels = 0; - ldi->sort_priority = 999; /* default: least priority */ - ldi->readonly = TRUE; -} + /* 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) { @@ -919,22 +1392,48 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) 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; + 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; - si->input[i].joy.device_name = getStringCopy(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; @@ -943,47 +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: - if (*(char **)setup_value != NULL) - free(*(char **)setup_value); - *(char **)setup_value = getStringCopy(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); } } @@ -994,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; -} - -static int compareLevelDirInfoEntries(const void *object1, const void *object2) -{ - const struct LevelDirInfo *entry1 = object1; - const struct LevelDirInfo *entry2 = object2; - int compare_result; - - 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); - - compare_result = strcmp(name1, name2); - - free(name1); - free(name2); - } - - return compare_result; -} - -static int LoadLevelInfoFromLevelDir(char *level_directory, int start_entry) -{ - 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; - - if ((dir = opendir(level_directory)) == NULL) - Error(ERR_EXIT, "cannot read level directory '%s'", level_directory); - - 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; - } - - if (strlen(dir_entry->d_name) >= MAX_LEVDIR_FILENAME) - { - Error(ERR_WARN, "filename of level directory '%s' too long -- ignoring", - dir_entry->d_name); - 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 && start_entry != -1) - Error(ERR_EXIT, "cannot find any valid level series in directory '%s'", - level_directory); - - return current_entry; -} - -void LoadLevelInfo() -{ - InitUserLevelDirectory(getLoginName()); - - num_leveldirs = 0; - leveldir_nr = 0; - - num_leveldirs = LoadLevelInfoFromLevelDir(options.level_directory, - num_leveldirs); - num_leveldirs = LoadLevelInfoFromLevelDir(getUserLevelDir(""), - num_leveldirs); - if (num_leveldirs > 1) - qsort(leveldir, num_leveldirs, sizeof(struct LevelDirInfo), - compareLevelDirInfoEntries); -} - -static void SaveUserLevelInfo() -{ - char filename[MAX_FILENAME_LEN]; - FILE *file; - int i; - - sprintf(filename, "%s/%s", - getUserLevelDir(getLoginName()), LEVELINFO_FILENAME); - - if (!(file = fopen(filename, "w"))) - { - Error(ERR_WARN, "cannot write level info file '%s'", filename); - return; - } - - 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); - - chmod(filename, SETUP_PERMS); -} - 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; @@ -1229,11 +1519,11 @@ void LoadSetup() freeSetupFileList(setup_file_list); /* 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) + if (strlen(setup.player_name) > 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_NAMELEN); + char *new_name = checked_malloc(MAX_PLAYER_NAME_LEN + 1); strcpy(new_name, setup.player_name); free(setup.player_name); @@ -1244,101 +1534,49 @@ void LoadSetup() 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); 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