rnd-20001104-1-src

[rocksndiamonds.git] / src / init.c

diff --git a/src/init.c b/src/init.c
index 7d97072ef0ac2b236aafdbc5019135e943632810..941881f3218f6126181cfad12fc76d15217e020a 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -170,7 +170,7 @@ void InitSound()
     return;
   }
 
-  if (Mix_OpenAudio(22050, AUDIO_S16, 2, 256) < 0)
+  if (Mix_OpenAudio(22050, AUDIO_S16, 2, 512) < 0)
   {
     Error(ERR_WARN, "Mix_OpenAudio() failed: %s", SDL_GetError());
     sound_status = SOUND_OFF;
@@ -193,7 +193,7 @@ void InitSound()
     return;
   }
 
-  if ((sound_device = open(sound_device_name,O_WRONLY))<0)
+  if ((sound_device = OpenAudio(sound_device_name)) < 0)
   {
     Error(ERR_WARN, "cannot open sound device - no sounds");
     sound_status = SOUND_OFF;
@@ -228,6 +228,7 @@ void InitSound()
     if (!LoadSound(&Sound[i]))
     {
       sound_status = SOUND_OFF;
+      sound_loops_allowed = FALSE;
       return;
     }
   }
@@ -282,7 +283,7 @@ void InitSoundServer()
 
 void InitJoysticks()
 {
-#ifdef USE_SDL_LIBRARY
+#ifdef USE_SDL_JOYSTICK
   static boolean sdl_joystick_subsystem_initialized = FALSE;
 #endif
 
@@ -293,7 +294,7 @@ void InitJoysticks()
 
   joystick_status = JOYSTICK_OFF;
 
-#ifdef USE_SDL_LIBRARY
+#ifdef USE_SDL_JOYSTICK
 
   if (!sdl_joystick_subsystem_initialized)
   {
@@ -333,7 +334,7 @@ void InitJoysticks()
     joystick_status = JOYSTICK_AVAILABLE;
   }
 
-#else /* !USE_SDL_LIBRARY */
+#else /* !USE_SDL_JOYSTICK */
 
 #ifndef MSDOS
   for (i=0; i<MAX_PLAYERS; i++)
@@ -2203,7 +2204,7 @@ void InitElementProperties()
     for(j=0; j<*(ep2_num[i]); j++)
       Elementeigenschaften2[(ep2_array[i])[j]] |= ep2_bit[i];
 
-  for(i=EL_CHAR_START; i<EL_CHAR_END; i++)
+  for(i=EL_CHAR_START; i<=EL_CHAR_END; i++)
     Elementeigenschaften1[i] |= (EP_BIT_CHAR | EP_BIT_INACTIVE);
 }