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
testing shared repo thing
[vor.git]
/
sound.c
diff --git
a/sound.c
b/sound.c
index
1a69535
..
16f3d60
100644
(file)
--- a/
sound.c
+++ b/
sound.c
@@
-1,5
+1,5
@@
-#include <SDL/SDL.h>
-#include <SDL/SDL_mixer.h>
+#include <SDL.h>
+#include <SDL_mixer.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
@@
-18,25
+18,25
@@
int audio_rate;
Uint16 audio_format;
int audio_channels;
Uint16 audio_format;
int audio_channels;
-char *add_path(char *);
+char *add_data_path(char *);
char *wav_file[] = {
char *wav_file[] = {
- "sounds/booom.wav",
- "sounds/cboom.wav",
- "sounds/boom.wav",
- "sounds/bzboom.wav"
+ "booom.wav",
+ "cboom.wav",
+ "boom.wav",
+ "bzboom.wav"
};
char *tune_file[] = {
};
char *tune_file[] = {
- "music/magic.mod",
- "music/getzznew.mod",
- "music/4est_fulla3s.mod"
+ "magic.mod",
+ "getzznew.mod",
+ "4est_fulla3s.mod"
};
};
+// Return 1 if the sound is ready to roll, and 0 if not.
int
init_sound() {
int
init_sound() {
- // Return 1 if the sound is ready to roll, and 0 if not.
-
int i;
int i;
+ char *s;
// 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) {
@@
-46,14
+46,21
@@
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(add_path(tune_file[i])))) {
- printf ("Failed to load %s\n",add_path(tune_file[i]));
+ s = add_data_path(tune_file[i]);
+ if(s) {
+ music[i] = Mix_LoadMUS(s);
+ if(!music[i]) printf("Failed to load %s.\n", s);
+ free(s);
}
}
// 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(add_path(wav_file[i]));
+ s = add_data_path(wav_file[i]);
+ if(s) {
+ wav[i] = Mix_LoadWAV(s);
+ free(s);
+ }
}
return 1;
}
return 1;
@@
-63,14
+70,14
@@
void
play_sound(int i) {
if(!opt_sound) return;
Mix_PlayChannel(-1, wav[i], 0);
play_sound(int i) {
if(!opt_sound) return;
Mix_PlayChannel(-1, wav[i], 0);
-}/*}}}*/
+}
int playing=-1;
void
int playing=-1;
void
-play_tune(int i) {/*{{{*/
- if(!opt_music) return;
+play_tune(int i) {
+ if(!opt_sound) return;
if (playing==i)
return;
if (playing) {
if (playing==i)
return;
if (playing) {