X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=ce7ff2d9a68f318c45f12982965fdea8cc570c3e;hb=dfe534c10c9825cafd54961c60fc81a56691dc55;hp=2c0117ddb77d3a9792fe362c25ba8d62b58a102d;hpb=94b124e87edbd2e12d7b83f45254fcbfff8554cd;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 2c0117dd..ce7ff2d9 100644 --- a/src/files.c +++ b/src/files.c @@ -1,14 +1,14 @@ /*********************************************************** -* 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 @@ -22,28 +22,29 @@ #include "tape.h" #include "joystick.h" -#define MAX_FILENAME_LEN 256 /* maximal filename length */ +#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 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 "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_2.0" #define SCORE_COOKIE "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2" -#define TAPE_COOKIE "ROCKSNDIAMONDS_TAPE_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) @@ -191,6 +192,53 @@ 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; @@ -359,6 +407,13 @@ 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; @@ -392,7 +447,8 @@ static void setLevelInfoToDefaults() for(i=0; i 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 */ @@ -477,12 +534,24 @@ void LoadLevel(int level_nr) 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, &chunk_length, BYTE_ORDER_BIG_ENDIAN); - if (strcmp(chunk, "HEAD") || chunk_length != LEVEL_HEADER_SIZE) + 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); @@ -532,21 +601,21 @@ void LoadLevel(int level_nr) if (file_version >= FILE_VERSION_1_2) { - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); + getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN); /* look for optional author chunk */ - if (strcmp(chunk, "AUTH") == 0 && chunk_length == MAX_LEVEL_AUTHOR_LEN) + if (strcmp(chunk_name, "AUTH") == 0 && chunk_size == MAX_LEVEL_AUTHOR_LEN) { for(i=0; ifieldx = 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; iname[i] = fgetc(file); + level->name[MAX_LEVEL_NAME_LEN] = 0; + + for(i=0; iscore[i] = fgetc(file); + + 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(struct LevelInfo *level, FILE *file, int chunk_size) +{ + int i; + + for(i=0; iauthor[i] = fgetc(file); + level->author[MAX_LEVEL_NAME_LEN] = 0; + + return chunk_size; +} + +static int LoadLevel_CONT(struct LevelInfo *level, FILE *file, int chunk_size) +{ + 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; + + /* 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_type1; + + 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 ? + getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) : + fgetc(file)); + return chunk_size; +} + +static int LoadLevel_BODY(struct LevelInfo *level, FILE *file, int chunk_size) +{ + 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 ? + getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) : + fgetc(file)); + return chunk_size; +} + +static int LoadLevel_CNT2(struct LevelInfo *level, FILE *file, int chunk_size) { int i, x, y; + int element; + int num_contents, content_xsize, content_ysize; + int content_array[MAX_ELEMENT_CONTENTS][3][3]; + + element = checkLevelElement(getFile16BitInteger(file,BYTE_ORDER_BIG_ENDIAN)); + 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_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); + } + + return chunk_size; +} + +void LoadLevel(int level_nr) +{ char *filename = getLevelFilename(level_nr); - boolean encoding_16bit = FALSE; /* default: maximal 256 elements */ + char cookie[MAX_LINE_LEN]; + char chunk_name[CHUNK_ID_LEN + 1]; + 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 (!checkCookieString(cookie, LEVEL_COOKIE)) /* unknown file format */ + { + 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); + } + else + { + static struct + { + char *name; + int size; + int (*loader)(struct LevelInfo *, FILE *, int); + } + chunk_info[] = + { + { "HEAD", LEVEL_HEADER_SIZE, LoadLevel_HEAD }, + { "AUTH", MAX_LEVEL_AUTHOR_LEN, LoadLevel_AUTH }, + { "CONT", -1, LoadLevel_CONT }, + { "BODY", -1, LoadLevel_BODY }, + { "CNT2", LEVEL_CHUNK_CNT2_SIZE, LoadLevel_CNT2 }, + { 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 (chunk_info[i].name == NULL) + { + Error(ERR_WARN, "unknown chunk '%s' in level 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 level file '%s'", + chunk_size, chunk_name, filename); + ReadUnusedBytesFromFile(file, chunk_size); + } + else + { + /* call function to load this level chunk */ + int chunk_size_expected = + (chunk_info[i].loader)(&level, file, chunk_size); + + /* 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 */ + if (chunk_size_expected != chunk_size) + { + Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'", + chunk_size, chunk_name, filename); + } + } + } + } + + fclose(file); + + if (IS_LEVELCLASS_CONTRIBUTION(leveldir_current) || + IS_LEVELCLASS_USER(leveldir_current)) + { + /* for user contributed and private levels, use the version of + the game engine the levels were created for */ + level.game_version = level.file_version; + + /* player was faster than monsters in pre-1.0 levels */ + if (level.file_version == FILE_VERSION_1_0) + { + Error(ERR_WARN, "level file '%s' has version number 1.0", filename); + Error(ERR_WARN, "using high speed movement for player"); + level.double_speed = TRUE; + } + } + else + { + /* always use the latest version of the game engine for all but + user contributed and private levels */ + level.game_version = GAME_VERSION_ACTUAL; + } + + /* determine border element for this level */ + 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, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot save level file '%s'", filename); return; @@ -708,18 +1096,221 @@ void SaveLevel(int level_nr) chmod(filename, LEVEL_PERMS); } +static void SaveLevel_HEAD(struct LevelInfo *level, FILE *file) +{ + int i, x, y; + + 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; 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); +} + +static void SaveLevel_AUTH(struct LevelInfo *level, FILE *file) +{ + int i; + + for(i=0; iauthor[i], file); +} + +#if 0 +static void SaveLevel_CONT(struct LevelInfo *level, FILE *file) +{ + int i, x, y; + + fputc(EL_MAMPFER, 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); +} +#endif + +static void SaveLevel_BODY(struct LevelInfo *level, FILE *file) +{ + int x, y; + + for(y=0; yencoding_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) +{ + 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 */ + for(i=0; i 255) + level.encoding_16bit_field = TRUE; + + /* check yamyam content for 16-bit elements */ + for(i=0; i 255) + level.encoding_16bit_yamyam = TRUE; + + /* check amoeba content for 16-bit elements */ + if (level.amoeba_content > 255) + level.encoding_16bit_amoeba = TRUE; + + fputs(LEVEL_COOKIE, file); /* file identifier */ + fputc('\n', file); + + putFileChunk(file, "HEAD", LEVEL_HEADER_SIZE, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_HEAD(&level, file); + + putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_AUTH(&level, file); + +#if 0 + if (level.encoding_16bit_field) /* obsolete since new "CNT2" chunk */ + { + chunk_size = 4 + 2 * (MAX_ELEMENT_CONTENTS * 3 * 3); + + 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_amoeba) + { + putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_CNT2(&level, file, EL_AMOEBE_BD); + } + + fclose(file); + + chmod(filename, LEVEL_PERMS); +} + void LoadTape(int level_nr) { int i, j; char *filename = getTapeFilename(level_nr); char cookie[MAX_LINE_LEN]; - char chunk[CHUNK_ID_LEN + 1]; + char chunk_name[CHUNK_ID_LEN + 1]; FILE *file; int num_participating_players; - int file_version = FILE_VERSION_1_2; /* last version of tape files */ - int chunk_length; + int file_version = FILE_VERSION_ACTUAL; /* last version of tape files */ + int chunk_size; /* 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 */ @@ -730,7 +1321,7 @@ void LoadTape(int level_nr) /* at least one (default: the first) player participates in every tape */ num_participating_players = 1; - if (!(file = fopen(filename, "r"))) + if (!(file = fopen(filename, MODE_READ))) return; /* check file identifier */ @@ -738,6 +1329,7 @@ void LoadTape(int level_nr) if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') cookie[strlen(cookie) - 1] = '\0'; +#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 */ @@ -746,12 +1338,25 @@ void LoadTape(int level_nr) 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; + } + + file_version = getFileVersionFromCookieString(cookie); +#endif + + tape.file_version = file_version; + tape.game_version = file_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) + 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); @@ -796,9 +1401,9 @@ void LoadTape(int level_nr) /* read chunk "BODY" */ if (file_version >= FILE_VERSION_1_2) { - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); - if (strcmp(chunk, "BODY") || - chunk_length != (num_participating_players + 1) * tape.length) + 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); @@ -806,6 +1411,10 @@ void LoadTape(int level_nr) } } +#if DEBUG + printf("\nTAPE OF LEVEL %d\n", level_nr); +#endif + for(i=0; i= MAX_TAPELEN) @@ -817,10 +1426,30 @@ void LoadTape(int level_nr) if (tape.player_participates[j]) tape.pos[i].action[j] = fgetc(file); + +#if DEBUG + { + int x = tape.pos[i].action[j]; + + printf("%d:%02x ", j, x); + printf("[%c%c%c%c|%c%c] - ", + (x & JOY_LEFT ? '<' : ' '), + (x & JOY_RIGHT ? '>' : ' '), + (x & JOY_UP ? '^' : ' '), + (x & JOY_DOWN ? 'v' : ' '), + (x & JOY_BUTTON_1 ? '1' : ' '), + (x & JOY_BUTTON_2 ? '2' : ' ')); + } +#endif + } tape.pos[i].delay = fgetc(file); +#if DEBUG + printf("[%03d]\n", tape.pos[i].delay); +#endif + if (file_version == FILE_VERSION_1_0) { /* eliminate possible diagonal moves in old tapes */ @@ -848,6 +1477,23 @@ void LoadTape(int level_nr) tape.length += num_moves; } } + else if (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; j 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 */ + { + Error(ERR_WARN, "unknown format of score file '%s'", filename); + fclose(file); + return; + } +#endif for(i=0; ifilename); - if (!(file = fopen(filename, "w"))) + if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot save score for level %d", level_nr); return; @@ -1304,7 +1959,7 @@ static struct SetupFileList *loadSetupFileList(char *filename) FILE *file; - if (!(file = fopen(filename, "r"))) + if (!(file = fopen(filename, MODE_READ))) { Error(ERR_WARN, "cannot open configuration file '%s'", filename); return NULL; @@ -1782,7 +2437,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); @@ -1926,7 +2581,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); @@ -1973,7 +2628,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 */ @@ -2014,7 +2669,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); @@ -2159,7 +2814,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); @@ -2178,3 +2833,5 @@ void SaveLevelSetup_SeriesInfo() chmod(filename, SETUP_PERMS); } +/* LocalWords: Rocks'n + */