[Scummvm-cvs-logs] CVS: scummvm boxes.cpp,1.11,1.12 resource.cpp,1.34,1.35 script_v1.cpp,1.27,1.28 sound.cpp,1.16,1.17

[Vincent Hamm]

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

Modified Files:
	boxes.cpp resource.cpp script_v1.cpp sound.cpp 
Log Message:
Partialy fixed Indy3 intro

Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/boxes.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** boxes.cpp	14 Feb 2002 22:51:01 -0000	1.11
--- boxes.cpp	15 Feb 2002 00:46:51 -0000	1.12
***************
*** 464,467 ****
--- 464,468 ----
  	}
  	warning("findPathTowards: default"); // FIXME: ZAK256
+ 	return 0;
  }
  void Scumm::setBoxFlags(int box, int val) {

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** resource.cpp	13 Feb 2002 17:33:52 -0000	1.34
--- resource.cpp	15 Feb 2002 00:46:51 -0000	1.35
***************
*** 420,425 ****
                       //          fileReadByte();
                                 _objectOwnerTable[i] = fileReadByte();
!                      //          _objectStateTable[i] = _objectOwnerTable[i]>>OF_STATE_SHL;
!                      //          _objectOwnerTable[i] &= OF_OWNER_MASK;
                         }
                 
--- 420,425 ----
                       //          fileReadByte();
                                 _objectOwnerTable[i] = fileReadByte();
!                                _objectStateTable[i] = _objectOwnerTable[i]>>OF_STATE_SHL;
!                                _objectOwnerTable[i] &= OF_OWNER_MASK;
                         }
                 

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** script_v1.cpp	14 Feb 2002 22:51:01 -0000	1.27
--- script_v1.cpp	15 Feb 2002 00:46:51 -0000	1.28
***************
*** 29,33 ****
  	&Scumm::o5_stopObjectCode,
  	&Scumm::o5_putActor,
! 	&Scumm::o5_startMusic,
  	&Scumm::o5_getActorRoom,
  	/* 04 */
--- 29,33 ----
  	&Scumm::o5_stopObjectCode,
  	&Scumm::o5_putActor,
! 	&Scumm::o5_tartMusic,
  	&Scumm::o5_getActorRoom,
  	/* 04 */
***************
*** 1685,1694 ****
  	script = getVarOrDirectByte(0x40);
  
- 	if(_gameId == GID_INDY3_256) /*FIXME*/
- 	{
- 		fetchScriptByte();
- 		return;
- 	}
- 	
  	getWordVararg(data);
  	runVerbCode(obj, script, 0, 0, data);
--- 1685,1688 ----
***************
*** 2141,2148 ****
  	if(getObjectIndex(obj) != 1)
  		return;
! 
  
  	
! 	warning("Unsupported pickupObjectOld");
  
  }
--- 2135,2143 ----
  	if(getObjectIndex(obj) != 1)
  		return;
! 	
! 	addObjectToInventory(obj,_currentRoom);	/*FIXME: the implementation is not quite acurate */
  
  	
! 	warning("pickupObjectOld(%d) not fully supported",obj);
  
  }

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** sound.cpp	14 Feb 2002 22:51:01 -0000	1.16
--- sound.cpp	15 Feb 2002 00:46:51 -0000	1.17
***************
*** 30,33 ****
--- 30,36 ----
  	addSoundToQueue2(sound);
  #endif
+ 	
+ 	if(_features & GF_AUDIOTRACKS)
+ 		warning("Requesting audio track: %d",sound);
  }