[Scummvm-cvs-logs] CVS: scummvm/scumm akos.cpp,1.37,1.38
James Brown
ender at users.sourceforge.net
Sun Jan 12 10:36:02 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv16183/scumm
Modified Files:
akos.cpp
Log Message:
Add uSweat token (used when trying to walk across hot sand at brimstone beach)
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/akos.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- akos.cpp 7 Jan 2003 17:35:10 -0000 1.37
+++ akos.cpp 12 Jan 2003 18:35:01 -0000 1.38
@@ -95,7 +95,8 @@
AKC_JumpLE = 0xC093,
AKC_JumpG = 0xC094,
AKC_JumpGE = 0xC095,
- AKC_ClearFlag = 0xC09F
+ AKC_ClearFlag = 0xC09F,
+ AKC_EndSeq = 0xC0FF
};
bool Scumm::akos_hasManyDirections(Actor *a)
@@ -257,7 +258,7 @@
if (code & 0x80)
code = (code << 8) | p[1];
- if (code == AKC_Return)
+ if (code == AKC_Return || code == AKC_EndSeq)
return false;
if (code != AKC_ComplexChan) {
@@ -1424,6 +1425,7 @@
case AKC_HideActor:
case AKC_CmdQue3Quick:
case AKC_Return:
+ case AKC_EndSeq:
curpos += 2;
break;
case AKC_JumpGE:
@@ -1561,6 +1563,7 @@
break;
case AKC_Return:
+ case AKC_EndSeq:
case AKC_ComplexChan:
break;
@@ -1590,7 +1593,7 @@
int code2 = aksq[curpos];
if (code2 & 0x80)
code2 = (code2 << 8) | aksq[curpos + 1];
- assert((code2 & 0xC000) != 0xC000 || code2 == AKC_ComplexChan || code2 == AKC_Return);
+ assert((code2 & 0xC000) != 0xC000 || code2 == AKC_ComplexChan || code2 == AKC_Return || code2 == AKC_EndSeq);
a->cost.curpos[chan] = curpos;
More information about the Scummvm-git-logs
mailing list