reverted commit 4ca952cbcd991a3e351b6292b37e47361b8f04d3

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 079ece2f796b6f6071b82fb5e413329393cf90ab..eaee671dd79f3f5d2b399de7ac0764eeae3159b1 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -5589,6 +5589,8 @@ static void InitGfx(void)
   InitGfxCustomArtworkInfo();
   InitGfxOtherSettings();
 
+  InitGfxTileSizeInfo(TILESIZE, TILESIZE);
+
   bitmap_font_initial = LoadCustomImage(filename_font_initial);
 
   for (j = 0; j < NUM_INITIAL_FONTS; j++)
@@ -5600,6 +5602,8 @@ static void InitGfx(void)
 
   DrawInitTextHead("Loading graphics");
 
+  InitMenuDesignSettings_Static();
+
   // initialize settings for busy animation with default values
   int parameter[NUM_GFX_ARGS];
   for (i = 0; i < NUM_GFX_ARGS; i++)
@@ -5641,6 +5645,9 @@ static void InitGfx(void)
        }
       }
 
+      // read values from custom graphics config file
+      InitMenuDesignSettings_FromHash(setup_file_hash, FALSE);
+
       freeSetupFileHash(setup_file_hash);
     }
   }
@@ -5688,8 +5695,6 @@ static void InitGfx(void)
   init.busy.width  = anim_initial.width;
   init.busy.height = anim_initial.height;
 
-  InitMenuDesignSettings_Static();
-
   InitGfxDrawBusyAnimFunction(DrawInitAnim);
   InitGfxDrawGlobalAnimFunction(DrawGlobalAnimations);
   InitGfxDrawGlobalBorderFunction(DrawMaskedBorderToTarget);