Friction doesn't make sense any more, dropped that.

[vor.git] / sound.c

diff --git a/sound.c b/sound.c
index e9008f1..480690d 100644 (file)
--- a/sound.c
+++ b/sound.c
@@ -1,10 +1,13 @@
-#include "sound.h"
+#include <SDL/SDL.h>
+#include <SDL/SDL_mixer.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <unistd.h>
+
+#include "args.h"
+#include "common.h"
 #include "config.h"
-
-extern int sound_flag, music_flag;
-
-#define CONDERROR(a) if ((a)) {fprintf(stderr,"Error: %s\n",SDL_GetError());exit(1);}
-#define NULLERROR(a) CONDERROR((a)==NULL)
+#include "sound.h"
 
 #define TUNE_TITLE_PAGE                0
 #define TUNE_GAMEPLAY          1
@@ -24,30 +27,30 @@ int audio_channels;
 
 char *add_path(char *);
 char *wav_file[] = {
-    "sounds/booom.wav",
+       "sounds/booom.wav",
        "sounds/cboom.wav",
        "sounds/boom.wav",
        "sounds/bzboom.wav"
 };
 
 char *tune_file[] = {
-    "music/magic.mod",
-    "music/getzznew.mod",
-    "music/4est_fulla3s.mod"
+       "music/magic.mod",
+       "music/getzznew.mod",
+       "music/4est_fulla3s.mod"
 };
 
 int
 init_sound() {
-    // Return 1 if the sound is ready to roll, and 0 if not.
+       // Return 1 if the sound is ready to roll, and 0 if not.
 
-    int i;
-    debug(printf ("Initialise sound\n"));
+       int i;
+       debug(printf ("Initialise sound\n"));
 
-    // Initialise output with SDL_mixer
-    if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, AUDIO_S16, MIX_DEFAULT_CHANNELS, 4096) < 0) {
+       // Initialise output with SDL_mixer
+       if (Mix_OpenAudio(MIX_DEFAULT_FREQUENCY, AUDIO_S16, MIX_DEFAULT_CHANNELS, 4096) < 0) {
        fprintf(stderr, "Couldn't open SDL_mixer audio: %s\n", SDL_GetError());
        return 0;
-    }
+       }
 
        debug(
                        // What kind of sound did we get?  Ah who cares. As long as it can play
@@ -58,26 +61,26 @@ init_sound() {
                                (audio_channels > 1) ? "stereo" : "mono");
                        ) 
 
-    // Preload all the tunes into memory
-    for (i=0; i<NUM_TUNES; i++) {
-       if (!(music[i] = Mix_LoadMUS(add_path(tune_file[i])))) {
-           printf ("Failed to load %s\n",add_path(tune_file[i]));
+       // Preload all the tunes into memory
+       for (i=0; i<NUM_TUNES; i++) {
+               if (!(music[i] = Mix_LoadMUS(add_path(tune_file[i])))) {
+                       printf ("Failed to load %s\n",add_path(tune_file[i]));
+               }
        }
-    }
 
-    // Preload all the wav files into memory
-    for (i=0; i<NUM_SOUNDS; i++) {
-       wav[i] = Mix_LoadWAV(add_path(wav_file[i]));
-    }
+       // Preload all the wav files into memory
+       for (i=0; i<NUM_SOUNDS; i++) {
+               wav[i] = Mix_LoadWAV(add_path(wav_file[i]));
+       }
 
-    return 1;
+       return 1;
 }
 
 void
 play_sound(int i)  {
-       if(!sound_flag) return;
-    debug(printf ("play sound %d on first free channel\n",i));
-    Mix_PlayChannel(-1, wav[i], 0);
+       if(!opt_sound) return;
+       debug(printf ("play sound %d on first free channel\n",i));
+       Mix_PlayChannel(-1, wav[i], 0);
 }/*}}}*/
 
 int playing=-1;
@@ -85,21 +88,21 @@ int playing=-1;
 
 void
 play_tune(int i) {/*{{{*/
-       if(!sound_flag || !music_flag) return;
-    if (playing==i)
+       if(!opt_music) return;
+       if (playing==i)
        return;
-    if (playing) {
-       Mix_FadeOutMusic(1500);
-       debug(printf("Stop playing %d\n",playing));
-    }
+       if (playing) {
+               Mix_FadeOutMusic(1500);
+               debug(printf("Stop playing %d\n",playing));
+       }
        debug(
                        printf ("Play music %d\n",i);
                        printf ("volume %d\n",music_volume[i]);
                        )
-    Mix_FadeInMusic(music[i],-1,2000);
-    Mix_VolumeMusic(music_volume[i]);
+       Mix_FadeInMusic(music[i],-1,2000);
+       Mix_VolumeMusic(music_volume[i]);
 
-    playing = i;
+       playing = i;
 }
 
 /*