X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Finit.c;h=e54a016b4542caf01148424f68d24eb5cf96f529;hb=4e745044fe35b4b093b1490a6e3da0fe4ee512de;hp=e4b15279a401e5024b84b343b1fb16613e1f0f06;hpb=3282aa616432ea42399d4dc4ffe637c4406a71c4;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index e4b15279..e54a016b 100644
--- a/src/init.c
+++ b/src/init.c
@@ -4734,6 +4734,12 @@ void Execute_Command(char *command)
       Error(ERR_EXIT, "image target directory '%s' not found or not writable",
 	    global.create_images_dir);
   }
+  else if (strPrefix(command, "create CE image "))
+  {
+    CreateCustomElementImages(&command[16]);
+
+    exit(0);
+  }
 
 #if DEBUG
 #if defined(TARGET_SDL2)
@@ -5069,6 +5075,7 @@ void InitGfx()
 
   InitGfxBuffers();
   InitGfxCustomArtworkInfo();
+  InitGfxOtherSettings();
 
   bitmap_font_initial = LoadCustomImage(filename_font_initial);
 
@@ -5080,52 +5087,79 @@ void InitGfx()
   font_height = getFontHeight(FC_RED);
 
   DrawInitText(getProgramInitString(), 20, FC_YELLOW);
-  DrawInitText(PROGRAM_COPYRIGHT_STRING, 50, FC_RED);
-  DrawInitText(PROGRAM_WEBSITE_STRING, WIN_YSIZE - 20 - font_height, FC_RED);
+  DrawInitText(setup.internal.program_copyright, 50, FC_RED);
+  DrawInitText(setup.internal.program_website, WIN_YSIZE - 20 - font_height,
+	       FC_RED);
 
   DrawInitText("Loading graphics", 120, FC_GREEN);
 
-  /* initialize busy animation with default values */
+  /* initialize settings for busy animation with default values */
   int parameter[NUM_GFX_ARGS];
   for (i = 0; i < NUM_GFX_ARGS; i++)
     parameter[i] = get_graphic_parameter_value(image_config_suffix[i].value,
                                                image_config_suffix[i].token,
                                                image_config_suffix[i].type);
 
-  /* determine settings for busy animation (when displaying startup messages) */
-  for (i = 0; image_config[i].token != NULL; i++)
+  char *anim_token = CONFIG_TOKEN_GLOBAL_BUSY;
+  int len_anim_token = strlen(anim_token);
+
+  /* read settings for busy animation from default custom artwork config */
+  char *gfx_config_filename = getPath3(options.graphics_directory,
+				       GFX_DEFAULT_SUBDIR,
+				       GRAPHICSINFO_FILENAME);
+
+  if (fileExists(gfx_config_filename))
   {
-    char *anim_token = CONFIG_TOKEN_GLOBAL_BUSY;
-    int len_anim_token = strlen(anim_token);
+    SetupFileHash *setup_file_hash = loadSetupFileHash(gfx_config_filename);
 
-    if (strEqual(image_config[i].token, anim_token))
-      filename_anim_initial = image_config[i].value;
-    else if (strlen(image_config[i].token) > len_anim_token &&
-	     strncmp(image_config[i].token, anim_token, len_anim_token) == 0)
+    if (setup_file_hash)
     {
-      for (j = 0; image_config_suffix[j].token != NULL; j++)
+      char *filename = getHashEntry(setup_file_hash, anim_token);
+
+      if (filename)
       {
-	if (strEqual(&image_config[i].token[len_anim_token],
-		     image_config_suffix[j].token))
-	  parameter[j] =
-	    get_graphic_parameter_value(image_config[i].value,
-					image_config_suffix[j].token,
-					image_config_suffix[j].type);
+	filename_anim_initial = getStringCopy(filename);
+
+	for (j = 0; image_config_suffix[j].token != NULL; j++)
+	{
+	  int type = image_config_suffix[j].type;
+	  char *suffix = image_config_suffix[j].token;
+	  char *token = getStringCat2(anim_token, suffix);
+	  char *value = getHashEntry(setup_file_hash, token);
+
+	  checked_free(token);
+
+	  if (value)
+	    parameter[j] = get_graphic_parameter_value(value, suffix, type);
+	}
       }
+
+      freeSetupFileHash(setup_file_hash);
     }
   }
 
-#if defined(CREATE_SPECIAL_EDITION_RND_JUE)
-  filename_anim_initial = "loading.pcx";
-
-  parameter[GFX_ARG_X] = 0;
-  parameter[GFX_ARG_Y] = 0;
-  parameter[GFX_ARG_WIDTH] = 128;
-  parameter[GFX_ARG_HEIGHT] = 40;
-  parameter[GFX_ARG_FRAMES] = 32;
-  parameter[GFX_ARG_DELAY] = 4;
-  parameter[GFX_ARG_FRAMES_PER_LINE] = ARG_UNDEFINED_VALUE;
-#endif
+  if (filename_anim_initial == NULL)
+  {
+    /* read settings for busy animation from static default artwork config */
+    for (i = 0; image_config[i].token != NULL; i++)
+    {
+      if (strEqual(image_config[i].token, anim_token))
+	filename_anim_initial = getStringCopy(image_config[i].value);
+      else if (strlen(image_config[i].token) > len_anim_token &&
+	       strncmp(image_config[i].token, anim_token, len_anim_token) == 0)
+      {
+	for (j = 0; image_config_suffix[j].token != NULL; j++)
+	{
+	  if (strEqual(&image_config[i].token[len_anim_token],
+		       image_config_suffix[j].token))
+	    parameter[j] =
+	      get_graphic_parameter_value(image_config[i].value,
+					  image_config_suffix[j].token,
+					  image_config_suffix[j].type);
+	}
+      }
+    }
+  }
 
   if (filename_anim_initial == NULL)	/* should not happen */
     Error(ERR_EXIT, "cannot get filename for '%s'", CONFIG_TOKEN_GLOBAL_BUSY);
@@ -5136,6 +5170,8 @@ void InitGfx()
   anim_initial.bitmaps[IMG_BITMAP_STANDARD] =
     LoadCustomImage(filename_anim_initial);
 
+  checked_free(filename_anim_initial);
+
   graphic_info = &anim_initial;		/* graphic == 0 => anim_initial */
 
   set_graphic_parameters_ext(0, parameter, anim_initial.bitmaps);
@@ -5152,7 +5188,7 @@ void InitGfx()
   init_last = init;
 }
 
-void RedrawBackground()
+void RedrawGlobalBorder()
 {
   BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, backbuffer,
 	     0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0);
@@ -5569,7 +5605,7 @@ void ReloadCustomArtwork(int force_reload)
 
   FadeOut(REDRAW_ALL);
 
-  RedrawBackground();
+  RedrawGlobalBorder();
 
   /* force redraw of (open or closed) door graphics */
   SetDoorState(DOOR_OPEN_ALL);
@@ -5666,6 +5702,10 @@ void OpenAll()
 
   print_timestamp_time("[init global stuff]");
 
+  InitSetup();
+
+  print_timestamp_time("[init setup/config stuff (1)]");
+
   if (options.execute_command)
     Execute_Command(options.execute_command);
 
@@ -5680,10 +5720,6 @@ void OpenAll()
     exit(0);			/* never reached, server loops forever */
   }
 
-  InitSetup();
-
-  print_timestamp_time("[init setup/config stuff (1)]");
-
   InitGameInfo();
   print_timestamp_time("[init setup/config stuff (2)]");
   InitPlayerInfo();