[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.31,1.32

Vincent Hamm yazoo at users.sourceforge.net
Fri Feb 15 07:01:40 CET 2002


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

Modified Files:
	script_v1.cpp 
Log Message:
Fixed a few opcodes...

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** script_v1.cpp	15 Feb 2002 13:11:51 -0000	1.31
--- script_v1.cpp	15 Feb 2002 15:00:48 -0000	1.32
***************
*** 85,89 ****
  	&Scumm::o5_putActorInRoom,
  	&Scumm::o5_delay,
! 	&Scumm::o5_badOpcode,
  	/* 30 */
  	&Scumm::o5_matrixOps,
--- 85,89 ----
  	&Scumm::o5_putActorInRoom,
  	&Scumm::o5_delay,
! 	&Scumm::o5_getObjectState,
  	/* 30 */
  	&Scumm::o5_matrixOps,
***************
*** 1294,1299 ****
  
  void Scumm::o5_getObjectState() {
! 	getResultPos();
! 	setResult(getState(getVarOrDirectWord(0x80)));
  }
  
--- 1294,1306 ----
  
  void Scumm::o5_getObjectState() {
! 	if(_features & GF_SMALL_HEADER) {
! 		if((getState(getVarOrDirectWord(0x80)) &0x0F >>4) != getVarOrDirectByte(0x40))
! 			o5_jumpRelative();
! 		else
! 			ignoreScriptWord();
! 	} else {
! 		getResultPos();
! 		setResult(getState(getVarOrDirectWord(0x80)));
! 	}
  }
  
***************
*** 1477,1480 ****
--- 1484,1493 ----
  	int a,b;
  
+ 	if(_features & GF_OLD256) { /* FIXME: missing function call*/
+ 		a=getVarOrDirectByte(0x80);
+ 		b=fetchScriptByte();
+ 		return;
+ 	}
+ 	
  	_opcode = fetchScriptByte();
  	switch(_opcode & 0x1F) {





More information about the Scummvm-git-logs mailing list