[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.32,1.33 string.cpp,1.20,1.21

[James Brown]

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

Modified Files:
	script_v1.cpp string.cpp 
Log Message:
A few small hacks to make Indy3 (256) run through the intro..



Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** script_v1.cpp	15 Feb 2002 15:00:48 -0000	1.32
--- script_v1.cpp	16 Feb 2002 03:59:18 -0000	1.33
***************
*** 2257,2260 ****
--- 2257,2264 ----
  	byte *oldaddr;
  
+ 	 // Fixme: Indy3
+ 	if ((_opcode == 0xAE) && (_gameId == GID_INDY3_256))
+           return;
+ 
  	oldaddr = _scriptPointer - 1;
  	

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** string.cpp	14 Feb 2002 22:51:01 -0000	1.20
--- string.cpp	16 Feb 2002 03:59:18 -0000	1.21
***************
*** 242,252 ****
  	charset._color = _charsetColor;
  	_bkColor = 0;
! 
! 	for (i=0; i<4; i++)
                  if(_features & GF_SMALL_HEADER)
                          charset._colorMap[i] = _charsetData[charset._curId][i-12];
                  else
                          charset._colorMap[i] = _charsetData[charset._curId][i];
! 
  	if (_keepText) {
  		charset._strLeft = gdi._mask_left;
--- 242,253 ----
  	charset._color = _charsetColor;
  	_bkColor = 0;
! 	
! 	if(!(_features & GF_OLD256))	// FIXME
! 		for (i=0; i<4; i++)
                  if(_features & GF_SMALL_HEADER)
                          charset._colorMap[i] = _charsetData[charset._curId][i-12];
                  else
                          charset._colorMap[i] = _charsetData[charset._curId][i];
! 	
  	if (_keepText) {
  		charset._strLeft = gdi._mask_left;
***************
*** 419,423 ****
  	charset._unk12 = 1;
  	charset._disableOffsX = 1;
! 
  	charsetptr = getResourceAddress(rtCharset, charset._curId);
  	assert(charsetptr);
--- 420,424 ----
  	charset._unk12 = 1;
  	charset._disableOffsX = 1;
! 	if(!(_features & GF_OLD256)) {
  	charsetptr = getResourceAddress(rtCharset, charset._curId);
  	assert(charsetptr);
***************
*** 433,437 ****
  
  	byte1 = charsetptr[1];
! 	
  	_msgPtrToAdd = buf;
  
--- 434,438 ----
  
  	byte1 = charsetptr[1];
! 	}
  	_msgPtrToAdd = buf;
  
***************
*** 654,657 ****
--- 655,659 ----
  void Scumm::initCharset(int charsetno) {
  	int i;
+ 	if(_features & GF_OLD256) return; // FIXME
  
          if (_features & GF_SMALL_HEADER)