[Scummvm-cvs-logs] CVS: scummvm insane.cpp,1.10,1.11 scumm.h,1.103,1.104 scummvm.cpp,1.97,1.98 sdl.cpp,1.65,1.66

[Vincent Hamm]

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

Modified Files:
	insane.cpp scumm.h scummvm.cpp sdl.cpp 
Log Message:
Implemented gui during insane

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** insane.cpp	21 Mar 2002 00:40:18 -0000	1.10
--- insane.cpp	25 Mar 2002 14:22:09 -0000	1.11
***************
*** 415,419 ****
  	case 1:
  	case 4:
! 		printf("code %d", cd->src[0]);
  		return;
  
--- 415,419 ----
  	case 1:
  	case 4:
! 		warning("code %d", cd->src[0]);
  		return;
  
***************
*** 597,600 ****
--- 597,603 ----
  	fileSize=fileReadBE32();
  
+ 	sm->videoFinished = 0;
+ 	sm->_insaneState = 1;
+ 
  	do {
  		if(ftell(_in)>=fileSize )
***************
*** 614,621 ****
  
  		sm->delta = sm->_system->waitTick(sm->delta);
  		
! 		if(sm->_keyPressed == sm->_vars[sm->VAR_CUTSCENEEXIT_KEY])
! 			return;
! 	} while (1);
  }
  
--- 617,626 ----
  
  		sm->delta = sm->_system->waitTick(sm->delta);
+ 	
+ 		sm->processKbd();
  		
! 	} while (!sm->videoFinished);
! 
! 	sm->_insaneState = 0;
  }
  

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.103
retrieving revision 1.104
diff -C2 -d -r1.103 -r1.104
*** scumm.h	25 Mar 2002 12:26:36 -0000	1.103
--- scumm.h	25 Mar 2002 14:22:09 -0000	1.104
***************
*** 592,595 ****
--- 592,597 ----
  
  	int _insaneFlag;
+ 	int _insaneState;
+ 	int videoFinished;
  	
  	

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -C2 -d -r1.97 -r1.98
*** scummvm.cpp	25 Mar 2002 12:26:36 -0000	1.97
--- scummvm.cpp	25 Mar 2002 14:22:09 -0000	1.98
***************
*** 789,793 ****
  
  	if (_lastKeyHit==_vars[VAR_CUTSCENEEXIT_KEY]) {
! 		exitCutscene();
  	} else if (_lastKeyHit==_vars[VAR_SAVELOADDIALOG_KEY]) {
  		if ( _features & GF_AFTER_V7)
--- 789,796 ----
  
  	if (_lastKeyHit==_vars[VAR_CUTSCENEEXIT_KEY]) {
! 		if (_insaneState) {
! 			videoFinished=1;
! 		} else
! 			exitCutscene();
  	} else if (_lastKeyHit==_vars[VAR_SAVELOADDIALOG_KEY]) {
  		if ( _features & GF_AFTER_V7)

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** sdl.cpp	25 Mar 2002 12:26:37 -0000	1.65
--- sdl.cpp	25 Mar 2002 14:22:09 -0000	1.66
***************
*** 1088,1091 ****
--- 1088,1093 ----
  	scumm->_insaneFlag = 12;
  
+ 	scumm->_insaneState = 0;
+ 
  /* */