[Scummvm-cvs-logs] CVS: scummvm resource.cpp,1.43,1.44 scumm.h,1.61,1.62

[Vincent Hamm]

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

Modified Files:
	resource.cpp scumm.h 
Log Message:
Fixed a few things with V7 and samnmax midi (still not working)

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** resource.cpp	2 Mar 2002 12:21:06 -0000	1.43
--- resource.cpp	5 Mar 2002 22:23:48 -0000	1.44
***************
*** 658,700 ****
  	total_size = fileReadDwordBE();
  
! #if defined(SAMNMAX) || defined(FULL_THROTTLE)
! 	if (basetag == MKID('MIDI')) {
! 		fileSeek(_fileHandle, -8, SEEK_CUR);
! 		fileRead(_fileHandle,createResource(type, index, total_size+8), total_size+8);
! 		return 1;
!         }
! #else
! 	best_pri = -1;
! 	while (pos < total_size) {
! 		tag = fileReadDword();
! 		size = fileReadDwordBE() + 8;
! 		pos += size;
  		
! 		switch(tag) {
  #ifdef USE_ADLIB
! 		case MKID('ADL '): pri = 10; break;
  #else
! 		case MKID('ROL '): pri = 1; break;
! 		case MKID('GMD '): pri = 2; break;
  #endif
! 		default:	pri = -1;
! 		}
  
! 		if (pri > best_pri) {
! 			best_pri = pri;
! 			best_size = size;
! 			best_offs = filePos(_fileHandle);
  		}
  
! 		fileSeek(_fileHandle, size - 8, SEEK_CUR);
! 	}
  
- 	if (best_pri != -1) {
- 		fileSeek(_fileHandle, best_offs - 8, SEEK_SET);
- 		fileRead(_fileHandle,createResource(type, index, best_size), best_size);
- 		return 1;
  	}
- 
- #endif
  	res.roomoffs[type][index] = 0xFFFFFFFF;
  	return 0;
--- 658,700 ----
  	total_size = fileReadDwordBE();
  
! 	if (_gameId==GID_SAMNMAX) {
! 		if (basetag == MKID('MIDI')) {
! 			fileSeek(_fileHandle, -8, SEEK_CUR);
! 			fileRead(_fileHandle,createResource(type, index, total_size+8), total_size+8);
! 			return 1;
!         	}
! 	} else {
! 		best_pri = -1;
! 		while (pos < total_size) {
! 			tag = fileReadDword();
! 			size = fileReadDwordBE() + 8;
! 			pos += size;
  		
! 			switch(tag) {
  #ifdef USE_ADLIB
! 			case MKID('ADL '): pri = 10; break;
  #else
! 			case MKID('ROL '): pri = 1; break;
! 			case MKID('GMD '): pri = 2; break;
  #endif
! 			default:	pri = -1;
! 			}
  
! 			if (pri > best_pri) {
! 				best_pri = pri;
! 				best_size = size;
! 				best_offs = filePos(_fileHandle);
! 			}
! 	
! 			fileSeek(_fileHandle, size - 8, SEEK_CUR);
  		}
  
! 		if (best_pri != -1) {
! 			fileSeek(_fileHandle, best_offs - 8, SEEK_SET);
! 			fileRead(_fileHandle,createResource(type, index, best_size), best_size);
! 			return 1;
! 		}
  
  	}
  	res.roomoffs[type][index] = 0xFFFFFFFF;
  	return 0;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** scumm.h	5 Mar 2002 21:27:23 -0000	1.61
--- scumm.h	5 Mar 2002 22:23:48 -0000	1.62
***************
*** 574,580 ****
  	int8 layer;
  	ActorWalkData walkdata;
- //#if defined(FULL_THROTTLE)
  	int16 animVariable[16];
- //#endif
  	uint16 sound[8];
  	CostumeData cost;
--- 574,578 ----
***************
*** 582,586 ****
  };
  
- #if defined(FULL_THROTTLE)
  struct CameraData {
  	Point _cur;
--- 580,583 ----
***************
*** 588,604 ****
  	Point _accel;
  	Point _last;
- 	byte _follows;
- 	bool _movingToActor;
- };
- #else
- struct CameraData {
- 	Point _cur;
- 	Point _dest;
- 	Point _last;
  	int _leftTrigger, _rightTrigger;
  	byte _follows, _mode;
  	bool _movingToActor;
  };
- #endif
  
  #define ARRAY_HDR_SIZE 6
--- 585,592 ----