[Scummvm-cvs-logs] CVS: scummvm/sound imuse.cpp,1.6,1.7

[James Brown]

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

Modified Files:
	imuse.cpp 
Log Message:
Fixed the actor crash bug properly. NOTE: This -will- break ALL saved games 
made with previous versions.



Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/imuse.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** imuse.cpp	5 Mar 2002 15:50:11 -0000	1.6
--- imuse.cpp	5 Mar 2002 16:13:09 -0000	1.7
***************
*** 41,49 ****
  #define COMMAND_ID 1
  
! #ifdef SAMNMAX
  	#define MDHD_TAG "MDpg"
! #else
! 	#define MDHD_TAG "MDhd"
! #endif
  
  int clamp(int val, int min, int max) {
--- 41,49 ----
  #define COMMAND_ID 1
  
! //#ifdef SAMNMAX
  	#define MDHD_TAG "MDpg"
! //#else
! //	#define MDHD_TAG "MDhd"
! //#endif
  
  int clamp(int val, int min, int max) {
***************
*** 182,188 ****
  
  	mdhd = findTag(sound, MDHD_TAG, 0);
!     if (!mdhd) 
  		return false;
! 
  	player = allocate_player(128);
  	if (!player)
--- 182,189 ----
  
  	mdhd = findTag(sound, MDHD_TAG, 0);
!     if (!mdhd)  {
! 		warning("SE::start_sound failed: Couldn't find %s", MDHD_TAG);
  		return false;
! 	}
  	player = allocate_player(128);
  	if (!player)
***************
*** 997,1003 ****
  	
  	mdhd = _se->findTag(sound, MDHD_TAG, 0);
! 	if (mdhd==NULL)
  		return false;
! 
  	_parts = NULL;
  	_active = true;
--- 998,1005 ----
  	
  	mdhd = _se->findTag(sound, MDHD_TAG, 0);
! 	if (mdhd==NULL) {
! 		warning("P::start_sound failed: Couldn't find %s", MDHD_TAG);
  		return false;
! 	}
  	_parts = NULL;
  	_active = true;