X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=791181393dc89c48c1e0ec28f5381c994bc0004f;hb=0ef9c7d4b387b42f40d2f226920e306d588544f7;hp=41cc12714eff0f0f53817ad465c39b1144d3586e;hpb=d5224fde97c235c903f631a4eccb9904c2ddf9c3;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 41cc1271..79118139 100644 --- a/src/files.c +++ b/src/files.c @@ -27,12 +27,16 @@ #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 14 /* unused level header bytes */ +#define LEVEL_HEADER_UNUSED 13 /* 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 LEVEL_CPART_CUS3_SIZE 134 /* size of CUS3 chunk part */ +#define LEVEL_CPART_CUS3_UNUSED 15 /* unused CUS3 bytes / part */ #define TAPE_HEADER_SIZE 20 /* size of tape file header */ #define TAPE_HEADER_UNUSED 3 /* unused tape header bytes */ +#define LEVEL_CHUNK_CUS3_SIZE(x) (2 + x * LEVEL_CPART_CUS3_SIZE) + /* file identifier strings */ #define LEVEL_COOKIE_TMPL "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_x.x" #define TAPE_COOKIE_TMPL "ROCKSNDIAMONDS_TAPE_FILE_VERSION_x.x" @@ -43,67 +47,135 @@ /* level file functions */ /* ========================================================================= */ -static void setLevelInfoToDefaults() +static void setLevelInfoToDefaults(struct LevelInfo *level) { - int i, x, y; + int i, j, x, y; - level.file_version = FILE_VERSION_ACTUAL; - level.game_version = GAME_VERSION_ACTUAL; + 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 */ + 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; + level->fieldx = STD_LEV_FIELDX; + level->fieldy = STD_LEV_FIELDY; for(x=0; xfield[x][y] = EL_SAND; + + level->time = 100; + level->gems_needed = 0; + level->amoeba_speed = 10; + level->time_magic_wall = 10; + level->time_wheel = 10; + level->time_light = 10; + level->time_timegate = 10; + level->amoeba_content = EL_DIAMOND; + level->double_speed = FALSE; + level->gravity = FALSE; + level->em_slippery_gems = FALSE; + + level->use_custom_template = FALSE; for(i=0; iname[i] = '\0'; for(i=0; iauthor[i] = '\0'; - strcpy(level.name, NAMELESS_LEVEL_NAME); - strcpy(level.author, ANONYMOUS_NAME); + strcpy(level->name, NAMELESS_LEVEL_NAME); + strcpy(level->author, ANONYMOUS_NAME); for(i=0; iscore[i] = 10; - level.num_yam_contents = STD_ELEMENT_CONTENTS; + level->num_yamyam_contents = STD_ELEMENT_CONTENTS; for(i=0; iyamyam_content[i][x][y] = (i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY); - Feld[0][0] = Ur[0][0] = EL_PLAYER_1; - Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = - Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED; + level->field[0][0] = EL_PLAYER_1; + level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED; for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) { - level.custom_element_successor[i] = EL_EMPTY_SPACE; - Properties[EL_CUSTOM_START + i][EP_BITFIELD_BASE] = EP_BITMASK_DEFAULT; + int element = EL_CUSTOM_START + i; + + for(j=0; jno_level_file = FALSE; if (leveldir_current == NULL) /* only when dumping level */ return; @@ -111,25 +183,25 @@ static void setLevelInfoToDefaults() /* try to determine better author name than 'anonymous' */ if (strcmp(leveldir_current->author, ANONYMOUS_NAME) != 0) { - strncpy(level.author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN); - level.author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + strncpy(level->author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN); + level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; } else { switch (LEVELCLASS(leveldir_current)) { case LEVELCLASS_TUTORIAL: - strcpy(level.author, PROGRAM_AUTHOR_STRING); + strcpy(level->author, PROGRAM_AUTHOR_STRING); break; case LEVELCLASS_CONTRIBUTION: - strncpy(level.author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN); - level.author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + strncpy(level->author, leveldir_current->name,MAX_LEVEL_AUTHOR_LEN); + level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; break; case LEVELCLASS_USER: - strncpy(level.author, getRealName(), MAX_LEVEL_AUTHOR_LEN); - level.author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + strncpy(level->author, getRealName(), MAX_LEVEL_AUTHOR_LEN); + level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; break; default: @@ -139,6 +211,20 @@ static void setLevelInfoToDefaults() } } +static void ActivateLevelTemplate() +{ + /* Currently there is no special action needed to activate the template + data, because 'element_info' and 'Properties' overwrite the original + level data, while all other variables do not change. */ +} + +boolean LevelFileExists(int level_nr) +{ + char *filename = getLevelFilename(level_nr); + + return (access(filename, F_OK) == 0); +} + static int checkLevelElement(int element) { if (element >= NUM_FILE_ELEMENTS) @@ -166,33 +252,35 @@ static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) { int i, x, y; - lev_fieldx = level->fieldx = fgetc(file); - lev_fieldy = level->fieldy = fgetc(file); + level->fieldx = getFile8Bit(file); + level->fieldy = getFile8Bit(file); level->time = getFile16BitBE(file); level->gems_needed = getFile16BitBE(file); for(i=0; iname[i] = fgetc(file); + level->name[i] = getFile8Bit(file); level->name[MAX_LEVEL_NAME_LEN] = 0; for(i=0; iscore[i] = fgetc(file); + level->score[i] = getFile8Bit(file); - level->num_yam_contents = STD_ELEMENT_CONTENTS; + level->num_yamyam_contents = STD_ELEMENT_CONTENTS; for(i=0; iyam_content[i][x][y] = checkLevelElement(fgetc(file)); + level->yamyam_content[i][x][y] = checkLevelElement(getFile8Bit(file)); + + level->amoeba_speed = getFile8Bit(file); + level->time_magic_wall = getFile8Bit(file); + level->time_wheel = getFile8Bit(file); + level->amoeba_content = checkLevelElement(getFile8Bit(file)); + level->double_speed = (getFile8Bit(file) == 1 ? TRUE : FALSE); + level->gravity = (getFile8Bit(file) == 1 ? TRUE : FALSE); + level->encoding_16bit_field = (getFile8Bit(file) == 1 ? TRUE : FALSE); + level->em_slippery_gems = (getFile8Bit(file) == 1 ? TRUE : FALSE); - 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); - level->em_slippery_gems = (fgetc(file) == 1 ? TRUE : FALSE); + level->use_custom_template = (getFile8Bit(file) == 1 ? TRUE : FALSE); ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED); @@ -204,7 +292,7 @@ static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level) int i; for(i=0; iauthor[i] = fgetc(file); + level->author[i] = getFile8Bit(file); level->author[MAX_LEVEL_NAME_LEN] = 0; return chunk_size; @@ -231,9 +319,9 @@ static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level) for(y=0; yfieldy; y++) for(x=0; xfieldx; x++) - Feld[x][y] = Ur[x][y] = - checkLevelElement(level->encoding_16bit_field ? - getFile16BitBE(file) : fgetc(file)); + level->field[x][y] = + checkLevelElement(level->encoding_16bit_field ? getFile16BitBE(file) : + getFile8Bit(file)); return chunk_size; } @@ -258,22 +346,22 @@ static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size_expected; } - fgetc(file); - level->num_yam_contents = fgetc(file); - fgetc(file); - fgetc(file); + getFile8Bit(file); + level->num_yamyam_contents = getFile8Bit(file); + getFile8Bit(file); + getFile8Bit(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; + if (level->num_yamyam_contents < 1 || + level->num_yamyam_contents > MAX_ELEMENT_CONTENTS) + level->num_yamyam_contents = STD_ELEMENT_CONTENTS; for(i=0; iyam_content[i][x][y] = + level->yamyam_content[i][x][y] = checkLevelElement(level->encoding_16bit_field ? - getFile16BitBE(file) : fgetc(file)); + getFile16BitBE(file) : getFile8Bit(file)); return chunk_size; } @@ -285,9 +373,9 @@ static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level) int content_array[MAX_ELEMENT_CONTENTS][3][3]; element = checkLevelElement(getFile16BitBE(file)); - num_contents = fgetc(file); - content_xsize = fgetc(file); - content_ysize = fgetc(file); + num_contents = getFile8Bit(file); + content_xsize = getFile8Bit(file); + content_ysize = getFile8Bit(file); ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED); for(i=0; inum_yam_contents = num_contents; + level->num_yamyam_contents = num_contents; for(i=0; iyam_content[i][x][y] = content_array[i][x][y]; + level->yamyam_content[i][x][y] = content_array[i][x][y]; } else if (element == EL_BD_AMOEBA) { @@ -361,11 +449,10 @@ static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level) for (i=0; i < num_changed_custom_elements; i++) { int element = getFile16BitBE(file); - int custom_element_successor = getFile16BitBE(file); - int i = element - EL_CUSTOM_START; + int custom_target_element = getFile16BitBE(file); if (IS_CUSTOM_ELEMENT(element)) - level->custom_element_successor[i] = custom_element_successor; + element_info[element].change.target_element = custom_target_element; else Error(ERR_WARN, "invalid custom element number %d", element); } @@ -373,7 +460,94 @@ static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -void LoadLevelFromFilename(char *filename) +static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) +{ + int num_changed_custom_elements = getFile16BitBE(file); + int chunk_size_expected = LEVEL_CHUNK_CUS3_SIZE(num_changed_custom_elements); + int i, j, x, y; + + if (chunk_size_expected != chunk_size) + { + ReadUnusedBytesFromFile(file, chunk_size - 2); + return chunk_size_expected; + } + + for (i=0; i < num_changed_custom_elements; i++) + { + int element = getFile16BitBE(file); + + if (!IS_CUSTOM_ELEMENT(element)) + { + Error(ERR_WARN, "invalid custom element number %d", element); + + element = EL_DEFAULT; /* dummy element used for artwork config */ + } + + for(j=0; jno_level_file = TRUE; + + if (level != &level_template) + Error(ERR_WARN, "cannot read level '%s' - creating new level", filename); - Error(ERR_WARN, "cannot read level '%s' - creating new level", filename); return; } @@ -418,7 +594,7 @@ void LoadLevelFromFilename(char *filename) return; } - if ((level.file_version = getFileVersionFromCookieString(cookie)) == -1) + if ((level->file_version = getFileVersionFromCookieString(cookie)) == -1) { Error(ERR_WARN, "unsupported version of level file '%s'", filename); fclose(file); @@ -426,14 +602,14 @@ void LoadLevelFromFilename(char *filename) } /* pre-2.0 level files have no game version, so use file version here */ - level.game_version = level.file_version; + level->game_version = level->file_version; } - if (level.file_version < FILE_VERSION_1_2) + if (level->file_version < FILE_VERSION_1_2) { /* level files from versions before 1.2.0 without chunk structure */ - LoadLevel_HEAD(file, LEVEL_HEADER_SIZE, &level); - LoadLevel_BODY(file, level.fieldx * level.fieldy, &level); + LoadLevel_HEAD(file, LEVEL_HEADER_SIZE, level); + LoadLevel_BODY(file, level->fieldx * level->fieldy, level); } else { @@ -453,6 +629,7 @@ void LoadLevelFromFilename(char *filename) { "CNT2", LEVEL_CHUNK_CNT2_SIZE, LoadLevel_CNT2 }, { "CUS1", -1, LoadLevel_CUS1 }, { "CUS2", -1, LoadLevel_CUS2 }, + { "CUS3", -1, LoadLevel_CUS3 }, { NULL, 0, NULL } }; @@ -481,7 +658,7 @@ void LoadLevelFromFilename(char *filename) { /* call function to load this level chunk */ int chunk_size_expected = - (chunk_info[i].loader)(file, chunk_size, &level); + (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") that contain some header @@ -496,6 +673,11 @@ void LoadLevelFromFilename(char *filename) } fclose(file); +} + +static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename) +{ + int x, y; if (leveldir_current == NULL) /* only when dumping level */ return; @@ -512,18 +694,18 @@ void LoadLevelFromFilename(char *filename) file format version used to store the level -- see above). */ /* do some special adjustments to support older level versions */ - if (level.file_version == FILE_VERSION_1_0) + if (level->file_version == FILE_VERSION_1_0) { - Error(ERR_WARN, "level file '%s' has version number 1.0", filename); + Error(ERR_WARN, "level file '%s'has version number 1.0", filename); Error(ERR_WARN, "using high speed movement for player"); /* player was faster than monsters in (pre-)1.0 levels */ - level.double_speed = TRUE; + level->double_speed = TRUE; } /* Default behaviour for EM style gems was "slippery" only in 2.0.1 */ - if (level.game_version == VERSION_IDENT(2,0,1)) - level.em_slippery_gems = TRUE; + if (level->game_version == VERSION_IDENT(2,0,1)) + level->em_slippery_gems = TRUE; } else { @@ -534,7 +716,7 @@ void LoadLevelFromFilename(char *filename) make the game emulation more accurate, while (hopefully) not breaking existing levels created from other players. */ - level.game_version = GAME_VERSION_ACTUAL; + level->game_version = GAME_VERSION_ACTUAL; /* Set special EM style gems behaviour: EM style gems slip down from normal, steel and growing wall. As this is a more fundamental change, @@ -543,46 +725,74 @@ void LoadLevelFromFilename(char *filename) of gem style elements). Already existing converted levels (neither private nor contributed levels) are changed to the new behaviour. */ - if (level.file_version < FILE_VERSION_2_0) - level.em_slippery_gems = TRUE; + if (level->file_version < FILE_VERSION_2_0) + level->em_slippery_gems = TRUE; } - /* map some elements which have changed in newer versions */ - if (level.game_version <= VERSION_IDENT(2,2,0)) + /* map elements which have changed in newer versions */ + for(y=0; yfieldy; y++) { - int x, y; - - /* map game font elements */ - for(y=0; yfieldx; x++) { - for(x=0; xfield[x][y]; + + if (level->game_version <= VERSION_IDENT(2,2,0)) + { + /* map game font elements */ + element = (element == EL_CHAR('[') ? EL_CHAR_AUMLAUT : + element == EL_CHAR('\\') ? EL_CHAR_OUMLAUT : + element == EL_CHAR(']') ? EL_CHAR_UUMLAUT : + element == EL_CHAR('^') ? EL_CHAR_COPYRIGHT : element); + } + else if (level->game_version < VERSION_IDENT(3,0,0)) { - int element = Ur[x][y]; - - if (element == EL_CHAR('[')) - element = EL_CHAR_AUMLAUT; - else if (element == EL_CHAR('\\')) - element = EL_CHAR_OUMLAUT; - else if (element == EL_CHAR(']')) - element = EL_CHAR_UUMLAUT; - else if (element == EL_CHAR('^')) - element = EL_CHAR_COPYRIGHT; - - Feld[x][y] = Ur[x][y] = element; + /* map Supaplex gravity tube elements */ + element = (element == EL_SP_GRAVITY_PORT_LEFT ? EL_SP_PORT_LEFT : + element == EL_SP_GRAVITY_PORT_RIGHT ? EL_SP_PORT_RIGHT : + element == EL_SP_GRAVITY_PORT_UP ? EL_SP_PORT_UP : + element == EL_SP_GRAVITY_PORT_DOWN ? EL_SP_PORT_DOWN : + element); } + + level->field[x][y] = element; } } + /* copy elements to runtime playfield array */ + for(x=0; xfield[x][y]; + + /* initialize level size variables for faster access */ + lev_fieldx = level->fieldx; + lev_fieldy = level->fieldy; + /* determine border element for this level */ SetBorderElement(); + + /* initialize element properties for level editor etc. */ + InitElementPropertiesEngine(level->game_version); +} + +void LoadLevelTemplate(int level_nr) +{ + char *filename = getLevelFilename(level_nr); + + LoadLevelFromFilename(&level_template, filename); + + ActivateLevelTemplate(); } void LoadLevel(int level_nr) { char *filename = getLevelFilename(level_nr); - LoadLevelFromFilename(filename); - InitElementPropertiesEngine(level.game_version); + LoadLevelFromFilename(&level, filename); + + if (level.use_custom_template) + LoadLevelTemplate(-1); + + LoadLevel_InitLevel(&level, filename); } static void SaveLevel_VERS(FILE *file, struct LevelInfo *level) @@ -595,33 +805,34 @@ static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level) { int i, x, y; - fputc(level->fieldx, file); - fputc(level->fieldy, file); + putFile8Bit(file, level->fieldx); + putFile8Bit(file, level->fieldy); putFile16BitBE(file, level->time); putFile16BitBE(file, level->gems_needed); for(i=0; iname[i], file); + putFile8Bit(file, level->name[i]); for(i=0; iscore[i], file); + putFile8Bit(file, level->score[i]); for(i=0; iencoding_16bit_yamyam ? EL_EMPTY : - 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_EMPTY : 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); - fputc((level->em_slippery_gems ? 1 : 0), file); + putFile8Bit(file, (level->encoding_16bit_yamyam ? EL_EMPTY : + level->yamyam_content[i][x][y])); + putFile8Bit(file, level->amoeba_speed); + putFile8Bit(file, level->time_magic_wall); + putFile8Bit(file, level->time_wheel); + putFile8Bit(file, (level->encoding_16bit_amoeba ? EL_EMPTY : + level->amoeba_content)); + putFile8Bit(file, (level->double_speed ? 1 : 0)); + putFile8Bit(file, (level->gravity ? 1 : 0)); + putFile8Bit(file, (level->encoding_16bit_field ? 1 : 0)); + putFile8Bit(file, (level->em_slippery_gems ? 1 : 0)); + + putFile8Bit(file, (level->use_custom_template ? 1 : 0)); WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED); } @@ -631,7 +842,7 @@ static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level) int i; for(i=0; iauthor[i], file); + putFile8Bit(file, level->author[i]); } static void SaveLevel_BODY(FILE *file, struct LevelInfo *level) @@ -641,9 +852,9 @@ static void SaveLevel_BODY(FILE *file, struct LevelInfo *level) for(y=0; yfieldy; y++) for(x=0; xfieldx; x++) if (level->encoding_16bit_field) - putFile16BitBE(file, Ur[x][y]); + putFile16BitBE(file, level->field[x][y]); else - fputc(Ur[x][y], file); + putFile8Bit(file, level->field[x][y]); } #if 0 @@ -651,18 +862,18 @@ static void SaveLevel_CONT(FILE *file, struct LevelInfo *level) { int i, x, y; - fputc(EL_YAMYAM, file); - fputc(level->num_yam_contents, file); - fputc(0, file); - fputc(0, file); + putFile8Bit(file, EL_YAMYAM); + putFile8Bit(file, level->num_yamyam_contents); + putFile8Bit(file, 0); + putFile8Bit(file, 0); for(i=0; iencoding_16bit_field) - putFile16BitBE(file, level->yam_content[i][x][y]); + putFile16BitBE(file, level->yamyam_content[i][x][y]); else - fputc(level->yam_content[i][x][y], file); + putFile8Bit(file, level->yamyam_content[i][x][y]); } #endif @@ -674,14 +885,14 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) if (element == EL_YAMYAM) { - num_contents = level->num_yam_contents; + num_contents = level->num_yamyam_contents; content_xsize = 3; content_ysize = 3; for(i=0; iyam_content[i][x][y]; + content_array[i][x][y] = level->yamyam_content[i][x][y]; } else if (element == EL_BD_AMOEBA) { @@ -705,9 +916,9 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) } putFile16BitBE(file, element); - fputc(num_contents, file); - fputc(content_xsize, file); - fputc(content_ysize, file); + putFile8Bit(file, num_contents); + putFile8Bit(file, content_xsize); + putFile8Bit(file, content_ysize); WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED); @@ -717,6 +928,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) putFile16BitBE(file, content_array[i][x][y]); } +#if 0 static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level, int num_changed_custom_elements) { @@ -743,7 +955,9 @@ static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level, if (check != num_changed_custom_elements) /* should not happen */ Error(ERR_WARN, "inconsistent number of custom element properties"); } +#endif +#if 0 static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level, int num_changed_custom_elements) { @@ -755,12 +969,12 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level, { int element = EL_CUSTOM_START + i; - if (level->custom_element_successor[i] != EL_EMPTY_SPACE) + if (element_info[element].change.target_element != EL_EMPTY_SPACE) { if (check < num_changed_custom_elements) { putFile16BitBE(file, element); - putFile16BitBE(file, level->custom_element_successor[i]); + putFile16BitBE(file, element_info[element].change.target_element); } check++; @@ -768,15 +982,95 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level, } if (check != num_changed_custom_elements) /* should not happen */ - Error(ERR_WARN, "inconsistent number of custom element successors"); + Error(ERR_WARN, "inconsistent number of custom target elements"); } +#endif -void SaveLevel(int level_nr) +static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, + int num_changed_custom_elements) +{ + int i, j, x, y, check = 0; + + putFile16BitBE(file, num_changed_custom_elements); + + for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + { + int element = EL_CUSTOM_START + i; + + if (Properties[element][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT) + { + if (check < num_changed_custom_elements) + { + putFile16BitBE(file, element); + + for(j=0; jfile_version = FILE_VERSION_ACTUAL; + level->game_version = GAME_VERSION_ACTUAL; /* check level field for 16-bit elements */ - level.encoding_16bit_field = FALSE; - for(y=0; y 255) - level.encoding_16bit_field = TRUE; + level->encoding_16bit_field = FALSE; + for(y=0; yfieldy; y++) + for(x=0; xfieldx; x++) + if (level->field[x][y] > 255) + level->encoding_16bit_field = TRUE; /* check yamyam content for 16-bit elements */ - level.encoding_16bit_yamyam = FALSE; - for(i=0; iencoding_16bit_yamyam = FALSE; + for(i=0; inum_yamyam_contents; i++) for(y=0; y<3; y++) for(x=0; x<3; x++) - if (level.yam_content[i][x][y] > 255) - level.encoding_16bit_yamyam = TRUE; + if (level->yamyam_content[i][x][y] > 255) + level->encoding_16bit_yamyam = TRUE; /* check amoeba content for 16-bit elements */ - level.encoding_16bit_amoeba = FALSE; - if (level.amoeba_content > 255) - level.encoding_16bit_amoeba = TRUE; + level->encoding_16bit_amoeba = FALSE; + if (level->amoeba_content > 255) + level->encoding_16bit_amoeba = TRUE; /* calculate size of "BODY" chunk */ body_chunk_size = - level.fieldx * level.fieldy * (level.encoding_16bit_field ? 2 : 1); + level->fieldx * level->fieldy * (level->encoding_16bit_field ? 2 : 1); - /* check for non-standard custom elements and calculate "CUS1" chunk size */ + /* check for non-standard custom elements and calculate "CUS3" chunk size */ for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) if (Properties[EL_CUSTOM_START +i][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT) - num_changed_custom_elements1++; - - /* check for non-standard custom elements and calculate "CUS2" chunk size */ - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) - if (level.custom_element_successor[i] != EL_EMPTY_SPACE) - num_changed_custom_elements2++; + num_changed_custom_elements++; + level_chunk_CUS3_size = LEVEL_CHUNK_CUS3_SIZE(num_changed_custom_elements); putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED); putFileChunkBE(file, "CAVE", CHUNK_SIZE_NONE); putFileChunkBE(file, "VERS", FILE_VERS_CHUNK_SIZE); - SaveLevel_VERS(file, &level); + SaveLevel_VERS(file, level); putFileChunkBE(file, "HEAD", LEVEL_HEADER_SIZE); - SaveLevel_HEAD(file, &level); + SaveLevel_HEAD(file, level); putFileChunkBE(file, "AUTH", MAX_LEVEL_AUTHOR_LEN); - SaveLevel_AUTH(file, &level); + SaveLevel_AUTH(file, level); putFileChunkBE(file, "BODY", body_chunk_size); - SaveLevel_BODY(file, &level); + SaveLevel_BODY(file, level); - if (level.encoding_16bit_yamyam || - level.num_yam_contents != STD_ELEMENT_CONTENTS) + if (level->encoding_16bit_yamyam || + level->num_yamyam_contents != STD_ELEMENT_CONTENTS) { putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE); - SaveLevel_CNT2(file, &level, EL_YAMYAM); + SaveLevel_CNT2(file, level, EL_YAMYAM); } - if (level.encoding_16bit_amoeba) + if (level->encoding_16bit_amoeba) { putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE); - SaveLevel_CNT2(file, &level, EL_BD_AMOEBA); - } - - if (num_changed_custom_elements1 > 0) - { - putFileChunkBE(file, "CUS1", 2 + num_changed_custom_elements1 * 6); - SaveLevel_CUS1(file, &level, num_changed_custom_elements1); + SaveLevel_CNT2(file, level, EL_BD_AMOEBA); } - if (num_changed_custom_elements2 > 0) + if (num_changed_custom_elements > 0 && !level->use_custom_template) { - putFileChunkBE(file, "CUS2", 2 + num_changed_custom_elements2 * 4); - SaveLevel_CUS2(file, &level, num_changed_custom_elements2); + putFileChunkBE(file, "CUS3", level_chunk_CUS3_size); + SaveLevel_CUS3(file, level, num_changed_custom_elements); } fclose(file); @@ -868,10 +1152,24 @@ void SaveLevel(int level_nr) SetFilePermissions(filename, PERMS_PRIVATE); } +void SaveLevel(int level_nr) +{ + char *filename = getLevelFilename(level_nr); + + SaveLevelFromFilename(&level, filename); +} + +void SaveLevelTemplate() +{ + char *filename = getLevelFilename(-1); + + SaveLevelFromFilename(&level, filename); +} + void DumpLevel(struct LevelInfo *level) { printf_line("-", 79); - printf("Level xxx (file version %06d, game version %06d)\n", + printf("Level xxx (file version %08d, game version %08d)\n", level->file_version, level->game_version); printf_line("-", 79); @@ -945,7 +1243,7 @@ static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape) /* read header fields that are new since version 1.2 */ if (tape->file_version >= FILE_VERSION_1_2) { - byte store_participating_players = fgetc(file); + byte store_participating_players = getFile8Bit(file); int engine_version; /* since version 1.2, tapes store which players participate in the tape */ @@ -982,7 +1280,7 @@ static int LoadTape_INFO(FILE *file, int chunk_size, struct TapeInfo *tape) checked_realloc(tape->level_identifier, level_identifier_size); for(i=0; i < level_identifier_size; i++) - tape->level_identifier[i] = fgetc(file); + tape->level_identifier[i] = getFile8Bit(file); tape->level_nr = getFile16BitBE(file); @@ -1013,10 +1311,10 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) tape->pos[i].action[j] = MV_NO_MOVING; if (tape->player_participates[j]) - tape->pos[i].action[j] = fgetc(file); + tape->pos[i].action[j] = getFile8Bit(file); } - tape->pos[i].delay = fgetc(file); + tape->pos[i].delay = getFile8Bit(file); if (tape->file_version == FILE_VERSION_1_0) { @@ -1191,6 +1489,10 @@ void LoadTapeFromFilename(char *filename) fclose(file); tape.length_seconds = GetTapeLength(); + +#if 0 + printf("tape version: %d\n", tape.game_version); +#endif } void LoadTape(int level_nr) @@ -1220,7 +1522,7 @@ static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape) putFile32BitBE(file, tape->date); putFile32BitBE(file, tape->length); - fputc(store_participating_players, file); + putFile8Bit(file, store_participating_players); /* unused bytes not at the end here for 4-byte alignment of engine_version */ WriteUnusedBytesToFile(file, TAPE_HEADER_UNUSED); @@ -1236,7 +1538,7 @@ static void SaveTape_INFO(FILE *file, struct TapeInfo *tape) putFile16BitBE(file, level_identifier_size); for(i=0; i < level_identifier_size; i++) - fputc(tape->level_identifier[i], file); + putFile8Bit(file, tape->level_identifier[i]); putFile16BitBE(file, tape->level_nr); } @@ -1249,9 +1551,9 @@ static void SaveTape_BODY(FILE *file, struct TapeInfo *tape) { for(j=0; jplayer_participates[j]) - fputc(tape->pos[i].action[j], file); + putFile8Bit(file, tape->pos[i].action[j]); - fputc(tape->pos[i].delay, file); + putFile8Bit(file, tape->pos[i].delay); } } @@ -1328,7 +1630,7 @@ void DumpTape(struct TapeInfo *tape) } printf_line("-", 79); - printf("Tape of Level %03d (file version %06d, game version %06d)\n", + printf("Tape of Level %03d (file version %08d, game version %08d)\n", tape->level_nr, tape->file_version, tape->game_version); printf("Level series identifier: '%s'\n", tape->level_identifier); printf_line("-", 79); @@ -1912,16 +2214,19 @@ void LoadSpecialMenuDesignSettings() if ((setup_file_hash = loadSetupFileHash(filename)) == NULL) return; - /* special case: initialize with default values that may be overwrittem */ + /* special case: initialize with default values that may be overwritten */ for (i=0; i < NUM_SPECIAL_GFX_ARGS; i++) { char *value_x = getHashEntry(setup_file_hash, "menu.draw_xoffset"); char *value_y = getHashEntry(setup_file_hash, "menu.draw_yoffset"); + char *list_size = getHashEntry(setup_file_hash, "menu.list_size"); if (value_x != NULL) menu.draw_xoffset[i] = get_integer_from_string(value_x); if (value_y != NULL) menu.draw_yoffset[i] = get_integer_from_string(value_y); + if (list_size != NULL) + menu.list_size[i] = get_integer_from_string(list_size); } /* read (and overwrite with) values that may be specified in config file */