[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.293,1.294
Gregory Montoir
cyx at users.sourceforge.net
Sun Sep 19 01:59:01 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.292,1.293 intern.h,2.261,2.262 script_v72he.cpp,2.108,2.109 script_v80he.cpp,2.32,2.33 script_v90he.cpp,2.43,2.44 scumm.cpp,1.214,1.215
- Next message: [Scummvm-cvs-logs] CVS: scummvm configure,1.101,1.102
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11007/scumm
Modified Files:
actor.cpp
Log Message:
only warn if the AXFD block is valid
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -d -r1.293 -r1.294
--- actor.cpp 19 Sep 2004 08:37:19 -0000 1.293
+++ actor.cpp 19 Sep 2004 08:58:51 -0000 1.294
@@ -1917,7 +1917,7 @@
error("No AXFD block for actor %d", ae->actorNum);
} else {
uint16 comp = READ_LE_UINT16(axfd);
- if (comp == 1 || comp == 16) {
+ if (comp != 0) {
int x1 = (int16)READ_LE_UINT16(axfd + 2) + dx;
int y1 = (int16)READ_LE_UINT16(axfd + 4) + dy;
int x2 = (int16)READ_LE_UINT16(axfd + 6);
@@ -1933,10 +1933,7 @@
warning("unimplemented compression type %d", comp);
break;
}
- } else {
- warning("unimplemented compression type %d", comp);
}
-
}
const uint8 *axur = findResourceData(MKID('AXUR'), auxd);
if (axur) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.292,1.293 intern.h,2.261,2.262 script_v72he.cpp,2.108,2.109 script_v80he.cpp,2.32,2.33 script_v90he.cpp,2.43,2.44 scumm.cpp,1.214,1.215
- Next message: [Scummvm-cvs-logs] CVS: scummvm configure,1.101,1.102
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list