libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-05 00:01:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug : INDY3: Crash when loading new savegames

Browse Source 
svn-id: r7240
This commit is contained in:
Max Horn 2003-05-01 11:03:41 +00:00
parent f62a4ae83e
commit c77cbc5cb4
2 changed files with 7 additions and 2 deletions

4
scumm/charset.cpp

@ -29,7 +29,9 @@ void CharsetRendererCommon::setCurID(byte id) {
_curId = id;
_fontPtr = _vm->getResourceAddress(rtCharset, id);
assert(_fontPtr);
if (_fontPtr == 0)
error("CharsetRendererCommon::setCurID: charset %d not found!\n", id);
if (_vm->_features & GF_AFTER_V3) {
_nbChars = _fontPtr[4];
_fontPtr += 6 + _nbChars;

5
scumm/resource.cpp

@ -558,7 +558,10 @@ void Scumm::ensureResourceLoaded(int type, int i) {
i = _resourceMapper[i & 0x7F];
}
if (i == 0)
// FIXME - TODO: This check used to be "i==0". However, that causes
// problems when using this function to ensure charset 0 is loaded.
// Quesetion: Why was this check like that in the first place?
if (i < 0)
return;
if (i <= res.num[type])