X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=b7d62ce76da659b01723a6b5ae4397b95566d63c;hb=2f5368f25e34c02cb5ff7a012aa96198442231cb;hp=779a6751d92524be848de4f240098914ca2394e6;hpb=983c38dbae8637ef26d8be356e04c9b64bf9fc1f;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 779a6751..b7d62ce7 100644 --- a/src/files.c +++ b/src/files.c @@ -91,8 +91,8 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) change->random = 100; change->power = CP_NON_DESTRUCTIVE; - for(x=0; x<3; x++) - for(y=0; y<3; y++) + for (x = 0; x < 3; x++) + for (y = 0; y < 3; y++) change->content[x][y] = EL_EMPTY_SPACE; change->direct_action = 0; @@ -117,8 +117,8 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->fieldx = STD_LEV_FIELDX; level->fieldy = STD_LEV_FIELDY; - for(x=0; xfield[x][y] = EL_SAND; level->time = 100; @@ -135,45 +135,45 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) 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); - for (i=0; i<4; i++) + for (i = 0; i < 4; i++) { level->envelope_text[i][0] = '\0'; level->envelope_xsize[i] = MAX_ENVELOPE_XSIZE; level->envelope_ysize[i] = MAX_ENVELOPE_YSIZE; } - for(i=0; iscore[i] = 10; level->num_yamyam_contents = STD_ELEMENT_CONTENTS; - for(i=0; iyamyam_content[i][x][y] = (i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY); level->field[0][0] = EL_PLAYER_1; level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED; - for (i=0; i < MAX_NUM_ELEMENTS; i++) + for (i = 0; i < MAX_NUM_ELEMENTS; i++) { setElementChangePages(&element_info[i], 1); setElementChangeInfoToDefaults(element_info[i].change); } - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; - for(j=0; j < MAX_ELEMENT_NAME_LEN + 1; j++) + for (j = 0; j < MAX_ELEMENT_NAME_LEN + 1; j++) element_info[element].description[j] = '\0'; if (element_info[element].custom_description != NULL) strncpy(element_info[element].description, @@ -199,8 +199,8 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) element_info[element].slippery_type = SLIPPERY_ANY_RANDOM; - for(x=0; x<3; x++) - for(y=0; y<3; y++) + for (x = 0; x < 3; x++) + for (y = 0; y < 3; y++) element_info[element].content[x][y] = EL_EMPTY_SPACE; element_info[element].access_type = 0; @@ -217,7 +217,7 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) element_info[element].current_change_page = 0; /* start with no properties at all */ - for (j=0; j < NUM_EP_BITFIELDS; j++) + for (j = 0; j < NUM_EP_BITFIELDS; j++) Properties[element][j] = EP_BITMASK_DEFAULT; element_info[element].modified_settings = FALSE; @@ -356,17 +356,17 @@ static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) level->time = getFile16BitBE(file); level->gems_needed = getFile16BitBE(file); - for(i=0; iname[i] = getFile8Bit(file); level->name[MAX_LEVEL_NAME_LEN] = 0; - for(i=0; iscore[i] = getFile8Bit(file); level->num_yamyam_contents = STD_ELEMENT_CONTENTS; - for(i=0; iyamyam_content[i][x][y] = checkLevelElement(getFile8Bit(file)); level->amoeba_speed = getFile8Bit(file); @@ -389,7 +389,7 @@ static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level) { int i; - for(i=0; iauthor[i] = getFile8Bit(file); level->author[MAX_LEVEL_NAME_LEN] = 0; @@ -415,8 +415,8 @@ static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size_expected; } - for(y=0; yfieldy; y++) - for(x=0; xfieldx; x++) + for (y = 0; y < level->fieldy; y++) + for (x = 0; x < level->fieldx; x++) level->field[x][y] = checkLevelElement(level->encoding_16bit_field ? getFile16BitBE(file) : getFile8Bit(file)); @@ -454,9 +454,9 @@ static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level) level->num_yamyam_contents > MAX_ELEMENT_CONTENTS) level->num_yamyam_contents = STD_ELEMENT_CONTENTS; - for(i=0; iyamyam_content[i][x][y] = checkLevelElement(level->encoding_16bit_field ? getFile16BitBE(file) : getFile8Bit(file)); @@ -477,9 +477,9 @@ static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level) ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED); - for(i=0; inum_yamyam_contents = num_contents; - for(i=0; iyamyam_content[i][x][y] = content_array[i][x][y]; } else if (element == EL_BD_AMOEBA) @@ -536,7 +536,7 @@ static int LoadLevel_CNT3(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size_expected; } - for(i=0; i < envelope_len; i++) + for (i = 0; i < envelope_len; i++) level->envelope_text[envelope_nr][i] = getFile8Bit(file); return chunk_size; @@ -554,7 +554,7 @@ static int LoadLevel_CUS1(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size_expected; } - for (i=0; i < num_changed_custom_elements; i++) + for (i = 0; i < num_changed_custom_elements; i++) { int element = getFile16BitBE(file); int properties = getFile32BitBE(file); @@ -580,7 +580,7 @@ static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size_expected; } - for (i=0; i < num_changed_custom_elements; i++) + for (i = 0; i < num_changed_custom_elements; i++) { int element = getFile16BitBE(file); int custom_target_element = getFile16BitBE(file); @@ -606,7 +606,7 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size_expected; } - for (i=0; i < num_changed_custom_elements; i++) + for (i = 0; i < num_changed_custom_elements; i++) { int element = getFile16BitBE(file); @@ -614,10 +614,10 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) { Error(ERR_WARN, "invalid custom element number %d", element); - element = EL_DEFAULT; /* dummy element used for artwork config */ + element = EL_DUMMY; } - for(j=0; jrandom = getFile8Bit(file); element_info[element].change->power = getFile8Bit(file); - for(y=0; y<3; y++) - for(x=0; x<3; x++) + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) element_info[element].change->content[x][y] = checkLevelElement(getFile16BitBE(file)); @@ -697,12 +697,12 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) { Error(ERR_WARN, "invalid custom element number %d", element); - element = EL_DEFAULT; /* dummy element used for artwork config */ + element = EL_DUMMY; } ei = &element_info[element]; - for(i=0; i < MAX_ELEMENT_NAME_LEN; i++) + for (i = 0; i < MAX_ELEMENT_NAME_LEN; i++) ei->description[i] = getFile8Bit(file); ei->description[MAX_ELEMENT_NAME_LEN] = 0; @@ -740,8 +740,8 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) ei->slippery_type = getFile8Bit(file); - for(y=0; y<3; y++) - for(x=0; x<3; x++) + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) ei->content[x][y] = checkLevelElement(getFile16BitBE(file)); /* some free bytes for future custom property values and padding */ @@ -751,7 +751,7 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) setElementChangePages(ei, ei->num_change_pages); - for (i=0; i < ei->num_change_pages; i++) + for (i = 0; i < ei->num_change_pages; i++) { struct ElementChangeInfo *change = &ei->change_page[i]; @@ -776,8 +776,8 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) change->random = getFile8Bit(file); change->power = getFile8Bit(file); - for(y=0; y<3; y++) - for(x=0; x<3; x++) + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) change->content[x][y] = checkLevelElement(getFile16BitBE(file)); change->can_change = getFile8Bit(file); @@ -1027,12 +1027,12 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) (these following values were accidentally changed in version 3.0.1) */ if (level->game_version <= VERSION_IDENT(3,0,0,0)) { - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; /* order of checking and copying events to be mapped is important */ - for (j=CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER; j--) + for (j = CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER_OBSOLETE; j--) { if (HAS_CHANGE_EVENT(element, j - 2)) { @@ -1042,7 +1042,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } /* order of checking and copying events to be mapped is important */ - for (j=CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION; j--) + for (j = CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION_ACTIVE; j--) { if (HAS_CHANGE_EVENT(element, j - 1)) { @@ -1054,15 +1054,15 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } /* some custom element change events get mapped since version 3.0.3 */ - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; - if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER) || - HAS_CHANGE_EVENT(element, CE_BY_COLLISION)) + if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE) || + HAS_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE)) { - SET_CHANGE_EVENT(element, CE_BY_PLAYER, FALSE); - SET_CHANGE_EVENT(element, CE_BY_COLLISION, FALSE); + SET_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE, FALSE); + SET_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE, FALSE); SET_CHANGE_EVENT(element, CE_BY_DIRECT_ACTION, TRUE); } @@ -1071,7 +1071,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) /* initialize "can_change" field for old levels with only one change page */ if (level->game_version <= VERSION_IDENT(3,0,2,0)) { - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; @@ -1094,7 +1094,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } /* set uninitialized push delay values of custom elements in older levels */ - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; @@ -1114,9 +1114,9 @@ static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename) int x, y; /* map elements that have changed in newer versions */ - for(y=0; yfieldy; y++) + for (y = 0; y < level->fieldy; y++) { - for(x=0; xfieldx; x++) + for (x = 0; x < level->fieldx; x++) { int element = level->field[x][y]; @@ -1144,8 +1144,8 @@ static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename) } /* copy elements to runtime playfield array */ - for(x=0; xfield[x][y]; /* initialize level size variables for faster access */ @@ -1202,15 +1202,15 @@ static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level) putFile16BitBE(file, level->time); putFile16BitBE(file, level->gems_needed); - for(i=0; iname[i]); - for(i=0; iscore[i]); - for(i=0; iencoding_16bit_yamyam ? EL_EMPTY : level->yamyam_content[i][x][y])); putFile8Bit(file, level->amoeba_speed); @@ -1232,7 +1232,7 @@ static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level) { int i; - for(i=0; iauthor[i]); } @@ -1240,8 +1240,8 @@ static void SaveLevel_BODY(FILE *file, struct LevelInfo *level) { int x, y; - for(y=0; yfieldy; y++) - for(x=0; xfieldx; x++) + for (y = 0; y < level->fieldy; y++) + for (x = 0; x < level->fieldx; x++) if (level->encoding_16bit_field) putFile16BitBE(file, level->field[x][y]); else @@ -1258,9 +1258,9 @@ static void SaveLevel_CONT(FILE *file, struct LevelInfo *level) putFile8Bit(file, 0); putFile8Bit(file, 0); - for(i=0; iencoding_16bit_field) putFile16BitBE(file, level->yamyam_content[i][x][y]); else @@ -1280,9 +1280,9 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) content_xsize = 3; content_ysize = 3; - for(i=0; iyamyam_content[i][x][y]; } else if (element == EL_BD_AMOEBA) @@ -1291,9 +1291,9 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) content_xsize = 1; content_ysize = 1; - for(i=0; iamoeba_content; } @@ -1313,9 +1313,9 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_UNUSED); - for(i=0; ienvelope_text[envelope_nr][i]); } @@ -1344,7 +1344,7 @@ static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level, putFile16BitBE(file, num_changed_custom_elements); - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; @@ -1373,7 +1373,7 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level, putFile16BitBE(file, num_changed_custom_elements); - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; @@ -1402,7 +1402,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, putFile16BitBE(file, num_changed_custom_elements); - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; @@ -1412,7 +1412,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, { putFile16BitBE(file, element); - for(j=0; jevents); @@ -1457,8 +1457,8 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, putFile8Bit(file, element_info[element].change->random); putFile8Bit(file, element_info[element].change->power); - for(y=0; y<3; y++) - for(x=0; x<3; x++) + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) putFile16BitBE(file, element_info[element].change->content[x][y]); putFile8Bit(file, element_info[element].slippery_type); @@ -1483,7 +1483,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile16BitBE(file, element); - for(i=0; i < MAX_ELEMENT_NAME_LEN; i++) + for (i = 0; i < MAX_ELEMENT_NAME_LEN; i++) putFile8Bit(file, ei->description[i]); putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE]); @@ -1513,8 +1513,8 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile8Bit(file, ei->slippery_type); - for(y=0; y<3; y++) - for(x=0; x<3; x++) + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) putFile16BitBE(file, ei->content[x][y]); /* some free bytes for future custom property values and padding */ @@ -1522,7 +1522,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) /* write change property values */ - for (i=0; i < ei->num_change_pages; i++) + for (i = 0; i < ei->num_change_pages; i++) { struct ElementChangeInfo *change = &ei->change_page[i]; @@ -1544,8 +1544,8 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile8Bit(file, change->random); putFile8Bit(file, change->power); - for(y=0; y<3; y++) - for(x=0; x<3; x++) + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) putFile16BitBE(file, change->content[x][y]); putFile8Bit(file, change->can_change); @@ -1574,16 +1574,16 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) /* check level field for 16-bit elements */ level->encoding_16bit_field = FALSE; - for(y=0; yfieldy; y++) - for(x=0; xfieldx; x++) + for (y = 0; y < level->fieldy; y++) + for (x = 0; x < level->fieldx; 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; inum_yamyam_contents; i++) - for(y=0; y<3; y++) - for(x=0; x<3; x++) + for (i = 0; i < level->num_yamyam_contents; i++) + for (y = 0; y < 3; y++) + for (x = 0; x < 3; x++) if (level->yamyam_content[i][x][y] > 255) level->encoding_16bit_yamyam = TRUE; @@ -1625,7 +1625,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) } /* check for envelope content */ - for (i=0; i<4; i++) + for (i = 0; i < 4; i++) { if (strlen(level->envelope_text[i]) > 0) { @@ -1639,7 +1639,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) /* check for non-default custom elements (unless using template level) */ if (!level->use_custom_template) { - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; @@ -1715,7 +1715,7 @@ static void setTapeInfoToDefaults() /* default values (also for pre-1.2 tapes) with only the first player */ tape.player_participates[0] = TRUE; - for(i=1; inum_participating_players = 0; - for(i=0; iplayer_participates[i] = FALSE; @@ -1787,7 +1787,7 @@ static int LoadTape_INFO(FILE *file, int chunk_size, struct TapeInfo *tape) tape->level_identifier = checked_realloc(tape->level_identifier, level_identifier_size); - for(i=0; i < level_identifier_size; i++) + for (i = 0; i < level_identifier_size; i++) tape->level_identifier[i] = getFile8Bit(file); tape->level_nr = getFile16BitBE(file); @@ -1809,12 +1809,12 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) return chunk_size_expected; } - for(i=0; ilength; i++) + for (i = 0; i < tape->length; i++) { if (i >= MAX_TAPELEN) break; - for(j=0; jpos[i].action[j] = MV_NO_MOVING; @@ -1833,7 +1833,7 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) byte action = tape->pos[i].action[0]; int k, num_moves = 0; - for (k=0; k<4; k++) + for (k = 0; k<4; k++) { if (action & joy_dir[k]) { @@ -1862,7 +1862,7 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) tape->pos[i + 1].delay = 1; /* delay part */ - for(j=0; jpos[i].action[j] = MV_NO_MOVING; tape->pos[i].delay--; @@ -2011,6 +2011,13 @@ void LoadTape(int level_nr) LoadTapeFromFilename(filename); } +void LoadSolutionTape(int level_nr) +{ + char *filename = getSolutionTapeFilename(level_nr); + + LoadTapeFromFilename(filename); +} + static void SaveTape_VERS(FILE *file, struct TapeInfo *tape) { putFileVersion(file, tape->file_version); @@ -2023,7 +2030,7 @@ static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape) byte store_participating_players = 0; /* set bits for participating players for compact storage */ - for(i=0; iplayer_participates[i]) store_participating_players |= (1 << i); @@ -2046,7 +2053,7 @@ static void SaveTape_INFO(FILE *file, struct TapeInfo *tape) putFile16BitBE(file, level_identifier_size); - for(i=0; i < level_identifier_size; i++) + for (i = 0; i < level_identifier_size; i++) putFile8Bit(file, tape->level_identifier[i]); putFile16BitBE(file, tape->level_nr); @@ -2056,9 +2063,9 @@ static void SaveTape_BODY(FILE *file, struct TapeInfo *tape) { int i, j; - for(i=0; ilength; i++) + for (i = 0; i < tape->length; i++) { - for(j=0; jplayer_participates[j]) putFile8Bit(file, tape->pos[i].action[j]); @@ -2096,7 +2103,7 @@ void SaveTape(int level_nr) tape.game_version = GAME_VERSION_ACTUAL; /* count number of participating players */ - for(i=0; ilevel_identifier); printf_line("-", 79); - for(i=0; ilength; i++) + for (i = 0; i < tape->length; i++) { if (i >= MAX_TAPELEN) break; printf("%03d: ", i); - for(j=0; jplayer_participates[j]) { @@ -2189,7 +2196,7 @@ void LoadScore(int level_nr) FILE *file; /* always start with reliable default values */ - for(i=0; ishortcut.load_game = DEFAULT_KEY_LOAD_GAME; si->shortcut.toggle_pause = DEFAULT_KEY_TOGGLE_PAUSE; - for (i=0; iinput[i].use_joystick = FALSE; si->input[i].joy.device_name=getStringCopy(getDeviceNameFromJoystickNr(i)); @@ -2530,34 +2537,34 @@ static void decodeSetupFileHash(SetupFileHash *setup_file_hash) /* global setup */ si = setup; - for (i=0; i 2147483647) /* yes, this is a kludge */ - i = 2147483647; - - a = checked_malloc(10 + 1); - - sprintf(a, "%d", i); - - return a; -} - void LoadUserDefinedEditorElementList(int **elements, int *num_elements) { char *filename = getEditorSetupFilename(); @@ -2792,8 +2782,8 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) element_hash = newSetupFileHash(); - for (i=0; i < NUM_FILE_ELEMENTS; i++) - setHashEntry(element_hash, element_info[i].token_name, itoa(i)); + for (i = 0; i < NUM_FILE_ELEMENTS; i++) + setHashEntry(element_hash, element_info[i].token_name, i_to_a(i)); /* determined size may be larger than needed (due to unknown elements) */ *num_elements = 0; @@ -2840,18 +2830,18 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) #if 0 /* TEST-ONLY */ - for (i=0; i < *num_elements; i++) + for (i = 0; i < *num_elements; i++) printf("editor: element '%s' [%d]\n", element_info[(*elements)[i]].token_name, (*elements)[i]); #endif } -static struct MusicFileInfo *get_music_file_info(char *basename) +static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music, + boolean is_sound) { SetupFileHash *setup_file_hash = NULL; struct MusicFileInfo tmp_music_file_info, *new_music_file_info; - char *filename_music = getCustomMusicFilename(basename); - char *filename_prefix, *filename_info; + char *filename_music, *filename_prefix, *filename_info; struct { char *token; @@ -2859,14 +2849,23 @@ static struct MusicFileInfo *get_music_file_info(char *basename) } token_to_value_ptr[] = { - { "title", &tmp_music_file_info.title }, - { "artist", &tmp_music_file_info.artist }, - { "album", &tmp_music_file_info.album }, - { "year", &tmp_music_file_info.year }, - { NULL, NULL }, + { "title_header", &tmp_music_file_info.title_header }, + { "artist_header", &tmp_music_file_info.artist_header }, + { "album_header", &tmp_music_file_info.album_header }, + { "year_header", &tmp_music_file_info.year_header }, + + { "title", &tmp_music_file_info.title }, + { "artist", &tmp_music_file_info.artist }, + { "album", &tmp_music_file_info.album }, + { "year", &tmp_music_file_info.year }, + + { NULL, NULL }, }; int i; + filename_music = (is_sound ? getCustomSoundFilename(basename) : + getCustomMusicFilename(basename)); + if (filename_music == NULL) return NULL; @@ -2910,27 +2909,65 @@ static struct MusicFileInfo *get_music_file_info(char *basename) /* ---------- music file info found ---------- */ + memset(&tmp_music_file_info, 0, sizeof(struct MusicFileInfo)); + for (i = 0; token_to_value_ptr[i].token != NULL; i++) { char *value = getHashEntry(setup_file_hash, token_to_value_ptr[i].token); - if (value != NULL) - *token_to_value_ptr[i].value_ptr = getStringCopy(value); + *token_to_value_ptr[i].value_ptr = + getStringCopy(value != NULL ? value : UNKNOWN_NAME); } - new_music_file_info = checked_calloc(sizeof(struct MusicFileInfo)); + tmp_music_file_info.basename = basename; + tmp_music_file_info.music = music; + tmp_music_file_info.is_sound = is_sound; + + new_music_file_info = checked_malloc(sizeof(struct MusicFileInfo)); *new_music_file_info = tmp_music_file_info; return new_music_file_info; } +static struct MusicFileInfo *get_music_file_info(char *basename, int music) +{ + return get_music_file_info_ext(basename, music, FALSE); +} + +static struct MusicFileInfo *get_sound_file_info(char *basename, int sound) +{ + return get_music_file_info_ext(basename, sound, TRUE); +} + +static boolean music_info_listed_ext(struct MusicFileInfo *list, + char *basename, boolean is_sound) +{ + for (; list != NULL; list = list->next) + if (list->is_sound == is_sound && strcmp(list->basename, basename) == 0) + return TRUE; + + return FALSE; +} + +static boolean music_info_listed(struct MusicFileInfo *list, char *basename) +{ + return music_info_listed_ext(list, basename, FALSE); +} + +static boolean sound_info_listed(struct MusicFileInfo *list, char *basename) +{ + return music_info_listed_ext(list, basename, TRUE); +} + void LoadMusicInfo() { char *music_directory = getCustomMusicDirectory(); int num_music = getMusicListSize(); + int num_music_noconf = 0; + int num_sounds = getSoundListSize(); DIR *dir; struct dirent *dir_entry; - struct FileInfo *music; + struct FileInfo *music, *sound; struct MusicFileInfo *next, **new; int i; @@ -2938,8 +2975,15 @@ void LoadMusicInfo() { next = music_file_info->next; - if (music_file_info->context) - free(music_file_info->context); + if (music_file_info->title_header) + free(music_file_info->title_header); + if (music_file_info->artist_header) + free(music_file_info->artist_header); + if (music_file_info->album_header) + free(music_file_info->album_header); + if (music_file_info->year_header) + free(music_file_info->year_header); + if (music_file_info->title) free(music_file_info->title); if (music_file_info->artist) @@ -2956,20 +3000,38 @@ void LoadMusicInfo() new = &music_file_info; - for (i=0; i < num_music; i++) +#if 0 + printf("::: num_music == %d\n", num_music); +#endif + + for (i = 0; i < num_music; i++) { music = getMusicListEntry(i); +#if 0 + printf("::: %d [%08x]\n", i, music->filename); +#endif + + if (music->filename == NULL) + continue; + if (strcmp(music->filename, UNDEFINED_FILENAME) == 0) continue; + /* a configured file may be not recognized as music */ + if (!FileIsMusic(music->filename)) + continue; + #if 0 - printf("::: -> '%s'\n", music->filename); + printf("::: -> '%s' (configured)\n", music->filename); #endif - *new = get_music_file_info(music->filename); - if (*new != NULL) - new = &(*new)->next; + if (!music_info_listed(music_file_info, music->filename)) + { + *new = get_music_file_info(music->filename, i); + if (*new != NULL) + new = &(*new)->next; + } } if ((dir = opendir(music_directory)) == NULL) @@ -2984,10 +3046,13 @@ void LoadMusicInfo() boolean music_already_used = FALSE; int i; - for (i=0; i < num_music; i++) + for (i = 0; i < num_music; i++) { music = getMusicListEntry(i); + if (music->filename == NULL) + continue; + if (strcmp(basename, music->filename) == 0) { music_already_used = TRUE; @@ -2998,23 +3063,335 @@ void LoadMusicInfo() if (music_already_used) continue; - if (!FileIsSound(basename) && !FileIsMusic(basename)) + if (!FileIsMusic(basename)) continue; #if 0 - printf("::: -> '%s'\n", basename); + printf("::: -> '%s' (found in directory)\n", basename); #endif - *new = get_music_file_info(basename); - if (*new != NULL) - new = &(*new)->next; + if (!music_info_listed(music_file_info, basename)) + { + *new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf)); + if (*new != NULL) + new = &(*new)->next; + } + + num_music_noconf++; } closedir(dir); + for (i = 0; i < num_sounds; i++) + { + sound = getSoundListEntry(i); + + if (sound->filename == NULL) + continue; + + if (strcmp(sound->filename, UNDEFINED_FILENAME) == 0) + continue; + + /* a configured file may be not recognized as sound */ + if (!FileIsSound(sound->filename)) + continue; + +#if 0 + printf("::: -> '%s' (configured)\n", sound->filename); +#endif + + if (!sound_info_listed(music_file_info, sound->filename)) + { + *new = get_sound_file_info(sound->filename, i); + if (*new != NULL) + new = &(*new)->next; + } + } + #if 0 /* TEST-ONLY */ for (next = music_file_info; next != NULL; next = next->next) printf("::: title == '%s'\n", next->title); #endif } + +void add_helpanim_entry(int element, int action, int direction, int delay, + int *num_list_entries) +{ + struct HelpAnimInfo *new_list_entry; + (*num_list_entries)++; + + helpanim_info = + checked_realloc(helpanim_info, + *num_list_entries * sizeof(struct HelpAnimInfo)); + new_list_entry = &helpanim_info[*num_list_entries - 1]; + + new_list_entry->element = element; + new_list_entry->action = action; + new_list_entry->direction = direction; + new_list_entry->delay = delay; +} + +void print_unknown_token(char *filename, char *token, int token_nr) +{ + if (token_nr == 0) + { + Error(ERR_RETURN_LINE, "-"); + Error(ERR_RETURN, "warning: unknown token(s) found in config file:"); + Error(ERR_RETURN, "- config file: '%s'", filename); + } + + Error(ERR_RETURN, "- token: '%s'", token); +} + +void print_unknown_token_end(int token_nr) +{ + if (token_nr > 0) + Error(ERR_RETURN_LINE, "-"); +} + +void LoadHelpAnimInfo() +{ + char *filename = getHelpAnimFilename(); + SetupFileList *setup_file_list = NULL, *list; + SetupFileHash *element_hash, *action_hash, *direction_hash; + int num_list_entries = 0; + int num_unknown_tokens = 0; + int i; + + if (fileExists(filename)) + setup_file_list = loadSetupFileList(filename); + + if (setup_file_list == NULL) + { + /* use reliable default values from static configuration */ + SetupFileList *insert_ptr; + + insert_ptr = setup_file_list = + newSetupFileList(helpanim_config[0].token, + helpanim_config[0].value); + + for (i = 1; helpanim_config[i].token; i++) + insert_ptr = addListEntry(insert_ptr, + helpanim_config[i].token, + helpanim_config[i].value); + } + + element_hash = newSetupFileHash(); + action_hash = newSetupFileHash(); + direction_hash = newSetupFileHash(); + + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + setHashEntry(element_hash, element_info[i].token_name, i_to_a(i)); + + for (i = 0; i < NUM_ACTIONS; i++) + setHashEntry(action_hash, element_action_info[i].suffix, + i_to_a(element_action_info[i].value)); + + /* do not store direction index (bit) here, but direction value! */ + for (i = 0; i < NUM_DIRECTIONS; i++) + setHashEntry(direction_hash, element_direction_info[i].suffix, + i_to_a(1 << element_direction_info[i].value)); + + for (list = setup_file_list; list != NULL; list = list->next) + { + char *element_token, *action_token, *direction_token; + char *element_value, *action_value, *direction_value; + int delay = atoi(list->value); + + if (strcmp(list->token, "end") == 0) + { + add_helpanim_entry(HELPANIM_LIST_NEXT, -1, -1, -1, &num_list_entries); + + continue; + } + + /* first try to break element into element/action/direction parts; + if this does not work, also accept combined "element[.act][.dir]" + elements (like "dynamite.active"), which are unique elements */ + + if (strchr(list->token, '.') == NULL) /* token contains no '.' */ + { + element_value = getHashEntry(element_hash, list->token); + if (element_value != NULL) /* element found */ + add_helpanim_entry(atoi(element_value), -1, -1, delay, + &num_list_entries); + else + { + /* no further suffixes found -- this is not an element */ + print_unknown_token(filename, list->token, num_unknown_tokens++); + } + + continue; + } + + /* token has format "." */ + + action_token = strchr(list->token, '.'); /* suffix may be action ... */ + direction_token = action_token; /* ... or direction */ + + element_token = getStringCopy(list->token); + *strchr(element_token, '.') = '\0'; + + element_value = getHashEntry(element_hash, element_token); + + if (element_value == NULL) /* this is no element */ + { + element_value = getHashEntry(element_hash, list->token); + if (element_value != NULL) /* combined element found */ + add_helpanim_entry(atoi(element_value), -1, -1, delay, + &num_list_entries); + else + print_unknown_token(filename, list->token, num_unknown_tokens++); + + free(element_token); + + continue; + } + + action_value = getHashEntry(action_hash, action_token); + + if (action_value != NULL) /* action found */ + { + add_helpanim_entry(atoi(element_value), atoi(action_value), -1, delay, + &num_list_entries); + + free(element_token); + + continue; + } + + direction_value = getHashEntry(direction_hash, direction_token); + + if (direction_value != NULL) /* direction found */ + { + add_helpanim_entry(atoi(element_value), -1, atoi(direction_value), delay, + &num_list_entries); + + free(element_token); + + continue; + } + + if (strchr(action_token + 1, '.') == NULL) + { + /* no further suffixes found -- this is not an action nor direction */ + + element_value = getHashEntry(element_hash, list->token); + if (element_value != NULL) /* combined element found */ + add_helpanim_entry(atoi(element_value), -1, -1, delay, + &num_list_entries); + else + print_unknown_token(filename, list->token, num_unknown_tokens++); + + free(element_token); + + continue; + } + + /* token has format ".." */ + + direction_token = strchr(action_token + 1, '.'); + + action_token = getStringCopy(action_token); + *strchr(action_token + 1, '.') = '\0'; + + action_value = getHashEntry(action_hash, action_token); + + if (action_value == NULL) /* this is no action */ + { + element_value = getHashEntry(element_hash, list->token); + if (element_value != NULL) /* combined element found */ + add_helpanim_entry(atoi(element_value), -1, -1, delay, + &num_list_entries); + else + print_unknown_token(filename, list->token, num_unknown_tokens++); + + free(element_token); + free(action_token); + + continue; + } + + direction_value = getHashEntry(direction_hash, direction_token); + + if (direction_value != NULL) /* direction found */ + { + add_helpanim_entry(atoi(element_value), atoi(action_value), + atoi(direction_value), delay, &num_list_entries); + + free(element_token); + free(action_token); + + continue; + } + + /* this is no direction */ + + element_value = getHashEntry(element_hash, list->token); + if (element_value != NULL) /* combined element found */ + add_helpanim_entry(atoi(element_value), -1, -1, delay, + &num_list_entries); + else + print_unknown_token(filename, list->token, num_unknown_tokens++); + + free(element_token); + free(action_token); + } + + print_unknown_token_end(num_unknown_tokens); + + add_helpanim_entry(HELPANIM_LIST_NEXT, -1, -1, -1, &num_list_entries); + add_helpanim_entry(HELPANIM_LIST_END, -1, -1, -1, &num_list_entries); + + freeSetupFileList(setup_file_list); + freeSetupFileHash(element_hash); + freeSetupFileHash(action_hash); + freeSetupFileHash(direction_hash); + +#if 0 + /* TEST ONLY */ + for (i = 0; i < num_list_entries; i++) + printf("::: %d, %d, %d => %d\n", + helpanim_info[i].element, + helpanim_info[i].action, + helpanim_info[i].direction, + helpanim_info[i].delay); +#endif +} + +void LoadHelpTextInfo() +{ + char *filename = getHelpTextFilename(); + int i; + + if (helptext_info != NULL) + { + freeSetupFileHash(helptext_info); + helptext_info = NULL; + } + + if (fileExists(filename)) + helptext_info = loadSetupFileHash(filename); + + if (helptext_info == NULL) + { + /* use reliable default values from static configuration */ + helptext_info = newSetupFileHash(); + + for (i = 0; helptext_config[i].token; i++) + setHashEntry(helptext_info, + helptext_config[i].token, + helptext_config[i].value); + } + +#if 0 + /* TEST ONLY */ + BEGIN_HASH_ITERATION(helptext_info, itr) + { + printf("::: '%s' => '%s'\n", + HASH_ITERATION_TOKEN(itr), HASH_ITERATION_VALUE(itr)); + } + END_HASH_ITERATION(hash, itr) +#endif +}