[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.49,1.50 scummvm.cpp,1.71,1.72

[James Brown]

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

Modified Files:
	gfx.cpp scummvm.cpp 
Log Message:
Correct a DOTT bug - and break some saved games again :/
People, remember this is alpha software - things change constantly :)

DOTT is now fully completable again, along with Sam and Max.




Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** gfx.cpp	9 Mar 2002 12:39:13 -0000	1.49
--- gfx.cpp	9 Mar 2002 15:07:31 -0000	1.50
***************
*** 6,10 ****
   * as published by the Free Software Foundation; either version 2
   * of the License, or (at your option) any later version.
- 
   * This program is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
--- 6,9 ----
***************
*** 948,956 ****
  	gfxUsageBits[s]|=0x80000000;
  	
! 	if (_curVirtScreen->height < _scrHeight) {	
  		warning("Screen Y size %d < Room height %d",
  			_curVirtScreen->height,
  			_scrHeight);
! 	}	
  
  	gdi.drawBitmap(getResourceAddress(rtRoom, _roomResource)+_IM00_offs,
--- 947,955 ----
  	gfxUsageBits[s]|=0x80000000;
  	
! 	/*if (_curVirtScreen->height < _scrHeight) {	
  		warning("Screen Y size %d < Room height %d",
  			_curVirtScreen->height,
  			_scrHeight);
! 	}*/	
  
  	gdi.drawBitmap(getResourceAddress(rtRoom, _roomResource)+_IM00_offs,

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** scummvm.cpp	9 Mar 2002 00:56:22 -0000	1.71
--- scummvm.cpp	9 Mar 2002 15:07:32 -0000	1.72
***************
*** 224,228 ****
  
  	
! 	if (_features & GF_AFTER_V6)
  		NUM_ACTORS = 30;
  	else
--- 224,228 ----
  
  	
! 	if ((_features & GF_AFTER_V7) || (_gameId == GID_SAMNMAX)) 
  		NUM_ACTORS = 30;
  	else