X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=3f50b5e9da42d312637589df1fd4dd84a5f8065c;hb=df8111be2dc97172f30c7162eca4641d027e2aa4;hp=a32c0e5a0a37950bf2ff09a448f15348c86ba196;hpb=3efd2f9aa751bbadb75b584f64568115a6ede379;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index a32c0e5a..3f50b5e9 100644 --- a/src/files.c +++ b/src/files.c @@ -35,7 +35,7 @@ /* file identifier strings */ #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" @@ -44,6 +44,7 @@ #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) @@ -409,7 +410,9 @@ static void setLevelInfoToDefaults() level.file_version = FILE_VERSION_ACTUAL; level.game_version = GAME_VERSION_ACTUAL; - level.encoding_16bit = FALSE; /* default: only 8-bit elements */ + 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; @@ -444,7 +447,8 @@ static void setLevelInfoToDefaults() 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)); - else - level->yam_content[i][x][y] = EL_LEERRAUM; - } - } - } + level->yam_content[i][x][y] = checkLevelElement(fgetc(file)); level->amoeba_speed = fgetc(file); level->time_magic_wall = fgetc(file); @@ -742,7 +737,7 @@ static int LoadLevel_HEAD(struct LevelInfo *level, FILE *file, int chunk_size) level->double_speed = (fgetc(file) == 1 ? TRUE : FALSE); level->gravity = (fgetc(file) == 1 ? TRUE : FALSE); - level->encoding_16bit = (fgetc(file) == 1 ? TRUE : FALSE); + level->encoding_16bit_field = (fgetc(file) == 1 ? TRUE : FALSE); ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED); @@ -764,14 +759,16 @@ 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; + 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). */ - if (level->encoding_16bit && level->file_version >= FILE_VERSION_2_0) - chunk_size_expected += content_size_type1; + 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) { @@ -793,9 +790,8 @@ static int LoadLevel_CONT(struct LevelInfo *level, FILE *file, int chunk_size) for(y=0; y<3; y++) for(x=0; x<3; x++) level->yam_content[i][x][y] = - checkLevelElement(level->encoding_16bit ? - getFile16BitInteger(file, - BYTE_ORDER_BIG_ENDIAN) : + checkLevelElement(level->encoding_16bit_field ? + getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) : fgetc(file)); return chunk_size; } @@ -806,8 +802,11 @@ static int LoadLevel_BODY(struct LevelInfo *level, FILE *file, int chunk_size) 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). */ - if (level->encoding_16bit && level->file_version >= FILE_VERSION_2_0) + 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) @@ -819,7 +818,7 @@ static int LoadLevel_BODY(struct LevelInfo *level, FILE *file, int chunk_size) for(y=0; yfieldy; y++) for(x=0; xfieldx; x++) Feld[x][y] = Ur[x][y] = - checkLevelElement(level->encoding_16bit ? + checkLevelElement(level->encoding_16bit_field ? getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) : fgetc(file)); return chunk_size; @@ -832,7 +831,7 @@ static int LoadLevel_CNT2(struct LevelInfo *level, FILE *file, int chunk_size) int num_contents, content_xsize, content_ysize; int content_array[MAX_ELEMENT_CONTENTS][3][3]; - element = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN); + element = checkLevelElement(getFile16BitInteger(file,BYTE_ORDER_BIG_ENDIAN)); num_contents = fgetc(file); content_xsize = fgetc(file); content_ysize = fgetc(file); @@ -842,7 +841,7 @@ static int LoadLevel_CNT2(struct LevelInfo *level, FILE *file, int chunk_size) for(y=0; y<3; y++) for(x=0; x<3; x++) content_array[i][x][y] = - getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN); + checkLevelElement(getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN)); /* correct invalid number of content fields -- should never happen */ if (num_contents < 1 || num_contents > MAX_ELEMENT_CONTENTS) @@ -957,8 +956,8 @@ void LoadLevel(int level_nr) (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 */ + 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'", @@ -1115,17 +1114,18 @@ static void SaveLevel_HEAD(struct LevelInfo *level, FILE *file) for(i=0; iencoding_16bit ? EL_LEERRAUM : + fputc((level->encoding_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->amoeba_content, 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 ? 1 : 0), file); + fputc((level->encoding_16bit_field ? 1 : 0), file); WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED); } @@ -1138,6 +1138,7 @@ static void SaveLevel_AUTH(struct LevelInfo *level, FILE *file) fputc(level->author[i], file); } +#if 0 static void SaveLevel_CONT(struct LevelInfo *level, FILE *file) { int i, x, y; @@ -1150,12 +1151,13 @@ static void SaveLevel_CONT(struct LevelInfo *level, FILE *file) for(i=0; iencoding_16bit) + if (level->encoding_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) { @@ -1163,7 +1165,7 @@ static void SaveLevel_BODY(struct LevelInfo *level, FILE *file) for(y=0; yencoding_16bit) + if (level->encoding_16bit_field) putFile16BitInteger(file, Ur[x][y], BYTE_ORDER_BIG_ENDIAN); else fputc(Ur[x][y], file); @@ -1201,8 +1203,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 = TRUE; + level.encoding_16bit_field = TRUE; - /* check yam content for 16-bit elements */ - for(i=0; i 255) - encoding_16bit_yamyam = TRUE; + level.encoding_16bit_yamyam = TRUE; /* check amoeba content for 16-bit elements */ if (level.amoeba_content > 255) - encoding_16bit_amoeba = TRUE; + level.encoding_16bit_amoeba = TRUE; + + body_chunk_size = + level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1); fputs(LEVEL_COOKIE, file); /* file identifier */ fputc('\n', file); @@ -1269,25 +1265,27 @@ void SaveLevel(int level_nr) putFileChunk(file, "AUTH", MAX_LEVEL_AUTHOR_LEN, BYTE_ORDER_BIG_ENDIAN); SaveLevel_AUTH(&level, file); - if (0 && level.encoding_16bit) /* obsolete since new "CNT2" chunk */ +#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 ? 2 : 1); - putFileChunk(file, "BODY", chunk_size, BYTE_ORDER_BIG_ENDIAN); + putFileChunk(file, "BODY", body_chunk_size, BYTE_ORDER_BIG_ENDIAN); SaveLevel_BODY(&level, file); - if (encoding_16bit_yamyam) + 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 (encoding_16bit_amoeba) + if (level.encoding_16bit_amoeba) { putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN); SaveLevel_CNT2(&level, file, EL_AMOEBE_BD); @@ -1298,7 +1296,33 @@ void SaveLevel(int level_nr) chmod(filename, LEVEL_PERMS); } -void LoadTape(int level_nr) +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 */ + tape.player_participates[0] = TRUE; + for(i=1; i= MAX_TAPELEN) @@ -1423,10 +1451,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 */ @@ -1454,6 +1502,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; jrandom_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 (tape->file_version >= FILE_VERSION_1_2) + { + byte store_participating_players = fgetc(file); + + ReadUnusedBytesFromFile(file, TAPE_HEADER_UNUSED); + + /* since version 1.2, tapes store which players participate in the tape */ + tape->num_participating_players = 0; + for(i=0; iplayer_participates[i] = FALSE; + + if (store_participating_players & (1 << i)) + { + tape->player_participates[i] = TRUE; + tape->num_participating_players++; + } + } + } + + return chunk_size; +} + +static int LoadTape_BODY(struct TapeInfo *tape, FILE *file, int chunk_size) +{ + int i, j; + int chunk_size_expected = + (tape->num_participating_players + 1) * tape->length; + + if (chunk_size_expected != chunk_size) + { + ReadUnusedBytesFromFile(file, chunk_size); + return chunk_size_expected; + } + + for(i=0; ilength; i++) + { + if (i >= MAX_TAPELEN) + break; + + for(j=0; 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) + { + /* 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; + + /* 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, TAPE_COOKIE)) /* unknown file format */ + { + 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(&tape, file, TAPE_HEADER_SIZE); + LoadTape_BODY(&tape, file, 2 * tape.length); + } + else + { + static struct + { + char *name; + int size; + int (*loader)(struct TapeInfo *, FILE *, int); + } + chunk_info[] = + { + { "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 (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)(&tape, file, chunk_size); + + /* 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(); +} + +void OLD_SaveTape(int level_nr) { int i; char *filename = getTapeFilename(level_nr); @@ -1542,6 +1821,133 @@ void SaveTape(int level_nr) Request("tape saved !", REQ_CONFIRM); } +static void SaveTape_HEAD(struct TapeInfo *tape, FILE *file) +{ + 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(struct TapeInfo *tape, FILE *file) +{ + 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; + int num_participating_players = 0; + int body_chunk_size; + + InitTapeDirectory(leveldir_current->filename); + + /* if a tape still exists, ask to overwrite it */ + if (access(filename, F_OK) == 0) + { + new_tape = FALSE; + if (!Request("Replace old tape ?", REQ_ASK)) + return; + } + + if (!(file = fopen(filename, MODE_WRITE))) + { + Error(ERR_WARN, "cannot save level recording file '%s'", filename); + return; + } + + /* count number of participating players */ + for(i=0; ilevel_nr); + return; + } + + printf("\n"); + printf("-------------------------------------------------------------------------------\n"); + printf("TAPE OF LEVEL %d\n", tape->level_nr); + printf("-------------------------------------------------------------------------------\n"); + + for(i=0; ilength; i++) + { + if (i >= MAX_TAPELEN) + break; + + 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' : ' ')); + } + } + + printf("(%03d)\n", tape->pos[i].delay); + } + + printf("-------------------------------------------------------------------------------\n"); +} + void LoadScore(int level_nr) { int i;