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
music pauses when game pauses and ends when game ends
[vor.git]
/
sound.c
diff --git
a/sound.c
b/sound.c
index
6ddc496
..
471808e
100644
(file)
--- a/
sound.c
+++ b/
sound.c
@@
-74,18
+74,48
@@
int playing=-1;
void
play_tune(int i) {
void
play_tune(int i) {
- if(!opt_sound) return;
- if (playing==i)
- return;
+ if(!opt_sound) {
+ return;
+ }
+ if (playing == i) {
+ return;
+ }
if (playing) {
if (playing) {
- Mix_FadeOutMusic(1500);
+ Mix_FadeOutMusic(2500);
+ }
+ if(i == TUNE_GAMEPLAY) {
+ 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;
}
+
+int tune_paused=0;
+
+void
+pause_tune() {
+ if(!opt_sound) {
+ return;
+ }
+ if(playing == TUNE_GAMEPLAY && !tune_paused) {
+ Mix_PauseMusic();
+ tune_paused = 1;
+ }
+}
+
+void
+resume_tune() {
+ if(!opt_sound) {
+ return;
+ }
+ if(playing == TUNE_GAMEPLAY && tune_paused) {
+ Mix_ResumeMusic();
+ tune_paused = 0;
+ }
+}
+
/*
*
* The init_sound() routine is called first.
/*
*
* The init_sound() routine is called first.