X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=cbf242ca3a5de0c98f1e808a60924fad5f56cff3;hb=e20a5f598ac5ef3280c4a881fe63e44463dff086;hp=ce7ff2d9a68f318c45f12982965fdea8cc570c3e;hpb=dfe534c10c9825cafd54961c60fc81a56691dc55;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index ce7ff2d9..cbf242ca 100644 --- a/src/files.c +++ b/src/files.c @@ -22,29 +22,24 @@ #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 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 */ +#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_2.0" +#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_2.0" #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 LEVEL_COOKIE_14 "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.4" -#define TAPE_COOKIE_10 "ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0" -#define TAPE_COOKIE_12 "ROCKSNDIAMONDS_TAPE_FILE_VERSION_1.2" /* file names and filename extensions */ #if !defined(PLATFORM_MSDOS) @@ -65,36 +60,6 @@ #define SCOREFILE_EXTENSION "sco" #endif -#if defined(PLATFORM_WIN32) -#ifndef S_IRGRP -#define S_IRGRP S_IRUSR -#endif -#ifndef S_IROTH -#define S_IROTH S_IRUSR -#endif -#ifndef S_IWGRP -#define S_IWGRP S_IWUSR -#endif -#ifndef S_IWOTH -#define S_IWOTH S_IWUSR -#endif -#ifndef S_IXGRP -#define S_IXGRP S_IXUSR -#endif -#ifndef S_IXOTH -#define S_IXOTH S_IXUSR -#endif -#endif /* PLATFORM_WIN32 */ - -/* 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 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 @@ -192,53 +157,6 @@ char *levelclass_desc[NUM_LEVELCLASS_DESC] = IS_LEVELCLASS_USER(n) ? 7 : \ 9) -static int getFileVersionFromCookieString(const char *cookie) -{ - const char *ptr_cookie1, *ptr_cookie2; - const char *pattern1 = "_FILE_VERSION_"; - const char *pattern2 = "?.?"; - const int len_cookie = strlen(cookie); - const int len_pattern1 = strlen(pattern1); - const int len_pattern2 = strlen(pattern2); - const int len_pattern = len_pattern1 + len_pattern2; - int version_major, version_minor; - - if (len_cookie <= len_pattern) - return -1; - - ptr_cookie1 = &cookie[len_cookie - len_pattern]; - ptr_cookie2 = &cookie[len_cookie - len_pattern2]; - - if (strncmp(ptr_cookie1, pattern1, len_pattern1) != 0) - return -1; - - if (ptr_cookie2[0] < '0' || ptr_cookie2[0] > '9' || - ptr_cookie2[1] != '.' || - ptr_cookie2[2] < '0' || ptr_cookie2[2] > '9') - return -1; - - version_major = ptr_cookie2[0] - '0'; - version_minor = ptr_cookie2[2] - '0'; - - return (version_major * 10 + version_minor); -} - -boolean checkCookieString(const char *cookie, const char *template) -{ - const char *pattern = "_FILE_VERSION_?.?"; - const int len_cookie = strlen(cookie); - const int len_template = strlen(template); - const int len_pattern = strlen(pattern); - - if (len_cookie != len_template) - return FALSE; - - if (strncmp(cookie, template, len_cookie - len_pattern) != 0) - return FALSE; - - return TRUE; -} - char *getLevelClassDescription(struct LevelDirInfo *ldi) { int position = ldi->sort_priority / 100; @@ -252,11 +170,6 @@ char *getLevelClassDescription(struct LevelDirInfo *ldi) static void SaveUserLevelInfo(); /* for 'InitUserLevelDir()' */ static char *getSetupLine(char *, int); /* for 'SaveUserLevelInfo()' */ -static char *getSetupDir() -{ - return getUserDataDir(); -} - static char *getUserLevelDir(char *level_subdir) { static char *userlevel_dir = NULL; @@ -373,24 +286,24 @@ static char *getScoreFilename(int nr) 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(); } @@ -398,9 +311,53 @@ 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() @@ -498,216 +455,14 @@ static int checkLevelElement(int element) return element; } -void OLD_LoadLevel(int level_nr) -{ - int i, x, y; - char *filename = getLevelFilename(level_nr); - char cookie[MAX_LINE_LEN]; - char chunk_name[CHUNK_ID_LEN + 1]; - boolean encoding_16bit = FALSE; /* default: maximal 256 elements */ - int file_version = FILE_VERSION_ACTUAL; - int chunk_size; - FILE *file; - - /* always start with reliable default values */ - setLevelInfoToDefaults(); - - if (!(file = fopen(filename, MODE_READ))) - { - Error(ERR_WARN, "cannot read level '%s' - creating new level", filename); - return; - } - - /* check file identifier */ - fgets(cookie, MAX_LINE_LEN, file); - if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') - cookie[strlen(cookie) - 1] = '\0'; - -#if 0 - if (strcmp(cookie, LEVEL_COOKIE_10) == 0) /* old 1.0 level format */ - file_version = FILE_VERSION_1_0; - else if (strcmp(cookie, LEVEL_COOKIE_12) == 0)/* 1.2 (8 bit) level format */ - file_version = FILE_VERSION_1_2; - else if (strcmp(cookie, LEVEL_COOKIE) != 0) /* unknown level format */ - { - Error(ERR_WARN, "wrong file identifier of level file '%s'", filename); - fclose(file); - return; - } -#else - if (!checkCookieString(cookie, LEVEL_COOKIE)) /* unknown file format */ - { - Error(ERR_WARN, "unknown format of level file '%s'", filename); - fclose(file); - return; - } - - file_version = getFileVersionFromCookieString(cookie); -#endif - - level.file_version = file_version; - - /* read chunk "HEAD" */ - if (file_version >= FILE_VERSION_1_2) - { - getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN); - if (strcmp(chunk_name, "HEAD") || chunk_size != LEVEL_HEADER_SIZE) - { - Error(ERR_WARN, "wrong 'HEAD' chunk of level file '%s'", filename); - fclose(file); - return; - } - } - - 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(i=0; i= FILE_VERSION_1_2) - { - getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN); - - /* look for optional author chunk */ - if (strcmp(chunk_name, "AUTH") == 0 && chunk_size == MAX_LEVEL_AUTHOR_LEN) - { - for(i=0; i 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; ifile_version), &(level->game_version)); -static void WriteUnusedBytesToFile(FILE *file, unsigned long bytes) -{ - while (bytes--) - fputc(0, file); + return chunk_size; } -static int LoadLevel_HEAD(struct LevelInfo *level, FILE *file, int chunk_size) +static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) { int i, x, y; @@ -744,7 +499,7 @@ static int LoadLevel_HEAD(struct LevelInfo *level, FILE *file, int chunk_size) return chunk_size; } -static int LoadLevel_AUTH(struct LevelInfo *level, FILE *file, int chunk_size) +static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level) { int i; @@ -755,13 +510,12 @@ static int LoadLevel_AUTH(struct LevelInfo *level, FILE *file, int chunk_size) return chunk_size; } -static int LoadLevel_CONT(struct LevelInfo *level, FILE *file, int 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_type1 = MAX_ELEMENT_CONTENTS * 3 * 3; - - int chunk_size_expected = header_size + content_size_type1; + 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). @@ -769,7 +523,7 @@ static int LoadLevel_CONT(struct LevelInfo *level, FILE *file, int chunk_size) contained 16-bit elements and vice versa. */ if (level->encoding_16bit_field && level->file_version >= FILE_VERSION_2_0) - chunk_size_expected += content_size_type1; + chunk_size_expected += content_size; if (chunk_size_expected != chunk_size) { @@ -797,7 +551,7 @@ static int LoadLevel_CONT(struct LevelInfo *level, FILE *file, int chunk_size) return chunk_size; } -static int LoadLevel_BODY(struct LevelInfo *level, FILE *file, int 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; @@ -825,7 +579,7 @@ static int LoadLevel_BODY(struct LevelInfo *level, FILE *file, int chunk_size) return chunk_size; } -static int LoadLevel_CNT2(struct LevelInfo *level, FILE *file, int chunk_size) +static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level) { int i, x, y; int element; @@ -886,30 +640,46 @@ void LoadLevel(int level_nr) return; } - /* check file identifier */ - fgets(cookie, MAX_LINE_LEN, file); - if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') - cookie[strlen(cookie) - 1] = '\0'; - - if (!checkCookieString(cookie, LEVEL_COOKIE)) /* unknown file format */ + getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN); + if (strcmp(chunk_name, "RND1") == 0) { - Error(ERR_WARN, "unknown format of level file '%s'", filename); - fclose(file); - return; - } + getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); /* not used */ - if ((level.file_version = getFileVersionFromCookieString(cookie)) == -1) + getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN); + 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 */ { - Error(ERR_WARN, "unsupported version of level file '%s'", filename); - fclose(file); - return; + 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 (!checkCookieString(cookie, LEVEL_COOKIE_TMPL)) + { + Error(ERR_WARN, "unknown format of level file '%s'", filename); + fclose(file); + return; + } + + if ((level.file_version = getFileVersionFromCookieString(cookie)) == -1) + { + Error(ERR_WARN, "unsupported version of level file '%s'", filename); + fclose(file); + return; + } } if (level.file_version < FILE_VERSION_1_2) { /* level files from versions before 1.2.0 without chunk structure */ - LoadLevel_HEAD(&level, file, LEVEL_HEADER_SIZE); - LoadLevel_BODY(&level, file, level.fieldx * level.fieldy); + LoadLevel_HEAD(file, LEVEL_HEADER_SIZE, &level); + LoadLevel_BODY(file, level.fieldx * level.fieldy, &level); } else { @@ -917,10 +687,11 @@ void LoadLevel(int level_nr) { char *name; int size; - int (*loader)(struct LevelInfo *, FILE *, int); + int (*loader)(FILE *, int, struct LevelInfo *); } chunk_info[] = { + { "VERS", FILE_VERS_CHUNK_SIZE, LoadLevel_VERS }, { "HEAD", LEVEL_HEADER_SIZE, LoadLevel_HEAD }, { "AUTH", MAX_LEVEL_AUTHOR_LEN, LoadLevel_AUTH }, { "CONT", -1, LoadLevel_CONT }, @@ -954,11 +725,11 @@ void LoadLevel(int level_nr) { /* call function to load this level chunk */ int chunk_size_expected = - (chunk_info[i].loader)(&level, file, chunk_size); + (chunk_info[i].loader)(file, chunk_size, &level); /* the size of some chunks cannot be checked before reading other - chunks first (like "HEAD" and "BODY") or before reading some - header information first (like "CONT"), so check them here */ + 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 level file '%s'", @@ -996,107 +767,7 @@ void LoadLevel(int level_nr) SetBorderElement(); } -void OLD_SaveLevel(int level_nr) -{ - int i, x, y; - char *filename = getLevelFilename(level_nr); -#if 0 - boolean encoding_16bit_amoeba = FALSE; - boolean encoding_16bit_yamyam = FALSE; -#endif - boolean encoding_16bit = FALSE; /* default: only 8-bit elements */ - char *oldest_possible_cookie; - FILE *file; - - if (!(file = fopen(filename, MODE_WRITE))) - { - Error(ERR_WARN, "cannot save level file '%s'", filename); - return; - } - - /* 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); - - for(i=0; ifieldy; 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); } -static void SaveLevel_CNT2(struct LevelInfo *level, FILE *file, int element) +static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) { int i, x, y; int num_contents, content_xsize, content_ysize; @@ -1204,8 +875,7 @@ static void SaveLevel_CNT2(struct LevelInfo *level, FILE *file, int element) else { /* chunk header already written -- write empty chunk data */ - 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_amoeba = TRUE; - fputs(LEVEL_COOKIE, file); /* file identifier */ - fputc('\n', file); + 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(&level, file); + SaveLevel_HEAD(file, &level); putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN); - SaveLevel_AUTH(&level, file); + SaveLevel_AUTH(file, &level); -#if 0 - if (level.encoding_16bit_field) /* obsolete since new "CNT2" chunk */ - { - chunk_size = 4 + 2 * (MAX_ELEMENT_CONTENTS * 3 * 3); + putFileChunk(file, "BODY", body_chunk_size, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_BODY(file, &level); - putFileChunk(file, "CONT", chunk_size, BYTE_ORDER_BIG_ENDIAN); - SaveLevel_CONT(&level, file); - } -#endif - - chunk_size = - level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1); - putFileChunk(file, "BODY", chunk_size, BYTE_ORDER_BIG_ENDIAN); - SaveLevel_BODY(&level, file); - - 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(&level, file, EL_MAMPFER); + 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(&level, file, EL_AMOEBE_BD); + SaveLevel_CNT2(file, &level, EL_AMOEBE_BD); } fclose(file); - chmod(filename, LEVEL_PERMS); + SetFilePermissions(filename, PERMS_PRIVATE); } -void LoadTape(int level_nr) +static void setTapeInfoToDefaults() { - int i, j; - char *filename = getTapeFilename(level_nr); - char cookie[MAX_LINE_LEN]; - char chunk_name[CHUNK_ID_LEN + 1]; - FILE *file; - int num_participating_players; - int file_version = FILE_VERSION_ACTUAL; /* last version of tape files */ - int chunk_size; + int i; /* always start with reliable default values (empty tape) */ tape.file_version = FILE_VERSION_ACTUAL; @@ -1319,153 +980,99 @@ 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; - - if (!(file = fopen(filename, MODE_READ))) - return; + tape.num_participating_players = 1; - /* check file identifier */ - fgets(cookie, MAX_LINE_LEN, file); - if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') - cookie[strlen(cookie) - 1] = '\0'; + tape.level_nr = level_nr; + tape.counter = 0; + tape.changed = FALSE; -#if 0 - 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; - } -#else - if (!checkCookieString(cookie, TAPE_COOKIE)) /* unknown file format */ - { - Error(ERR_WARN, "unknown format of tape file '%s'", filename); - fclose(file); - return; - } + tape.recording = FALSE; + tape.playing = FALSE; + tape.pausing = FALSE; +} - file_version = getFileVersionFromCookieString(cookie); -#endif +static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape) +{ + ReadChunk_VERS(file, &(tape->file_version), &(tape->game_version)); - tape.file_version = file_version; - tape.game_version = file_version; + return chunk_size; +} - /* read chunk "HEAD" */ - if (file_version >= FILE_VERSION_1_2) - { - getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN); - if (strcmp(chunk_name, "HEAD") || chunk_size != TAPE_HEADER_SIZE) - { - Error(ERR_WARN, "wrong 'HEAD' chunk of tape file '%s'", filename); - fclose(file); - return; - } - } +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; - /* read chunk "BODY" */ - if (file_version >= FILE_VERSION_1_2) + if (chunk_size_expected != chunk_size) { - getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN); - if (strcmp(chunk_name, "BODY") || - chunk_size != (num_participating_players + 1) * tape.length) - { - Error(ERR_WARN, "wrong 'BODY' chunk of tape file '%s'", filename); - fclose(file); - return; - } + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; } -#if DEBUG - printf("\nTAPE OF LEVEL %d\n", level_nr); -#endif - - for(i=0; ilength; i++) { if (i >= MAX_TAPELEN) break; for(j=0; j' : ' '), - (x & JOY_UP ? '^' : ' '), - (x & JOY_DOWN ? 'v' : ' '), - (x & JOY_BUTTON_1 ? '1' : ' '), - (x & JOY_BUTTON_2 ? '2' : ' ')); - } -#endif + tape->pos[i].action[j] = MV_NO_MOVING; + if (tape->player_participates[j]) + tape->pos[i].action[j] = fgetc(file); } - tape.pos[i].delay = fgetc(file); - -#if DEBUG - printf("[%03d]\n", tape.pos[i].delay); -#endif + tape->pos[i].delay = fgetc(file); - if (file_version == FILE_VERSION_1_0) + 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++; } } @@ -1474,24 +1081,24 @@ void LoadTape(int level_nr) { num_moves--; i += num_moves; - tape.length += num_moves; + tape->length += num_moves; } } - else if (file_version < FILE_VERSION_2_0) + else if (tape->file_version < FILE_VERSION_2_0) { - if (tape.pos[i].delay > 1) + if (tape->pos[i].delay > 1) { /* action part */ - tape.pos[i + 1] = tape.pos[i]; - tape.pos[i + 1].delay = 1; + 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++; + tape->length++; } } @@ -1499,22 +1106,170 @@ void LoadTape(int level_nr) break; } - fclose(file); + 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'; + + if (!checkCookieString(cookie, TAPE_COOKIE_TMPL)) + { + Error(ERR_WARN, "unknown format of tape file '%s'", filename); + fclose(file); + return; + } + + if ((tape.file_version = getFileVersionFromCookieString(cookie)) == -1) + { + Error(ERR_WARN, "unsupported version of tape file '%s'", filename); + fclose(file); + return; + } + } + + tape.game_version = tape.file_version; + + if (tape.file_version < FILE_VERSION_1_2) + { + /* tape files from versions before 1.2.0 without chunk structure */ + LoadTape_HEAD(file, TAPE_HEADER_SIZE, &tape); + LoadTape_BODY(file, 2 * tape.length, &tape); + } + else + { + static struct + { + char *name; + int size; + int (*loader)(FILE *, int, struct TapeInfo *); + } + chunk_info[] = + { + { "VERS", FILE_VERS_CHUNK_SIZE, LoadTape_VERS }, + { "HEAD", TAPE_HEADER_SIZE, LoadTape_HEAD }, + { "BODY", -1, LoadTape_BODY }, + { NULL, 0, NULL } + }; + + while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN)) + { + int i = 0; + + while (chunk_info[i].name != NULL && + strcmp(chunk_name, chunk_info[i].name) != 0) + i++; - if (i != tape.length) - Error(ERR_WARN, "level recording file '%s' corrupted", filename); + if (chunk_info[i].name == NULL) + { + Error(ERR_WARN, "unknown chunk '%s' in tape file '%s'", + chunk_name, filename); + ReadUnusedBytesFromFile(file, chunk_size); + } + else if (chunk_info[i].size != -1 && + chunk_info[i].size != chunk_size) + { + 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); + } + } + } + } + + fclose(file); 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); @@ -1526,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"); - chmod(filename, TAPE_PERMS); + for(i=0; ilength; i++) + { + if (i >= MAX_TAPELEN) + break; - tape.changed = FALSE; + for(j=0; jplayer_participates[j]) + { + int action = tape->pos[i].action[j]; - if (new_tape) - Request("tape saved !", REQ_CONFIRM); + 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' : ' ')); + } + } + + printf("(%03d)\n", tape->pos[i].delay); + } + + printf("-------------------------------------------------------------------------------\n"); } void LoadScore(int level_nr) @@ -1606,21 +1384,12 @@ void LoadScore(int level_nr) if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') cookie[strlen(cookie) - 1] = '\0'; -#if 0 - if (strcmp(cookie, SCORE_COOKIE) != 0) - { - Error(ERR_WARN, "wrong file identifier of score file '%s'", filename); - fclose(file); - return; - } -#else - if (!checkCookieString(cookie, SCORE_COOKIE)) /* unknown file format */ + if (!checkCookieString(cookie, SCORE_COOKIE)) { Error(ERR_WARN, "unknown format of score file '%s'", filename); fclose(file); return; } -#endif for(i=0; i= 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, MODE_READ))) - { - 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; @@ -2466,7 +1958,7 @@ static void SaveUserLevelInfo() fclose(file); free(filename); - chmod(filename, SETUP_PERMS); + SetFilePermissions(filename, PERMS_PRIVATE); } void LoadSetup() @@ -2619,7 +2111,7 @@ void SaveSetup() fclose(file); free(filename); - chmod(filename, SETUP_PERMS); + SetFilePermissions(filename, PERMS_PRIVATE); } void LoadLevelSetup_LastSeries() @@ -2684,7 +2176,7 @@ void SaveLevelSetup_LastSeries() fclose(file); free(filename); - chmod(filename, SETUP_PERMS); + SetFilePermissions(filename, PERMS_PRIVATE); } static void checkSeriesInfo() @@ -2831,7 +2323,5 @@ void SaveLevelSetup_SeriesInfo() fclose(file); free(filename); - chmod(filename, SETUP_PERMS); + SetFilePermissions(filename, PERMS_PRIVATE); } -/* LocalWords: Rocks'n - */