X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=b4ce8d8917ea41515eba64d48d05e5f17048ca1b;hb=2bcba5d4d363ba2f58c9d3f22aba6a455522f499;hp=88bfaeb84572c4362ad2a65a79231309e073f8fd;hpb=e77dd3ec50667c0c0bf1683a0fed15498c256010;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index 88bfaeb8..b4ce8d89 100644 --- a/src/init.c +++ b/src/init.c @@ -428,6 +428,19 @@ void InitElementGraphicInfo() if (graphic_info[graphic].bitmap == NULL) continue; + if ((action > -1 || direction > -1) && el2img(element) != -1) + { + boolean base_redefined = getImageListEntry(el2img(element))->redefined; + boolean act_dir_redefined = getImageListEntry(graphic)->redefined; + + /* if the base graphic ("emerald", for example) has been redefined, + but not the action graphic ("emerald.falling", for example), do not + use an existing (in this case considered obsolete) action graphic + anymore, but use the automatically determined default graphic */ + if (base_redefined && !act_dir_redefined) + continue; + } + if (action < 0) action = ACTION_DEFAULT; @@ -455,6 +468,10 @@ void InitElementGraphicInfo() if (action < 0) action = ACTION_DEFAULT; + if (direction < 0) + for (dir=0; dir -1) element_info[element].direction_graphic[action][direction] = graphic; else @@ -464,19 +481,19 @@ void InitElementGraphicInfo() /* now set all '-1' values to element specific default values */ for (i=0; iredefined; boolean special_redefined = getImageListEntry(graphic)->redefined; + /* if the base graphic ("emerald", for example) has been redefined, + but not the special graphic ("emerald.EDITOR", for example), do not + use an existing (in this case considered obsolete) special graphic + anymore, but use the automatically created (down-scaled) graphic */ if (base_redefined && !special_redefined) continue; @@ -610,7 +645,7 @@ static void set_graphic_parameters(int graphic, char **parameter_raw) anim_frames_per_col = src_bitmap->height / graphic_info[graphic].height; } - /* correct x or y offset dependant of vertical or horizontal frame order */ + /* correct x or y offset dependent of vertical or horizontal frame order */ if (parameter[GFX_ARG_VERTICAL]) /* frames are ordered vertically */ { graphic_info[graphic].offset_y = @@ -719,6 +754,16 @@ static void InitGraphicInfo() int src_x, src_y; int first_frame, last_frame; +#if 0 + printf("::: image: '%s'\n", image->token); +#endif + +#if 0 + printf("::: image # %d: '%s' ['%s']\n", + i, image->token, + getTokenFromImageID(i)); +#endif + set_graphic_parameters(i, image->parameter); /* now check if no animation frames are outside of the loaded image */ @@ -851,48 +896,61 @@ static void InitElementSoundInfo() element_info[j].sound[action] = sound; } - /* initialize element/sound mapping from dynamic configuration */ + /* initialize element class/sound mapping from dynamic configuration */ for (i=0; i < num_property_mappings; i++) { - int element = property_mapping[i].base_index; - int action = property_mapping[i].ext1_index; - int sound = property_mapping[i].artwork_index; + int element_class = property_mapping[i].base_index - MAX_NUM_ELEMENTS; + int action = property_mapping[i].ext1_index; + int sound = property_mapping[i].artwork_index; - if (element >= MAX_NUM_ELEMENTS) + if (element_class < 0 || element_class >= MAX_NUM_ELEMENTS) continue; if (action < 0) action = ACTION_DEFAULT; - element_info[element].sound[action] = sound; + for (j=0; j < MAX_NUM_ELEMENTS; j++) + if (strcmp(element_info[j].class_name, + element_info[element_class].class_name) == 0) + element_info[j].sound[action] = sound; } - /* initialize element class/sound mapping from dynamic configuration */ + /* initialize element/sound mapping from dynamic configuration */ for (i=0; i < num_property_mappings; i++) { - int element_class = property_mapping[i].base_index - MAX_NUM_ELEMENTS; - int action = property_mapping[i].ext1_index; - int sound = property_mapping[i].artwork_index; + int element = property_mapping[i].base_index; + int action = property_mapping[i].ext1_index; + int sound = property_mapping[i].artwork_index; - if (element_class < 0 || element_class >= MAX_NUM_ELEMENTS) + if (element >= MAX_NUM_ELEMENTS) continue; if (action < 0) action = ACTION_DEFAULT; - for (j=0; j < MAX_NUM_ELEMENTS; j++) - if (strcmp(element_info[j].class_name, - element_info[element_class].class_name) == 0) - element_info[j].sound[action] = sound; + element_info[element].sound[action] = sound; } /* now set all '-1' values to element specific default values */ for (i=0; itoken); +#endif + /* determine all loop sounds and identify certain sound classes */ for (j=0; element_action_info[j].suffix; j++) @@ -954,12 +1018,17 @@ static void InitSoundInfo() element_action_info[j].suffix) == 0) { sound_effect_properties[i] = element_action_info[j].value; + sound_info[i].loop = element_action_info[j].is_loop_sound; - if (element_action_info[j].is_loop_sound) - sound_info[i].loop = TRUE; + break; } } +#if 0 + if (strcmp(sound->token, "custom_42") == 0) + printf("::: '%s' -> %d\n", sound->token, sound_info[i].loop); +#endif + /* associate elements and some selected sound actions */ for (j=0; j VERSION_IDENT(2,0,1))); } + +#if 0 + /* dynamically adjust element properties according to game engine version */ +#if 0 + if (engine_version < RELEASE_IDENT(2,2,0,7)) +#endif + { + for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + { + int element = EL_CUSTOM_START + i; + + element_info[element].push_delay_fixed = 2; + element_info[element].push_delay_random = 8; + } + } +#endif } static void InitGlobal() @@ -2542,7 +2776,7 @@ void Execute_Command(char *command) if (access(filename, F_OK) != 0) Error(ERR_EXIT, "cannot open file '%s'", filename); - LoadLevelFromFilename(filename); + LoadLevelFromFilename(&level, filename); DumpLevel(&level); exit(0); @@ -2607,6 +2841,16 @@ static void InitArtworkInfo() LoadArtworkInfo(); } +static char *get_string_in_brackets(char *string) +{ + char *string_in_brackets = checked_malloc(strlen(string) + 3); + + sprintf(string_in_brackets, "[%s]", string); + + return string_in_brackets; +} + +#if 0 static char *get_element_class_token(int element) { char *element_class_name = element_info[element].class_name; @@ -2617,10 +2861,21 @@ static char *get_element_class_token(int element) return element_class_token; } +static char *get_action_class_token(int action) +{ + char *action_class_name = &element_action_info[action].suffix[1]; + char *action_class_token = checked_malloc(strlen(action_class_name) + 3); + + sprintf(action_class_token, "[%s]", action_class_name); + + return action_class_token; +} +#endif + static void InitArtworkConfig() { static char *image_id_prefix[MAX_NUM_ELEMENTS + NUM_FONTS + 1]; - static char *sound_id_prefix[MAX_NUM_ELEMENTS + MAX_NUM_ELEMENTS + 1]; + static char *sound_id_prefix[2 * MAX_NUM_ELEMENTS + 1]; static char *action_id_suffix[NUM_ACTIONS + 1]; static char *direction_id_suffix[NUM_DIRECTIONS + 1]; static char *special_id_suffix[NUM_SPECIAL_GFX_ARGS + 1]; @@ -2671,8 +2926,9 @@ static void InitArtworkConfig() for (i=0; iidentifier, + leveldir_current->graphics_set, + leveldir_current->graphics_path); +#endif + ReloadCustomImages(); LoadCustomElementDescriptions(); @@ -2814,12 +3082,16 @@ static void InitImages() static void InitSound() { + setLevelArtworkDir(artwork.snd_first); + InitReloadCustomSounds(artwork.snd_current->identifier); ReinitializeSounds(); } static void InitMusic() { + setLevelArtworkDir(artwork.mus_first); + InitReloadCustomMusic(artwork.mus_current->identifier); ReinitializeMusic(); } @@ -2853,14 +3125,28 @@ void ReloadCustomArtwork() static boolean last_override_level_graphics = FALSE; static boolean last_override_level_sounds = FALSE; static boolean last_override_level_music = FALSE; + static boolean last_own_level_graphics_set = FALSE; + static boolean last_own_level_sounds_set = FALSE; + static boolean last_own_level_music_set = FALSE; + boolean level_graphics_set_changed = FALSE; + boolean level_sounds_set_changed = FALSE; + boolean level_music_set_changed = FALSE; /* identifier for new artwork; default: artwork configured in setup */ +#if 0 char *gfx_new_identifier = artwork.gfx_current->identifier; char *snd_new_identifier = artwork.snd_current->identifier; char *mus_new_identifier = artwork.mus_current->identifier; +#else + char *gfx_new_identifier = artwork.gfx_current_identifier; + char *snd_new_identifier = artwork.snd_current_identifier; + char *mus_new_identifier = artwork.mus_current_identifier; +#endif boolean redraw_screen = FALSE; +#if 0 if (leveldir_current_identifier == NULL) leveldir_current_identifier = leveldir_current->identifier; +#endif #if 0 printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier, @@ -2884,27 +3170,72 @@ void ReloadCustomArtwork() /* when a new level series was selected, check if there was a change in custom artwork stored in level series directory */ - if (leveldir_current_identifier != leveldir_current->identifier) + if (1 || leveldir_current_identifier != leveldir_current->identifier) { +#if 0 char *identifier_old = leveldir_current_identifier; +#endif char *identifier_new = leveldir_current->identifier; - if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old) != - getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new)) +#if 0 + printf("::: 1: ['%s'] '%s', '%s' [%lx, %lx]\n", + gfx_new_identifier, identifier_old, identifier_new, + getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old), + getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new)); +#endif + +#if 0 + if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new) == NULL) + gfx_new_identifier = GRAPHICS_SUBDIR; + else if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old) != + getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new)) + gfx_new_identifier = identifier_new; +#else + if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new)) gfx_new_identifier = identifier_new; - if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_old) != - getTreeInfoFromIdentifier(artwork.snd_first, identifier_new)) + else + gfx_new_identifier = setup.graphics_set; +#endif + +#if 0 + if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_new) == NULL) + snd_new_identifier = SOUNDS_SUBDIR; + else if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_old) != + getTreeInfoFromIdentifier(artwork.snd_first, identifier_new)) + snd_new_identifier = identifier_new; +#else + if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_new)) snd_new_identifier = identifier_new; - if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) != - getTreeInfoFromIdentifier(artwork.mus_first, identifier_new)) + else + snd_new_identifier = setup.sounds_set; +#endif + +#if 0 + if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) == NULL) + mus_new_identifier = MUSIC_SUBDIR; + else if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) != + getTreeInfoFromIdentifier(artwork.mus_first, identifier_new)) + mus_new_identifier = identifier_new; +#else + if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new)) mus_new_identifier = identifier_new; + else + mus_new_identifier = setup.music_set; +#endif +#if 0 + printf("::: 2: ['%s'] '%s', '%s'\n", + gfx_new_identifier, identifier_old, identifier_new); +#endif + +#if 0 leveldir_current_identifier = leveldir_current->identifier; +#endif } /* custom level artwork configured in level series configuration file always overrides custom level artwork stored in level series directory - and (level independant) custom artwork configured in setup menue */ + and (level independent) custom artwork configured in setup menu */ if (leveldir_current->graphics_set != NULL) gfx_new_identifier = leveldir_current->graphics_set; if (leveldir_current->sounds_set != NULL) @@ -2912,33 +3243,99 @@ void ReloadCustomArtwork() if (leveldir_current->music_set != NULL) mus_new_identifier = leveldir_current->music_set; + if (leveldir_current_identifier != leveldir_current->identifier) + { + if (last_own_level_graphics_set || leveldir_current->graphics_set != NULL) + level_graphics_set_changed = TRUE; + + if (last_own_level_sounds_set || leveldir_current->sounds_set != NULL) + level_sounds_set_changed = TRUE; + + if (last_own_level_music_set || leveldir_current->music_set != NULL) + level_music_set_changed = TRUE; + + last_own_level_graphics_set = (leveldir_current->graphics_set != NULL); + last_own_level_sounds_set = (leveldir_current->sounds_set != NULL); + last_own_level_music_set = (leveldir_current->music_set != NULL); + } + +#if 1 + leveldir_current_identifier = leveldir_current->identifier; +#endif + + if (setup.override_level_graphics) + gfx_new_identifier = artwork.gfx_current->identifier; + if (setup.override_level_sounds) + snd_new_identifier = artwork.snd_current->identifier; + if (setup.override_level_music) + mus_new_identifier = artwork.mus_current->identifier; + + +#if 0 + printf("CHECKING OLD/NEW GFX:\n OLD: '%s'\n NEW: '%s' ['%s', '%s'] [%d]\n", + artwork.gfx_current_identifier, gfx_new_identifier, + artwork.gfx_current->identifier, leveldir_current->graphics_set, + level_graphics_set_changed); +#endif + if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 || - last_override_level_graphics != setup.override_level_graphics) + last_override_level_graphics != setup.override_level_graphics || + level_graphics_set_changed) { #if 0 - printf("RELOADING GRAPHICS '%s' -> '%s' ('%s')\n", + printf("RELOADING GRAPHICS '%s' -> '%s' ['%s']\n", artwork.gfx_current_identifier, - artwork.gfx_current->identifier, - gfx_new_identifier); + gfx_new_identifier, + artwork.gfx_current->identifier); +#endif + +#if 0 + artwork.gfx_current = + getTreeInfoFromIdentifier(artwork.gfx_first, gfx_new_identifier); +#endif +#if 0 + artwork.gfx_current_identifier = gfx_new_identifier; #endif +#if 0 setLevelArtworkDir(artwork.gfx_first); +#endif ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); InitImages(); +#if 0 + printf("::: %d\n", menu.list_size[GAME_MODE_LEVELS]); +#endif + FreeTileClipmasks(); InitTileClipmasks(); +#if 0 + artwork.gfx_current = + getTreeInfoFromIdentifier(artwork.gfx_first, gfx_new_identifier); +#endif +#if 0 + printf("::: '%s', %lx\n", gfx_new_identifier, artwork.gfx_current); +#endif +#if 0 artwork.gfx_current_identifier = artwork.gfx_current->identifier; +#endif + artwork.gfx_current_identifier = gfx_new_identifier; last_override_level_graphics = setup.override_level_graphics; +#if 0 + printf("DONE RELOADING GFX: '%s' ['%s']\n", + artwork.gfx_current_identifier, artwork.gfx_current->identifier); +#endif + redraw_screen = TRUE; } if (strcmp(artwork.snd_current_identifier, snd_new_identifier) != 0 || - last_override_level_sounds != setup.override_level_sounds) + last_override_level_sounds != setup.override_level_sounds || + level_sounds_set_changed) { #if 0 printf("RELOADING SOUNDS '%s' -> '%s' ('%s')\n", @@ -2950,25 +3347,40 @@ void ReloadCustomArtwork() /* set artwork path to send it to the sound server process */ setLevelArtworkDir(artwork.snd_first); + ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); + InitReloadCustomSounds(snd_new_identifier); ReinitializeSounds(); +#if 0 + artwork.snd_current = + getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set); artwork.snd_current_identifier = artwork.snd_current->identifier; +#endif + artwork.snd_current_identifier = snd_new_identifier; last_override_level_sounds = setup.override_level_sounds; redraw_screen = TRUE; } if (strcmp(artwork.mus_current_identifier, mus_new_identifier) != 0 || - last_override_level_music != setup.override_level_music) + last_override_level_music != setup.override_level_music || + level_music_set_changed) { /* set artwork path to send it to the sound server process */ setLevelArtworkDir(artwork.mus_first); + ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); + InitReloadCustomMusic(mus_new_identifier); ReinitializeMusic(); +#if 0 + artwork.mus_current = + getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set); artwork.mus_current_identifier = artwork.mus_current->identifier; +#endif + artwork.mus_current_identifier = mus_new_identifier; last_override_level_music = setup.override_level_music; redraw_screen = TRUE; @@ -3069,7 +3481,7 @@ void CloseAllAndExit(int exit_value) FreeTileClipmasks(); CloseVideoDisplay(); - ClosePlatformDependantStuff(); + ClosePlatformDependentStuff(); exit(exit_value); }