[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.145,1.146
Travis Howell
kirben at users.sourceforge.net
Sat Aug 28 08:11:04 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21335/scumm
Modified Files:
akos.cpp
Log Message:
Small correction for code c025
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- akos.cpp 28 Aug 2004 08:02:28 -0000 1.145
+++ akos.cpp 28 Aug 2004 15:09:54 -0000 1.146
@@ -60,7 +60,7 @@
AKC_CmdQue3 = 0xC015,
AKC_ComplexChan = 0xC020,
AKC_Unk3 = 0xC021,
- AKC_Unk2 = 0xC025,
+ AKC_ComplexChan2 = 0xC025,
AKC_Jump = 0xC030,
AKC_JumpIfSet = 0xC031,
AKC_AddVar = 0xC040,
@@ -286,7 +286,7 @@
// Code 0xC025 reads 4 bytes of extra information
- if (code != AKC_ComplexChan && code != 0xC025) {
+ if (code != AKC_ComplexChan && code != AKC_ComplexChan2) {
off = akof + (code & 0xFFF);
assert((code & 0xFFF) * 6 < READ_BE_UINT32((const byte *)akof - 4) - 8);
@@ -316,6 +316,9 @@
error("akos_drawLimb: invalid codec %d", codec);
}
} else {
+ if (code == AKC_ComplexChan2)
+ p += 4;
+
extra = p[2];
p += 3;
@@ -1170,7 +1173,7 @@
case AKC_Unk4:
curpos += 4;
break;
- case AKC_Unk2:
+ case AKC_ComplexChan2:
curpos += 4;
// Fall through
case AKC_ComplexChan:
@@ -1307,7 +1310,7 @@
case AKC_EndSeq:
case AKC_ComplexChan:
case AKC_Unk1:
- case AKC_Unk2:
+ case AKC_ComplexChan2:
case AKC_Unk3:
break;
@@ -1340,7 +1343,7 @@
int code2 = aksq[curpos];
if (code2 & 0x80)
code2 = (code2 << 8) | aksq[curpos + 1];
- assert((code2 & 0xC000) != 0xC000 || code2 == AKC_ComplexChan || code2 == AKC_Return || code2 == AKC_EndSeq || code2 == AKC_Unk1 || code2 == AKC_Unk2);
+ assert((code2 & 0xC000) != 0xC000 || code2 == AKC_ComplexChan || code2 == AKC_Return || code2 == AKC_EndSeq || code2 == AKC_Unk1 || code2 == AKC_ComplexChan2);
a->cost.curpos[chan] = curpos;
More information about the Scummvm-git-logs
mailing list