[Scummvm-cvs-logs] CVS: scummvm script.cpp,1.33,1.34 script_v1.cpp,1.44,1.45

[James Brown]

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

Modified Files:
	script.cpp script_v1.cpp 
Log Message:
Quick Zak crash workarounds.



Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** script.cpp	10 Mar 2002 17:33:02 -0000	1.33
--- script.cpp	11 Mar 2002 14:24:48 -0000	1.34
***************
*** 255,259 ****
  		_scriptPointerStart = _scriptPointer;
  		vm.slot[_currentScript].didexec = 1;
! 		//debug(1, "[%X] %s()", _opcode, _opcodes_lookup[_opcode]);
  		op = getOpcode(_opcode);
  		(this->*op)();
--- 255,259 ----
  		_scriptPointerStart = _scriptPointer;
  		vm.slot[_currentScript].didexec = 1;
! 		debug(1, "[%X] %s()", _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.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** script_v1.cpp	11 Mar 2002 13:15:06 -0000	1.44
--- script_v1.cpp	11 Mar 2002 14:24:48 -0000	1.45
***************
*** 697,701 ****
                 if(_features & GF_SMALL_HEADER)
                         _opcode = (_opcode&0xE0) | convertTable[(_opcode&0x1F)-1];
! 
  		switch(_opcode&0x1F) {
  		case 0: /* dummy case */
--- 697,701 ----
                 if(_features & GF_SMALL_HEADER)
                         _opcode = (_opcode&0xE0) | convertTable[(_opcode&0x1F)-1];
! if (!a) return;
  		switch(_opcode&0x1F) {
  		case 0: /* dummy case */
***************
*** 1582,1585 ****
--- 1582,1586 ----
  
  	a = derefActorSafe(getVarOrDirectByte(0x80), "o5_putActor");
+ 	if (!a) return;
  	x = getVarOrDirectWord(0x40);
  	y = getVarOrDirectWord(0x20);