rnd-20030719-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 7e4b1727863b3c5ffd3b1cd59a9da024e5fdae19..19e3230bc0eafec2ad75d6756dfd1d6d6d441b33 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 */
@@ -2749,7 +2757,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);
@@ -3088,19 +3096,23 @@ 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
+#if 1
   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 0
+#if 1
   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",
@@ -3118,16 +3130,48 @@ void ReloadCustomArtwork()
     char *identifier_old = leveldir_current_identifier;
     char *identifier_new = leveldir_current->identifier;
 
-    if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_old) !=
-       getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new))
+#if 1
+    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;
-    if (getTreeInfoFromIdentifier(artwork.snd_first, identifier_old) !=
-       getTreeInfoFromIdentifier(artwork.snd_first, identifier_new))
+#else
+    if (getTreeInfoFromIdentifier(artwork.gfx_first, identifier_new) == NULL)
+      gfx_new_identifier = setup.graphics_set;
+    else
+      gfx_new_identifier = identifier_new;
+#endif
+
+#if 1
+    if (leveldir_current_identifier == NULL)
+      leveldir_current_identifier = leveldir_current->identifier;
+#endif
+
+    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))
+
+    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;
 
+#if 1
+    printf("::: 2: ['%s'] '%s', '%s'\n",
+          gfx_new_identifier, identifier_old, identifier_new);
+#endif
+
     leveldir_current_identifier = leveldir_current->identifier;
   }
 
@@ -3141,10 +3185,24 @@ void ReloadCustomArtwork()
   if (leveldir_current->music_set != NULL)
     mus_new_identifier = leveldir_current->music_set;
 
+#if 1
+  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
+    artwork.gfx_current =
+      getTreeInfoFromIdentifier(artwork.gfx_first, gfx_new_identifier);
+#endif
+#if 1
+    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,
@@ -3159,10 +3217,22 @@ void ReloadCustomArtwork()
 
     FreeTileClipmasks();
     InitTileClipmasks();
+#if 0
+    artwork.gfx_current =
+      getTreeInfoFromIdentifier(artwork.gfx_first, gfx_new_identifier);
+#endif
+    printf("::: '%s', %lx\n", gfx_new_identifier, artwork.gfx_current);
 
+#if 0
     artwork.gfx_current_identifier = artwork.gfx_current->identifier;
+#endif
     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;
   }
 
@@ -3182,6 +3252,8 @@ void ReloadCustomArtwork()
     InitReloadCustomSounds(snd_new_identifier);
     ReinitializeSounds();
 
+    artwork.snd_current =
+      getTreeInfoFromIdentifier(artwork.snd_first, setup.sounds_set);
     artwork.snd_current_identifier = artwork.snd_current->identifier;
     last_override_level_sounds = setup.override_level_sounds;
 
@@ -3197,6 +3269,8 @@ void ReloadCustomArtwork()
     InitReloadCustomMusic(mus_new_identifier);
     ReinitializeMusic();
 
+    artwork.mus_current =
+      getTreeInfoFromIdentifier(artwork.mus_first, setup.music_set);
     artwork.mus_current_identifier = artwork.mus_current->identifier;
     last_override_level_music = setup.override_level_music;