[Scummvm-cvs-logs] CVS: scummvm costume.cpp,1.14,1.15
Vincent Hamm
yazoo at users.sourceforge.net
Thu Feb 21 14:49:09 CET 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv29604
Modified Files:
costume.cpp
Log Message:
Partial fix for Zak's costume system
Index: costume.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/costume.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** costume.cpp 14 Feb 2002 22:51:01 -0000 1.14
--- costume.cpp 21 Feb 2002 22:48:13 -0000 1.15
***************
*** 787,791 ****
LoadedCostume lc;
! if(_features & GF_OLD256) /*FIXME*/
return;
--- 787,791 ----
LoadedCostume lc;
! if(_gameId == GID_INDY3_256) /*FIXME*/
return;
***************
*** 803,808 ****
return;
}
!
! dataptr = p + READ_LE_UINT16(p + lc._numColors + 8);
mask = READ_LE_UINT16(r);
--- 803,811 ----
return;
}
!
! if(_features & GF_OLD256)
! dataptr = p + *(p + lc._numColors + 8);
! else
! dataptr = p + READ_LE_UINT16(p + lc._numColors + 8);
mask = READ_LE_UINT16(r);
***************
*** 811,816 ****
do {
if (mask&0x8000) {
! j = READ_LE_UINT16(r);
! r+=2;
if (usemask&0x8000) {
if (j==0xFFFF) {
--- 814,824 ----
do {
if (mask&0x8000) {
! if(_features & GF_OLD256) {
! j = *(r);
! r++;
! } else {
! j = READ_LE_UINT16(r);
! r+=2;
! }
if (usemask&0x8000) {
if (j==0xFFFF) {
More information about the Scummvm-git-logs
mailing list