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

Fix anti-aliasing crash and a Zak crash. Note there are still AA

Browse source 
artifacts left on screen. Anyone want to fix this? :)

svn-id: r3909
This commit is contained in:
James Brown 2002-04-11 20:10:47 +00:00
parent 7696081c54
commit 6e508eed29
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
actor.cpp
View file

@ -480,6 +480,9 @@ void Scumm::putActor(Actor * a, int x, int y, byte room)
int Scumm::getActorXYPos(Actor * a) int Scumm::getActorXYPos(Actor * a)
{ {
if (!a)
return -1;
if (a->room != _currentRoom) if (a->room != _currentRoom)
return -1; return -1;
_xPos = a->x; _xPos = a->x;

3
script_v1.cpp
View file

@ -2702,11 +2702,10 @@ void Scumm::o5_pickupObjectOld()
return; return;
if (whereIsObject(obj) == WIO_INVENTORY) /* Don't take an */ if (whereIsObject(obj) == WIO_INVENTORY) /* Don't take an */
return; /* object twice */ return; /* object twice */
// warning("adding %d from %d to inventoryOld", obj, _currentRoom); // warning("adding %d from %d to inventoryOld", obj, _currentRoom);
addObjectToInventory(obj, _currentRoom); addObjectToInventory(obj, _currentRoom);
// warning("added to inventoryOld");
removeObjectFromRoom(obj); removeObjectFromRoom(obj);
putOwner(obj, _vars[VAR_EGO]); putOwner(obj, _vars[VAR_EGO]);
putClass(obj, 32, 1); putClass(obj, 32, 1);

2
sdl.cpp
View file

@ -485,7 +485,7 @@ void updateScreen2xSaI(Scumm *s)
SDL_Rect *dr; SDL_Rect *dr;
int i; int i;
for (i = 0; i <= numDirtyRects; i++) { for (i = 0; i < numDirtyRects; i++) {
dr = &dirtyRects[i]; dr = &dirtyRects[i];
Draw2xSaI(dr, s->_videoMode); Draw2xSaI(dr, s->_videoMode);
} }