[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.46,1.47

James Brown ender at users.sourceforge.net
Sat Mar 9 04:18:05 CET 2002


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

Modified Files:
	gfx.cpp 
Log Message:
Make a slightly less hackier workaround. The virtScreen height check was wrong in the first place.. 


Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** gfx.cpp	9 Mar 2002 12:12:54 -0000	1.46
--- gfx.cpp	9 Mar 2002 12:17:52 -0000	1.47
***************
*** 947,958 ****
  
  	gfxUsageBits[s]|=0x80000000;
! 	if (_curVirtScreen->height > _scrHeight) {
! 		error("Screen Y size %d < Room height %d",
  			_curVirtScreen->height,
  			_scrHeight);
  	}
! 	if (_currentRoom == 79 && _gameID = GID_INDY3_256)	// FIXME: Indy3 workaround
! 			_curVirtScreen->height = 136;
! 
  	gdi.drawBitmap(getResourceAddress(rtRoom, _roomResource)+_IM00_offs,
  		_curVirtScreen, s, 0, _curVirtScreen->height, s, num, 0);
--- 947,958 ----
  
  	gfxUsageBits[s]|=0x80000000;
! 	
! 	if (_curVirtScreen->height < _scrHeight) {	
! 		warning("Screen Y size %d < Room height %d",
  			_curVirtScreen->height,
  			_scrHeight);
+ 		_curVirtScreen->height = _scrHeight; // FIXME: Indy3 Hack
  	}
! 	
  	gdi.drawBitmap(getResourceAddress(rtRoom, _roomResource)+_IM00_offs,
  		_curVirtScreen, s, 0, _curVirtScreen->height, s, num, 0);





More information about the Scummvm-git-logs mailing list