diff options
| author | Filippos Karapetis | 2010-11-17 08:53:02 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-11-17 08:53:02 +0000 |
| commit | f44b084deba5a192ac1fe90377179733b694d243 (patch) | |
| tree | 0e91cdf25e97b77b2ac2d42277e0ac983f8cef2a /engines/sci/resource.cpp | |
| parent | 0470e47145b42a8e9af56c1553bc9944c6096cba (diff) | |
| download | scummvm-rg350-f44b084deba5a192ac1fe90377179733b694d243.tar.gz scummvm-rg350-f44b084deba5a192ac1fe90377179733b694d243.tar.bz2 scummvm-rg350-f44b084deba5a192ac1fe90377179733b694d243.zip | |
SCI: Some restructuring. Added some SCI3 placeholders/stubs
svn-id: r54280
Diffstat (limited to 'engines/sci/resource.cpp')
| -rw-r--r-- | engines/sci/resource.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp index 0be52834b9..71ea2decc4 100644 --- a/engines/sci/resource.cpp +++ b/engines/sci/resource.cpp @@ -2411,9 +2411,9 @@ reg_t ResourceManager::findGameObject(bool addSci11ScriptOffset) { int16 offset = !isSci11Mac() ? READ_LE_UINT16(offsetPtr) : READ_BE_UINT16(offsetPtr); - // In SCI1.1 and newer, the heap is appended at the end of the script, + // In SCI1.1 - SCI2.1, the heap is appended at the end of the script, // so adjust the offset accordingly - if (getSciVersion() >= SCI_VERSION_1_1 && addSci11ScriptOffset) { + if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1 && addSci11ScriptOffset) { offset += script->size; // Ensure that the start of the heap is word-aligned - same as in Script::init() @@ -2425,7 +2425,8 @@ reg_t ResourceManager::findGameObject(bool addSci11ScriptOffset) { } Common::String ResourceManager::findSierraGameId() { - // In SCI0-SCI1, the heap is embedded in the script. In SCI1.1+, it's separated + // In SCI0-SCI1, the heap is embedded in the script. In SCI1.1 - SCI2.1, + // it's in a separate heap resource Resource *heap = 0; int nameSelector = 3; |