rnd-19981025-1

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index c3798d5abd4ac316fd9aba0f23a3d948636572f0..211e66e36260200fe2630aacad99a78de6dbf913 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -94,6 +94,9 @@ void InitLevelAndPlayerInfo()
 {
   int i;
 
+
+#if 0
+
   /* initialize local setup */
   setup.sound_on = TRUE;
   setup.sound_loops_on = FALSE;
@@ -120,12 +123,22 @@ void InitLevelAndPlayerInfo()
     setup.input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KEY_UNDEFINDED);
   }
 
+#endif
+
+
+
   /* choose default local player */
   local_player = &stored_player[0];
 
   if (!LoadLevelInfo())                        /* global level info */
     Error(ERR_EXIT, NULL);
 
+
+
+  LoadSetup();
+
+
+
   LoadPlayerInfo(PLAYER_SETUP);                /* global setup info */
   LoadPlayerInfo(PLAYER_LEVEL);                /* level specific info */