Don't link pak tool with SDL.

[quix0rs-blobwars.git] / src / CAudio.cpp

diff --git a/src/CAudio.cpp b/src/CAudio.cpp
index 40af208fc2b2966ab985451364dafe3cf433f3cb..aaab6a87fb9b29125bc8aaff8dfeb170d4e5543e 100644 (file)
--- a/src/CAudio.cpp
+++ b/src/CAudio.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2004-2010 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -110,8 +110,6 @@ bool Audio::loadMusic(const char *filename)
 
        remove(tempPath);
        
-       SDL_Delay(250); // wait a bit, just to be sure!
-
        if (music != NULL)
        {
                Mix_HaltMusic();
@@ -138,7 +136,15 @@ bool Audio::loadMusic(const char *filename)
                return false;
        }
 
-       snprintf(tempPath, sizeof tempPath, "%s.tags", filename);
+       #if USEPAK
+               snprintf(tempPath, sizeof tempPath, "%smusic.tags", engine->userHomeDirectory);
+               remove(tempPath);
+               char tagfilename[PATH_MAX];
+               snprintf(tagfilename, sizeof tagfilename, "%s.tags", filename);
+               engine->unpack(tagfilename, PAK_TAGS);
+       #else
+               snprintf(tempPath, sizeof tempPath, "%s.tags", filename);
+       #endif
        FILE *fp = fopen(tempPath, "r");
        char line[1024];