[Scummvm-cvs-logs] CVS: scummvm script.cpp,1.48,1.49 script_v1.cpp,1.82,1.83

[Vincent Hamm]

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

Modified Files:
	script.cpp script_v1.cpp 
Log Message:
Fixed a roomOps that was creating a lots of bugs in indy and Zak

Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** script.cpp	16 Apr 2002 05:36:41 -0000	1.48
--- script.cpp	19 Apr 2002 18:05:26 -0000	1.49
***************
*** 273,277 ****
  		_scriptPointerStart = _scriptPointer;
  		vm.slot[_currentScript].didexec = 1;
! 		//debug(1, "Script %d: [%X] %s()", vm.slot[_currentScript].number, _opcode, _opcodes_lookup[_opcode]);
  		op = getOpcode(_opcode);
  		(this->*op) ();
--- 273,277 ----
  		_scriptPointerStart = _scriptPointer;
  		vm.slot[_currentScript].didexec = 1;
! 		debug(1, "Script %d: [%X] %s()", vm.slot[_currentScript].number, _opcode, _opcodes_lookup[_opcode]);
  		op = getOpcode(_opcode);
  		(this->*op) ();

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -d -r1.82 -r1.83
*** script_v1.cpp	19 Apr 2002 16:26:44 -0000	1.82
--- script_v1.cpp	19 Apr 2002 18:05:26 -0000	1.83
***************
*** 1320,1328 ****
  
  void Scumm::o5_getAnimCounter()
! {
! 	getResultPos();
! 	setResult(derefActorSafe
! 						(getVarOrDirectByte(0x80),
! 						 "o5_getActorAnimCounter")->cost.animCounter1);
  }
  
--- 1320,1331 ----
  
  void Scumm::o5_getAnimCounter()
! {
! 	Actor *a;
! 	getResultPos();
! 	a=derefActorSafe(getVarOrDirectByte(0x80),"o5_getActorAnimCounter");
! 	if(a) // FIXME
! 		setResult(a->cost.animCounter1);
! 	else
! 		setResult(0);
  }
  
***************
*** 1891,1904 ****
  
  	if (_features & GF_OLD256) {
! 		a = getVarOrDirectByte(0x80);
! 		b = getVarOrDirectByte(0x40);
! 		if (_gameId == GID_INDY3_256 && (a == 0 || a ==16) && b == 0) {	/* FIXME */
! 			// Set screen height
! 			c = fetchScriptByte();
! 			d = fetchScriptByte();
! 			e = fetchScriptByte();
! 			initScreens(0, a, 320, c);
! 			return;
! 		}
  	}
  
--- 1894,1899 ----
  
  	if (_features & GF_OLD256) {
! 		a = getVarOrDirectWord(0x80);
! 		b = getVarOrDirectWord(0x40);
  	}
  
***************
*** 1977,1984 ****
  		setScaleItem(e - 1, b, a, d, c);
  	case 8:											/* room scale? */
! 
! 		a = getVarOrDirectByte(0x80);
! 		b = getVarOrDirectByte(0x40);
! 		c = getVarOrDirectByte(0x20);
  		darkenPalette(b, c, a, a, a);
  		break;
--- 1972,1978 ----
  		setScaleItem(e - 1, b, a, d, c);
  	case 8:											/* room scale? */
! //		a = getVarOrDirectByte(0x80);
! //		b = getVarOrDirectByte(0x40);
! //		c = getVarOrDirectByte(0x20);
  		darkenPalette(b, c, a, a, a);
  		break;
***************
*** 2245,2249 ****
  
  void Scumm::o5_startSound()
! {
  	addSoundToQueue(getVarOrDirectByte(0x80));
  }
--- 2239,2243 ----
  
  void Scumm::o5_startSound()
! {
  	addSoundToQueue(getVarOrDirectByte(0x80));
  }