thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: The heap was a separate resource in SCI1.1 - SCI2.1 games only. It was later

Browse source 
merged into the script files again in SCI3

svn-id: r54279
This commit is contained in:
Filippos Karapetis 2010-11-17 08:30:08 +00:00
parent 553d571c50
commit 0470e47145
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/sci/console.cpp
View file

@ -834,7 +834,7 @@ bool Console::cmdHexgrep(int argc, const char **argv) {
}
bool Console::cmdVerifyScripts(int argc, const char **argv) {
if (getSciVersion() < SCI_VERSION_1_1) {
if (getSciVersion() < SCI_VERSION_1_1 || getSciVersion() == SCI_VERSION_3) {
DebugPrintf("This script check is only meant for SCI1.1-SCI2.1 games\n");
return true;
}

6
engines/sci/engine/script.cpp
View file

@ -90,8 +90,8 @@ void Script::init(int script_nr, ResourceManager *resMan) {
if (getSciVersion() == SCI_VERSION_0_EARLY) {
_bufSize += READ_LE_UINT16(script->data) * 2;
} else if (getSciVersion() >= SCI_VERSION_1_1) {
// In SCI11, the heap was in a separate space from the script. We append
} else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1) {
// In SCI1.1 - SCI2.1, the heap was in a separate space from the script. We append
// it to the end of the script, and adjust addressing accordingly.
// However, since we address the heap with a 16-bit pointer, the
// combined size of the stack and the heap must be 64KB. So far this has
@ -129,7 +129,7 @@ void Script::load(ResourceManager *resMan) {
// Check scripts for matching signatures and patch those, if found
matchSignatureAndPatch(_nr, _buf, script->size);
if (getSciVersion() >= SCI_VERSION_1_1) {
if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1) {
Resource *heap = resMan->findResource(ResourceId(kResourceTypeHeap, _nr), 0);
assert(heap != 0);

4
engines/sci/resource.cpp
View file

@ -2431,9 +2431,11 @@ Common::String ResourceManager::findSierraGameId() {
if (getSciVersion() < SCI_VERSION_1_1) {
heap = findResource(ResourceId(kResourceTypeScript, 0), false);
} else {
} else if (getSciVersion() >= SCI_VERSION_1_1 && getSciVersion() <= SCI_VERSION_2_1) {
heap = findResource(ResourceId(kResourceTypeHeap, 0), false);
nameSelector += 5;
} else if (getSciVersion() == SCI_VERSION_3) {
warning("TODO: findSierraGameId(): SCI3 equivalent");
}
if (!heap)