[Scummvm-cvs-logs] CVS: scummvm sound.cpp,1.13,1.14 scumm.h,1.37,1.38 script_v2.cpp,1.17,1.18 saveload.cpp,1.22,1.23

Ludvig Strigeus strigeus at users.sourceforge.net
Wed Jan 2 03:51:02 CET 2002


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

Modified Files:
	sound.cpp scumm.h script_v2.cpp saveload.cpp 
Log Message:
full throttle speech,
fixed two bugs appearing in DOTT

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** sound.cpp	2001/12/27 17:51:58	1.13
--- sound.cpp	2002/01/02 11:50:28	1.14
***************
*** 304,318 ****
  }
  
! #pragma START_PACK_STRUCTS
! struct VOCHeader {
! 	byte id[19];
! 	byte extra[7];
! } GCC_PACK;
! #pragma END_PACK_STRUCTS 
  
! static const char VALID_VOC_ID[] = "Creative Voice File";
  
  void Scumm::startSfxSound(void *file) {
! 	VOCHeader hdr;
  	int block_type;
  	byte work[8];
--- 304,315 ----
  }
  
! enum {
! 	SOUND_HEADER_SIZE = 26,
! 	SOUND_HEADER_BIG_SIZE = 26+8,
  
! };
  
  void Scumm::startSfxSound(void *file) {
! 	char ident[8];
  	int block_type;
  	byte work[8];
***************
*** 321,328 ****
  	byte *data;
  
! 	/* Full throttle audio fix HERE */
  
! 	if (fread(&hdr, sizeof(hdr), 1, (FILE*)file) != 1 || 
! 		memcmp(hdr.id, VALID_VOC_ID, sizeof(hdr.id)) != 0) {
  		warning("startSfxSound: invalid header");
  		return;
--- 318,330 ----
  	byte *data;
  
! 	if ( fread(ident, 8, 1, (FILE*)file) != 1)
! 		goto invalid;
  
! 	if (!memcmp(ident, "VTLK", 4)) {
! 		fseek((FILE*)file, SOUND_HEADER_BIG_SIZE - 8, SEEK_CUR);
! 	} else if (!memcmp(ident, "Creative", 8)) {
! 		fseek((FILE*)file, SOUND_HEADER_SIZE - 8, SEEK_CUR);
! 	} else {
! invalid:;
  		warning("startSfxSound: invalid header");
  		return;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** scumm.h	2001/12/28 15:26:28	1.37
--- scumm.h	2002/01/02 11:50:28	1.38
***************
*** 559,563 ****
  	int _xpos2, _ypos2;
  	
! 	byte _bufPos;
  	byte _unk12,_disableOffsX;
  	byte *_ptr;
--- 559,563 ----
  	int _xpos2, _ypos2;
  	
! 	int _bufPos;
  	byte _unk12,_disableOffsX;
  	byte *_ptr;

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** script_v2.cpp	2001/12/27 17:51:58	1.17
--- script_v2.cpp	2002/01/02 11:50:28	1.18
***************
*** 1320,1326 ****
  		a = pop();
  		if (a < 160) a=160;
- 		if (a > _scrWidth) a=_scrWidth;
  		if (b < 160) b=160;
! 		if (b > _scrHeight) b=_scrHeight;
  		_vars[VAR_CAMERA_MIN_X] = a;
  		_vars[VAR_CAMERA_MAX_X] = b;
--- 1320,1326 ----
  		a = pop();
  		if (a < 160) a=160;
  		if (b < 160) b=160;
! 		if (a > _scrWidth-160) a=_scrWidth-160;
! 		if (b > _scrWidth-160) b=_scrWidth-160;
  		_vars[VAR_CAMERA_MIN_X] = a;
  		_vars[VAR_CAMERA_MAX_X] = b;

Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** saveload.cpp	2001/12/28 15:26:28	1.22
--- saveload.cpp	2002/01/02 11:50:28	1.23
***************
*** 353,356 ****
--- 353,357 ----
  		MKLINE(Scumm,_actorToPrintStrFor,sleByte),
  		MKLINE(Scumm,_charsetColor,sleByte),
+ 		/* XXX Convert into word next time format changes */
  		MKLINE(Scumm,charset._bufPos,sleByte),
  		MKLINE(Scumm,_haveMsg,sleByte),





More information about the Scummvm-git-logs mailing list