aboutsummaryrefslogtreecommitdiff
path: root/scumm/smush
diff options
context:
space:
mode:
authorJonathan Gray2005-08-10 06:16:26 +0000
committerJonathan Gray2005-08-10 06:16:26 +0000
commit3c1b5648aed0be45b303cea49e7537c98dd4a001 (patch)
treebd810ba197c9ceeab024be3f4b602c558b92019f /scumm/smush
parentc6c5c8f868c0c0ea37ddef156b8581d304ad5cac (diff)
downloadscummvm-rg350-3c1b5648aed0be45b303cea49e7537c98dd4a001.tar.gz
scummvm-rg350-3c1b5648aed0be45b303cea49e7537c98dd4a001.tar.bz2
scummvm-rg350-3c1b5648aed0be45b303cea49e7537c98dd4a001.zip
Rest of the changes required for tremor to actually work.
Based on patches against 0.7.1 by Jolan Luff. svn-id: r18641
Diffstat (limited to 'scumm/smush')
-rw-r--r--scumm/smush/smush_player.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index 9ce66eb44e..e3b2d836e4 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -1199,7 +1199,7 @@ void SmushPlayer::tryCmpFile(const char *filename) {
if (i == NULL) {
error("invalid filename : %s", filename);
}
-#if defined(USE_MAD) || defined(USE_VORBIS)
+#if defined(USE_MAD) || defined(USE_VORBIS) || defined(USE_TREMOR)
char fname[260];
#endif
#ifdef USE_MAD
@@ -1213,7 +1213,7 @@ void SmushPlayer::tryCmpFile(const char *filename) {
return;
}
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
memcpy(fname, filename, i - filename);
strcpy(fname + (i - filename), ".ogg");
_compressedFile.open(fname);