[Scummvm-cvs-logs] CVS: scummvm boxes.cpp,1.10,1.11 costume.cpp,1.13,1.14 script_v1.cpp,1.26,1.27 sound.cpp,1.15,1.16 string.cpp,1.19,1.20

[Vincent Hamm]

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

Modified Files:
	boxes.cpp costume.cpp script_v1.cpp sound.cpp string.cpp 
Log Message:
Indy3 256 now boot. Disabled costumes for zak256 and indy3_256 since they can crash sdl

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** boxes.cpp	14 Feb 2002 18:20:22 -0000	1.10
--- boxes.cpp	14 Feb 2002 22:51:01 -0000	1.11
***************
*** 47,51 ****
  	checkRange(ptr[0]-1, 0, box, "Illegal box %d");
          if(_features & GF_SMALL_HEADER) {
! 		if (_gameId == GID_ZAK256) 
  			return (Box*)(ptr + box*(SIZEOF_BOX-2) + 1);		
  		else
--- 47,51 ----
  	checkRange(ptr[0]-1, 0, box, "Illegal box %d");
          if(_features & GF_SMALL_HEADER) {
! 		if (_features & GF_OLD256) 
  			return (Box*)(ptr + box*(SIZEOF_BOX-2) + 1);		
  		else

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** costume.cpp	12 Feb 2002 18:20:37 -0000	1.13
--- costume.cpp	14 Feb 2002 22:51:01 -0000	1.14
***************
*** 787,790 ****
--- 787,793 ----
  	LoadedCostume lc;
  
+ 	if(_features & GF_OLD256) /*FIXME*/
+ 		return;
+ 	
  	loadCostume(&lc, a->costume);
  

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** script_v1.cpp	14 Feb 2002 22:09:47 -0000	1.26
--- script_v1.cpp	14 Feb 2002 22:51:01 -0000	1.27
***************
*** 1295,1299 ****
  	if (_opcode != 17)
  		res = getVarOrDirectByte(0x80);
! 	if(_gameId == GID_ZAK256) /*FIXME: find a better way to implement this */
  		_opcode&=0x3F;
  	switch(_opcode&0x1F) {
--- 1295,1299 ----
  	if (_opcode != 17)
  		res = getVarOrDirectByte(0x80);
! 	if(_features & GF_OLD256) /*FIXME: find a better way to implement this */
  		_opcode&=0x3F;
  	switch(_opcode&0x1F) {
***************
*** 1308,1312 ****
  		break;
  	case 4: /* load room */
! 		if(_gameId == GID_ZAK256)
  			ensureResourceLoaded(rtScript, res & 0x7F); /*FIXME: missing stuff...*/
  		else
--- 1308,1312 ----
  		break;
  	case 4: /* load room */
! 		if(_features & GF_OLD256)
  			ensureResourceLoaded(rtScript, res & 0x7F); /*FIXME: missing stuff...*/
  		else
***************
*** 1383,1386 ****
--- 1383,1393 ----
  		a = getVarOrDirectByte(0x80);
  		b = getVarOrDirectByte(0x40);
+ 		if(_gameId == GID_INDY3_256 && a == 16 && b == 0) /* FIXME*/
+ 		{
+ 			fetchScriptByte();
+ 			fetchScriptByte();
+ 			fetchScriptByte();
+ 			return;
+ 		}
  	}
  	
***************
*** 1678,1681 ****
--- 1685,1694 ----
  	script = getVarOrDirectByte(0x40);
  
+ 	if(_gameId == GID_INDY3_256) /*FIXME*/
+ 	{
+ 		fetchScriptByte();
+ 		return;
+ 	}
+ 	
  	getWordVararg(data);
  	runVerbCode(obj, script, 0, 0, data);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** sound.cpp	12 Feb 2002 21:28:07 -0000	1.15
--- sound.cpp	14 Feb 2002 22:51:01 -0000	1.16
***************
*** 91,95 ****
  void Scumm::playSound(int sound) {
          SoundEngine *se = (SoundEngine*)_soundEngine;
!         if (_gameId == GID_ZAK256) return; /* FIXME */
  
  	if (se) {
--- 91,95 ----
  void Scumm::playSound(int sound) {
          SoundEngine *se = (SoundEngine*)_soundEngine;
!         if (_features & GF_OLD256) return; /* FIXME */
  
  	if (se) {

Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** string.cpp	14 Feb 2002 15:48:54 -0000	1.19
--- string.cpp	14 Feb 2002 22:51:01 -0000	1.20
***************
*** 286,290 ****
  
  	buffer = charset._buffer + charset._bufPos;
! 	if(_gameId==GID_ZAK256) {
  		debug(1, "CHARSET_1: %s", buffer);
  		return;
--- 286,290 ----
  
  	buffer = charset._buffer + charset._bufPos;
! 	if(_features & GF_OLD256) {
  		debug(1, "CHARSET_1: %s", buffer);
  		return;
***************
*** 447,451 ****
  	}
  	if(space) *space='\0';
! 	if(_gameId==GID_ZAK256) {
  		debug(1, "DRAWSTRING: %s", buf);
  		return;
--- 447,451 ----
  	}
  	if(space) *space='\0';
! 	if(_features & GF_OLD256) {
  		debug(1, "DRAWSTRING: %s", buf);
  		return;