From 4db96b636a3efd14581e3e31be03ede71391a854 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 26 Feb 2013 16:54:25 +0000
Subject: [PATCH] [Add] Just a bit more sanity checking for music.
---
src/land.c | 1 +
src/music.c | 6 +++---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/land.c b/src/land.c
index 0989c0f..94a66f3 100644
--- a/src/land.c
+++ b/src/land.c
@@ -148,6 +148,7 @@ void takeoff(void) {
if(!landed) return;
music_load(MUSIC_TAKEOFF);
+ music_play();
int sw, sh;
sw = planet->gfx_space->w;
diff --git a/src/music.c b/src/music.c
index 89d14c2..897e9c6 100644
--- a/src/music.c
+++ b/src/music.c
@@ -302,14 +302,14 @@ void music_load(const char* name) {
}
void music_play(void) {
- music_set(MUSIC_PLAYING);
+ if(!music_is(MUSIC_PLAYING)) music_set(MUSIC_PLAYING);
}
void music_stop(void) {
- music_rm(MUSIC_PLAYING);
+ if(music_is(MUSIC_PLAYING)) music_rm(MUSIC_PLAYING);
}
void music_kill(void) {
- music_set(MUSIC_KILL);
+ if(!music_is(MUSIC_KILL)) music_set(MUSIC_KILL);
}