diff options
| author | Filippos Karapetis | 2009-08-25 23:15:18 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-08-25 23:15:18 +0000 |
| commit | f7acc7f669537210b513559474799e52a04bd528 (patch) | |
| tree | 1f3e561efe24088863dae6a7e3435239fd14b234 /engines | |
| parent | 228ceb3b63cb0e0661259f946faf3fac98d22ee2 (diff) | |
| download | scummvm-rg350-f7acc7f669537210b513559474799e52a04bd528.tar.gz scummvm-rg350-f7acc7f669537210b513559474799e52a04bd528.tar.bz2 scummvm-rg350-f7acc7f669537210b513559474799e52a04bd528.zip | |
Fixed compilation when ENABLE_SCI32 is not set
svn-id: r43744
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/sci/engine/kernel32.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/resource.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/engines/sci/engine/kernel32.cpp b/engines/sci/engine/kernel32.cpp index eac0007ee3..0c1e35068c 100644 --- a/engines/sci/engine/kernel32.cpp +++ b/engines/sci/engine/kernel32.cpp @@ -27,6 +27,8 @@ namespace Sci { +#ifdef ENABLE_SCI32 + static const char *sci2_default_knames[] = { /*0x00*/ "Load", /*0x01*/ "UnLoad", @@ -356,4 +358,6 @@ void Kernel::setKernelNamesSci21() { _kernelNames = Common::StringList(sci21_default_knames, ARRAYSIZE(sci21_default_knames)); } +#endif // ENABLE_SCI32 + } // End of namespace Sci diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 68186a7501..9943ae0ae1 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -1587,7 +1587,11 @@ SciVersion ResourceManager::detectSciVersion() { } // Set view type - if (viewCompression == kCompDCL || viewCompression == kCompSTACpack) { + if (viewCompression == kCompDCL +#ifdef ENABLE_SCI32 + || viewCompression == kCompSTACpack +#endif + ) { // SCI1.1 VGA views _viewType = kViewVga11; } else { |