X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_files.c;h=caa92e02fb42521b5287975e793b394fbb368c02;hp=1def7cc3eaf5459dca625a549a2c7f667f5084d6;hb=b641818c787e48bbf03ce2a0cd5b542c4c21e523;hpb=439166f2dc0f7462a6e75497d1ac03f9e96042c7 diff --git a/src/game_mm/mm_files.c b/src/game_mm/mm_files.c index 1def7cc3..caa92e02 100644 --- a/src/game_mm/mm_files.c +++ b/src/game_mm/mm_files.c @@ -4,7 +4,7 @@ // (c) 1994-2017 by Artsoft Entertainment // Holger Schemel // info@artsoft.org -// http://www.artsoft.org/ +// https://www.artsoft.org/ // ---------------------------------------------------------------------------- // mm_files.c // ============================================================================ @@ -18,14 +18,14 @@ #include "mm_main.h" -#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ -#define CHUNK_SIZE_UNDEFINED 0 /* undefined chunk size == 0 */ -#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 19 /* unused level header bytes */ +#define CHUNK_ID_LEN 4 // IFF style chunk id length +#define CHUNK_SIZE_UNDEFINED 0 // undefined chunk size == 0 +#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 19 // unused level header bytes -/* file identifier strings */ +// file identifier strings #define LEVEL_COOKIE_TMPL "MIRRORMAGIC_LEVEL_FILE_VERSION_x.x" #define SCORE_COOKIE "MIRRORMAGIC_SCORE_FILE_VERSION_1.4" @@ -40,9 +40,9 @@ int default_score[LEVEL_SCORE_ELEMENTS] = }; -/* ========================================================================= */ -/* level file functions */ -/* ========================================================================= */ +// ============================================================================ +// level file functions +// ============================================================================ static void ReadChunk_MM_VERS(File *file, int *file_version, int *game_version) { @@ -52,12 +52,12 @@ static void ReadChunk_MM_VERS(File *file, int *file_version, int *game_version) file_version_major = getFile8Bit(file); file_version_minor = getFile8Bit(file); file_version_patch = getFile8Bit(file); - getFile8Bit(file); /* not used */ + getFile8Bit(file); // not used game_version_major = getFile8Bit(file); game_version_minor = getFile8Bit(file); game_version_patch = getFile8Bit(file); - getFile8Bit(file); /* not used */ + getFile8Bit(file); // not used *file_version = MM_VERSION_IDENT(file_version_major, file_version_minor, @@ -80,29 +80,29 @@ static void WriteChunk_MM_VERS(FILE *file, int file_version, int game_version) fputc(file_version_major, file); fputc(file_version_minor, file); fputc(file_version_patch, file); - fputc(0, file); /* not used */ + fputc(0, file); // not used fputc(game_version_major, file); fputc(game_version_minor, file); fputc(game_version_patch, file); - fputc(0, file); /* not used */ + fputc(0, file); // not used } -void setLevelInfoToDefaults_MM() +void setLevelInfoToDefaults_MM(void) { int i, x, y; native_mm_level.file_version = MM_FILE_VERSION_ACTUAL; native_mm_level.game_version = MM_GAME_VERSION_ACTUAL; - native_mm_level.encoding_16bit_field = FALSE; /* default: only 8-bit elements */ + native_mm_level.encoding_16bit_field = FALSE; // default: only 8-bit elements - lev_fieldx = native_mm_level.fieldx = STD_LEV_FIELDX; - lev_fieldy = native_mm_level.fieldy = STD_LEV_FIELDY; + native_mm_level.fieldx = STD_LEV_FIELDX; + native_mm_level.fieldy = STD_LEV_FIELDY; for (x = 0; x < MAX_LEV_FIELDX; x++) for (y = 0; y < MAX_LEV_FIELDY; y++) - native_mm_level.field[x][y] = Feld[x][y] = Ur[x][y] = EL_EMPTY; + native_mm_level.field[x][y] = Ur[x][y] = EL_EMPTY; native_mm_level.time = 100; native_mm_level.kettles_needed = 0; @@ -127,9 +127,8 @@ void setLevelInfoToDefaults_MM() for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++) native_mm_level.score[i] = 10; - native_mm_level.field[0][0] = Feld[0][0] = Ur[0][0] = EL_MCDUFFIN_RIGHT; + native_mm_level.field[0][0] = Ur[0][0] = EL_MCDUFFIN_RIGHT; native_mm_level.field[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = - Feld[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = Ur[STD_LEV_FIELDX-1][STD_LEV_FIELDY-1] = EL_EXIT_CLOSED; } @@ -158,8 +157,8 @@ static int LoadLevel_MM_HEAD(File *file, int chunk_size, int i; int laser_color; - lev_fieldx = level->fieldx = getFile8Bit(file); - lev_fieldy = level->fieldy = getFile8Bit(file); + level->fieldx = getFile8Bit(file); + level->fieldy = getFile8Bit(file); level->time = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN); level->kettles_needed = getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN); @@ -236,7 +235,7 @@ static int LoadLevel_MM_BODY(File *file, int chunk_size, for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) - native_mm_level.field[x][y] = Feld[x][y] = Ur[x][y] = + native_mm_level.field[x][y] = Ur[x][y] = checkLevelElement(level->encoding_16bit_field ? getFile16BitInteger(file, BYTE_ORDER_BIG_ENDIAN) : getFile8Bit(file)); @@ -265,7 +264,7 @@ boolean LoadNativeLevel_MM(char *filename, boolean level_info_only) { NULL, 0, NULL } }; - /* always start with reliable default values */ + // always start with reliable default values setLevelInfoToDefaults_MM(); if (!(file = openFile(filename, MODE_READ))) @@ -279,7 +278,7 @@ boolean LoadNativeLevel_MM(char *filename, boolean level_info_only) getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN); if (strcmp(chunk_name, "MMII") == 0) { - getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); /* not used */ + getFile32BitInteger(file, BYTE_ORDER_BIG_ENDIAN); // not used getFileChunk(file, chunk_name, NULL, BYTE_ORDER_BIG_ENDIAN); if (strcmp(chunk_name, "CAVE") != 0) @@ -291,7 +290,7 @@ boolean LoadNativeLevel_MM(char *filename, boolean level_info_only) return FALSE; } } - else /* check for pre-2.0 file format with cookie string */ + else // check for pre-2.0 file format with cookie string { strcpy(cookie, chunk_name); getStringFromFile(file, &cookie[4], MAX_LINE_LEN - 4); @@ -343,13 +342,13 @@ boolean LoadNativeLevel_MM(char *filename, boolean level_info_only) } else { - /* call function to load this level chunk */ + // call function to load this level chunk int chunk_size_expected = (chunk_info[i].loader)(file, chunk_size, &native_mm_level); - /* 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 */ + // 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 level file '%s'", chunk_size, chunk_name, filename); @@ -425,7 +424,7 @@ void SaveNativeLevel_MM(char *filename) return; } - /* check level field for 16-bit elements */ + // check level field for 16-bit elements native_mm_level.encoding_16bit_field = FALSE; for (y = 0; y < native_mm_level.fieldy; y++)