Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixes to new name input code
[vor.git]
/
sound.c
diff --git
a/sound.c
b/sound.c
index
0c72688
..
3f13e0e
100644
(file)
--- a/
sound.c
+++ b/
sound.c
@@
-1,8
+1,4
@@
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <SDL/SDL.h>
-#include <SDL/SDL_mixer.h>
+#include "sound.h"
extern int sound_flag, music_flag;
extern int sound_flag, music_flag;
@@
-25,7
+21,7
@@
int audio_rate;
Uint16 audio_format;
int audio_channels;
Uint16 audio_format;
int audio_channels;
-char *load_file(char *);
+char *add_path(char *);
char *wav_file[] = {
"sounds/booom.wav",
"sounds/cboom.wav",
char *wav_file[] = {
"sounds/booom.wav",
"sounds/cboom.wav",
@@
-33,13
+29,14
@@
char *wav_file[] = {
"sounds/bzboom.wav"
};
"sounds/bzboom.wav"
};
-char *tune_file[] = {/*{{{*/
+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() {/*{{{*/
+int
+init_sound() {
// Return 1 if the sound is ready to roll, and 0 if not.
int i;
// Return 1 if the sound is ready to roll, and 0 if not.
int i;
@@
-64,20
+61,21
@@
int init_sound() {/*{{{*/
// Preload all the tunes into memory
for (i=0; i<NUM_TUNES; i++) {
// Preload all the tunes into memory
for (i=0; i<NUM_TUNES; i++) {
- if (!(music[i] = Mix_LoadMUS(load_file(tune_file[i])))) {
- printf ("Failed to load %s\n",load_file(tune_file[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++) {
}
}
// Preload all the wav files into memory
for (i=0; i<NUM_SOUNDS; i++) {
- wav[i] = Mix_LoadWAV(load_file(wav_file[i]));
+ wav[i] = Mix_LoadWAV(add_path(wav_file[i]));
}
return 1;
}
return 1;
-}/*}}}*/
+}
-void play_sound(int i) {/*{{{*/
+void
+play_sound(int i) {
if(!sound_flag) return;
#ifdef DEBUG
printf ("play sound %d on first free channel\n",i);
if(!sound_flag) return;
#ifdef DEBUG
printf ("play sound %d on first free channel\n",i);
@@
-90,7
+88,8
@@
int playing=-1;
#undef DEBUG
#undef DEBUG
-void play_tune(int i) {/*{{{*/
+void
+play_tune(int i) {/*{{{*/
if(!sound_flag || !music_flag) return;
if (playing==i)
return;
if(!sound_flag || !music_flag) return;
if (playing==i)
return;
@@
-108,7
+107,7
@@
void play_tune(int i) {/*{{{*/
Mix_VolumeMusic(music_volume[i]);
playing = i;
Mix_VolumeMusic(music_volume[i]);
playing = i;
-}/*}}}*/
+}
/*
*
/*
*