[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.70,1.71 sdl.cpp,1.74,1.75 scummvm.cpp,1.101,1.102

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


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

Modified Files:
	script_v1.cpp sdl.cpp scummvm.cpp 
Log Message:
Kind of hack that seems to synchronize loom's cutscenes + remove these damned ^M (time to configure my CVS properly I guess ...)

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** script_v1.cpp	7 Apr 2002 00:47:55 -0000	1.70
--- script_v1.cpp	7 Apr 2002 01:40:38 -0000	1.71
***************
*** 2479,2493 ****
  			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) 
  				cd_play(this, 1, 0, offset, delay);
--- 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) 
  				cd_play(this, 1, 0, offset, delay);

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sdl.cpp,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** sdl.cpp	7 Apr 2002 00:47:55 -0000	1.74
--- sdl.cpp	7 Apr 2002 01:40:38 -0000	1.75
***************
*** 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
--- 679,683 ----
  
  void cd_play(Scumm *s, int track, int num_loops, int start_frame, int end_frame) {
! 	scumm->_vars[14] = 0;
  
  #ifdef COMPRESSED_SOUND_FILE

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** scummvm.cpp	31 Mar 2002 11:55:24 -0000	1.101
--- scummvm.cpp	7 Apr 2002 01:40:38 -0000	1.102
***************
*** 188,193 ****
  
  int Scumm::scummLoop(int delta) {
! 
! 
  
  #ifndef _WIN32_WCE
--- 188,192 ----
  
  int Scumm::scummLoop(int delta) {
! 	static int counter=0;
  
  #ifndef _WIN32_WCE
***************
*** 229,234 ****
  	_vars[VAR_DEBUGMODE] = _debugMode;
  
! 	if (_features & GF_AUDIOTRACKS)
! 		_vars[VAR_MI1_TIMER]+=5;
  	else
  		if(_features & GF_OLD256)
--- 228,241 ----
  	_vars[VAR_DEBUGMODE] = _debugMode;
  
! 	if (_features & GF_AUDIOTRACKS) {
! 		if (delta) {
! 			if (++counter != 2)
! 				_vars[VAR_MI1_TIMER]+=5;
! 			else {
! 				counter = 0;
! 				_vars[VAR_MI1_TIMER]+=6;
! 			}
! 		}
! 	}
  	else
  		if(_features & GF_OLD256)





More information about the Scummvm-git-logs mailing list