rnd-20030719-2-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 45211a85d182f37c68dafc194fc6d3544052753b..cb782a1f0357598b16e01795519e5a8ff80a5dd3 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -966,8 +966,10 @@ static void set_sound_parameters(int sound, char **parameter_raw)
 
 static void InitSoundInfo()
 {
+#if 0
   struct PropertyMapping *property_mapping = getSoundListPropertyMapping();
   int num_property_mappings = getSoundListPropertyMappingSize();
+#endif
   int *sound_effect_properties;
   int num_sounds = getSoundListSize();
   int i, j;
@@ -1033,6 +1035,8 @@ static void InitSoundInfo()
 
   free(sound_effect_properties);
 
+#if 0
+  /* !!! now handled in InitElementSoundInfo() !!! */
   /* initialize element/sound mapping from dynamic configuration */
   for (i=0; i < num_property_mappings; i++)
   {
@@ -1043,8 +1047,12 @@ static void InitSoundInfo()
     if (action < 0)
       action = ACTION_DEFAULT;
 
+    printf("::: %d: %d, %d, %d ['%s']\n",
+          i, element, action, sound, element_info[element].token_name);
+
     element_info[element].sound[action] = sound;
   }
+#endif
 
 #if 0
   /* TEST ONLY */
@@ -3088,8 +3096,10 @@ void ReloadCustomArtwork()
   char *mus_new_identifier = artwork.mus_current->identifier;
   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,
@@ -3115,18 +3125,61 @@ 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 (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;
-    if (getTreeInfoFromIdentifier(artwork.mus_first, identifier_new) !=
-       getTreeInfoFromIdentifier(artwork.mus_first, 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 0
+    printf("::: 2: ['%s'] '%s', '%s'\n",
+          gfx_new_identifier, identifier_old, identifier_new);
+#endif
 
     leveldir_current_identifier = leveldir_current->identifier;
   }
@@ -3141,14 +3194,28 @@ void ReloadCustomArtwork()
   if (leveldir_current->music_set != NULL)
     mus_new_identifier = leveldir_current->music_set;
 
+#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);
+#endif
+
   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",
+    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
 
     setLevelArtworkDir(artwork.gfx_first);
@@ -3159,10 +3226,25 @@ void ReloadCustomArtwork()
 
     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;
   }
 
@@ -3179,10 +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;
@@ -3194,10 +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;