diff options
| author | Travis Howell | 2004-09-22 05:08:07 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-22 05:08:07 +0000 |
| commit | 08856609f3db4fdf5d18d1cd8c7c2e6bebcdc9ea (patch) | |
| tree | 960af03da2d51e9b76a7b1b45f8c908e13e3b53c | |
| parent | 93784786744cc1507de68c27065d2d79b5bdb112 (diff) | |
| download | scummvm-rg350-08856609f3db4fdf5d18d1cd8c7c2e6bebcdc9ea.tar.gz scummvm-rg350-08856609f3db4fdf5d18d1cd8c7c2e6bebcdc9ea.tar.bz2 scummvm-rg350-08856609f3db4fdf5d18d1cd8c7c2e6bebcdc9ea.zip | |
Filename string go a bit higher
svn-id: r15231
| -rw-r--r-- | scumm/script_v6he.cpp | 3 | ||||
| -rw-r--r-- | scumm/script_v72he.cpp | 4 | ||||
| -rw-r--r-- | scumm/script_v80he.cpp | 7 |
3 files changed, 8 insertions, 6 deletions
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp index 66f2cd5c2e..3b34e8dce8 100644 --- a/scumm/script_v6he.cpp +++ b/scumm/script_v6he.cpp @@ -1031,8 +1031,7 @@ void ScummEngine_v60he::o60_openFile() { void ScummEngine_v60he::o60_closeFile() { int slot = pop(); if (slot != -1) - if (_hFileTable[slot].isOpen() == true) - _hFileTable[slot].close(); + _hFileTable[slot].close(); } void ScummEngine_v60he::o60_deleteFile() { diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index f8ece1fd73..5e66341317 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -1239,7 +1239,7 @@ void ScummEngine_v72he::o72_arrayOps() { int list[128]; byte string[2048]; - debug(1,"o72_arrayOps: case %d\n", subOp); + debug(1,"o72_arrayOps: case %d", subOp); switch (subOp) { case 7: // SO_ASSIGN_STRING copyScriptString(string); @@ -1756,7 +1756,7 @@ void ScummEngine_v72he::o72_jumpToScript() { void ScummEngine_v72he::o72_openFile() { int mode, slot, l, r; - byte filename[100]; + byte filename[256]; mode = pop(); copyScriptString(filename); diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp index 981b832f48..728f49700c 100644 --- a/scumm/script_v80he.cpp +++ b/scumm/script_v80he.cpp @@ -561,8 +561,11 @@ void ScummEngine_v80he::o80_cursorCommand() { void ScummEngine_v80he::loadImgSpot(int resId, int state, uint32 &w, uint32 &h) { const uint8 *dataPtr = getResourceAddress(rtImage, resId); - if (!dataPtr) - error("loadImgSpot: unknown Image %d", resId); + if (!dataPtr) { + warning("loadImgSpot: unknown Image %d", resId); + w = h = 0; + return; + } const uint8 *spotPtr = findWrappedBlock(MKID('SPOT'), dataPtr, state, 0); |