rnd-20030722-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 19e3230bc0eafec2ad75d6756dfd1d6d6d441b33..57cdc8e15ac56852058190a16dfe5ef9ebb8976b 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -2628,7 +2628,7 @@ void InitElementPropertiesEngine(int engine_version)
     /* ---------- CAN_EXPLODE ---------------------------------------------- */
     SET_PROPERTY(i, EP_CAN_EXPLODE, (CAN_EXPLODE_BY_FIRE(i) ||
                                     CAN_EXPLODE_SMASHED(i) ||
-                                    CAN_EXPLODE_BY_FIRE(i)));
+                                    CAN_EXPLODE_IMPACT(i)));
   }
 
 #if 0
@@ -3091,9 +3091,15 @@ void ReloadCustomArtwork()
   static boolean last_override_level_sounds = FALSE;
   static boolean last_override_level_music = 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
@@ -3101,18 +3107,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",
@@ -3125,12 +3129,14 @@ 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;
+#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 +3150,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
@@ -3186,7 +3201,7 @@ void ReloadCustomArtwork()
     mus_new_identifier = leveldir_current->music_set;
 
 #if 1
-  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' [setup '%s', level '%s']\n",
         artwork.gfx_current_identifier, gfx_new_identifier,
         artwork.gfx_current->identifier, leveldir_current->graphics_set);
 #endif
@@ -3194,38 +3209,45 @@ void ReloadCustomArtwork()
   if (strcmp(artwork.gfx_current_identifier, gfx_new_identifier) != 0 ||
       last_override_level_graphics != setup.override_level_graphics)
   {
+#if 1
+    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);
 
     InitImages();
 
+#if 0
+    printf("::: %d\n", menu.list_size[GAME_MODE_LEVELS]);
+#endif
+
     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
@@ -3249,12 +3271,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 +3293,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;