From 64076b9d6ca8f9ea1ddc168b92433c71178e7728 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Sat, 19 Jul 2003 01:54:30 +0200 Subject: [PATCH 1/1] rnd-20030719-2-src --- src/conftime.h | 2 +- src/init.c | 68 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 46 insertions(+), 24 deletions(-) diff --git a/src/conftime.h b/src/conftime.h index dba09655..0eca52f6 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2003-07-19 00:38]" +#define COMPILE_DATE_STRING "[2003-07-19 01:53]" diff --git a/src/init.c b/src/init.c index 19e3230b..cb782a1f 100644 --- a/src/init.c +++ b/src/init.c @@ -3101,18 +3101,16 @@ void ReloadCustomArtwork() leveldir_current_identifier = leveldir_current->identifier; #endif -#if 1 +#if 0 printf("CURRENT GFX: '%s' ['%s']\n", artwork.gfx_current->identifier, leveldir_current->graphics_set); printf("CURRENT LEV: '%s' / '%s'\n", leveldir_current_identifier, leveldir_current->identifier); #endif -#if 1 +#if 0 printf("graphics --> '%s' ('%s')\n", artwork.gfx_current_identifier, artwork.gfx_current->filename); -#endif -#if 0 printf("sounds --> '%s' ('%s')\n", artwork.snd_current_identifier, artwork.snd_current->filename); printf("music --> '%s' ('%s')\n", @@ -3127,10 +3125,12 @@ void ReloadCustomArtwork() in custom artwork stored in level series directory */ if (leveldir_current_identifier != leveldir_current->identifier) { +#if 0 char *identifier_old = leveldir_current_identifier; +#endif char *identifier_new = leveldir_current->identifier; -#if 1 +#if 0 printf("::: 1: ['%s'] '%s', '%s' [%lx, %lx]\n", gfx_new_identifier, identifier_old, identifier_new, getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old), @@ -3144,30 +3144,39 @@ void ReloadCustomArtwork() getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new)) gfx_new_identifier = identifier_new; #else - if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new) == NULL) - gfx_new_identifier = setup.graphics_set; - else + if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new)) gfx_new_identifier = identifier_new; + else + gfx_new_identifier = setup.graphics_set; #endif -#if 1 - if (leveldir_current_identifier == NULL) - leveldir_current_identifier = leveldir_current->identifier; -#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; + 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 1 +#if 0 printf("::: 2: ['%s'] '%s', '%s'\n", gfx_new_identifier, identifier_old, identifier_new); #endif @@ -3185,7 +3194,7 @@ void ReloadCustomArtwork() if (leveldir_current->music_set != NULL) mus_new_identifier = leveldir_current->music_set; -#if 1 +#if 0 printf("CHECKING OLD/NEW GFX:\n OLD: '%s'\n NEW: '%s' ['%s', '%s']\n", artwork.gfx_current_identifier, gfx_new_identifier, artwork.gfx_current->identifier, leveldir_current->graphics_set); @@ -3194,21 +3203,21 @@ void ReloadCustomArtwork() if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 || last_override_level_graphics != setup.override_level_graphics) { +#if 0 + printf("RELOADING GRAPHICS '%s' -> '%s' ['%s']\n", + artwork.gfx_current_identifier, + gfx_new_identifier, + artwork.gfx_current->identifier); +#endif + #if 0 artwork.gfx_current = getTreeInfoFromIdentifier(artwork.gfx_first, gfx_new_identifier); #endif -#if 1 +#if 0 artwork.gfx_current_identifier = gfx_new_identifier; #endif -#if 1 - printf("RELOADING GRAPHICS '%s' -> '%s' ('%s')\n", - artwork.gfx_current_identifier, - artwork.gfx_current->identifier, - gfx_new_identifier); -#endif - setLevelArtworkDir(artwork.gfx_first); ClearRectangle(window, 0, 0, WIN_XSIZE, WIN_YSIZE); @@ -3221,11 +3230,14 @@ void ReloadCustomArtwork() 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 @@ -3249,12 +3261,17 @@ 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; @@ -3266,12 +3283,17 @@ void ReloadCustomArtwork() /* 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; -- 2.34.1