X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=4407567a3299729d09233cf4897bb5a20d81c74e;hb=491bed5d84c41f14bd1b7875699a1fae63a1986d;hp=6cfba4e633c944145fee8330797e0ef72c32a839;hpb=4f1505e125379280d5e68a04ac780e746e6dfdf5;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index 6cfba4e6..4407567a 100644
--- a/src/init.c
+++ b/src/init.c
@@ -2279,6 +2279,11 @@ static void InitSoundInfo(void)
     }
 
     set_sound_parameters(i, sound->parameter);
+
+#if 0
+    Debug("init:InitSoundInfo", "loop mode: %d ['%s']",
+	  sound_info[i].loop, sound->token);
+#endif
   }
 
   free(sound_effect_properties);
@@ -5471,6 +5476,12 @@ static void InitSetup(void)
   if (setup.options.verbose)
     options.verbose = TRUE;
 
+  if (setup.options.debug)
+    options.debug = TRUE;
+
+  if (!strEqual(setup.options.debug_mode, ARG_UNDEFINED_STRING))
+    options.debug_mode = getStringCopy(setup.options.debug_mode);
+
   if (setup.debug.show_frames_per_second)
     global.show_frames_per_second = TRUE;
 }
@@ -5478,7 +5489,6 @@ static void InitSetup(void)
 static void InitGameInfo(void)
 {
   game.restart_level = FALSE;
-  game.restart_game_message = NULL;
 
   game.request_active = FALSE;
   game.request_active_or_moving = FALSE;
@@ -5703,6 +5713,7 @@ void InitGfxBuffers(void)
 
   InitGfxBuffers_EM();
   InitGfxBuffers_SP();
+  InitGfxBuffers_MM();
 }
 
 static void InitGfx(void)
@@ -5781,10 +5792,6 @@ static void InitGfx(void)
 
   InitFontGraphicInfo();
 
-  DrawProgramInfo();
-
-  DrawInitTextHead("Loading graphics");
-
   InitMenuDesignSettings_Static();
 
   // initialize settings for initial images with default values
@@ -5900,6 +5907,8 @@ static void InitGfx(void)
 
   ClearRectangleOnBackground(window, 0, 0, WIN_XSIZE, WIN_YSIZE);
 
+  DrawProgramInfo();
+
   InitGfxDrawBusyAnimFunction(DrawInitAnim);
   InitGfxDrawGlobalAnimFunction(DrawGlobalAnimations);
   InitGfxDrawGlobalBorderFunction(DrawMaskedBorderToTarget);