[Scummvm-cvs-logs] CVS: scummvm akos.cpp,1.10,1.11 script_v2.cpp,1.38,1.39 scumm.h,1.102,1.103 scummvm.cpp,1.96,1.97 sdl.cpp,1.64,1.65

[Vincent Hamm]

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

Modified Files:
	akos.cpp script_v2.cpp scumm.h scummvm.cpp sdl.cpp 
Log Message:
Fixed a bit the gui for FT and DIG. It still doesn't display a thing but it's not crashing anymore

Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** akos.cpp	24 Mar 2002 17:49:46 -0000	1.10
--- akos.cpp	25 Mar 2002 12:26:36 -0000	1.11
***************
*** 774,780 ****
--- 774,782 ----
  	case 2:
  //		akos_c1_spec2(ar);
+ 		warning("akos_c1_spec2");
  		return;
  	case 3:
  //		akos_c1_spec3(ar);
+ 		warning("akos_c1_spec3");
  		return;
  	}
***************
*** 782,786 ****
  	akos_generic_decode(ar);
  	
! 	//	akos_c1_0y_decode(ar);
  
  #if 0
--- 784,788 ----
  	akos_generic_decode(ar);
  	
! //	akos_c1_0y_decode(ar);
  
  #if 0

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** script_v2.cpp	22 Mar 2002 11:15:33 -0000	1.38
--- script_v2.cpp	25 Mar 2002 12:26:36 -0000	1.39
***************
*** 2510,2514 ****
  			break;
  		case 15:
! 			warning("o6_miscOps: stub15(%d)", args[1]);
  			break;
  		case 16: {
--- 2510,2514 ----
  			break;
  		case 15:
! 			_insaneFlag = args[1];
  			break;
  		case 16: {

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** scumm.h	25 Mar 2002 02:09:04 -0000	1.102
--- scumm.h	25 Mar 2002 12:26:36 -0000	1.103
***************
*** 589,592 ****
--- 589,596 ----
  	int delta; // global time
  
+ 	/* _insane vars */
+ 
+ 	int _insaneFlag;
+ 	
  	
  	void scummInit();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** scummvm.cpp	24 Mar 2002 16:05:56 -0000	1.96
--- scummvm.cpp	25 Mar 2002 12:26:36 -0000	1.97
***************
*** 791,795 ****
--- 791,799 ----
  		exitCutscene();
  	} else if (_lastKeyHit==_vars[VAR_SAVELOADDIALOG_KEY]) {
+ 		if ( _features & GF_AFTER_V7)
+ 			runScript(_vars[VAR_UNK_SCRIPT],0,0,0);
  		((Gui*)_gui)->saveLoadDialog();
+ 		if ( _features & GF_AFTER_V7)
+ 			runScript(_vars[VAR_UNK_SCRIPT_2],0,0,0);
  	} else if (_lastKeyHit==_vars[VAR_TALKSTOP_KEY]) {
  		_talkDelay = 0;

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** sdl.cpp	25 Mar 2002 10:05:32 -0000	1.64
--- sdl.cpp	25 Mar 2002 12:26:37 -0000	1.65
***************
*** 1085,1088 ****
--- 1085,1091 ----
  
  	scumm->_charsetColor = 0;
+ 
+ 	scumm->_insaneFlag = 12;
+ 
  /* */