diff options
author | Torbjörn Andersson | 2004-04-20 07:21:25 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2004-04-20 07:21:25 +0000 |
commit | dfe25fbfd8f8c2a1d015e5d6ca9380ca5a07c00d (patch) | |
tree | f7538c677016a573b4fbe6c90ac47db22d515355 /scumm | |
parent | ac967bde630457fbaf2220145ee048abda652cfe (diff) | |
download | scummvm-rg350-dfe25fbfd8f8c2a1d015e5d6ca9380ca5a07c00d.tar.gz scummvm-rg350-dfe25fbfd8f8c2a1d015e5d6ca9380ca5a07c00d.tar.bz2 scummvm-rg350-dfe25fbfd8f8c2a1d015e5d6ca9380ca5a07c00d.zip |
Added note that the previous commit probably fixed bug #933610 as well.
svn-id: r13599
Diffstat (limited to 'scumm')
-rw-r--r-- | scumm/resource.cpp | 3 | ||||
-rw-r--r-- | scumm/saveload.cpp | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/scumm/resource.cpp b/scumm/resource.cpp index d204df526d..369ed6c603 100644 --- a/scumm/resource.cpp +++ b/scumm/resource.cpp @@ -2111,7 +2111,8 @@ void ScummEngine::readMAXS() { _numLocalObjects = _fileHandle.readUint16LE(); // 200 _numArray = 50; _numVerbs = 100; - // Used to be 50, which wasn't enough for MI2. See bug #936323. + // Used to be 50, which wasn't enough for MI2 and FOA. See bugs + // #933610 and #936323. _numNewNames = 100; _objectRoomTable = NULL; diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp index 51a090b87a..42c8fa24c8 100644 --- a/scumm/saveload.cpp +++ b/scumm/saveload.cpp @@ -824,10 +824,11 @@ void ScummEngine::saveLoadResource(Serializer *ser, int type, int idx) { } if (type == rtObjectName && ser->getVersion() >= VER(25)) { // Paranoia: We increased the possible number of new names - // for MI2 to fix bug #936323. The savegame format didn't - // change, but at least during the transition period there - // is a slight chance that we try to load more names than - // we have allocated space for. If so, discard them. + // to fix bugs #933610 and #936323. The savegame format + // didn't change, but at least during the transition + // period there is a slight chance that we try to load + // more names than we have allocated space for. If so, + // discard them. if (idx < _numNewNames) _newNames[idx] = ser->loadUint16(); } |