[Scummvm-git-logs] scummvm master -> 7fb79ea69748becd956833cc8eb5391700f1d585
AndywinXp
noreply at scummvm.org
Mon Sep 26 17:07:17 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7fb79ea697 SCUMM: AKOS: Document opcodes
Commit: 7fb79ea69748becd956833cc8eb5391700f1d585
https://github.com/scummvm/scummvm/commit/7fb79ea69748becd956833cc8eb5391700f1d585
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-09-26T19:07:07+02:00
Commit Message:
SCUMM: AKOS: Document opcodes
It was getting painful to go through the AKOS system without proper opcodes documentation, so here it is.
This was checked against COMI and SCUMM HE code, for names consistency.
Changed paths:
engines/scumm/akos.cpp
engines/scumm/akos.h
engines/scumm/debugger.cpp
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp
index 4f6bd9ec9dc..51c60be5983 100644
--- a/engines/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
@@ -334,7 +334,7 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) {
if (_vm->_game.heversion >= 90)
_shadow_mode = 0;
- if (code == AKC_C021 || code == AKC_C022) {
+ if (code == AKC_CondDrawMany || code == AKC_CondRelativeOffsetDrawMany) {
uint16 s = cost.curpos[limb] + 4;
uint j = 0;
extra = p[3];
@@ -345,13 +345,13 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) {
}
useCondMask = true;
p += extra + 2;
- code = (code == AKC_C021) ? AKC_ComplexChan : AKC_ComplexChan2;
+ code = (code == AKC_CondDrawMany) ? AKC_DrawMany : AKC_RelativeOffsetDrawMany;
}
- if (code == AKC_Return || code == AKC_EndSeq)
+ if (code == AKC_EmptyCel || code == AKC_EndSeq)
return 0;
- if (code != AKC_ComplexChan && code != AKC_ComplexChan2) {
+ if (code != AKC_DrawMany && code != AKC_RelativeOffsetDrawMany) {
off = akof + (code & 0xFFF);
assert((code & 0xFFF) * 6 < READ_BE_UINT32((const byte *)akof - 4) - 8);
@@ -381,7 +381,7 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) {
error("akos_drawLimb: invalid _codec %d", _codec);
}
} else {
- if (code == AKC_ComplexChan2) {
+ if (code == AKC_RelativeOffsetDrawMany) {
lastDx = (int16)READ_LE_UINT16(p + 2);
lastDy = (int16)READ_LE_UINT16(p + 4);
p += 4;
@@ -1312,13 +1312,13 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
byte active;
uint old_curpos, curpos, end;
uint code;
- bool flag_value, needRedraw;
+ bool skipNextState, needRedraw;
int tmp, tmp2;
active = a->_cost.active[chan];
end = a->_cost.end[chan];
old_curpos = curpos = a->_cost.curpos[chan];
- flag_value = false;
+ skipNextState = false;
needRedraw = false;
do {
@@ -1331,33 +1331,33 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
case 6:
case 8:
switch (code) {
- case AKC_JumpIfSet:
+ case AKC_IfVarGoTo:
case AKC_AddVar:
case AKC_SetVar:
- case AKC_SkipGE:
- case AKC_SkipG:
- case AKC_SkipLE:
- case AKC_SkipL:
-
- case AKC_SkipNE:
- case AKC_SkipE:
- case AKC_C016:
- case AKC_C017:
- case AKC_C018:
- case AKC_C019:
+ case AKC_IfVarGEDo:
+ case AKC_IfVarGTDo:
+ case AKC_IfVarLEDo:
+ case AKC_IfVarLTDo:
+
+ case AKC_IfVarNEDo:
+ case AKC_IfVarEQDo:
+ case AKC_IfSoundInVarRunningGoTo:
+ case AKC_IfNotSoundInVarRunningGoTo:
+ case AKC_IfSoundRunningGoTo:
+ case AKC_IfNotSoundRunningGoTo:
curpos += 5;
break;
- case AKC_JumpTable:
- case AKC_SetActorClip:
- case AKC_Ignore3:
- case AKC_Ignore2:
- case AKC_Ignore:
+ case AKC_JumpToOffsetInVar:
+ case AKC_SetActorZClipping:
+ case AKC_StartScriptVar:
+ case AKC_StartSoundVar:
+ case AKC_StartScript:
case AKC_StartAnim:
case AKC_StartVarAnim:
- case AKC_CmdQue3:
- case AKC_C042:
- case AKC_C044:
- case AKC_C0A3:
+ case AKC_StartSound:
+ case AKC_SoftSound:
+ case AKC_SoftVarSound:
+ case AKC_StartTalkieInVar:
curpos += 3;
break;
case AKC_SoundStuff:
@@ -1366,40 +1366,40 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
else
curpos += 8;
break;
- case AKC_Cmd3:
- case AKC_SetVarInActor:
+ case AKC_StartActionOn:
+ case AKC_SetActorVar:
case AKC_SetDrawOffs:
curpos += 6;
break;
- case AKC_ClearFlag:
+ case AKC_EndOfIfDo:
case AKC_HideActor:
case AKC_IncVar:
- case AKC_CmdQue3Quick:
- case AKC_Return:
+ case AKC_StartSound_SpecialCase:
+ case AKC_EmptyCel:
case AKC_EndSeq:
curpos += 2;
break;
- case AKC_JumpGE:
- case AKC_JumpG:
- case AKC_JumpLE:
- case AKC_JumpL:
- case AKC_JumpNE:
- case AKC_JumpE:
- case AKC_Random:
+ case AKC_IfVarGEJump:
+ case AKC_IfVarGTJump:
+ case AKC_IfVarLEJump:
+ case AKC_IfVarLTJump:
+ case AKC_IfVarNEJump:
+ case AKC_IfVarEQJump:
+ case AKC_SetVarRandom:
curpos += 7;
break;
case AKC_Flip:
- case AKC_Jump:
- case AKC_StartAnimInActor:
- case AKC_C0A0:
- case AKC_C0A1:
- case AKC_C0A2:
+ case AKC_GoToState:
+ case AKC_StartActorAnim:
+ case AKC_StartActorTalkie:
+ case AKC_IfTalkingGoTo:
+ case AKC_IfNotTalkingGoTo:
curpos += 4;
break;
- case AKC_ComplexChan2:
+ case AKC_RelativeOffsetDrawMany:
curpos += 4;
// Fall through
- case AKC_ComplexChan:
+ case AKC_DrawMany:
curpos += 3;
tmp = aksq[curpos - 1];
while (--tmp >= 0) {
@@ -1407,16 +1407,16 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
curpos += (aksq[curpos] & 0x80) ? 2 : 1;
}
break;
- case AKC_C021:
- case AKC_C022:
- case AKC_C045:
- case AKC_C046:
- case AKC_C047:
- case AKC_C048:
+ case AKC_CondDrawMany:
+ case AKC_CondRelativeOffsetDrawMany:
+ case AKC_SetUserCondition:
+ case AKC_SetVarToUserCondition:
+ case AKC_SetTalkCondition:
+ case AKC_SetVarToTalkCondition:
needRedraw = 1;
curpos += aksq[curpos + 2];
break;
- case AKC_C08E:
+ case AKC_DisplayAuxFrame:
akos_queCommand(7, a, GW(2), 0);
curpos += 4;
break;
@@ -1442,24 +1442,24 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
if (code & 0x80)
code = READ_BE_UINT16(aksq + curpos);
- if (flag_value && code != AKC_ClearFlag)
+ if (skipNextState && code != AKC_EndOfIfDo)
continue;
switch (code) {
- case AKC_StartAnimInActor:
+ case AKC_StartActorAnim:
akos_queCommand(4, derefActor(a->getAnimVar(GB(2)), "akos_increaseAnim:29"), a->getAnimVar(GB(3)), 0);
continue;
- case AKC_Random:
+ case AKC_SetVarRandom:
a->setAnimVar(GB(6), _rnd.getRandomNumberRng(GW(2), GW(4)));
continue;
- case AKC_JumpGE:
- case AKC_JumpG:
- case AKC_JumpLE:
- case AKC_JumpL:
- case AKC_JumpNE:
- case AKC_JumpE:
- if (akos_compare(a->getAnimVar(GB(4)), GW(5), code - AKC_JumpStart) != 0) {
+ case AKC_IfVarGEJump:
+ case AKC_IfVarGTJump:
+ case AKC_IfVarLEJump:
+ case AKC_IfVarLTJump:
+ case AKC_IfVarNEJump:
+ case AKC_IfVarEQJump:
+ if (akos_compare(a->getAnimVar(GB(4)), GW(5), code - AKC_ConditionalJumpStart) != 0) {
curpos = GUW(2);
break;
}
@@ -1476,7 +1476,7 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
case AKC_Flip:
a->_flip = GW(2) != 0;
continue;
- case AKC_CmdQue3:
+ case AKC_StartSound:
if (_game.heversion >= 61)
tmp = GB(2);
else
@@ -1484,7 +1484,7 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
if ((uint) tmp < 24)
akos_queCommand(3, a, a->_sound[tmp], 0);
continue;
- case AKC_CmdQue3Quick:
+ case AKC_StartSound_SpecialCase:
akos_queCommand(3, a, a->_sound[0], 0);
continue;
case AKC_StartAnim:
@@ -1493,13 +1493,13 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
case AKC_StartVarAnim:
akos_queCommand(4, a, a->getAnimVar(GB(2)), 0);
continue;
- case AKC_SetVarInActor:
+ case AKC_SetActorVar:
derefActor(a->getAnimVar(GB(2)), "akos_increaseAnim:9")->setAnimVar(GB(3), GW(4));
continue;
case AKC_HideActor:
akos_queCommand(1, a, 0, 0);
continue;
- case AKC_SetActorClip:
+ case AKC_SetActorZClipping:
akos_queCommand(5, a, GB(2), 0);
continue;
case AKC_SoundStuff:
@@ -1516,7 +1516,7 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
case AKC_SetDrawOffs:
akos_queCommand(6, a, GW(2), GW(4));
continue;
- case AKC_JumpTable:
+ case AKC_JumpToOffsetInVar:
if (akfo == nullptr)
error("akos_increaseAnim: no AKFO table");
tmp = a->getAnimVar(GB(2)) - 1;
@@ -1530,18 +1530,18 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
curpos = READ_LE_UINT16(&akfo[tmp]);
}
break;
- case AKC_JumpIfSet:
+ case AKC_IfVarGoTo:
if (!a->getAnimVar(GB(4)))
continue;
a->setAnimVar(GB(4), 0);
curpos = GUW(2);
break;
- case AKC_ClearFlag:
- flag_value = false;
+ case AKC_EndOfIfDo:
+ skipNextState = false;
continue;
- case AKC_Jump:
+ case AKC_GoToState:
curpos = GUW(2);
// WORKAROUND bug #3813: In the German version of SPY Fox 3: Operation Ozone
@@ -1554,104 +1554,104 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
}
break;
- case AKC_Return:
+ case AKC_EmptyCel:
case AKC_EndSeq:
- case AKC_ComplexChan:
- case AKC_C08E:
- case AKC_ComplexChan2:
+ case AKC_DrawMany:
+ case AKC_DisplayAuxFrame:
+ case AKC_RelativeOffsetDrawMany:
break;
- case AKC_C021:
- case AKC_C022:
+ case AKC_CondDrawMany:
+ case AKC_CondRelativeOffsetDrawMany:
needRedraw = 1;
break;
- case AKC_Cmd3:
- case AKC_Ignore:
- case AKC_Ignore3:
+ case AKC_StartActionOn:
+ case AKC_StartScript:
+ case AKC_StartScriptVar:
continue;
- case AKC_Ignore2:
+ case AKC_StartSoundVar:
if (_game.heversion >= 71)
akos_queCommand(3, a, a->_sound[a->getAnimVar(GB(2))], 0);
continue;
- case AKC_SkipE:
- case AKC_SkipNE:
- case AKC_SkipL:
- case AKC_SkipLE:
- case AKC_SkipG:
- case AKC_SkipGE:
- if (akos_compare(a->getAnimVar(GB(4)), GW(2), code - AKC_SkipStart) == 0)
- flag_value = true;
+ case AKC_IfVarEQDo:
+ case AKC_IfVarNEDo:
+ case AKC_IfVarLTDo:
+ case AKC_IfVarLEDo:
+ case AKC_IfVarGTDo:
+ case AKC_IfVarGEDo:
+ if (akos_compare(a->getAnimVar(GB(4)), GW(2), code - AKC_ConditionalDoStart) == 0)
+ skipNextState = true;
continue;
- case AKC_C016:
+ case AKC_IfSoundInVarRunningGoTo:
if (_sound->isSoundRunning( a->_sound[a->getAnimVar(GB(4))])) {
curpos = GUW(2);
break;
}
continue;
- case AKC_C017:
+ case AKC_IfNotSoundInVarRunningGoTo:
if (!_sound->isSoundRunning(a->_sound[a->getAnimVar(GB(4))])) {
curpos = GUW(2);
break;
}
continue;
- case AKC_C018:
+ case AKC_IfSoundRunningGoTo:
if (_sound->isSoundRunning(a->_sound[GB(4)])) {
curpos = GUW(2);
break;
}
continue;
- case AKC_C019:
+ case AKC_IfNotSoundRunningGoTo:
if (!_sound->isSoundRunning(a->_sound[GB(4)])) {
curpos = GUW(2);
break;
}
continue;
- case AKC_C042:
+ case AKC_SoftSound:
akos_queCommand(9, a, a->_sound[GB(2)], 0);
continue;
- case AKC_C044:
+ case AKC_SoftVarSound:
akos_queCommand(9, a, a->_sound[a->getAnimVar(GB(2))], 0);
continue;
- case AKC_C045:
+ case AKC_SetUserCondition:
((ActorHE *)a)->setUserCondition(GB(3), a->getAnimVar(GB(4)));
continue;
- case AKC_C046:
+ case AKC_SetVarToUserCondition:
a->setAnimVar(GB(4), ((ActorHE *)a)->isUserConditionSet(GB(3)));
continue;
- case AKC_C047:
+ case AKC_SetTalkCondition:
((ActorHE *)a)->setTalkCondition(GB(3));
continue;
- case AKC_C048:
+ case AKC_SetVarToTalkCondition:
a->setAnimVar(GB(4), ((ActorHE *)a)->isTalkConditionSet(GB(3)));
continue;
- case AKC_C0A0:
+ case AKC_StartActorTalkie:
akos_queCommand(8, a, GB(2), 0);
continue;
- case AKC_C0A1:
+ case AKC_IfTalkingGoTo:
if (((ActorHE *)a)->_heTalking != 0) {
curpos = GUW(2);
break;
}
continue;
- case AKC_C0A2:
+ case AKC_IfNotTalkingGoTo:
if (((ActorHE *)a)->_heTalking == 0) {
curpos = GUW(2);
break;
}
continue;
- case AKC_C0A3:
+ case AKC_StartTalkieInVar:
akos_queCommand(8, a, a->getAnimVar(GB(2)), 0);
continue;
- case AKC_C0A4:
+ case AKC_IfAnyTalkingGoTo:
if (VAR(VAR_TALK_ACTOR) != 0) {
curpos = GUW(2);
break;
}
continue;
- case AKC_C0A5:
+ case AKC_IfNotAnyTalkingGoTo:
if (VAR(VAR_TALK_ACTOR) == 0) {
curpos = GUW(2);
break;
@@ -1668,7 +1668,7 @@ bool ScummEngine_v6::akos_increaseAnim(Actor *a, int chan, const byte *aksq, con
if (code2 & 0x80)
code2 = READ_BE_UINT16(aksq + curpos);
- if ((code2 & 0xC000) == 0xC000 && code2 != AKC_ComplexChan && code2 != AKC_Return && code2 != AKC_EndSeq && code2 != AKC_C08E && code2 != AKC_ComplexChan2 && code2 != AKC_C021 && code2 != AKC_C022)
+ if ((code2 & 0xC000) == 0xC000 && code2 != AKC_DrawMany && code2 != AKC_EmptyCel && code2 != AKC_EndSeq && code2 != AKC_DisplayAuxFrame && code2 != AKC_RelativeOffsetDrawMany && code2 != AKC_CondDrawMany && code2 != AKC_CondRelativeOffsetDrawMany)
error("Ending with undefined uSweat token %X", code2);
a->_cost.curpos[chan] = curpos;
diff --git a/engines/scumm/akos.h b/engines/scumm/akos.h
index 0dc3c0e1f83..64932335bb7 100644
--- a/engines/scumm/akos.h
+++ b/engines/scumm/akos.h
@@ -124,67 +124,67 @@ protected:
};
enum AkosOpcodes {
- AKC_Return = 0xC001,
+ AKC_EmptyCel = 0xC001,
AKC_SetVar = 0xC010,
- AKC_CmdQue3 = 0xC015,
- AKC_C016 = 0xC016,
- AKC_C017 = 0xC017,
- AKC_C018 = 0xC018,
- AKC_C019 = 0xC019,
- AKC_ComplexChan = 0xC020,
- AKC_C021 = 0xC021,
- AKC_C022 = 0xC022,
- AKC_ComplexChan2 = 0xC025,
- AKC_Jump = 0xC030,
- AKC_JumpIfSet = 0xC031,
+ AKC_StartSound = 0xC015,
+ AKC_IfSoundInVarRunningGoTo = 0xC016,
+ AKC_IfNotSoundInVarRunningGoTo = 0xC017,
+ AKC_IfSoundRunningGoTo = 0xC018,
+ AKC_IfNotSoundRunningGoTo = 0xC019,
+ AKC_DrawMany = 0xC020,
+ AKC_CondDrawMany = 0xC021,
+ AKC_CondRelativeOffsetDrawMany = 0xC022,
+ AKC_RelativeOffsetDrawMany = 0xC025,
+ AKC_GoToState = 0xC030,
+ AKC_IfVarGoTo = 0xC031,
AKC_AddVar = 0xC040,
- AKC_C042 = 0xC042,
- AKC_C044 = 0xC044,
- AKC_C045 = 0xC045,
- AKC_C046 = 0xC046,
- AKC_C047 = 0xC047,
- AKC_C048 = 0xC048,
- AKC_Ignore = 0xC050,
+ AKC_SoftSound = 0xC042,
+ AKC_SoftVarSound = 0xC044,
+ AKC_SetUserCondition = 0xC045,
+ AKC_SetVarToUserCondition = 0xC046,
+ AKC_SetTalkCondition = 0xC047,
+ AKC_SetVarToTalkCondition = 0xC048,
+ AKC_StartScript = 0xC050,
AKC_IncVar = 0xC060,
- AKC_CmdQue3Quick = 0xC061,
- AKC_JumpStart = 0xC070,
- AKC_JumpE = 0xC070,
- AKC_JumpNE = 0xC071,
- AKC_JumpL = 0xC072,
- AKC_JumpLE = 0xC073,
- AKC_JumpG = 0xC074,
- AKC_JumpGE = 0xC075,
+ AKC_StartSound_SpecialCase = 0xC061,
+ AKC_ConditionalJumpStart = 0xC070,
+ AKC_IfVarEQJump = 0xC070,
+ AKC_IfVarNEJump = 0xC071,
+ AKC_IfVarLTJump = 0xC072,
+ AKC_IfVarLEJump = 0xC073,
+ AKC_IfVarGTJump = 0xC074,
+ AKC_IfVarGEJump = 0xC075,
AKC_StartAnim = 0xC080,
AKC_StartVarAnim = 0xC081,
- AKC_Random = 0xC082,
- AKC_SetActorClip = 0xC083,
- AKC_StartAnimInActor = 0xC084,
- AKC_SetVarInActor = 0xC085,
+ AKC_SetVarRandom = 0xC082,
+ AKC_SetActorZClipping = 0xC083,
+ AKC_StartActorAnim = 0xC084,
+ AKC_SetActorVar = 0xC085,
AKC_HideActor = 0xC086,
AKC_SetDrawOffs = 0xC087,
- AKC_JumpTable = 0xC088,
+ AKC_JumpToOffsetInVar = 0xC088,
AKC_SoundStuff = 0xC089,
AKC_Flip = 0xC08A,
- AKC_Cmd3 = 0xC08B,
- AKC_Ignore3 = 0xC08C,
- AKC_Ignore2 = 0xC08D,
- AKC_C08E = 0xC08E,
- AKC_SkipStart = 0xC090,
- AKC_SkipE = 0xC090,
- AKC_SkipNE = 0xC091,
- AKC_SkipL = 0xC092,
- AKC_SkipLE = 0xC093,
- AKC_SkipG = 0xC094,
- AKC_SkipGE = 0xC095,
- AKC_ClearFlag = 0xC09F,
- AKC_C0A0 = 0xC0A0,
- AKC_C0A1 = 0xC0A1,
- AKC_C0A2 = 0xC0A2,
- AKC_C0A3 = 0xC0A3,
- AKC_C0A4 = 0xC0A4,
- AKC_C0A5 = 0xC0A5,
- AKC_C0A6 = 0xC0A6,
- AKC_C0A7 = 0xC0A7,
+ AKC_StartActionOn = 0xC08B,
+ AKC_StartScriptVar = 0xC08C,
+ AKC_StartSoundVar = 0xC08D,
+ AKC_DisplayAuxFrame = 0xC08E,
+ AKC_ConditionalDoStart = 0xC090,
+ AKC_IfVarEQDo = 0xC090,
+ AKC_IfVarNEDo = 0xC091,
+ AKC_IfVarLTDo = 0xC092,
+ AKC_IfVarLEDo = 0xC093,
+ AKC_IfVarGTDo = 0xC094,
+ AKC_IfVarGEDo = 0xC095,
+ AKC_EndOfIfDo = 0xC09F,
+ AKC_StartActorTalkie = 0xC0A0,
+ AKC_IfTalkingGoTo = 0xC0A1,
+ AKC_IfNotTalkingGoTo = 0xC0A2,
+ AKC_StartTalkieInVar = 0xC0A3,
+ AKC_IfAnyTalkingGoTo = 0xC0A4,
+ AKC_IfNotAnyTalkingGoTo = 0xC0A5,
+ AKC_IfTalkingPickGoTo = 0xC0A6,
+ AKC_IfNotTalkingPickGoTo = 0xC0A7,
AKC_EndSeq = 0xC0FF
};
diff --git a/engines/scumm/debugger.cpp b/engines/scumm/debugger.cpp
index fe744d8fcba..b830ad2898b 100644
--- a/engines/scumm/debugger.cpp
+++ b/engines/scumm/debugger.cpp
@@ -565,7 +565,7 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
code = READ_BE_UINT16(aksq + curpos);
debugPrintf("[%04x] (%04x) ", curpos, code);
switch (code) {
- case AKC_Return:
+ case AKC_EmptyCel:
debugPrintf("RETURN\n");
curpos += 2;
break;
@@ -573,27 +573,27 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
debugPrintf("VAR[%d] = %d\n", GB(4), GW(2));
curpos += 5;
break;
- case AKC_CmdQue3:
+ case AKC_StartSound:
debugPrintf("START SOUND %d\n", GB(2));
curpos += 3;
break;
- case AKC_C016:
+ case AKC_IfSoundInVarRunningGoTo:
debugPrintf("IF SOUND RUNNING VAR[%d] GOTO [%04x]\n", GB(4), GUW(2));
curpos += 5;
break;
- case AKC_C017:
+ case AKC_IfNotSoundInVarRunningGoTo:
debugPrintf("IF NOT SOUND RUNNING VAR[%d] GOTO [%04x]\n", GB(4), GUW(2));
curpos += 5;
break;
- case AKC_C018:
+ case AKC_IfSoundRunningGoTo:
debugPrintf("IF SOUND RUNNING %d GOTO [%04x]\n", GB(4), GUW(2));
curpos += 5;
break;
- case AKC_C019:
+ case AKC_IfNotSoundRunningGoTo:
debugPrintf("IF NOT SOUND RUNNING %d GOTO [%04x]\n", GB(4), GUW(2));
curpos += 5;
break;
- case AKC_ComplexChan:
+ case AKC_DrawMany:
debugPrintf("DRAW:\n");
curpos += 2;
count = GB(0);
@@ -610,7 +610,7 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
curpos += 5;
}
break;
- case AKC_C021:
+ case AKC_CondDrawMany:
debugPrintf("CONDITION MASK DRAW [%04x] [", curpos + GB(2));
count = GB(3);
for (i = 0; i < count; i++) {
@@ -635,7 +635,7 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
curpos += 5;
}
break;
- case AKC_C022:
+ case AKC_CondRelativeOffsetDrawMany:
debugPrintf("CONDITION MASK DRAW [%04x] [", curpos + GB(2));
count = GB(3);
for (i = 0; i < count; i++) {
@@ -660,7 +660,7 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
curpos += 5;
}
break;
- case AKC_ComplexChan2:
+ case AKC_RelativeOffsetDrawMany:
debugPrintf("DRAW AT OFFSET %d, %d:\n", GW(2), GW(4));
curpos += 6;
count = GB(0);
@@ -677,11 +677,11 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
curpos += 5;
}
break;
- case AKC_Jump:
+ case AKC_GoToState:
debugPrintf("GOTO [%04x]\n", GUW(2));
curpos += 4;
break;
- case AKC_JumpIfSet:
+ case AKC_IfVarGoTo:
debugPrintf("IF VAR[%d] GOTO [%04x]\n", GB(4), GUW(2));
curpos += 5;
break;
@@ -689,31 +689,31 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
debugPrintf("VAR[%d] += %d\n", GB(4), GW(2));
curpos += 5;
break;
- case AKC_C042:
+ case AKC_SoftSound:
debugPrintf("START SOUND %d SOFT\n", GB(2));
curpos += 3;
break;
- case AKC_C044:
+ case AKC_SoftVarSound:
debugPrintf("START SOUND VAR[%d] SOFT\n", GB(2));
curpos += 3;
break;
- case AKC_C045:
+ case AKC_SetUserCondition:
debugPrintf("USER CONDITION %d = VAR[%d] GOTO [%04x] \n", GB(3), GB(4), GB(2));
curpos += 5;
break;
- case AKC_C046:
+ case AKC_SetVarToUserCondition:
debugPrintf("VAR[%d] = USER CONDITION %d GOTO [%04x] \n", GB(4), GB(3), GB(2));
curpos += 5;
break;
- case AKC_C047:
+ case AKC_SetTalkCondition:
debugPrintf("TALK CONDITION %d SET GOTO [%04x] \n", GB(3), GB(2));
curpos += 4;
break;
- case AKC_C048:
+ case AKC_SetVarToTalkCondition:
debugPrintf("VAR[%d] = TALK CONDITION %d GOTO [%04x] \n", GB(4), GB(3), GB(2));
curpos += 5;
break;
- case AKC_Ignore:
+ case AKC_StartScript:
debugPrintf("IGNORE %d\n", GB(2));
curpos += 3;
break;
@@ -721,31 +721,31 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
debugPrintf("VAR[0]++\n");
curpos += 2;
break;
- case AKC_CmdQue3Quick:
+ case AKC_StartSound_SpecialCase:
debugPrintf("START SOUND QUICK\n");
curpos += 2;
break;
- case AKC_JumpE:
+ case AKC_IfVarEQJump:
debugPrintf("IF VAR[%d] == %d GOTO [%04x]\n", GB(4), GW(5), GUW(2));
curpos += 7;
break;
- case AKC_JumpNE:
+ case AKC_IfVarNEJump:
debugPrintf("IF VAR[%d] != %d GOTO [%04x]\n", GB(4), GW(5), GUW(2));
curpos += 7;
break;
- case AKC_JumpL:
+ case AKC_IfVarLTJump:
debugPrintf("IF VAR[%d] < %d GOTO [%04x]\n", GB(4), GW(5), GUW(2));
curpos += 7;
break;
- case AKC_JumpLE:
+ case AKC_IfVarLEJump:
debugPrintf("IF VAR[%d] <= %d GOTO [%04x]\n", GB(4), GW(5), GUW(2));
curpos += 7;
break;
- case AKC_JumpG:
+ case AKC_IfVarGTJump:
debugPrintf("IF VAR[%d] > %d GOTO [%04x]\n", GB(4), GW(5), GUW(2));
curpos += 7;
break;
- case AKC_JumpGE:
+ case AKC_IfVarGEJump:
debugPrintf("IF VAR[%d] >= %d GOTO [%04x]\n", GB(4), GW(5), GUW(2));
curpos += 7;
break;
@@ -757,19 +757,19 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
debugPrintf("START ANIMATION VAR[%d]\n", GB(2));
curpos += 3;
break;
- case AKC_Random:
+ case AKC_SetVarRandom:
debugPrintf("VAR[%d] = RANDOM BETWEEN %d AND %d\n", GB(6), GW(2), GW(4));
curpos += 7;
break;
- case AKC_SetActorClip:
+ case AKC_SetActorZClipping:
debugPrintf("ZCLIP %d\n", GB(2));
curpos += 3;
break;
- case AKC_StartAnimInActor:
+ case AKC_StartActorAnim:
debugPrintf("START ANIMATION ACTOR VAR[%d] VAR[%d]\n", GB(2), GB(3));
curpos += 4;
break;
- case AKC_SetVarInActor:
+ case AKC_SetActorVar:
debugPrintf("ACTOR VAR[%d] VAR[%d] = %d\n", GB(2), GB(3), GW(4));
curpos += 6;
break;
@@ -781,7 +781,7 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
debugPrintf("SET DRAW OFFSETS %d %d\n", GW(2), GW(4));
curpos += 6;
break;
- case AKC_JumpTable:
+ case AKC_JumpToOffsetInVar:
debugPrintf("GOTO OFFSET AT VAR[%d]\n", GB(2));
curpos += 3;
break;
@@ -789,53 +789,53 @@ bool ScummDebugger::Cmd_Cosdump(int argc, const char **argv) {
// break;
// case AKC_Flip:
// break;
- // case AKC_Cmd3:
+ // case AKC_StartActionOn:
// break;
- // case AKC_Ignore3:
+ // case AKC_StartScriptVar:
// break;
- case AKC_Ignore2:
+ case AKC_StartSoundVar:
debugPrintf("START SOUND VAR[%d]\n", GB(2));
curpos += 3;
break;
- // case AKC_C08E:
+ // case AKC_DisplayAuxFrame:
// break;
- // case AKC_SkipE:
+ // case AKC_IfVarEQDo:
// break;
// case AKC_SkipNE:
// break;
- // case AKC_SkipL:
+ // case AKC_IfVarLTDo:
// break;
- // case AKC_SkipLE:
+ // case AKC_IfVarLEDo:
// break;
- // case AKC_SkipG:
+ // case AKC_IfVarGTDo:
// break;
- // case AKC_SkipGE:
+ // case AKC_IfVarGEDo:
// break;
- // case AKC_ClearFlag:
+ // case AKC_EndOfIfDo:
// break;
- case AKC_C0A0:
+ case AKC_StartActorTalkie:
debugPrintf("START TALK %d {%d}\n", GB(2), GB(3));
curpos += 4;
break;
- case AKC_C0A1:
+ case AKC_IfTalkingGoTo:
debugPrintf("IF ACTOR TALKING GOTO [%04x]\n", GUW(2));
curpos += 4;
break;
- case AKC_C0A2:
+ case AKC_IfNotTalkingGoTo:
debugPrintf("IF NOT ACTOR TALKING GOTO [%04x]\n", GUW(2));
curpos += 4;
break;
- case AKC_C0A3:
+ case AKC_StartTalkieInVar:
debugPrintf("START TALK VAR[%d]\n", GB(2));
curpos += 3;
break;
- // case AKC_C0A4:
+ // case AKC_IfAnyTalkingGoTo:
// break;
- // case AKC_C0A5:
+ // case AKC_IfNotAnyTalkingGoTo:
// break;
- // case AKC_C0A6:
+ // case AKC_IfTalkingPickGoTo:
// break;
- // case AKC_C0A7:
+ // case AKC_IfNotTalkingPickGoTo:
// break;
case AKC_EndSeq:
debugPrintf("STOP\n");
More information about the Scummvm-git-logs
mailing list