[Scummvm-cvs-logs] CVS: scummvm actor.cpp,1.26,1.27 object.cpp,1.28,1.29 script_v2.cpp,1.24,1.25 scumm.h,1.57,1.58 scummvm.cpp,1.54,1.55

[Vincent Hamm]

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

Modified Files:
	actor.cpp object.cpp script_v2.cpp scumm.h scummvm.cpp 
Log Message:
Fixed struct RoomHeader for v7 implementation

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** actor.cpp	25 Feb 2002 23:00:32 -0000	1.26
--- actor.cpp	5 Mar 2002 20:13:47 -0000	1.27
***************
*** 405,413 ****
  		if (vald==0xFFFF)
  			continue;
! #if !defined(FULL_THROTTLE)
! 		cost_decodeData(a, vald, mask);
! #else
  		akos_decodeData(a, vald, mask);
! #endif
  	}
  
--- 405,412 ----
  		if (vald==0xFFFF)
  			continue;
! 	if(_features & GF_AFTER_V7)
  		akos_decodeData(a, vald, mask);
! 	else
! 		cost_decodeData(a, vald, mask);
  	}
  

Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** object.cpp	5 Mar 2002 09:24:42 -0000	1.28
--- object.cpp	5 Mar 2002 20:13:47 -0000	1.29
***************
*** 355,359 ****
  	roomhdr = (RoomHeader*)findResourceData(MKID('RMHD'), room);
  
! 	_numObjectsInRoom = READ_LE_UINT16(&roomhdr->numObjects);
  	
  	if (_numObjectsInRoom == 0)
--- 355,362 ----
  	roomhdr = (RoomHeader*)findResourceData(MKID('RMHD'), room);
  
! 	if(_features & GF_AFTER_V7)
! 		_numObjectsInRoom = READ_LE_UINT16(&(roomhdr->v7.numObjects));
! 	else
! 		_numObjectsInRoom = READ_LE_UINT16(&(roomhdr->old.numObjects));
  	
  	if (_numObjectsInRoom == 0)
***************
*** 421,425 ****
         roomhdr = (RoomHeader*)findResourceData(MKID('RMHD'), room);
  
!        _numObjectsInRoom = READ_LE_UINT16(&roomhdr->numObjects);
  
         if (_numObjectsInRoom == 0)
--- 424,428 ----
         roomhdr = (RoomHeader*)findResourceData(MKID('RMHD'), room);
  
!        _numObjectsInRoom = READ_LE_UINT16(&(roomhdr->old.numObjects));
  
         if (_numObjectsInRoom == 0)
***************
*** 748,752 ****
  	fo->roomptr = roomptr = getResourceAddress(rtRoom, room);
  	roomhdr = (RoomHeader*)findResourceData(MKID('RMHD'), roomptr);
! 	numobj = READ_LE_UINT16(&roomhdr->numObjects);
  	if (numobj==0)
  		error("findObjectInRoom: No object found in room %d", room);
--- 751,760 ----
  	fo->roomptr = roomptr = getResourceAddress(rtRoom, room);
  	roomhdr = (RoomHeader*)findResourceData(MKID('RMHD'), roomptr);
! 	
! 	if(_features & GF_AFTER_V7)
! 		numobj = READ_LE_UINT16(&(roomhdr->v7.numObjects));
! 	else
! 		numobj = READ_LE_UINT16(&(roomhdr->old.numObjects));
! 	
  	if (numobj==0)
  		error("findObjectInRoom: No object found in room %d", room);

Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** script_v2.cpp	5 Mar 2002 16:13:09 -0000	1.24
--- script_v2.cpp	5 Mar 2002 20:13:47 -0000	1.25
***************
*** 1180,1190 ****
  
  void Scumm::o6_panCameraTo() {
! #if defined(FULL_THROTTLE)
! 	int y = pop();
! 	int x = pop();
! 	panCameraTo(x,y);
! #else
! 	panCameraTo(pop(), 0);
! #endif
  }
  
--- 1180,1190 ----
  
  void Scumm::o6_panCameraTo() {
! 	if(_features & GF_AFTER_V7) {
! 		int y = pop();
! 		int x = pop();
! 		panCameraTo(x,y);
! 	} else {
! 		panCameraTo(pop(), 0);
! 	}
  }
  

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** scumm.h	5 Mar 2002 16:13:09 -0000	1.57
--- scumm.h	5 Mar 2002 20:13:47 -0000	1.58
***************
*** 76,84 ****
  
  struct RoomHeader {
! #ifdef FULL_THROTTLE
! 	uint32 version;
! #endif
! 	uint16 width,height;
! 	uint16 numObjects;
  } GCC_PACK;
  
--- 76,90 ----
  
  struct RoomHeader {
! 	union {
! 		struct {
! 			uint32 version;
! 			uint16 width,height;
! 			uint16 numObjects;
! 		} v7;
! 		struct {
! 			uint16 width,height;
! 			uint16 numObjects;
! 		} old;
! 	};
  } GCC_PACK;
  

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** scummvm.cpp	5 Mar 2002 09:58:12 -0000	1.54
--- scummvm.cpp	5 Mar 2002 20:13:47 -0000	1.55
***************
*** 682,687 ****
  	
  	rmhd = (RoomHeader*)findResourceData(MKID('RMHD'), roomptr);
! 	_scrWidth = READ_LE_UINT16(&rmhd->width);
! 	_scrHeight = READ_LE_UINT16(&rmhd->height);
  
          if( _features & GF_SMALL_HEADER)
--- 682,694 ----
  	
  	rmhd = (RoomHeader*)findResourceData(MKID('RMHD'), roomptr);
! 	
! 	if(_features & GF_AFTER_V7) {
! 		_scrWidth = READ_LE_UINT16(&(rmhd->v7.width));
! 		_scrHeight = READ_LE_UINT16(&(rmhd->v7.height));
! 	} else {
!                 _scrWidth = READ_LE_UINT16(&(rmhd->old.width));
! 		_scrHeight = READ_LE_UINT16(&(rmhd->old.height));
! 	}
! 				
  
          if( _features & GF_SMALL_HEADER)