From: Holger Schemel Date: Fri, 19 May 2006 23:19:08 +0000 (+0200) Subject: rnd-20060520-2-src X-Git-Tag: 3.2.0^2~13 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=1847b9f73a9189758958980912c005dc289e1b08;hp=f2d0f3fed679ea3573f51aa298adce2d9a78d8be;p=rocksndiamonds.git rnd-20060520-2-src * updated magic(5) file to recognize changed and new level file chunks --- diff --git a/ChangeLog b/ChangeLog index 9f8625fb..299b1599 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * added new chunk "NAME" to level file format for level name settings * added new chunk "NOTE" to level file format for envelope settings * changed name of chunk "CONF" to "ELEM" (for normal element settings) + * updated magic(5) file to recognize changed and new level file chunks 2006-05-17 * changed gravity (which only affects the player) from level property diff --git a/src/conftime.h b/src/conftime.h index 5f4aaceb..511b2356 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2006-05-20 00:09]" +#define COMPILE_DATE_STRING "[2006-05-20 01:03]" diff --git a/src/files.c b/src/files.c index 585933c3..aa6ce259 100644 --- a/src/files.c +++ b/src/files.c @@ -32,6 +32,7 @@ #define LEVEL_CHUNK_AUTH_SIZE MAX_LEVEL_AUTHOR_LEN #define LEVEL_CHUNK_VERS_SIZE 8 /* size of file version chunk */ +#define LEVEL_CHUNK_DATE_SIZE 4 /* size of file date chunk */ #define LEVEL_CHUNK_HEAD_SIZE 80 /* size of level file header */ #define LEVEL_CHUNK_HEAD_UNUSED 0 /* unused level header bytes */ #define LEVEL_CHUNK_CNT2_SIZE 160 /* size of level CNT2 chunk */ @@ -1160,6 +1161,19 @@ filetype_id_list[] = /* level file functions */ /* ========================================================================= */ +static struct DateInfo getCurrentDate() +{ + time_t epoch_seconds = time(NULL); + struct tm *now = localtime(&epoch_seconds); + struct DateInfo date; + + date.year = now->tm_year + 1900; + date.month = now->tm_mon + 1; + date.day = now->tm_mday; + + return date; +} + static void resetEventFlags(struct ElementChangeInfo *change) { int i; @@ -1524,6 +1538,8 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->file_version = FILE_VERSION_ACTUAL; level->game_version = GAME_VERSION_ACTUAL; + level->creation_date = getCurrentDate(); + #if 1 level->encoding_16bit_field = TRUE; level->encoding_16bit_yamyam = TRUE; @@ -2240,6 +2256,15 @@ static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } +static int LoadLevel_DATE(FILE *file, int chunk_size, struct LevelInfo *level) +{ + level->creation_date.year = getFile16BitBE(file); + level->creation_date.month = getFile8Bit(file); + level->creation_date.day = getFile8Bit(file); + + return chunk_size; +} + static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) { int initial_player_stepsize; @@ -3314,6 +3339,7 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, chunk_info[] = { { "VERS", LEVEL_CHUNK_VERS_SIZE, LoadLevel_VERS }, + { "DATE", LEVEL_CHUNK_DATE_SIZE, LoadLevel_DATE }, { "HEAD", LEVEL_CHUNK_HEAD_SIZE, LoadLevel_HEAD }, { "NAME", LEVEL_CHUNK_NAME_SIZE, LoadLevel_NAME }, { "AUTH", LEVEL_CHUNK_AUTH_SIZE, LoadLevel_AUTH }, @@ -4988,6 +5014,17 @@ static int SaveLevel_VERS(FILE *file, struct LevelInfo *level) return chunk_size; } +static int SaveLevel_DATE(FILE *file, struct LevelInfo *level) +{ + int chunk_size = 0; + + chunk_size += putFile16BitBE(file, level->creation_date.year); + chunk_size += putFile8Bit(file, level->creation_date.month); + chunk_size += putFile8Bit(file, level->creation_date.day); + + return chunk_size; +} + #if 0 static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level) { @@ -5884,6 +5921,8 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) level->file_version = FILE_VERSION_ACTUAL; level->game_version = GAME_VERSION_ACTUAL; + level->creation_date = getCurrentDate(); + #if 0 /* check level field for 16-bit elements */ level->encoding_16bit_field = FALSE; @@ -5923,6 +5962,10 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) putFileChunkBE(file, "VERS", chunk_size); SaveLevel_VERS(file, level); + chunk_size = SaveLevel_DATE(NULL, level); + putFileChunkBE(file, "DATE", chunk_size); + SaveLevel_DATE(file, level); + #if 0 putFileChunkBE(file, "HEAD", LEVEL_CHUNK_HEAD_SIZE); SaveLevel_HEAD(file, level); @@ -6004,23 +6047,19 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) #endif chunk_size = SaveLevel_ELEM(NULL, level); - - /* check if non-default element settings need to be saved */ - if (chunk_size > LEVEL_CHUNK_ELEM_UNCHANGED) + if (chunk_size > LEVEL_CHUNK_ELEM_UNCHANGED) /* save if changed */ { putFileChunkBE(file, "ELEM", chunk_size); SaveLevel_ELEM(file, level); } #if 1 - for (i = 0; i < 4; i++) + for (i = 0; i < NUM_ENVELOPES; i++) { int element = EL_ENVELOPE_1 + i; chunk_size = SaveLevel_NOTE(NULL, level, element); - - /* check if non-default element settings need to be saved */ - if (chunk_size > LEVEL_CHUNK_NOTE_UNCHANGED) + if (chunk_size > LEVEL_CHUNK_NOTE_UNCHANGED) /* save if changed */ { putFileChunkBE(file, "NOTE", chunk_size); SaveLevel_NOTE(file, level, element); @@ -6037,9 +6076,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) int element = EL_CUSTOM_START + i; chunk_size = SaveLevel_CUSX(NULL, level, element); - - /* check if non-default element settings need to be saved */ - if (chunk_size > LEVEL_CHUNK_CUSX_UNCHANGED) + if (chunk_size > LEVEL_CHUNK_CUSX_UNCHANGED) /* save if changed */ { putFileChunkBE(file, "CUSX", chunk_size); SaveLevel_CUSX(file, level, element); @@ -6051,9 +6088,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) int element = EL_GROUP_START + i; chunk_size = SaveLevel_GRPX(NULL, level, element); - - /* check if non-default element settings need to be saved */ - if (chunk_size > LEVEL_CHUNK_GRPX_UNCHANGED) + if (chunk_size > LEVEL_CHUNK_GRPX_UNCHANGED) /* save if changed */ { putFileChunkBE(file, "GRPX", chunk_size); SaveLevel_GRPX(file, level, element); diff --git a/src/main.h b/src/main.h index 747858fc..d1196890 100644 --- a/src/main.h +++ b/src/main.h @@ -1838,6 +1838,13 @@ struct LevelFileInfo char *filename; }; +struct DateInfo +{ + int year; + int month; + int day; +}; + struct LevelInfo { struct LevelFileInfo file_info; @@ -1850,6 +1857,8 @@ struct LevelInfo int file_version; /* file format version the level is stored with */ int game_version; /* game release version the level was created with */ + struct DateInfo creation_date; + boolean encoding_16bit_field; /* level contains 16-bit elements */ boolean encoding_16bit_yamyam; /* yamyam contains 16-bit elements */ boolean encoding_16bit_amoeba; /* amoeba contains 16-bit elements */