summaryrefslogtreecommitdiff
path: root/src/audio/music.c
diff options
context:
space:
mode:
authororoborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-09-03 09:58:41 +0000
committeroroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>2008-09-03 09:58:41 +0000
commit24bb721b3c1dc0b15d74ccecda03744357af558d (patch)
treee4af6ea2eedb649b55689f141fb8bf343875165f /src/audio/music.c
parent85c0f71d6e90a451f64cd032a3e58157d57dc226 (diff)
- opravene regresnie, kotre vznikli, pri prepise naciatavania aren z *.zip
( a odstranene prebytocne subory z adresarovej struktury -- tie ktore su uz zabalene v zip ) git-svn-id: http://opensvn.csie.org/tuxanci_ng@265 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src/audio/music.c')
-rw-r--r--src/audio/music.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/audio/music.c b/src/audio/music.c
index f2ac6e1..f1c5cd8 100644
--- a/src/audio/music.c
+++ b/src/audio/music.c
@@ -50,13 +50,26 @@ static Mix_Music* loadMixMusic(char *file)
{
Mix_Music *mixer;
char str[STR_PATH_SIZE];
+
#ifdef DEBUG
printf(_("Loading music file: %s\n"), file);
#endif
- sprintf(str, PATH_MUSIC "%s", file);
+
+ if( isFillPath(file) )
+ {
+ strcpy(str, file);
+ }
+ else
+ {
+ sprintf(str, PATH_MUSIC "%s", file);
+ }
+
accessExistFile(str);
+
mixer = Mix_LoadMUS(str);
- if( mixer == NULL ) {
+
+ if( mixer == NULL )
+ {
fprintf(stderr, _("Unable to load music from file: %s\n"), file);
return NULL;
}