diff options
| author | Filippos Karapetis | 2010-07-25 22:47:17 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-07-25 22:47:17 +0000 |
| commit | fed9541f475f4781dca28fa1d4cc94b36402dc62 (patch) | |
| tree | 28a18f57c436ecbb4c7c045945de50eb5def3af9 /engines/sci/resource.cpp | |
| parent | e3866046af852a465acabdc018bc1adf97767ac9 (diff) | |
| download | scummvm-rg350-fed9541f475f4781dca28fa1d4cc94b36402dc62.tar.gz scummvm-rg350-fed9541f475f4781dca28fa1d4cc94b36402dc62.tar.bz2 scummvm-rg350-fed9541f475f4781dca28fa1d4cc94b36402dc62.zip | |
Fixed LSL6 hires resources, speech and lip sync work now (thanks to a discussion we had with clone2727)
svn-id: r51287
Diffstat (limited to 'engines/sci/resource.cpp')
| -rw-r--r-- | engines/sci/resource.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index d84e9cc75b..65c9e6f34e 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -164,8 +164,15 @@ ResourceType ResourceManager::convertResType(byte type) { } else { // SCI2.1+ #ifdef ENABLE_SCI32 - if (type < ARRAYSIZE(s_resTypeMapSci21)) - return s_resTypeMapSci21[type]; + if (type < ARRAYSIZE(s_resTypeMapSci21)) { + // LSL6 hires doesn't have the chunk resource type, to match + // the resource types of the lowres version, thus we use the + // older resource types here + if (g_sci && g_sci->getGameId() == GID_LSL6HIRES) + return s_resTypeMapSci0[type]; + else + return s_resTypeMapSci21[type]; + } #else error("SCI32 support not compiled in"); #endif |