[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.69,1.70 sdl.cpp,1.73,1.74

Nicolas Bacca arisme at users.sourceforge.net
Sun Apr 7 00:23:51 CEST 2002


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

Modified Files:
	script_v1.cpp sdl.cpp 
Log Message:
Small fix for MP3 CD music (successful cast sound, and a little bit more synchronized in cutscenes)

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** script_v1.cpp	6 Apr 2002 03:43:54 -0000	1.69
--- script_v1.cpp	7 Apr 2002 00:47:55 -0000	1.70
***************
*** 2479,2485 ****
  			string[textSlot].overhead = true;
  			break;
! 		case 8: { /* play loom talkie sound - use in other games ? */
! 			int offset = (int)(getVarOrDirectWord(0x80) * 7.5 - 22650);
! 			int delay = (int)(getVarOrDirectWord(0x40) * 7.5) + 10;
  
  			if (_gameId == GID_LOOM256) 
--- 2479,2492 ----
  			string[textSlot].overhead = true;
  			break;
! 		case 8: { /* play loom talkie sound - use in other games ? */
! 			int x = getVarOrDirectWord(0x80);
! 			int offset;
! 			int delay;
! 
! 			if (x != 0)
! 				offset = (int)((x & 0xffff) * 7.5 - 22650);
! 			else
! 				offset = 0;
! 			delay = (int)((getVarOrDirectWord(0x40) & 0xffff) * 7.5);
  
  			if (_gameId == GID_LOOM256) 

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** sdl.cpp	5 Apr 2002 08:48:10 -0000	1.73
--- sdl.cpp	7 Apr 2002 00:47:55 -0000	1.74
***************
*** 679,682 ****
--- 679,684 ----
  
  void cd_play(Scumm *s, int track, int num_loops, int start_frame, int end_frame) {
+ 
+ 	scumm->_vars[14] = 0;
  
  #ifdef COMPRESSED_SOUND_FILE
***************
*** 690,694 ****
  	if (!cdrom) return;
  
- 	scumm->_vars[14] = 0;
  	cd_track = track;
  	cd_num_loops = num_loops;
--- 692,695 ----





More information about the Scummvm-git-logs mailing list