[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.35,1.36 scummvm.cpp,1.41,1.42

[James Brown]

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

Modified Files:
	script_v1.cpp scummvm.cpp 
Log Message:
Quick patch for a Zak script bug.



Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** script_v1.cpp	19 Feb 2002 22:44:23 -0000	1.35
--- script_v1.cpp	20 Feb 2002 01:56:41 -0000	1.36
***************
*** 2269,2273 ****
  			break;
  		return;
! 	case 2: /* wait for message */
  		if (_vars[VAR_HAVE_MSG])
  			break;
--- 2269,2276 ----
  			break;
  		return;
! 	case 2: /* wait for message */		
! 		if ((_currentRoom == 0) && (_gameId == GID_ZAK256))	// Bypass Zak256 script hang
! 			return;
! 
  		if (_vars[VAR_HAVE_MSG])
  			break;

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** scummvm.cpp	19 Feb 2002 22:36:09 -0000	1.41
--- scummvm.cpp	20 Feb 2002 01:56:41 -0000	1.42
***************
*** 235,238 ****
--- 235,241 ----
  #endif
  	_vars[VAR_DEBUGMODE] = _debugMode;
+ 	
+ 	_haveMsg = 0xFF;
+ 	_vars[VAR_HAVE_MSG] = 0xFF;
  
  	if (_gameId==GID_MONKEY) {