aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorJonathan Gray2005-08-10 06:16:26 +0000
committerJonathan Gray2005-08-10 06:16:26 +0000
commit3c1b5648aed0be45b303cea49e7537c98dd4a001 (patch)
treebd810ba197c9ceeab024be3f4b602c558b92019f /base
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 'base')
-rw-r--r--base/engine.cpp2
-rw-r--r--base/main.cpp3
2 files changed, 4 insertions, 1 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index d84728a2e0..0fd5aaee6e 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -94,7 +94,7 @@ void Engine::checkCD() {
// If we can find a compressed audio track, then it should be ok even
// if it's running from CD.
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
if (Common::File::exists("track1.ogg"))
return;
#endif
diff --git a/base/main.cpp b/base/main.cpp
index edf970fe02..47e70194fd 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -97,6 +97,9 @@ const char *gScummVMVersion = "0.8.0CVS";
const char *gScummVMBuildDate = __DATE__ " " __TIME__;
const char *gScummVMFullVersion = "ScummVM 0.8.0CVS (" __DATE__ " " __TIME__ ")";
const char *gScummVMFeatures = ""
+#ifdef USE_TREMOR
+ "Tremor "
+#endif
#ifdef USE_VORBIS
"Vorbis "
#endif