X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=19e3230bc0eafec2ad75d6756dfd1d6d6d441b33;hb=68ce14c8ea8794fbf2c8af7c7119a514b024f7c4;hp=c614643e8d2bd8adf1e10c6bdd181f61d423f076;hpb=c9bb6e0a6eecbf84320be79b121bd957a938a08c;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index c614643e..19e3230b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -645,7 +645,7 @@ static void set_graphic_parameters(int graphic, char **parameter_raw)
     anim_frames_per_col = src_bitmap->height / graphic_info[graphic].height;
   }
 
-  /* correct x or y offset dependant of vertical or horizontal frame order */
+  /* correct x or y offset dependent of vertical or horizontal frame order */
   if (parameter[GFX_ARG_VERTICAL])	/* frames are ordered vertically */
   {
     graphic_info[graphic].offset_y =
@@ -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 */
@@ -1526,6 +1534,9 @@ void InitElementPropertiesStatic()
     EL_GATE_2_GRAY,
     EL_GATE_3_GRAY,
     EL_GATE_4_GRAY,
+    EL_PENGUIN,
+    EL_PIG,
+    EL_DRAGON,
     -1
   };
 
@@ -2243,7 +2254,9 @@ void InitElementPropertiesStatic()
     EL_DYNABOMB_INCREASE_NUMBER,
     EL_DYNABOMB_INCREASE_SIZE,
     EL_DYNABOMB_INCREASE_POWER,
+#if 0
     EL_SOKOBAN_OBJECT,
+#endif
     EL_SOKOBAN_FIELD_EMPTY,
     EL_SOKOBAN_FIELD_FULL,
     EL_WALL_EMERALD_RED,
@@ -2273,7 +2286,9 @@ void InitElementPropertiesStatic()
     EL_SP_PORT_VERTICAL,
     EL_SP_PORT_ANY,
     EL_SP_DISK_RED,
+#if 0
     EL_SP_DISK_YELLOW,
+#endif
     EL_SP_CHIP_SINGLE,
     EL_SP_CHIP_LEFT,
     EL_SP_CHIP_RIGHT,
@@ -2514,7 +2529,7 @@ void InitElementPropertiesEngine(int engine_version)
   InitElementPropertiesStatic();
 #endif
 
-  /* set all special, combined or engine dependant element properties */
+  /* set all special, combined or engine dependent element properties */
   for (i=0; i < MAX_NUM_ELEMENTS; i++)
   {
 #if 0
@@ -2659,6 +2674,7 @@ void InitElementPropertiesEngine(int engine_version)
 		  engine_version > VERSION_IDENT(2,0,1)));
   }
 
+#if 0
   /* dynamically adjust element properties according to game engine version */
 #if 0
   if (engine_version < RELEASE_IDENT(2,2,0,7))
@@ -2672,6 +2688,7 @@ void InitElementPropertiesEngine(int engine_version)
       element_info[element].push_delay_random = 8;
     }
   }
+#endif
 }
 
 static void InitGlobal()
@@ -2740,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);
@@ -3079,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",
@@ -3109,22 +3130,54 @@ 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;
   }
 
   /* custom level artwork configured in level series configuration file
      always overrides custom level artwork stored in level series directory
-     and (level independant) custom artwork configured in setup menue */
+     and (level independent) custom artwork configured in setup menue */
   if (leveldir_current->graphics_set != NULL)
     gfx_new_identifier = leveldir_current->graphics_set;
   if (leveldir_current->sounds_set != NULL)
@@ -3132,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,
@@ -3150,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;
   }
 
@@ -3173,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;
 
@@ -3188,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;
 
@@ -3289,7 +3372,7 @@ void CloseAllAndExit(int exit_value)
   FreeTileClipmasks();
 
   CloseVideoDisplay();
-  ClosePlatformDependantStuff();
+  ClosePlatformDependentStuff();
 
   exit(exit_value);
 }