diff options
| author | Travis Howell | 2005-05-07 08:10:23 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-05-07 08:10:23 +0000 |
| commit | abcd44cd683c91ec52b887cacee2d4fbff7e7e4c (patch) | |
| tree | ff8c8174175c450233330834d7ab38c4907dfb51 /scumm | |
| parent | 8de4c596a090c819e36990085ddc03302b482c0e (diff) | |
| download | scummvm-rg350-abcd44cd683c91ec52b887cacee2d4fbff7e7e4c.tar.gz scummvm-rg350-abcd44cd683c91ec52b887cacee2d4fbff7e7e4c.tar.bz2 scummvm-rg350-abcd44cd683c91ec52b887cacee2d4fbff7e7e4c.zip | |
Missed one section.
svn-id: r17939
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/script_v100he.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v7he.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scumm/script_v100he.cpp b/scumm/script_v100he.cpp index 45d18ccf8b..b132d0263d 100644 --- a/scumm/script_v100he.cpp +++ b/scumm/script_v100he.cpp @@ -1102,6 +1102,10 @@ void ScummEngine_v100he::o100_resourceRoutines() { break; case 136: // Queue loading + if (_heResType == rtScript && _heResId >= _numGlobalScripts) + break; + + ensureResourceLoaded(_heResType, _heResId); break; case 137: if (_heResType == rtScript && _heResId >= _numGlobalScripts) diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp index 5ba8004a14..b85e6da83d 100644 --- a/scumm/script_v7he.cpp +++ b/scumm/script_v7he.cpp @@ -512,7 +512,6 @@ void ScummEngine_v70he::o70_resourceRoutines() { subOp = fetchScriptByte(); - debug(0, "o70_resourceRoutines: case %d", subOp); switch (subOp) { case 100: // SO_LOAD_SCRIPT resid = pop(); @@ -606,6 +605,8 @@ void ScummEngine_v70he::o70_resourceRoutines() { case 120: // Queue load script resid = pop(); + if (resid >= _numGlobalScripts) + break; ensureResourceLoaded(rtScript, resid); break; case 121: |