[Scummvm-cvs-logs] CVS: scummvm script_v1.cpp,1.23,1.24 verbs.cpp,1.13,1.14

[Vincent Hamm]

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

Modified Files:
	script_v1.cpp verbs.cpp 
Log Message:
Fixed the distaff in Loom

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** script_v1.cpp	14 Feb 2002 15:09:40 -0000	1.23
--- script_v1.cpp	14 Feb 2002 17:02:07 -0000	1.24
***************
*** 1771,1774 ****
--- 1771,1775 ----
  	int a,b;
  	byte *ptr;
+ 	int tempRoom;
  
  	verb = getVarOrDirectByte(0x80);

Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** verbs.cpp	12 Feb 2002 21:28:07 -0000	1.13
--- verbs.cpp	14 Feb 2002 17:02:07 -0000	1.14
***************
*** 258,272 ****
  	uint32 size;
  	FindObjectInRoom foir;
  
  	if (whereIsObject(object) == WIO_FLOBJECT)
  		error("Can't grab verb image from flobject");
  
! 	findObjectInRoom(&foir, foImageHeader, object, room);
!         if(_features & GF_SMALL_HEADER)
!                 size = READ_LE_UINT32(foir.obim);
!         else
!                 size = READ_BE_UINT32_UNALIGNED(foir.obim+4);
! 	createResource(rtVerb, verb, size);
! 	obimptr = getResourceAddress(rtRoom, room) - foir.roomptr + foir.obim;
! 	memcpy(getResourceAddress(rtVerb, verb), obimptr, size);
  }
--- 258,282 ----
  	uint32 size;
  	FindObjectInRoom foir;
+ 	int i;
  
  	if (whereIsObject(object) == WIO_FLOBJECT)
  		error("Can't grab verb image from flobject");
  
! 	if(_features |= GF_SMALL_HEADER) {
! 		for(i = _numObjectsInRoom; i>0; i--) {
! 			if(_objs[i].obj_nr == object) {
! 				findObjectInRoom(&foir, foImageHeader, object, room);
! 				size = READ_LE_UINT32(foir.obim);
! 				createResource(rtVerb, verb, size);
! 				obimptr = getResourceAddress(rtRoom, room) - foir.roomptr + foir.obim;
! 				memcpy(getResourceAddress(rtVerb, verb), obimptr, size);
! 			}
! 		}
! 	} else {
! 		findObjectInRoom(&foir, foImageHeader, object, room);
!         	size = READ_BE_UINT32_UNALIGNED(foir.obim+4);
! 		createResource(rtVerb, verb, size);
! 		obimptr = getResourceAddress(rtRoom, room) - foir.roomptr + foir.obim;
! 		memcpy(getResourceAddress(rtVerb, verb), obimptr, size);
! 	}
  }