X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=4a5578e643e3bcc02f2ccc87c6f3b04df1f4d576;hb=8cef2a63b6c56ba086183693d3f73f02862cbd8f;hp=cbfab54b20dae6f0bb8a34c653630f0e075dd0b1;hpb=e7f36cd97c8580345714b4a22d6b4ad291e50ed6;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index cbfab54b..4a5578e6 100644
--- a/src/init.c
+++ b/src/init.c
@@ -34,7 +34,7 @@
 struct PictureFileInfo
 {
   char *picture_filename;
-  BOOL picture_with_mask;
+  boolean picture_with_mask;
 };
 
 struct IconFileInfo
@@ -57,9 +57,9 @@ static void InitElementProperties(void);
 
 void OpenAll(int argc, char *argv[])
 {
-  if (serveronly)
+  if (options.serveronly)
   {
-    NetworkServer(server_port, serveronly);
+    NetworkServer(options.server_port, options.serveronly);
 
     /* never reached */
     exit(0);
@@ -94,6 +94,33 @@ 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.joy_input[i].use_joystick = FALSE;
+    setup.joy_input[i].joystick_nr = i;
+    setup.joy_input[i].button_snap = JOY_BUTTON_1;
+    setup.joy_input[i].button_bomb = JOY_BUTTON_2;
+    setup.key_input[i].left = DEFAULT_KEY_LEFT;
+    setup.key_input[i].right = DEFAULT_KEY_RIGHT;
+    setup.key_input[i].up = DEFAULT_KEY_UP;
+    setup.key_input[i].down = DEFAULT_KEY_DOWN;
+    setup.key_input[i].snap = DEFAULT_KEY_SNAP;
+    setup.key_input[i].bomb = DEFAULT_KEY_BOMB;
+  }
+
+  /* choose default local player */
   local_player = &stored_player[0];
 
   if (!LoadLevelInfo())			/* global level info */
@@ -102,6 +129,7 @@ void InitLevelAndPlayerInfo()
   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;
@@ -115,12 +143,12 @@ void InitNetworkServer()
 {
   int nr_wanted;
 
-  if (!network)
+  if (!options.network)
     return;
 
   nr_wanted = Request("Choose player", REQ_PLAYER | REQ_STAY_CLOSED);
 
-  if (!ConnectToServer(server_host, server_port))
+  if (!ConnectToServer(options.server_host, options.server_port))
     Error(ERR_EXIT, "cannot connect to multiplayer server");
 
   SendToServer_Nickname(local_player->alias_name);
@@ -157,11 +185,11 @@ void InitSound()
 
 #ifdef VOXWARE
   sound_loops_allowed = TRUE;
-  sound_loops_on = TRUE;
+  setup.sound_loops_on = TRUE;
 #endif
 #else
   sound_loops_allowed = TRUE;
-  sound_loops_on = TRUE;
+  setup.sound_loops_on = TRUE;
 #endif
 
   for(i=0; i<NUM_SOUNDS; i++)
@@ -214,11 +242,13 @@ void InitSoundServer()
 
 void InitJoystick()
 {
+  int joystick_nr = setup.joy_input[0].joystick_nr;
+
   if (global_joystick_status == JOYSTICK_OFF)
     return;
 
 #ifndef MSDOS
-  if (access(joystick_device_name[joystick_nr],R_OK)<0)
+  if (access(joystick_device_name[joystick_nr], R_OK) < 0)
   {
     Error(ERR_RETURN, "cannot access joystick device '%s'",
 	  joystick_device_name[joystick_nr]);
@@ -226,7 +256,8 @@ void InitJoystick()
     return;
   }
 
-  if ((joystick_device = open(joystick_device_name[joystick_nr],O_RDONLY))<0)
+  if ((joystick_device =
+       open(joystick_device_name[joystick_nr], O_RDONLY)) < 0)
   {
     Error(ERR_RETURN, "cannot open joystick device '%s'",
 	  joystick_device_name[joystick_nr]);
@@ -248,8 +279,9 @@ void InitDisplay()
   unsigned int depth;
 
   /* connect to X server */
-  if (!(display = XOpenDisplay(display_name)))
-    Error(ERR_EXIT,"cannot connect to X server %s",XDisplayName(display_name));
+  if (!(display = XOpenDisplay(options.display_name)))
+    Error(ERR_EXIT, "cannot connect to X server %s",
+	  XDisplayName(options.display_name));
 
   screen = DefaultScreen(display);
   visual = DefaultVisual(display, screen);