[Scummvm-cvs-logs] CVS: scummvm sound.cpp,1.36,1.37

[Mutwin Kraus]

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

Modified Files:
	sound.cpp 
Log Message:
Changed the name of OffsetTable to MP3OffsetTable, as OffsetTable is already defined in the Apple Headers

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** sound.cpp	5 Apr 2002 04:35:41 -0000	1.36
--- sound.cpp	7 Apr 2002 18:46:44 -0000	1.37
***************
*** 159,163 ****
  #ifdef COMPRESSED_SOUND_FILE
  static int compar(const void *a, const void *b) {
!   return ((OffsetTable *) a)->org_offset - ((OffsetTable *) b)->org_offset;
  }
  #endif
--- 159,163 ----
  #ifdef COMPRESSED_SOUND_FILE
  static int compar(const void *a, const void *b) {
!   return ((MP3OffsetTable *) a)->org_offset - ((MP3OffsetTable *) b)->org_offset;
  }
  #endif
***************
*** 179,186 ****
  #ifdef COMPRESSED_SOUND_FILE
  	if (offset_table != NULL) {
! 	  OffsetTable *result = NULL, key;
  	  
  	  key.org_offset = offset;
! 	  result = (OffsetTable *) bsearch(&key, offset_table, num_sound_effects, sizeof(OffsetTable), compar);
  
  
--- 179,186 ----
  #ifdef COMPRESSED_SOUND_FILE
  	if (offset_table != NULL) {
! 	  MP3OffsetTable *result = NULL, key;
  	  
  	  key.org_offset = offset;
! 	  result = (MP3OffsetTable *) bsearch(&key, offset_table, num_sound_effects, sizeof(MP3OffsetTable), compar);
  
  
***************
*** 508,515 ****
  	  */
  	  int size, compressed_offset;
! 	  OffsetTable *cur;
  	  
  	  compressed_offset = get_int(file);
! 	  offset_table = (OffsetTable *) malloc(compressed_offset);
  	  num_sound_effects = compressed_offset / 16;
  	  
--- 508,515 ----
  	  */
  	  int size, compressed_offset;
! 	  MP3OffsetTable *cur;
  	  
  	  compressed_offset = get_int(file);
! 	  offset_table = (MP3OffsetTable *) malloc(compressed_offset);
  	  num_sound_effects = compressed_offset / 16;