diff options
| author | Jonathan Gray | 2005-08-10 12:42:56 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2005-08-10 12:42:56 +0000 |
| commit | 603a5e4d6f7403d3d797ead4b4cc909ab55c34d1 (patch) | |
| tree | 7d2419b901c71a0e6c823d4a7b07abebaf610dd7 /scumm/smush | |
| parent | 3c1b5648aed0be45b303cea49e7537c98dd4a001 (diff) | |
| download | scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.tar.gz scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.tar.bz2 scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.zip | |
Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.
svn-id: r18642
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_player.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index e3b2d836e4..9ce66eb44e 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) || defined(USE_TREMOR) +#if defined(USE_MAD) || defined(USE_VORBIS) char fname[260]; #endif #ifdef USE_MAD @@ -1213,7 +1213,7 @@ void SmushPlayer::tryCmpFile(const char *filename) { return; } #endif -#if defined(USE_VORBIS) || defined(USE_TREMOR) +#ifdef USE_VORBIS memcpy(fname, filename, i - filename); strcpy(fname + (i - filename), ".ogg"); _compressedFile.open(fname); |