[Scummvm-cvs-logs] CVS: scummvm costume.cpp,1.24,1.25 script_v1.cpp,1.80,1.81

Vincent Hamm yazoo at users.sourceforge.net
Fri Apr 19 08:35:20 CEST 2002


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

Modified Files:
	costume.cpp script_v1.cpp 
Log Message:
Fixed indy3 when going to Venice. Fixed missing objects in Zak intro.

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** costume.cpp	19 Apr 2002 12:38:03 -0000	1.24
--- costume.cpp	19 Apr 2002 15:34:35 -0000	1.25
***************
*** 847,854 ****
  			return 0;
  
! 		i = cd->curpos[slot] & 0x7FFF;
  		_frameptr =
! 			_loaded._ptr + READ_LE_UINT16(_loaded._ptr + _loaded._numColors +
! 																		slot * 2 + 10);
  		code = _loaded._dataptr[i] & 0x7F;
  
--- 847,855 ----
  			return 0;
  
! 		i = cd->curpos[slot] & 0x7FFF;
! 
  		_frameptr =
! 			_loaded._ptr + READ_LE_UINT16(_loaded._ptr + _loaded._numColors + slot * 2 + 10);
! 
  		code = _loaded._dataptr[i] & 0x7F;
  

Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v1.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** script_v1.cpp	18 Apr 2002 09:19:58 -0000	1.80
--- script_v1.cpp	19 Apr 2002 15:34:35 -0000	1.81
***************
*** 1075,1079 ****
  	if (_features & GF_SMALL_HEADER) {
  		int temp = getVarOrDirectWord(0x40);
! 		getVarOrDirectWord(0x20);		// Room
  
  		idx = getObjectIndex(obj);
--- 1075,1079 ----
  	if (_features & GF_SMALL_HEADER) {
  		int temp = getVarOrDirectWord(0x40);
! 		int temp2= getVarOrDirectWord(0x20);		// Room
  
  		idx = getObjectIndex(obj);
***************
*** 1082,1091 ****
  		od = &_objs[idx];
  		xpos = ypos = 255;
! 		if (temp != 0xFF) {
! 			od->walk_x += (xpos << 3) - od->x_pos;
! 			od->x_pos = xpos << 3;
! 			od->walk_y += (ypos << 3) - od->y_pos;
! 			od->y_pos = ypos << 3;
! 		}
  		addObjectToDrawQue(idx);
  
--- 1082,1090 ----
  		od = &_objs[idx];
  		xpos = ypos = 255;
! 		if (temp != 0xFF) {
! 			od->x_pos = temp<<3;
! 			od->y_pos = temp2<<3;
! 		}
! 
  		addObjectToDrawQue(idx);
  
***************
*** 1882,1886 ****
  		a = getVarOrDirectByte(0x80);
  		b = getVarOrDirectByte(0x40);
! 		if (_gameId == GID_INDY3_256 && a == 16 && b == 0) {	/* FIXME */
  			// Set screen height
  			c = fetchScriptByte();
--- 1881,1885 ----
  		a = getVarOrDirectByte(0x80);
  		b = getVarOrDirectByte(0x40);
! 		if (_gameId == GID_INDY3_256 && (a == 0 || a ==16) && b == 0) {	/* FIXME */
  			// Set screen height
  			c = fetchScriptByte();
***************
*** 1965,1969 ****
  		e = getVarOrDirectByte(0x40);
  		setScaleItem(e - 1, b, a, d, c);
! 	case 8:											/* room scale? */
  		a = getVarOrDirectByte(0x80);
  		b = getVarOrDirectByte(0x40);
--- 1964,1968 ----
  		e = getVarOrDirectByte(0x40);
  		setScaleItem(e - 1, b, a, d, c);
! 	case 8:											/* room scale? */
  		a = getVarOrDirectByte(0x80);
  		b = getVarOrDirectByte(0x40);





More information about the Scummvm-git-logs mailing list