X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Finit.c;h=92f52c568d337d766e2a69e22956caefdf048290;hb=41cfe645942062496cd063eb46e17d677a76c645;hp=ab51dd9fef4ce8c6ffc1ddacf9df2da289f99fc4;hpb=0e5a0f487acaed09a34c655b83ea637c83f4a0f0;p=rocksndiamonds.git

diff --git a/src/init.c b/src/init.c
index ab51dd9f..92f52c56 100644
--- a/src/init.c
+++ b/src/init.c
@@ -14,6 +14,7 @@
 #include <signal.h>
 
 #include "init.h"
+#include "events.h"
 #include "misc.h"
 #include "sound.h"
 #include "screens.h"
@@ -146,6 +147,31 @@ void InitSound()
   if (sound_status == SOUND_OFF)
     return;
 
+#ifdef USE_SDL_LIBRARY
+  /* initialize SDL audio */
+
+  if (SDL_Init(SDL_INIT_AUDIO) < 0)
+  {
+    Error(ERR_WARN, "SDL_Init() failed: %s\n", SDL_GetError());
+    sound_status = SOUND_OFF;
+    return;
+  }
+
+  if (Mix_OpenAudio(22050, AUDIO_S16, 2, 256) < 0)
+  {
+    Error(ERR_WARN, "Mix_OpenAudio() failed: %s\n", SDL_GetError());
+    sound_status = SOUND_OFF;
+    return;
+  }
+
+  Mix_Volume(-1, SDL_MIX_MAXVOLUME / 4);
+  Mix_VolumeMusic(SDL_MIX_MAXVOLUME / 4);
+
+  sound_status = SOUND_AVAILABLE;
+  sound_loops_allowed = TRUE;
+
+#else /* !USE_SDL_LIBRARY */
+
 #ifndef MSDOS
   if (access(sound_device_name, W_OK) != 0)
   {
@@ -180,6 +206,7 @@ void InitSound()
   */
 
 #endif /* MSDOS */
+#endif /* !USE_SDL_LIBRARY */
 
   for(i=0; i<NUM_SOUNDS; i++)
   {
@@ -187,13 +214,26 @@ void InitSound()
     sprintf(sound_name[i], "%d", i + 1);
 #endif
 
+#ifdef USE_SDL_LIBRARY
+    {
+      char *str = getStringCopy(sound_name[i]);
+      sprintf(str, "%d", i + 1);
+      Sound[i].name = str;
+    }
+#else
     Sound[i].name = sound_name[i];
+#endif
     if (!LoadSound(&Sound[i]))
     {
       sound_status = SOUND_OFF;
       return;
     }
   }
+
+#if 0
+  sound_status = SOUND_OFF;
+#endif
+
 }
 
 void InitSoundServer()
@@ -201,6 +241,10 @@ void InitSoundServer()
   if (sound_status == SOUND_OFF)
     return;
 
+#ifdef USE_SDL_LIBRARY
+  return;
+#endif
+
 #ifndef MSDOS
 
   if (pipe(sound_pipe)<0)
@@ -236,6 +280,10 @@ void InitSoundServer()
 
 void InitJoysticks()
 {
+#ifdef USE_SDL_LIBRARY
+  static boolean sdl_joystick_subsystem_initialized = FALSE;
+#endif
+
   int i;
 
   if (global_joystick_status == JOYSTICK_OFF)
@@ -243,6 +291,48 @@ void InitJoysticks()
 
   joystick_status = JOYSTICK_OFF;
 
+#ifdef USE_SDL_LIBRARY
+
+  if (!sdl_joystick_subsystem_initialized)
+  {
+    sdl_joystick_subsystem_initialized = TRUE;
+
+    if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
+    {
+      Error(ERR_EXIT, "SDL_Init() failed: %s\n", SDL_GetError());
+      return;
+    }
+  }
+
+  for (i=0; i<MAX_PLAYERS; i++)
+  {
+    char *device_name = setup.input[i].joy.device_name;
+    int joystick_nr = getJoystickNrFromDeviceName(device_name);
+
+    if (joystick_nr >= SDL_NumJoysticks())
+      joystick_nr = -1;
+
+    /* misuse joystick file descriptor variable to store joystick number */
+    stored_player[i].joystick_fd = joystick_nr;
+
+    /* this allows subsequent calls to 'InitJoysticks' for re-initialization */
+    if (Check_SDL_JoystickOpened(joystick_nr))
+      Close_SDL_Joystick(joystick_nr);
+
+    if (!setup.input[i].use_joystick)
+      continue;
+
+    if (!Open_SDL_Joystick(joystick_nr))
+    {
+      Error(ERR_WARN, "cannot open joystick %d", joystick_nr);
+      continue;
+    }
+
+    joystick_status = JOYSTICK_AVAILABLE;
+  }
+
+#else /* !USE_SDL_LIBRARY */
+
 #ifndef MSDOS
   for (i=0; i<MAX_PLAYERS; i++)
   {
@@ -296,12 +386,14 @@ void InitJoysticks()
     stored_player[i].joystick_fd = joystick_nr;
   }
 #endif
+
+#endif /* !USE_SDL_LIBRARY */
 }
 
 void InitDisplay()
 {
 #ifdef USE_SDL_LIBRARY
-  /* initialize SDL */
+  /* initialize SDL video */
   if (SDL_Init(SDL_INIT_VIDEO) < 0)
     Error(ERR_EXIT, "SDL_Init() failed: %s\n", SDL_GetError());
 
@@ -367,6 +459,9 @@ void InitWindow(int argc, char *argv[])
   /* set window and icon title */
   SDL_WM_SetCaption(WINDOW_TITLE_STRING, WINDOW_TITLE_STRING);
 
+  /* set event filter to filter out certain mouse motion events */
+  SDL_SetEventFilter(EventFilter);
+
 #else /* !USE_SDL_LIBRARY */
 
   unsigned int border_width = 4;