X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=229cba0a6512abd9eb5794ade523d49b9689d00e;hb=4386c0ac1665619412148f1eb907f6d366a70d7d;hp=e7013f64ed4fd02229d110cf13990ed276b97f7b;hpb=732fd648f26b307fa3ab0e2c44ec06eb28d6f0d6;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index e7013f64..229cba0a 100644 --- a/src/init.c +++ b/src/init.c @@ -411,24 +411,30 @@ void InitElementGraphicInfo() for (act=0; act -1; i++) { - int element = element_to_graphic[i].element; - int action = element_to_graphic[i].action; - int direction = element_to_graphic[i].direction; - int graphic = element_to_graphic[i].graphic; + int element = element_to_graphic[i].element; + int action = element_to_graphic[i].action; + int direction = element_to_graphic[i].direction; + boolean crumbled = element_to_graphic[i].crumbled; + int graphic = element_to_graphic[i].graphic; if (graphic_info[graphic].bitmap == NULL) continue; - if ((action > -1 || direction > -1) && el2img(element) != -1) + if ((action > -1 || direction > -1 || crumbled == TRUE) && + el2img(element) != -1) { boolean base_redefined = getImageListEntry(el2img(element))->redefined; boolean act_dir_redefined = getImageListEntry(graphic)->redefined; @@ -444,10 +450,20 @@ void InitElementGraphicInfo() if (action < 0) action = ACTION_DEFAULT; - if (direction > -1) - element_info[element].direction_graphic[action][direction] = graphic; + if (crumbled) + { + if (direction > -1) + element_info[element].direction_crumbled[action][direction] = graphic; + else + element_info[element].crumbled[action] = graphic; + } else - element_info[element].graphic[action] = graphic; + { + if (direction > -1) + element_info[element].direction_graphic[action][direction] = graphic; + else + element_info[element].graphic[action] = graphic; + } } /* initialize normal element/graphic mapping from dynamic configuration */ @@ -458,6 +474,13 @@ void InitElementGraphicInfo() int direction = property_mapping[i].ext2_index; int special = property_mapping[i].ext3_index; int graphic = property_mapping[i].artwork_index; + boolean crumbled = FALSE; + + if (special == GFX_SPECIAL_ARG_CRUMBLED) + { + special = -1; + crumbled = TRUE; + } if (graphic_info[graphic].bitmap == NULL) continue; @@ -468,32 +491,87 @@ void InitElementGraphicInfo() if (action < 0) action = ACTION_DEFAULT; - if (direction < 0) - for (dir=0; dir -1) - element_info[element].direction_graphic[action][direction] = graphic; + if (crumbled) + { + if (direction < 0) + for (dir=0; dir -1) + element_info[element].direction_crumbled[action][direction] = graphic; + else + element_info[element].crumbled[action] = graphic; + } else - element_info[element].graphic[action] = graphic; + { + if (direction < 0) + for (dir=0; dir -1) + element_info[element].direction_graphic[action][direction] = graphic; + else + element_info[element].graphic[action] = graphic; + } + } + + /* now copy all graphics that are defined to be cloned from other graphics */ + for (i=0; itoken); +#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 */ @@ -993,6 +1127,10 @@ static void InitSoundInfo() sound_effect_properties[i] = ACTION_OTHER; sound_info[i].loop = FALSE; +#if 0 + printf("::: sound %d: '%s'\n", i, sound->token); +#endif + /* determine all loop sounds and identify certain sound classes */ for (j=0; element_action_info[j].suffix; j++) @@ -1004,12 +1142,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; jidentifier, + leveldir_current->graphics_set, + leveldir_current->graphics_path); +#endif + ReloadCustomImages(); LoadCustomElementDescriptions(); @@ -3051,12 +3217,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(); } @@ -3090,6 +3260,12 @@ 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; @@ -3187,12 +3363,14 @@ void ReloadCustomArtwork() 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 independent) 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) @@ -3200,14 +3378,44 @@ 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']\n", + 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); + 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", @@ -3224,7 +3432,9 @@ void ReloadCustomArtwork() artwork.gfx_current_identifier = gfx_new_identifier; #endif +#if 0 setLevelArtworkDir(artwork.gfx_first); +#endif ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); @@ -3259,7 +3469,8 @@ void ReloadCustomArtwork() } 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", @@ -3288,7 +3499,8 @@ void ReloadCustomArtwork() } 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);