[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.48,1.49 script_v1.cpp,1.74,1.75 sdl.cpp,1.80,1.81

[James Brown]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv24646

Modified Files:
	actor.cpp script_v1.cpp sdl.cpp 
Log Message:
Fix anti-aliasing crash and a Zak crash. Note there are still AA
artifacts left on screen. Anyone want to fix this? :)



Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** actor.cpp	11 Apr 2002 17:19:14 -0000	1.48
--- actor.cpp	11 Apr 2002 20:10:46 -0000	1.49
***************
*** 481,484 ****
--- 481,487 ----
  int Scumm::getActorXYPos(Actor * a)
  {
+ 	if (!a)
+ 		return -1;
+ 
  	if (a->room != _currentRoom)
  		return -1;

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** script_v1.cpp	11 Apr 2002 17:19:15 -0000	1.74
--- script_v1.cpp	11 Apr 2002 20:10:46 -0000	1.75
***************
*** 2703,2711 ****
  
  	if (whereIsObject(obj) == WIO_INVENTORY)	/* Don't take an */
! 		return;											/* object twice */
  
  	// warning("adding %d from %d to inventoryOld", obj, _currentRoom);
! 	addObjectToInventory(obj, _currentRoom);
! 	// warning("added to inventoryOld");
  	removeObjectFromRoom(obj);
  	putOwner(obj, _vars[VAR_EGO]);
--- 2703,2710 ----
  
  	if (whereIsObject(obj) == WIO_INVENTORY)	/* Don't take an */
! 		return;									/* object twice */
  
  	// warning("adding %d from %d to inventoryOld", obj, _currentRoom);
! 	addObjectToInventory(obj, _currentRoom);	
  	removeObjectFromRoom(obj);
  	putOwner(obj, _vars[VAR_EGO]);

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** sdl.cpp	11 Apr 2002 17:19:15 -0000	1.80
--- sdl.cpp	11 Apr 2002 20:10:47 -0000	1.81
***************
*** 486,490 ****
  		int i;
  
! 		for (i = 0; i <= numDirtyRects; i++) {
  			dr = &dirtyRects[i];
  			Draw2xSaI(dr, s->_videoMode);
--- 486,490 ----
  		int i;
  
! 		for (i = 0; i < numDirtyRects; i++) {
  			dr = &dirtyRects[i];
  			Draw2xSaI(dr, s->_videoMode);