Mercurial Mercurial > hedgewars / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hedgewars/uSound.pas
branchphysfslayer
changeset 8046 4d3415927d2c
parent 8025 07862ab415c8
child 8096 453917e94e55
child 8145 6408c0ba4ba1 
--- a/hedgewars/uSound.pas	Sat Nov 17 00:41:30 2012 +0400
+++ b/hedgewars/uSound.pas	Sat Nov 17 22:07:17 2012 +0400
@@ -416,12 +416,10 @@
     if (not isSoundEnabled) or (MusicFN = '') or (not isMusicEnabled) then
         exit;
 
-    s:= UserPathPrefix + '/Data/Music/' + MusicFN;
-    if not FileExists(s) then
-        s:= PathPrefix + '/Music/' + MusicFN;
+    s:= '/Music/' + MusicFN;
     WriteToConsole(msgLoading + s + ' ');
 
-    Mus:= Mix_LoadMUS(Str2PChar(s));
+    Mus:= Mix_LoadMUS_RW(rwopsOpenRead(s));
     SDLTry(Mus <> nil, false);
     WriteLnToConsole(msgOK);
hedgewars