diff options
| -rw-r--r-- | scumm/actor.cpp | 1 | ||||
| -rw-r--r-- | scumm/script_v8.cpp | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index c0186a055d..c38e9833a7 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -1655,6 +1655,7 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() { MKLINE(Actor, room, sleByte, VER(8)), MKLINE(Actor, talkColor, sleByte, VER(8)), MKLINE(Actor, talkFrequency, sleInt16, VER(16)), +// MKLINE(Actor, talkPan, sleInt16, VER(???)), // TODO: Add this next time savegame format is updated MKLINE(Actor, scalex, sleByte, VER(8)), MKLINE(Actor, scaley, sleByte, VER(8)), MKLINE(Actor, charset, sleByte, VER(8)), diff --git a/scumm/script_v8.cpp b/scumm/script_v8.cpp index 385bb2bbb0..ba8d3d1331 100644 --- a/scumm/script_v8.cpp +++ b/scumm/script_v8.cpp @@ -1069,7 +1069,6 @@ void ScummEngine_v8::o8_actorOps() { a->talkFrequency = pop(); break; case 0x89: // SO_ACTOR_PAN - // FIXME: This should be stored in savegames. // 0 = left, 64 = middle, 127 = right. a->talkPan = pop(); @@ -1207,13 +1206,15 @@ void ScummEngine_v8::o8_verbOps() { case 0xA6: // SO_VERB_CHARSET Choose charset for verb // FIXME - TODO vs->charset_nr = pop(); + warning("SO_VERB_CHARSET %d: not yet implemented", vs->charset_nr); break; case 0xA7: // SO_VERB_LINE_SPACING Choose linespacing for verb // FIXME - TODO // Note: it seems that var596 stores the "line spacing". It is used by various // scripts that place verbs for that. // Also, var595 contains the vertical position at which to start placing verbs (330) - pop(); + a = pop(); + warning("SO_VERB_CHARSET %d: not yet implemented", a); break; default: error("o8_verbops: default case 0x%x", subOp); @@ -1305,9 +1306,6 @@ void ScummEngine_v8::o8_kernelSetFunctions() { case 23: // setActorChoreLimbFrame // FIXME: This is critical, and is the cause of the Cannon "too many scripts" crash // This opcode is used a lot in script 28. - // The problem here is that args[4] is always 0, as it is computed from - // lipSyncWidth and lipSyncHeight, which we currently don't support. As a result, - // actors will currently not move their mouth at all! // warning("o8_kernelSetFunctions: setActorChoreLimbFrame(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]); a = derefActor(args[1], "o8_kernelSetFunctions:setActorChoreLimbFrame"); |