[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.116,1.117

[Nicolas Bacca]

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

Modified Files:
	scummvm.cpp 
Log Message:
Restored update mess ...

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** scummvm.cpp	17 Apr 2002 20:22:21 -0000	1.116
--- scummvm.cpp	17 Apr 2002 20:30:54 -0000	1.117
***************
*** 907,910 ****
--- 907,911 ----
  {
  	if (id < 1 || id >= NUM_ACTORS) {
+ 		if (_debugMode)
  		warning
  			("Invalid actor %d in %s (script %d, opcode 0x%x) - This is potentially a BIG problem.",
***************
*** 1153,1156 ****
--- 1154,1158 ----
  		}
  
+ 		_system->update_cdrom(); /* Loop CD Audio if needed */
  		if (_system->get_msecs() >= start_time + msec_delay)
  			break;
***************
*** 1217,1220 ****
--- 1219,1223 ----
  
  	/* Create a primary virtual screen */
+ 	_videoBuffer = (byte*)malloc(328*200);
  
  	allocResTypeData(rtBuffer, MKID('NONE'), 10, "buffer", 0);
***************
*** 1291,1297 ****
  
  	/* bind the mixer to the system => mixer will be invoked
! 	 * automatically when samples need to be generated */
! 	scumm->_mixer->bind_to_system(syst);
  	scumm->_mixer->set_volume(128);
  
  	scumm->_fullScreen = detector->_fullScreen;
--- 1294,1308 ----
  
  	/* bind the mixer to the system => mixer will be invoked
! 	 * automatically when samples need to be generated */	
! 	if (!scumm->_mixer->bind_to_system(syst)) {         
!                  warning("Sound initialization failed");   
!                  if (detector->_use_adlib) {   
!                          detector->_use_adlib = false;   
!                          detector->_midi_driver = MD_NULL;   
!                          warning("Adlib music was selected, switching to midi null driver");   
!                  }   
!          } 
  	scumm->_mixer->set_volume(128);
+ 
  
  	scumm->_fullScreen = detector->_fullScreen;