X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Finit.c;h=7a5f5eeb521a651bff36cf587fed803df82831df;hp=488b4338c53a819df4c536e528a204ea2b5414f6;hb=2357c391b4a587709627cc30316734b3c83c8134;hpb=0a52f54d2f6ab7dce8062c7738ede185ba5acad3

diff --git a/src/init.c b/src/init.c
index 488b4338..7a5f5eeb 100644
--- a/src/init.c
+++ b/src/init.c
@@ -70,7 +70,7 @@ void OpenAll(int argc, char *argv[])
   InitCounter();
   InitSound();
   InitSoundServer();
-  InitJoystick();
+  InitJoysticks();
   InitRND(NEW_RANDOMIZE);
 
   signal(SIGINT, CloseAllAndExit);
@@ -96,8 +96,13 @@ void InitLevelAndPlayerInfo()
 
   /* choose default local player */
   local_player = &stored_player[0];
+
   for (i=0; i<MAX_PLAYERS; i++)
+  {
+    stored_player[i].joystick_fd = -1;	/* joystick device closed */
     stored_player[i].connected = FALSE;
+  }
+
   local_player->connected = TRUE;
 
   if (!LoadLevelInfo())			/* global level info */
@@ -119,7 +124,7 @@ void InitNetworkServer()
   if (!ConnectToServer(options.server_host, options.server_port))
     Error(ERR_EXIT, "cannot connect to multiplayer server");
 
-  SendToServer_Nickname(local_player->alias_name);
+  SendToServer_Nickname(setup.alias_name);
   SendToServer_ProtocolVersion();
 
   if (nr_wanted)
@@ -216,33 +221,44 @@ void InitSoundServer()
 #endif
 }
 
-void InitJoystick()
+void InitJoysticks()
 {
-  int joystick_nr = setup.input[0].joystick_nr;
+  int i;
 
   if (global_joystick_status == JOYSTICK_OFF)
     return;
 
+  joystick_status = JOYSTICK_OFF;
+
 #ifndef MSDOS
-  if (access(joystick_device_name[joystick_nr], R_OK) < 0)
+  for (i=0; i<MAX_PLAYERS; i++)
   {
-    Error(ERR_WARN, "cannot access joystick device '%s'",
-	  joystick_device_name[joystick_nr]);
-    joystick_status = JOYSTICK_OFF;
-    return;
-  }
+    char *device_name = setup.input[i].joy.device_name;
 
-  if ((joystick_device =
-       open(joystick_device_name[joystick_nr], O_RDONLY)) < 0)
-  {
-    Error(ERR_WARN, "cannot open joystick device '%s'",
-	  joystick_device_name[joystick_nr]);
-    joystick_status = JOYSTICK_OFF;
-    return;
-  }
+    /* this allows subsequent calls to 'InitJoysticks' for re-initialization */
+    if (stored_player[i].joystick_fd != -1)
+    {
+      close(stored_player[i].joystick_fd);
+      stored_player[i].joystick_fd = -1;
+    }
 
-  joystick_status = JOYSTICK_AVAILABLE;
-  LoadJoystickData();
+    if (!setup.input[i].use_joystick)
+      continue;
+
+    if (access(device_name, R_OK) < 0)
+    {
+      Error(ERR_WARN, "cannot access joystick device '%s'", device_name);
+      continue;
+    }
+
+    if ((stored_player[i].joystick_fd = open(device_name, O_RDONLY)) < 0)
+    {
+      Error(ERR_WARN, "cannot open joystick device '%s'", device_name);
+      continue;
+    }
+
+    joystick_status = JOYSTICK_AVAILABLE;
+  }
 #else
   joystick_status = JOYSTICK_AVAILABLE;
 #endif