From: Holger Schemel Date: Wed, 13 Mar 2002 16:48:18 +0000 (+0100) Subject: rnd-20020313-3-src X-Git-Tag: 2.0.1^2~13 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=3efd2f9aa751bbadb75b584f64568115a6ede379;p=rocksndiamonds.git rnd-20020313-3-src --- diff --git a/src/files.c b/src/files.c index 22638f76..a32c0e5a 100644 --- a/src/files.c +++ b/src/files.c @@ -27,15 +27,11 @@ #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 */ -#if 0 -#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) */ -#endif - /* file identifier strings */ #define LEVEL_COOKIE "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_2.0" #define SCORE_COOKIE "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2" @@ -503,10 +499,10 @@ void OLD_LoadLevel(int level_nr) int i, x, y; char *filename = getLevelFilename(level_nr); char cookie[MAX_LINE_LEN]; - char chunk[CHUNK_ID_LEN + 1]; + char chunk_name[CHUNK_ID_LEN + 1]; boolean encoding_16bit = FALSE; /* default: maximal 256 elements */ int file_version = FILE_VERSION_ACTUAL; - int chunk_length; + int chunk_size; FILE *file; /* always start with reliable default values */ @@ -550,8 +546,8 @@ void OLD_LoadLevel(int level_nr) /* 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); @@ -601,21 +597,21 @@ void OLD_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; iencoding_16bit = (fgetc(file) == 1 ? TRUE : FALSE); - SkipBytesInFile(file, LEVEL_HEADER_UNUSED); /* skip unused header bytes */ + ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED); + + return chunk_size; } -static void LoadLevel_AUTH(struct LevelInfo *level, FILE *file) +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 void LoadLevel_CONT(struct LevelInfo *level, FILE *file) +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). */ + if (level->encoding_16bit && 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) - { -#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 * 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) + 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++) @@ -792,14 +822,59 @@ static void LoadLevel_BODY(struct LevelInfo *level, FILE *file) checkLevelElement(level->encoding_16bit ? 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 = 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); char cookie[MAX_LINE_LEN]; - char chunk[CHUNK_ID_LEN + 1]; - int chunk_length; + char chunk_name[CHUNK_ID_LEN + 1]; + int chunk_size; FILE *file; /* always start with reliable default values */ @@ -833,101 +908,64 @@ void LoadLevel(int level_nr) if (level.file_version < FILE_VERSION_1_2) { /* level files from versions before 1.2.0 without chunk structure */ - LoadLevel_HEAD(&level, file); - LoadLevel_BODY(&level, file); + LoadLevel_HEAD(&level, file, LEVEL_HEADER_SIZE); + LoadLevel_BODY(&level, file, level.fieldx * level.fieldy); } else { static struct { - char *chunk_name; - void (*chunk_loader)(struct LevelInfo *, FILE *); - int chunk_length; + char *name; + int size; + int (*loader)(struct LevelInfo *, FILE *, int); } chunk_info[] = { - { "HEAD", LoadLevel_HEAD, LEVEL_HEADER_SIZE }, - { "AUTH", LoadLevel_AUTH, MAX_LEVEL_AUTHOR_LEN }, - { "CONT", LoadLevel_CONT, 4 + MAX_ELEMENT_CONTENTS * 3 * 3 }, - { "BODY", LoadLevel_BODY, 0 }, /* depends on contents of "HEAD" */ - { NULL, NULL, 0 } + { "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, &chunk_length, BYTE_ORDER_BIG_ENDIAN)) + while (getFileChunk(file, chunk_name, &chunk_size, BYTE_ORDER_BIG_ENDIAN)) { int i = 0; - while (chunk_info[i].chunk_name != NULL && - strcmp(chunk, chunk_info[i].chunk_name) != 0) + while (chunk_info[i].name != NULL && + strcmp(chunk_name, chunk_info[i].name) != 0) i++; - if (chunk_info[i].chunk_name == NULL) + if (chunk_info[i].name == NULL) { Error(ERR_WARN, "unknown chunk '%s' in level file '%s'", - chunk, filename); - SkipBytesInFile(file, chunk_length); + chunk_name, filename); + ReadUnusedBytesFromFile(file, chunk_size); } - else if (chunk_length != chunk_info[i].chunk_length) + 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_length, chunk, filename); - SkipBytesInFile(file, chunk_length); + chunk_size, chunk_name, filename); + ReadUnusedBytesFromFile(file, chunk_size); } else { /* call function to load this level chunk */ - (chunk_info[i].chunk_loader)(&level, file); + int chunk_size_expected = + (chunk_info[i].loader)(&level, file, chunk_size); - if (strcmp(chunk, "HEAD") == 0) + /* 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) { - /* Note: "chunk_length" for CONT and BODY is wrong when elements are - stored with 16-bit encoding (and should be twice as big then). */ - - chunk_info[3].chunk_length = level.fieldx * level.fieldy; + Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'", + chunk_size, chunk_name, filename); } } } - -#if 0 - 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; - } - - LoadLevel_HEAD(&level, file); - - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); - - /* look for optional author chunk */ - if (strcmp(chunk, "AUTH") == 0 && chunk_length == MAX_LEVEL_AUTHOR_LEN) - { - LoadLevel_AUTH(&level, file); - - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); - } - - /* look for optional content chunk */ - if (strcmp(chunk, "CONT") == 0 && - chunk_length == 4 + MAX_ELEMENT_CONTENTS * 3 * 3) - { - LoadLevel_CONT(&level, file); - - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_BIG_ENDIAN); - } - - /* next check body chunk identifier and chunk length */ - if (strcmp(chunk, "BODY") != 0 || chunk_length != lev_fieldx * lev_fieldy) - { - Error(ERR_WARN, "wrong 'BODY' chunk of level file '%s'", filename); - fclose(file); - return; - } - - LoadLevel_BODY(&level, file); -#endif } fclose(file); @@ -958,7 +996,7 @@ void LoadLevel(int level_nr) SetBorderElement(); } -void SaveLevel(int level_nr) +void OLD_SaveLevel(int level_nr) { int i, x, y; char *filename = getLevelFilename(level_nr); @@ -1058,16 +1096,218 @@ 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 ? 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->double_speed ? 1 : 0), file); + fputc((level->gravity ? 1 : 0), file); + + fputc((level->encoding_16bit ? 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); +} + +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) + putFile16BitInteger(file, level->yam_content[i][x][y], + BYTE_ORDER_BIG_ENDIAN); + else + fputc(level->yam_content[i][x][y], file); +} + +static void SaveLevel_BODY(struct LevelInfo *level, FILE *file) +{ + int x, y; + + for(y=0; yencoding_16bit) + 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 = TRUE; + + /* check yam content for 16-bit elements */ + for(i=0; i 255) + encoding_16bit_yamyam = TRUE; + + /* check amoeba content for 16-bit elements */ + if (level.amoeba_content > 255) + 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 && level.encoding_16bit) /* 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); + } + + chunk_size = level.fieldx * level.fieldy * (level.encoding_16bit ? 2 : 1); + putFileChunk(file, "BODY", chunk_size, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_BODY(&level, file); + + if (encoding_16bit_yamyam) + { + putFileChunk(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE, BYTE_ORDER_BIG_ENDIAN); + SaveLevel_CNT2(&level, file, EL_MAMPFER); + } + + if (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_ACTUAL; /* last version of tape files */ - int chunk_length; + int chunk_size; /* always start with reliable default values (empty tape) */ tape.file_version = FILE_VERSION_ACTUAL; @@ -1116,8 +1356,8 @@ void LoadTape(int level_nr) /* 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); @@ -1162,9 +1402,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); diff --git a/src/libgame/misc.c b/src/libgame/misc.c index 1e481dc3..93ba670d 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -700,28 +700,28 @@ void putFile32BitInteger(FILE *file, int value, int byte_order) } } -boolean getFileChunk(FILE *file, char *chunk_buffer, int *chunk_length, +boolean getFileChunk(FILE *file, char *chunk_name, int *chunk_size, int byte_order) { - const int chunk_identifier_length = 4; + const int chunk_name_length = 4; - /* read chunk identifier */ - fgets(chunk_buffer, chunk_identifier_length + 1, file); + /* read chunk name */ + fgets(chunk_name, chunk_name_length + 1, file); - /* read chunk length */ - *chunk_length = getFile32BitInteger(file, byte_order); + /* read chunk size */ + *chunk_size = getFile32BitInteger(file, byte_order); return (feof(file) || ferror(file) ? FALSE : TRUE); } -void putFileChunk(FILE *file, char *chunk_name, int chunk_length, +void putFileChunk(FILE *file, char *chunk_name, int chunk_size, int byte_order) { - /* write chunk identifier */ + /* write chunk name */ fputs(chunk_name, file); - /* write chunk length */ - putFile32BitInteger(file, chunk_length, byte_order); + /* write chunk size */ + putFile32BitInteger(file, chunk_size, byte_order); } #define TRANSLATE_KEYSYM_TO_KEYNAME 0 diff --git a/src/libgame/sound.c b/src/libgame/sound.c index f0aa106a..d97a4255 100644 --- a/src/libgame/sound.c +++ b/src/libgame/sound.c @@ -871,7 +871,7 @@ static boolean LoadSoundExt(char *sound_name, boolean is_music) #if !defined(TARGET_SDL) && !defined(PLATFORM_MSDOS) byte sound_header_buffer[WAV_HEADER_SIZE]; char chunk[CHUNK_ID_LEN + 1]; - int chunk_length, dummy; + int chunk_size, dummy; FILE *file; int i; #endif @@ -905,7 +905,7 @@ static boolean LoadSoundExt(char *sound_name, boolean is_music) } /* read chunk "RIFF" */ - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN); + getFileChunk(file, chunk, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); if (strcmp(chunk, "RIFF") != 0) { Error(ERR_WARN, "missing 'RIFF' chunk of sound file '%s'", filename); @@ -927,7 +927,7 @@ static boolean LoadSoundExt(char *sound_name, boolean is_music) sound_header_buffer[i] = fgetc(file); /* read chunk "data" */ - getFileChunk(file, chunk, &chunk_length, BYTE_ORDER_LITTLE_ENDIAN); + getFileChunk(file, chunk, &chunk_size, BYTE_ORDER_LITTLE_ENDIAN); if (strcmp(chunk, "data") != 0) { Error(ERR_WARN, "missing 'data' chunk of sound file '%s'", filename); @@ -935,7 +935,7 @@ static boolean LoadSoundExt(char *sound_name, boolean is_music) return FALSE; } - snd_info->data_len = chunk_length; + snd_info->data_len = chunk_size; snd_info->data_ptr = checked_malloc(snd_info->data_len); /* read sound data */ diff --git a/src/main.h b/src/main.h index 99e566ee..852f04bf 100644 --- a/src/main.h +++ b/src/main.h @@ -322,9 +322,9 @@ struct PlayerInfo struct LevelInfo { - int file_version; /* version of file this level was stored with */ - int game_version; /* version of game engine to play this level */ - boolean encoding_16bit; /* level contains 16-bit elements */ + int file_version; /* version of file this level was stored with */ + int game_version; /* version of game engine to play this level */ + boolean encoding_16bit; /* level contains 16-bit elements */ int fieldx; int fieldy;