[Scummvm-cvs-logs] CVS: scummvm costume.cpp,1.15,1.16

Vincent Hamm yazoo at users.sourceforge.net
Thu Feb 21 15:44:05 CET 2002


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

Modified Files:
	costume.cpp 
Log Message:
Fixed indy and zak costumes

Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** costume.cpp	21 Feb 2002 22:48:13 -0000	1.15
--- costume.cpp	21 Feb 2002 23:43:19 -0000	1.16
***************
*** 727,731 ****
  
  	if (code != 0x7B) {
! 		return mainRoutine(a, slot, code);
  	}
  #endif
--- 727,732 ----
  
  	if (code != 0x7B) {
! 		if( _vm->_features & GF_OLD256 && code <0x79)
! 			return mainRoutine(a, slot, code);
  	}
  #endif
***************
*** 787,793 ****
  	LoadedCostume lc;
  
- 	if(_gameId == GID_INDY3_256) /*FIXME*/
- 		return;
- 	
  	loadCostume(&lc, a->costume);
  
--- 788,791 ----
***************
*** 814,820 ****
  	do {
  		if (mask&0x8000) {
! 			if(_features & GF_OLD256) {
  				j = *(r);
  				r++;
  			} else {
  				j = READ_LE_UINT16(r);
--- 812,821 ----
  	do {
  		if (mask&0x8000) {
! 			if(_features & GF_OLD256 ) {
! 				j = 0;
  				j = *(r);
  				r++;
+ 				if(j==0xFF)
+ 					j=0xFFFF;
  			} else {
  				j = READ_LE_UINT16(r);





More information about the Scummvm-git-logs mailing list