rnd-19981026-2

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index c3798d5abd4ac316fd9aba0f23a3d948636572f0..488b4338c53a819df4c536e528a204ea2b5414f6 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -94,49 +94,17 @@ void InitLevelAndPlayerInfo()
 {
   int i;
 
-  /* initialize local setup */
-  setup.sound_on = TRUE;
-  setup.sound_loops_on = FALSE;
-  setup.sound_music_on = FALSE;
-  setup.sound_simple_on = FALSE;
-  setup.toons_on = TRUE;
-  setup.direct_draw_on = FALSE;
-  setup.scroll_delay_on = FALSE;
-  setup.soft_scrolling_on = TRUE;
-  setup.fading_on = FALSE;
-  setup.autorecord_on = FALSE;
-  setup.quick_doors = FALSE;
-  for (i=0; i<MAX_PLAYERS; i++)
-  {
-    setup.input[i].use_joystick = FALSE;
-    setup.input[i].joystick_nr = 0;
-    setup.input[i].joy.snap  = (i == 0 ? JOY_BUTTON_1 : 0);
-    setup.input[i].joy.bomb  = (i == 0 ? JOY_BUTTON_2 : 0);
-    setup.input[i].key.left  = (i == 0 ? DEFAULT_KEY_LEFT  : KEY_UNDEFINDED);
-    setup.input[i].key.right = (i == 0 ? DEFAULT_KEY_RIGHT : KEY_UNDEFINDED);
-    setup.input[i].key.up    = (i == 0 ? DEFAULT_KEY_UP    : KEY_UNDEFINDED);
-    setup.input[i].key.down  = (i == 0 ? DEFAULT_KEY_DOWN  : KEY_UNDEFINDED);
-    setup.input[i].key.snap  = (i == 0 ? DEFAULT_KEY_SNAP  : KEY_UNDEFINDED);
-    setup.input[i].key.bomb  = (i == 0 ? DEFAULT_KEY_BOMB  : KEY_UNDEFINDED);
-  }
-
   /* choose default local player */
   local_player = &stored_player[0];
+  for (i=0; i<MAX_PLAYERS; i++)
+    stored_player[i].connected = FALSE;
+  local_player->connected = TRUE;
 
   if (!LoadLevelInfo())                        /* global level info */
     Error(ERR_EXIT, NULL);
 
-  LoadPlayerInfo(PLAYER_SETUP);                /* global setup info */
-  LoadPlayerInfo(PLAYER_LEVEL);                /* level specific info */
-
-  /* after LoadPlayerInfo(), because it overwrites 'local_player' */
-  for (i=0; i<MAX_PLAYERS; i++)
-  {
-    stored_player[i].connected = FALSE;
-    stored_player[i].local = FALSE;
-  }
-  local_player->connected = TRUE;
-  local_player->local = TRUE;
+  LoadSetup();                         /* global setup info */
+  LoadLevelSetup();                    /* info about last played level */
 }
 
 void InitNetworkServer()
@@ -168,14 +136,14 @@ void InitSound()
 #ifndef MSDOS
   if (access(sound_device_name,W_OK)<0)
   {
-    Error(ERR_RETURN, "cannot access sound device - no sounds");
+    Error(ERR_WARN, "cannot access sound device - no sounds");
     sound_status = SOUND_OFF;
     return;
   }
 
   if ((sound_device = open(sound_device_name,O_WRONLY))<0)
   {
-    Error(ERR_RETURN, "cannot open sound device - no sounds");
+    Error(ERR_WARN, "cannot open sound device - no sounds");
     sound_status = SOUND_OFF;
     return;
   }
@@ -185,11 +153,19 @@ void InitSound()
 
 #ifdef VOXWARE
   sound_loops_allowed = TRUE;
+
+  /*
   setup.sound_loops_on = TRUE;
+  */
+
 #endif
 #else
   sound_loops_allowed = TRUE;
+
+  /*
   setup.sound_loops_on = TRUE;
+  */
+
 #endif
 
   for(i=0; i<NUM_SOUNDS; i++)
@@ -214,14 +190,14 @@ void InitSoundServer()
 #ifndef MSDOS
   if (pipe(sound_pipe)<0)
   {
-    Error(ERR_RETURN, "cannot create pipe - no sounds");
+    Error(ERR_WARN, "cannot create pipe - no sounds");
     sound_status = SOUND_OFF;
     return;
   }
 
   if ((sound_process_id = fork()) < 0)
   {       
-    Error(ERR_RETURN, "cannot create sound server process - no sounds");
+    Error(ERR_WARN, "cannot create sound server process - no sounds");
     sound_status = SOUND_OFF;
     return;
   }
@@ -250,7 +226,7 @@ void InitJoystick()
 #ifndef MSDOS
   if (access(joystick_device_name[joystick_nr], R_OK) < 0)
   {
-    Error(ERR_RETURN, "cannot access joystick device '%s'",
+    Error(ERR_WARN, "cannot access joystick device '%s'",
          joystick_device_name[joystick_nr]);
     joystick_status = JOYSTICK_OFF;
     return;
@@ -259,7 +235,7 @@ void InitJoystick()
   if ((joystick_device =
        open(joystick_device_name[joystick_nr], O_RDONLY)) < 0)
   {
-    Error(ERR_RETURN, "cannot open joystick device '%s'",
+    Error(ERR_WARN, "cannot open joystick device '%s'",
          joystick_device_name[joystick_nr]);
     joystick_status = JOYSTICK_OFF;
     return;