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

debugger fix,

Browse source 
removed hardcoded constants,
resouce lock state is now saved in the savegame,
fixed bug with MI1

svn-id: r3470
This commit is contained in:
Ludvig Strigeus 2001-11-07 18:10:52 +00:00
parent e55d303f22
commit 6cd4b9d71f
12 changed files with 175 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

5
object.cpp
View file

@ -85,7 +85,8 @@ int Scumm::getObjectIndex(int object) {
int Scumm::whereIsObject(int object) {
int i;
assert(object>=0 && object < _numGlobalObjects);
if (object >= _numGlobalObjects)
return -1;
if ((_objectFlagTable[object]&0xF)!=0xF) {
for (i=0; i<_maxInventoryItems; i++)
@ -793,7 +794,7 @@ void Scumm::setCursorImg(uint room, uint img) {
h = READ_LE_UINT16(&cdhd->v6.h)>>3;
size = READ_BE_UINT32(&cdhd->size);
if (size > 1000)
if (size > sizeof(_grabbedCursor))
error("setCursorImg: Cursor image too large");
dataptr = findResource(MKID('IM01'),obim, 0);