static void InitLevelInfo(void);
static void InitArtworkInfo(void);
static void InitNetworkServer(void);
-static void InitSoundServer(void);
+static void InitMixer(void);
static void InitSound(void);
static void InitGfx(void);
static void InitGfxBackground(void);
InitArtworkInfo(); /* needed before loading gfx, sound & music */
InitCounter();
- InitSoundServer();
+ InitMixer();
InitJoysticks();
InitRND(NEW_RANDOMIZE);
#endif
}
-static void ReloadCustomSounds()
-{
- int i;
-
-#if 1
- printf("DEBUG: reloading sounds '%s' ...\n", artwork.sounds_set_current);
-#endif
-
- FreeAllSounds();
-
- InitSoundList(NUM_SOUNDS);
- for(i=0; i<NUM_SOUNDS; i++)
- LoadSoundToList(sound_name[i], i);
-}
-
-static void ReloadCustomMusic()
-{
-#if 1
- printf("DEBUG: reloading music '%s' ...\n", artwork.music_set_current);
-#endif
-
- FreeAllMusic();
-
- LoadCustomMusic();
-}
-
-static void InitSoundServer()
+static void InitMixer()
{
OpenAudio();
- SetAudioReloadFunctions(ReloadCustomSounds, ReloadCustomMusic);
+ InitSoundList(sound_effects, NUM_SOUND_EFFECTS);
- StartSoundserver();
+ StartMixer();
}
static void InitSound()