X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Finit.c;h=b859112c771a04c6ac5d2a23ab9879d637efb77e;hb=684f9040af5b97bc73676f8f8198688d87c3ea25;hp=cb782a1f0357598b16e01795519e5a8ff80a5dd3;hpb=64076b9d6ca8f9ea1ddc168b92433c71178e7728;p=rocksndiamonds.git diff --git a/src/init.c b/src/init.c index cb782a1f..b859112c 100644 --- a/src/init.c +++ b/src/init.c @@ -754,6 +754,10 @@ static void InitGraphicInfo() int src_x, src_y; int first_frame, last_frame; +#if 0 + printf("::: image: '%s'\n", image->token); +#endif + set_graphic_parameters(i, image->parameter); /* now check if no animation frames are outside of the loaded image */ @@ -993,6 +997,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 +1012,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 +3076,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,10 +3119,22 @@ 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 @@ -3123,7 +3164,7 @@ 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; @@ -3181,12 +3222,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) @@ -3194,14 +3237,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", @@ -3218,12 +3291,18 @@ 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); InitImages(); +#if 0 + printf("::: %d\n", menu.list_size[GAME_MODE_LEVELS]); +#endif + FreeTileClipmasks(); InitTileClipmasks(); #if 0 @@ -3249,7 +3328,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", @@ -3278,7 +3358,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);