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
Moved macros and such from config.h to common.h
[vor.git]
/
sound.c
diff --git
a/sound.c
b/sound.c
index
d522955
..
480690d
100644
(file)
--- a/
sound.c
+++ b/
sound.c
@@
-1,7
+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"
#include "config.h"
-
-extern int sound_flag, music_flag;
+#include "sound.h"
#define TUNE_TITLE_PAGE 0
#define TUNE_GAMEPLAY 1
#define TUNE_TITLE_PAGE 0
#define TUNE_GAMEPLAY 1
@@
-72,7
+78,7
@@
init_sound() {
void
play_sound(int i) {
void
play_sound(int i) {
- if(!sound_flag) return;
+ if(!opt_sound) return;
debug(printf ("play sound %d on first free channel\n",i));
Mix_PlayChannel(-1, wav[i], 0);
}/*}}}*/
debug(printf ("play sound %d on first free channel\n",i));
Mix_PlayChannel(-1, wav[i], 0);
}/*}}}*/
@@
-82,7
+88,7
@@
int playing=-1;
void
play_tune(int i) {/*{{{*/
void
play_tune(int i) {/*{{{*/
- if(!music_flag) return;
+ if(!opt_music) return;
if (playing==i)
return;
if (playing) {
if (playing==i)
return;
if (playing) {