X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=9b5b73f5b302b002695091b382af99f7ea8f33da;hb=4311b2aed4570447d0e082334e8b8a6b7da6e9f9;hp=ce0aff38a2769de47d7b22becaa01980225fbb8e;hpb=adaabca253f2e76597725cdc86fc1fff6f0de1d2;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index ce0aff38..9b5b73f5 100644 --- a/src/files.c +++ b/src/files.c @@ -1,53 +1,48 @@ /*********************************************************** -* 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-2001 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_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 15 /* 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 /* 1.0 file version (old) */ -#define FILE_VERSION_1_2 12 /* 1.2 file version (still in use) */ -#define FILE_VERSION_1_4 14 /* 1.4 file version (new) */ +#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 15 /* 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 7 /* unused tape header bytes */ /* file identifier strings */ -#define LEVEL_COOKIE "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.4" +#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" -#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 LEVEL_COOKIE_12 "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.2" -#define TAPE_COOKIE_10 "ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0" /* file names and filename extensions */ -#ifndef MSDOS -#define USERDATA_DIRECTORY ".rocksndiamonds" +#if !defined(PLATFORM_MSDOS) #define LEVELSETUP_DIRECTORY "levelsetup" #define SETUP_FILENAME "setup.conf" #define LEVELSETUP_FILENAME "levelsetup.conf" @@ -56,7 +51,6 @@ #define TAPEFILE_EXTENSION "tape" #define SCOREFILE_EXTENSION "score" #else -#define USERDATA_DIRECTORY "userdata" #define LEVELSETUP_DIRECTORY "lvlsetup" #define SETUP_FILENAME "setup.cnf" #define LEVELSETUP_FILENAME "lvlsetup.cnf" @@ -64,19 +58,8 @@ #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 - /* sort priorities of level series (also used as level series classes) */ #define LEVELCLASS_TUTORIAL_START 10 #define LEVELCLASS_TUTORIAL_END 99 @@ -187,26 +170,6 @@ char *getLevelClassDescription(struct LevelDirInfo *ldi) static void SaveUserLevelInfo(); /* for 'InitUserLevelDir()' */ static char *getSetupLine(char *, int); /* for 'SaveUserLevelInfo()' */ -char *getUserDataDir() -{ - static char *userdata_dir = NULL; - - if (!userdata_dir) - { - char *home_dir = getHomeDir(); - char *data_dir = USERDATA_DIRECTORY; - - userdata_dir = getPath2(home_dir, data_dir); - } - - return userdata_dir; -} - -static char *getSetupDir() -{ - return getUserDataDir(); -} - static char *getUserLevelDir(char *level_subdir) { static char *userlevel_dir = NULL; @@ -321,38 +284,26 @@ static char *getScoreFilename(int nr) return filename; } -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); -} - -static void InitUserDataDirectory() -{ - createDirectory(getUserDataDir(), "user data"); -} - static void InitTapeDirectory(char *level_subdir) { - createDirectory(getUserDataDir(), "user data"); - createDirectory(getTapeDir(""), "main tape"); - createDirectory(getTapeDir(level_subdir), "level tape"); + createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); + createDirectory(getTapeDir(""), "main tape", PERMS_PRIVATE); + createDirectory(getTapeDir(level_subdir), "level tape", PERMS_PRIVATE); } static void InitScoreDirectory(char *level_subdir) { - createDirectory(getScoreDir(""), "main score"); - createDirectory(getScoreDir(level_subdir), "level score"); + createDirectory(getScoreDir(""), "main score", PERMS_PUBLIC); + createDirectory(getScoreDir(level_subdir), "level score", PERMS_PUBLIC); } static void InitUserLevelDirectory(char *level_subdir) { if (access(getUserLevelDir(level_subdir), F_OK) != 0) { - createDirectory(getUserDataDir(), "user data"); - createDirectory(getUserLevelDir(""), "main user level"); - createDirectory(getUserLevelDir(level_subdir), "user level"); + createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); + createDirectory(getUserLevelDir(""), "main user level", PERMS_PRIVATE); + createDirectory(getUserLevelDir(level_subdir), "user level",PERMS_PRIVATE); SaveUserLevelInfo(); } @@ -360,15 +311,66 @@ static void InitUserLevelDirectory(char *level_subdir) static void InitLevelSetupDirectory(char *level_subdir) { - createDirectory(getUserDataDir(), "user data"); - createDirectory(getLevelSetupDir(""), "main level setup"); - createDirectory(getLevelSetupDir(level_subdir), "level setup"); + createDirectory(getUserDataDir(), "user data", PERMS_PRIVATE); + createDirectory(getLevelSetupDir(""), "main level setup", PERMS_PRIVATE); + createDirectory(getLevelSetupDir(level_subdir), "level setup",PERMS_PRIVATE); +} + +static void ReadChunk_VERS(FILE *file, int *file_version, int *game_version) +{ + int file_version_major, file_version_minor, file_version_patch; + int game_version_major, game_version_minor, game_version_patch; + + file_version_major = fgetc(file); + file_version_minor = fgetc(file); + file_version_patch = fgetc(file); + fgetc(file); /* not used */ + + game_version_major = fgetc(file); + game_version_minor = fgetc(file); + game_version_patch = fgetc(file); + fgetc(file); /* not used */ + + *file_version = VERSION_IDENT(file_version_major, + file_version_minor, + file_version_patch); + + *game_version = VERSION_IDENT(game_version_major, + game_version_minor, + game_version_patch); +} + +static void WriteChunk_VERS(FILE *file, int file_version, int game_version) +{ + int file_version_major = VERSION_MAJOR(file_version); + int file_version_minor = VERSION_MINOR(file_version); + int file_version_patch = VERSION_PATCH(file_version); + int game_version_major = VERSION_MAJOR(game_version); + int game_version_minor = VERSION_MINOR(game_version); + int game_version_patch = VERSION_PATCH(game_version); + + fputc(file_version_major, file); + fputc(file_version_minor, file); + fputc(file_version_patch, file); + fputc(0, file); /* not used */ + + fputc(game_version_major, file); + fputc(game_version_minor, file); + fputc(game_version_patch, file); + fputc(0, file); /* not used */ } static void setLevelInfoToDefaults() { 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; @@ -402,7 +404,8 @@ static void setLevelInfoToDefaults() for(i=0; ifile_version), &(level->game_version)); + + return chunk_size; +} + +static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) { int i, x, y; - char *filename = getLevelFilename(level_nr); - char cookie[MAX_LINE_LEN]; - char chunk[CHUNK_ID_LEN + 1]; - boolean encoding_16bit = FALSE; /* default: maximal 256 elements */ - int file_version = FILE_VERSION_1_4; /* last version of level files */ - int chunk_length; - FILE *file; - /* always start with reliable default values */ - setLevelInfoToDefaults(); + lev_fieldx = level->fieldx = fgetc(file); + lev_fieldy = level->fieldy = fgetc(file); - if (!(file = fopen(filename, "r"))) - { - Error(ERR_WARN, "cannot read level '%s' - creating new level", filename); - return; - } + level->time = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN); + level->gems_needed = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN); - /* check file identifier */ - fgets(cookie, MAX_LINE_LEN, file); - if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') - cookie[strlen(cookie) - 1] = '\0'; + for(i=0; iname[i] = fgetc(file); + level->name[MAX_LEVEL_NAME_LEN] = 0; + + for(i=0; iscore[i] = fgetc(file); - if (strcmp(cookie, LEVEL_COOKIE_10) == 0) /* old 1.0 level format */ - file_version = FILE_VERSION_1_0; - else if (strcmp(cookie, LEVEL_COOKIE_12) == 0)/* 1.2 (8 bit) level format */ - file_version = FILE_VERSION_1_2; - else if (strcmp(cookie, LEVEL_COOKIE) != 0) /* unknown level format */ + 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); + + ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED); + + return chunk_size; +} + +static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level) +{ + int i; + + for(i=0; iauthor[i] = fgetc(file); + level->author[MAX_LEVEL_NAME_LEN] = 0; + + return chunk_size; +} + +static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level) +{ + 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) { - Error(ERR_WARN, "wrong file identifier of level file '%s'", filename); - fclose(file); - return; + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; } - /* read chunk "HEAD" */ - if (file_version >= FILE_VERSION_1_2) + 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 ? + getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) : + 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) { - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); - if (strcmp(chunk, "HEAD") || chunk_length != LEVEL_HEADER_SIZE) - { - Error(ERR_WARN, "wrong 'HEAD' chunk of level file '%s'", filename); - fclose(file); - return; - } + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; } - lev_fieldx = level.fieldx = fgetc(file); - lev_fieldy = level.fieldy = fgetc(file); - - level.time = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN); - level.gems_needed = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN); + for(y=0; yfieldy; y++) + for(x=0; xfieldx; x++) + Feld[x][y] = Ur[x][y] = + checkLevelElement(level->encoding_16bit_field ? + getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) : + fgetc(file)); + return chunk_size; +} - for(i=0; i MAX_ELEMENT_CONTENTS) + num_contents = STD_ELEMENT_CONTENTS; + + if (element == EL_MAMPFER) + { + level->num_yam_contents = num_contents; + + for(i=0; iyam_content[i][x][y] = content_array[i][x][y]; + } + else if (element == EL_AMOEBE_BD) + { + level->amoeba_content = content_array[0][0][0]; + } + else + { + Error(ERR_WARN, "cannot load content for element '%d'", element); } - 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); + return chunk_size; +} + +void LoadLevel(int level_nr) +{ + char *filename = getLevelFilename(level_nr); + char cookie[MAX_LINE_LEN]; + char chunk_name[CHUNK_ID_LEN + 1]; + int chunk_size; + FILE *file; - encoding_16bit = (fgetc(file) == 1 ? TRUE : FALSE); + /* always start with reliable default values */ + setLevelInfoToDefaults(); - for(i=0; i= FILE_VERSION_1_2) + getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN); + if (strcmp(chunk_name, "RND1") == 0) { - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); + getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); /* not used */ - /* look for optional author chunk */ - if (strcmp(chunk, "AUTH") == 0 && chunk_length == MAX_LEVEL_AUTHOR_LEN) + getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN); + if (strcmp(chunk_name, "CAVE") != 0) { - for(i=0; i 0 && cookie[strlen(cookie) - 1] == '\n') + cookie[strlen(cookie) - 1] = '\0'; - /* look for optional content chunk */ - if (strcmp(chunk, "CONT") == 0 && - chunk_length == 4 + MAX_ELEMENT_CONTENTS * 3 * 3) + if (!checkCookieString(cookie, LEVEL_COOKIE_TMPL)) { - fgetc(file); - level.num_yam_contents = fgetc(file); - fgetc(file); - fgetc(file); - - if (level.num_yam_contents < 1 || - level.num_yam_contents > MAX_ELEMENT_CONTENTS) - { -#if DEBUG - printf("WARNING: num_yam_contents == %d (corrected)\n", - level.num_yam_contents); -#endif - level.num_yam_contents = STD_ELEMENT_CONTENTS; - } - - for(i=0; ifieldx, file); + fputc(level->fieldy, file); - /* check yam content for 16-bit elements */ - for(i=0; i 255) - encoding_16bit = TRUE; - - /* check level field for 16-bit elements */ - for(y=0; y 255) - encoding_16bit = TRUE; - - oldest_possible_cookie = (encoding_16bit ? LEVEL_COOKIE : LEVEL_COOKIE_12); - - fputs(oldest_possible_cookie, file); /* file identifier */ - fputc('\n', file); - - putFileChunk(file, "HEAD", LEVEL_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN); - - fputc(level.fieldx, file); - fputc(level.fieldy, file); - - putFile16BitInteger(file, level.time, BYTE_ORDER_BIG_ENDIAN); - putFile16BitInteger(file, level.gems_needed, BYTE_ORDER_BIG_ENDIAN); + putFile16BitInteger(file, level->time, BYTE_ORDER_BIG_ENDIAN); + putFile16BitInteger(file, level->gems_needed, BYTE_ORDER_BIG_ENDIAN); for(i=0; iname[i], file); + for(i=0; iscore[i], file); + for(i=0; iencoding_16bit_yamyam ? EL_LEERRAUM : + 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_LEERRAUM : 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); + + WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED); +} - putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN); +static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level) +{ + int i; for(i=0; iauthor[i], file); +} - putFileChunk(file, "CONT", 4 + MAX_ELEMENT_CONTENTS * 3 * 3, - BYTE_ORDER_BIG_ENDIAN); +#if 0 +static void SaveLevel_CONT(FILE *file, struct LevelInfo *level) +{ + int i, x, y; fputc(EL_MAMPFER, file); - fputc(level.num_yam_contents, file); + fputc(level->num_yam_contents, file); fputc(0, file); fputc(0, file); for(i=0; iencoding_16bit_field) + putFile16BitInteger(file, level->yam_content[i][x][y], BYTE_ORDER_BIG_ENDIAN); else - fputc(level.yam_content[i][x][y], file); + fputc(level->yam_content[i][x][y], file); +} +#endif - putFileChunk(file, "BODY", lev_fieldx * lev_fieldy, BYTE_ORDER_BIG_ENDIAN); +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) putFile16BitInteger(file, Ur[x][y], BYTE_ORDER_BIG_ENDIAN); else fputc(Ur[x][y], file); +} - fclose(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_MAMPFER) + { + num_contents = level->num_yam_contents; + content_xsize = 3; + content_ysize = 3; + + for(i=0; iyam_content[i][x][y]; + } + else if (element == EL_AMOEBE_BD) + { + 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; + } + + putFile16BitInteger(file, element, BYTE_ORDER_BIG_ENDIAN); + fputc(num_contents, file); + fputc(content_xsize, file); + fputc(content_ysize, file); + + WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED); - chmod(filename, LEVEL_PERMS); + 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); + + putFileChunk(file, "RND1", CHUNK_SIZE_UNDEFINED, BYTE_ORDER_BIG_ENDIAN); + putFileChunk(file, "CAVE", CHUNK_SIZE_NONE, BYTE_ORDER_BIG_ENDIAN); + + putFileChunk(file, "VERS", FILE_VERS_CHUNK_SIZE, BYTE_ORDER_BIG_ENDIAN); + WriteChunk_VERS(file, FILE_VERSION_ACTUAL, GAME_VERSION_ACTUAL); + + putFileChunk(file, "HEAD", LEVEL_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_HEAD(file, &level); + + putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_AUTH(file, &level); + + putFileChunk(file, "BODY", body_chunk_size, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_BODY(file, &level); + + if (level.encoding_16bit_yamyam || + level.num_yam_contents != STD_ELEMENT_CONTENTS) + { + putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_CNT2(file, &level, EL_MAMPFER); + } + + if (level.encoding_16bit_amoeba) + { + putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_CNT2(file, &level, EL_AMOEBE_BD); + } + + fclose(file); + + SetFilePermissions(filename, PERMS_PRIVATE); +} + +static void setTapeInfoToDefaults() +{ + int i; /* always start with reliable default values (empty tape) */ + tape.file_version = FILE_VERSION_ACTUAL; + tape.game_version = GAME_VERSION_ACTUAL; TapeErase(); /* default values (also for pre-1.2 tapes) with only the first player */ @@ -738,147 +980,296 @@ void LoadTape(int level_nr) tape.player_participates[i] = FALSE; /* at least one (default: the first) player participates in every tape */ - num_participating_players = 1; + tape.num_participating_players = 1; - if (!(file = fopen(filename, "r"))) - return; + tape.level_nr = level_nr; + tape.counter = 0; + tape.changed = FALSE; - /* check file identifier */ - fgets(cookie, MAX_LINE_LEN, file); - if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') - cookie[strlen(cookie) - 1] = '\0'; + tape.recording = FALSE; + tape.playing = FALSE; + tape.pausing = FALSE; +} - 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 */ - { - Error(ERR_WARN, "wrong file identifier of tape file '%s'", filename); - fclose(file); - return; - } +static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape) +{ + ReadChunk_VERS(file, &(tape->file_version), &(tape->game_version)); - /* read chunk "HEAD" */ - if (file_version >= FILE_VERSION_1_2) - { - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); - if (strcmp(chunk, "HEAD") || chunk_length != TAPE_HEADER_SIZE) - { - Error(ERR_WARN, "wrong 'HEAD' chunk of tape file '%s'", filename); - fclose(file); - return; - } - } + return chunk_size; +} + +static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape) +{ + int i; - tape.random_seed = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); - tape.date = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); - tape.length = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); + tape->random_seed = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); + tape->date = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); + tape->length = getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); /* read header fields that are new since version 1.2 */ - if (file_version >= FILE_VERSION_1_2) + if (tape->file_version >= FILE_VERSION_1_2) { byte store_participating_players = fgetc(file); - for(i=0; inum_participating_players = 0; for(i=0; iplayer_participates[i] = FALSE; if (store_participating_players & (1 << i)) { - tape.player_participates[i] = TRUE; - num_participating_players++; + tape->player_participates[i] = TRUE; + tape->num_participating_players++; } } } - tape.level_nr = level_nr; - tape.counter = 0; - tape.changed = FALSE; + return chunk_size; +} - tape.recording = FALSE; - tape.playing = FALSE; - tape.pausing = FALSE; +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; + } - /* read chunk "BODY" */ - if (file_version >= FILE_VERSION_1_2) + for(i=0; ilength; i++) { - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); - if (strcmp(chunk, "BODY") || - chunk_length != (num_participating_players + 1) * tape.length) + if (i >= MAX_TAPELEN) + break; + + for(j=0; jpos[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 (tape->file_version == FILE_VERSION_1_0) { - Error(ERR_WARN, "wrong 'BODY' chunk of tape file '%s'", filename); + /* 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; + } + } + else if (tape->file_version < FILE_VERSION_2_0) + { + 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++; + } + } + + if (feof(file)) + break; + } + + if (i != tape->length) + chunk_size = (tape->num_participating_players + 1) * i; + + return chunk_size; +} + +void LoadTape(int level_nr) +{ + char *filename = getTapeFilename(level_nr); + char cookie[MAX_LINE_LEN]; + char chunk_name[CHUNK_ID_LEN + 1]; + FILE *file; + int chunk_size; + + /* always start with reliable default values */ + setTapeInfoToDefaults(); + + if (!(file = fopen(filename, MODE_READ))) + return; + + getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN); + if (strcmp(chunk_name, "RND1") == 0) + { + getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); /* not used */ + + getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN); + if (strcmp(chunk_name, "TAPE") != 0) + { + Error(ERR_WARN, "unknown format of tape file '%s'", filename); fclose(file); 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'; - for(i=0; i= MAX_TAPELEN) - break; - - for(j=0; j 0) - tape.pos[i + num_moves].delay = 0; - num_moves++; - } + Error(ERR_WARN, "unknown chunk '%s' in tape file '%s'", + chunk_name, filename); + ReadUnusedBytesFromFile(file, chunk_size); } - - if (num_moves > 1) + else if (chunk_info[i].size != -1 && + chunk_info[i].size != chunk_size) { - num_moves--; - i += num_moves; - tape.length += num_moves; + Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'", + chunk_size, chunk_name, filename); + ReadUnusedBytesFromFile(file, chunk_size); + } + else + { + /* call function to load this tape chunk */ + int chunk_size_expected = + (chunk_info[i].loader)(file, chunk_size, &tape); + + /* the size of some chunks cannot be checked before reading other + chunks first (like "HEAD" and "BODY") that contain some header + information, so check them here */ + if (chunk_size_expected != chunk_size) + { + Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'", + chunk_size, chunk_name, filename); + } } } - - if (feof(file)) - break; } fclose(file); - if (i != tape.length) - Error(ERR_WARN, "level recording file '%s' corrupted", filename); - tape.length_seconds = GetTapeLength(); } +static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape) +{ + int i; + byte store_participating_players = 0; + + /* set bits for participating players for compact storage */ + for(i=0; iplayer_participates[i]) + store_participating_players |= (1 << i); + + putFile32BitInteger(file, tape->random_seed, BYTE_ORDER_BIG_ENDIAN); + putFile32BitInteger(file, tape->date, BYTE_ORDER_BIG_ENDIAN); + putFile32BitInteger(file, tape->length, BYTE_ORDER_BIG_ENDIAN); + + fputc(store_participating_players, file); + + WriteUnusedBytesToFile(file, TAPE_HEADER_UNUSED); +} + +static void SaveTape_BODY(FILE *file, struct TapeInfo *tape) +{ + int i, j; + + for(i=0; ilength; i++) + { + for(j=0; jplayer_participates[j]) + fputc(tape->pos[i].action[j], file); + + fputc(tape->pos[i].delay, file); + } +} + void SaveTape(int level_nr) { int i; char *filename = getTapeFilename(level_nr); FILE *file; boolean new_tape = TRUE; - byte store_participating_players; - int num_participating_players; + int num_participating_players = 0; + int body_chunk_size; InitTapeDirectory(leveldir_current->filename); @@ -890,60 +1281,83 @@ void SaveTape(int level_nr) return; } - /* count number of players and set corresponding bits for compact storage */ - store_participating_players = 0; - num_participating_players = 0; - for(i=0; ilevel_nr); + return; } - fclose(file); + printf("\n"); + printf("-------------------------------------------------------------------------------\n"); + printf("Tape of Level %d (file version %06d, game version %06d\n", + tape->level_nr, tape->file_version, tape->game_version); + printf("-------------------------------------------------------------------------------\n"); + + for(i=0; ilength; i++) + { + if (i >= MAX_TAPELEN) + break; - chmod(filename, TAPE_PERMS); + 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' : ' ')); + } + } - tape.changed = FALSE; + printf("(%03d)\n", tape->pos[i].delay); + } - if (new_tape) - Request("tape saved !", REQ_CONFIRM); + printf("-------------------------------------------------------------------------------\n"); } void LoadScore(int level_nr) @@ -962,7 +1376,7 @@ void LoadScore(int level_nr) highscore[i].Score = 0; } - if (!(file = fopen(filename, "r"))) + if (!(file = fopen(filename, MODE_READ))) return; /* check file identifier */ @@ -970,9 +1384,9 @@ void LoadScore(int level_nr) if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') cookie[strlen(cookie) - 1] = '\0'; - if (strcmp(cookie, SCORE_COOKIE) != 0) + if (!checkCookieString(cookie, SCORE_COOKIE)) { - Error(ERR_WARN, "wrong file identifier of score file '%s'", filename); + Error(ERR_WARN, "unknown format of score file '%s'", filename); fclose(file); return; } @@ -1007,7 +1421,7 @@ void SaveScore(int level_nr) InitScoreDirectory(leveldir_current->filename); - if (!(file = fopen(filename, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot save score for level %d", level_nr); return; @@ -1020,29 +1434,24 @@ void SaveScore(int level_nr) fclose(file); - chmod(filename, SCORE_PERMS); + SetFilePermissions(filename, PERMS_PUBLIC); } -#define TOKEN_STR_FILE_IDENTIFIER "file_identifier" +/* ------------------------------------------------------------------------- */ +/* setup file stuff */ +/* ------------------------------------------------------------------------- */ + #define TOKEN_STR_LAST_LEVEL_SERIES "last_level_series" #define TOKEN_STR_LAST_PLAYED_LEVEL "last_played_level" #define TOKEN_STR_HANDICAP_LEVEL "handicap_level" #define TOKEN_STR_PLAYER_PREFIX "player_" -#define TOKEN_VALUE_POSITION 30 - /* 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 - -#if 0 -#define SETUP_TOKEN_TOONS 5 -#define SETUP_TOKEN_DOUBLE_BUFFERING 6 -#endif - #define SETUP_TOKEN_SCROLL_DELAY 5 #define SETUP_TOKEN_SOFT_SCROLLING 6 #define SETUP_TOKEN_FADING 7 @@ -1051,39 +1460,40 @@ void SaveScore(int level_nr) #define SETUP_TOKEN_TEAM_MODE 10 #define SETUP_TOKEN_HANDICAP 11 #define SETUP_TOKEN_TIME_LIMIT 12 +#define SETUP_TOKEN_FULLSCREEN 13 /* 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 +#define SETUP_TOKEN_USE_JOYSTICK 14 +#define SETUP_TOKEN_JOY_DEVICE_NAME 15 +#define SETUP_TOKEN_JOY_XLEFT 16 +#define SETUP_TOKEN_JOY_XMIDDLE 17 +#define SETUP_TOKEN_JOY_XRIGHT 18 +#define SETUP_TOKEN_JOY_YUPPER 19 +#define SETUP_TOKEN_JOY_YMIDDLE 20 +#define SETUP_TOKEN_JOY_YLOWER 21 +#define SETUP_TOKEN_JOY_SNAP 22 +#define SETUP_TOKEN_JOY_BOMB 23 +#define SETUP_TOKEN_KEY_LEFT 24 +#define SETUP_TOKEN_KEY_RIGHT 25 +#define SETUP_TOKEN_KEY_UP 26 +#define SETUP_TOKEN_KEY_DOWN 27 +#define SETUP_TOKEN_KEY_SNAP 28 +#define SETUP_TOKEN_KEY_BOMB 29 /* level directory info */ -#define LEVELINFO_TOKEN_NAME 29 -#define LEVELINFO_TOKEN_NAME_SHORT 30 -#define LEVELINFO_TOKEN_NAME_SORTING 31 -#define LEVELINFO_TOKEN_AUTHOR 32 -#define LEVELINFO_TOKEN_IMPORTED_FROM 33 -#define LEVELINFO_TOKEN_LEVELS 34 -#define LEVELINFO_TOKEN_FIRST_LEVEL 35 -#define LEVELINFO_TOKEN_SORT_PRIORITY 36 -#define LEVELINFO_TOKEN_LEVEL_GROUP 37 -#define LEVELINFO_TOKEN_READONLY 38 +#define LEVELINFO_TOKEN_NAME 30 +#define LEVELINFO_TOKEN_NAME_SHORT 31 +#define LEVELINFO_TOKEN_NAME_SORTING 32 +#define LEVELINFO_TOKEN_AUTHOR 33 +#define LEVELINFO_TOKEN_IMPORTED_FROM 34 +#define LEVELINFO_TOKEN_LEVELS 35 +#define LEVELINFO_TOKEN_FIRST_LEVEL 36 +#define LEVELINFO_TOKEN_SORT_PRIORITY 37 +#define LEVELINFO_TOKEN_LEVEL_GROUP 38 +#define LEVELINFO_TOKEN_READONLY 39 #define FIRST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_PLAYER_NAME -#define LAST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_TIME_LIMIT +#define LAST_GLOBAL_SETUP_TOKEN SETUP_TOKEN_FULLSCREEN #define FIRST_PLAYER_SETUP_TOKEN SETUP_TOKEN_USE_JOYSTICK #define LAST_PLAYER_SETUP_TOKEN SETUP_TOKEN_KEY_BOMB @@ -1091,12 +1501,6 @@ void SaveScore(int level_nr) #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; @@ -1113,12 +1517,6 @@ static struct { TYPE_SWITCH, &si.sound_loops, "repeating_sound_loops" }, { TYPE_SWITCH, &si.sound_music, "background_music" }, { TYPE_SWITCH, &si.sound_simple, "simple_sound_effects" }, - -#if 0 - { TYPE_SWITCH, &si.toons, "toons" }, - { TYPE_SWITCH, &si.double_buffering, "double_buffering" }, -#endif - { TYPE_SWITCH, &si.scroll_delay, "scroll_delay" }, { TYPE_SWITCH, &si.soft_scrolling, "soft_scrolling" }, { TYPE_SWITCH, &si.fading, "screen_fading" }, @@ -1127,6 +1525,7 @@ static struct { TYPE_SWITCH, &si.team_mode, "team_mode" }, { TYPE_SWITCH, &si.handicap, "handicap" }, { TYPE_SWITCH, &si.time_limit, "time_limit" }, + { TYPE_SWITCH, &si.fullscreen, "fullscreen" }, /* player setup */ { TYPE_BOOLEAN, &sii.use_joystick, ".use_joystick" }, @@ -1139,12 +1538,12 @@ static struct { 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" }, + { TYPE_KEY, &sii.key.left, ".key.move_left" }, + { TYPE_KEY, &sii.key.right, ".key.move_right" }, + { TYPE_KEY, &sii.key.up, ".key.move_up" }, + { TYPE_KEY, &sii.key.down, ".key.move_down" }, + { TYPE_KEY, &sii.key.snap, ".key.snap_field" }, + { TYPE_KEY, &sii.key.bomb, ".key.place_bomb" }, /* level directory info */ { TYPE_STRING, &ldi.name, "name" }, @@ -1159,261 +1558,6 @@ static struct { TYPE_BOOLEAN, &ldi.readonly, "readonly" } }; -static char *string_tolower(char *s) -{ - static char s_lower[100]; - int i; - - if (strlen(s) >= 100) - return s; - - strcpy(s_lower, s); - - for (i=0; itoken) - 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); -} - -static struct SetupFileList *newSetupFileList(char *token, char *value) -{ - struct SetupFileList *new = checked_malloc(sizeof(struct SetupFileList)); - - new->token = checked_malloc(strlen(token) + 1); - strcpy(new->token, token); - - new->value = checked_malloc(strlen(value) + 1); - strcpy(new->value, value); - - new->next = NULL; - - return new; -} - -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); -} - -static void setTokenValue(struct SetupFileList *setup_file_list, - char *token, char *value) -{ - if (!setup_file_list) - 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); - } - 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) - 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; - - if (!(file = fopen(filename, "r"))) - { - Error(ERR_WARN, "cannot open configuration file '%s'", filename); - return NULL; - } - - while(!feof(file)) - { - /* read next line of input file */ - if (!fgets(line, MAX_LINE_LEN, file)) - break; - - /* cut trailing comment or whitespace from input line */ - for (line_ptr = line; *line_ptr; line_ptr++) - { - if (*line_ptr == '#' || *line_ptr == '\n' || *line_ptr == '\r') - { - *line_ptr = '\0'; - break; - } - } - - /* cut trailing whitespaces from input line */ - for (line_ptr = &line[strlen(line)]; line_ptr > 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); - - /* cut leading whitespaces from token */ - for (token = line; *token; token++) - if (*token != ' ' && *token != '\t') - break; - - /* find end of token */ - for (line_ptr = token; *line_ptr; line_ptr++) - { - if (*line_ptr == ' ' || *line_ptr == '\t' || *line_ptr == ':') - { - *line_ptr = '\0'; - break; - } - } - - if (line_ptr < line + line_len) - value = line_ptr + 1; - else - value = "\0"; - - /* cut leading whitespaces from value */ - for (; *value; value++) - if (*value != ' ' && *value != '\t') - break; - - if (*token && *value) - setTokenValue(setup_file_list, token, value); - } - - fclose(file); - - first_valid_list_entry = setup_file_list->next; - - /* free empty list header */ - setup_file_list->next = NULL; - freeSetupFileList(setup_file_list); - - if (first_valid_list_entry == NULL) - Error(ERR_WARN, "configuration file '%s' is empty", filename); - - return first_valid_list_entry; -} - -static void checkSetupFileListIdentifier(struct SetupFileList *setup_file_list, - char *identifier) -{ - if (!setup_file_list) - return; - - if (strcmp(setup_file_list->token, TOKEN_STR_FILE_IDENTIFIER) == 0) - { - if (strcmp(setup_file_list->value, identifier) != 0) - { - Error(ERR_WARN, "configuration file has wrong version"); - return; - } - else - return; - } - - if (setup_file_list->next) - checkSetupFileListIdentifier(setup_file_list->next, identifier); - else - { - Error(ERR_WARN, "configuration file has no version information"); - return; - } -} - static void setLevelDirInfoToDefaults(struct LevelDirInfo *ldi) { ldi->filename = NULL; @@ -1500,6 +1644,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->team_mode = FALSE; si->handicap = TRUE; si->time_limit = TRUE; + si->fullscreen = FALSE; for (i=0; iinput[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); + 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); } } @@ -1538,8 +1683,8 @@ static void setSetupInfo(int token_nr, char *token_value) *(boolean *)setup_value = get_string_boolean_value(token_value); break; - case TYPE_KEYSYM: - *(KeySym *)setup_value = getKeySymFromX11KeyName(token_value); + case TYPE_KEY: + *(Key *)setup_value = getKeyFromX11KeyName(token_value); break; case TYPE_INTEGER: @@ -1789,7 +1934,7 @@ static void SaveUserLevelInfo() filename = getPath2(getUserLevelDir(getLoginName()), LEVELINFO_FILENAME); - if (!(file = fopen(filename, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot write level info file '%s'", filename); free(filename); @@ -1818,7 +1963,7 @@ static void SaveUserLevelInfo() fclose(file); free(filename); - chmod(filename, SETUP_PERMS); + SetFilePermissions(filename, PERMS_PRIVATE); } void LoadSetup() @@ -1884,12 +2029,12 @@ static char *getSetupLine(char *prefix, int token_nr) strcat(entry, (*(boolean *)setup_value ? "on" : "off")); break; - case TYPE_KEYSYM: + case TYPE_KEY: { - KeySym keysym = *(KeySym *)setup_value; - char *keyname = getKeyNameFromKeySym(keysym); + Key key = *(Key *)setup_value; + char *keyname = getKeyNameFromKey(key); - strcat(entry, getX11KeyNameFromKeySym(keysym)); + strcat(entry, getX11KeyNameFromKey(key)); for (i=strlen(entry); i<50; i++) strcat(entry, " "); @@ -1933,7 +2078,7 @@ void SaveSetup() filename = getPath2(getSetupDir(), SETUP_FILENAME); - if (!(file = fopen(filename, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot write setup file '%s'", filename); free(filename); @@ -1971,7 +2116,7 @@ void SaveSetup() fclose(file); free(filename); - chmod(filename, SETUP_PERMS); + SetFilePermissions(filename, PERMS_PRIVATE); } void LoadLevelSetup_LastSeries() @@ -1980,7 +2125,7 @@ void LoadLevelSetup_LastSeries() struct SetupFileList *level_setup_list = NULL; /* always start with reliable default values */ - leveldir_current = leveldir_first; + leveldir_current = getFirstValidLevelSeries(leveldir_first); /* ----------------------------------------------------------------------- */ /* ~/.rocksndiamonds/levelsetup.conf */ @@ -2021,7 +2166,7 @@ void SaveLevelSetup_LastSeries() filename = getPath2(getSetupDir(), LEVELSETUP_FILENAME); - if (!(file = fopen(filename, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot write setup file '%s'", filename); free(filename); @@ -2036,7 +2181,7 @@ void SaveLevelSetup_LastSeries() fclose(file); free(filename); - chmod(filename, SETUP_PERMS); + SetFilePermissions(filename, PERMS_PRIVATE); } static void checkSeriesInfo() @@ -2050,7 +2195,7 @@ static void checkSeriesInfo() level_directory = getPath2((leveldir_current->user_defined ? getUserLevelDir("") : options.level_directory), - leveldir_current->filename); + leveldir_current->fullpath); if ((dir = opendir(level_directory)) == NULL) { @@ -2166,7 +2311,7 @@ void SaveLevelSetup_SeriesInfo() filename = getPath2(getLevelSetupDir(level_subdir), LEVELSETUP_FILENAME); - if (!(file = fopen(filename, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot write setup file '%s'", filename); free(filename); @@ -2183,48 +2328,5 @@ void SaveLevelSetup_SeriesInfo() fclose(file); free(filename); - chmod(filename, SETUP_PERMS); -} - -#ifdef MSDOS -void initErrorFile() -{ - char *filename; - - InitUserDataDirectory(); - - filename = getPath2(getUserDataDir(), ERROR_FILENAME); - unlink(filename); - free(filename); -} - -FILE *openErrorFile() -{ - char *filename; - FILE *error_file; - - 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); - } + SetFilePermissions(filename, PERMS_PRIVATE); } -#endif