diff options
| author | Travis Howell | 2004-08-29 11:27:16 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-08-29 11:27:16 +0000 |
| commit | cbf5a60bab5770e7b199014f509720a248d12d5a (patch) | |
| tree | 30883d2858ce93f475ae654c941399ad633c747b /scumm/actor.cpp | |
| parent | 3540014e4590941f39c5975ce072f489f467edd7 (diff) | |
| download | scummvm-rg350-cbf5a60bab5770e7b199014f509720a248d12d5a.tar.gz scummvm-rg350-cbf5a60bab5770e7b199014f509720a248d12d5a.tar.bz2 scummvm-rg350-cbf5a60bab5770e7b199014f509720a248d12d5a.zip | |
Add a few akos codes
Give unknown akos codes better names
Rename actor variable
Remove hack (Use multi-version flag instead)
Another sound correction for HE games.
svn-id: r14827
Diffstat (limited to 'scumm/actor.cpp')
| -rw-r--r-- | scumm/actor.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 8c71367512..941f75691d 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -57,7 +57,7 @@ Actor::Actor() { walkbox = 0; animProgress = 0; skipLimb = false; - actorDrawVirScr = false; + drawToBackBuf = false; memset(animVariable, 0, sizeof(animVariable)); memset(palette, 0, sizeof(palette)); memset(sound, 0, sizeof(sound)); @@ -129,6 +129,7 @@ void Actor::initActor(int mode) { talkStopFrame = 5; } + talking = false; walkScript = 0; talkScript = 0; @@ -1062,7 +1063,7 @@ void Actor::drawActorCostume() { // If the actor is partially hidden, redraw it next frame. // Only done for pre-AKOS, though. - if (bcr->drawCostume(_vm->virtscr[0], cost, actorDrawVirScr) & 1) { + if (bcr->drawCostume(_vm->virtscr[0], cost, drawToBackBuf) & 1) { needRedraw = (_vm->_version <= 6); } @@ -1224,6 +1225,7 @@ void ScummEngine::actorTalk(const byte *msg) { if ((_version <= 7 && !_keepText) || (_version == 8 && VAR(VAR_HAVE_MSG))) stopTalk(); setTalkingActor(a->number); + a->talking = true; if (!_string[0].no_talk_anim) { a->runActorTalkScript(a->talkStartFrame); _useTalkAnims = true; @@ -1287,6 +1289,7 @@ void ScummEngine::stopTalk() { } if (_version <= 7 && !(_features & GF_HUMONGOUS)) setTalkingActor(0xFF); + a->talking = false; } if (_version == 8 || _features & GF_HUMONGOUS) setTalkingActor(0); @@ -1828,7 +1831,7 @@ const SaveLoadEntry *Actor::getSaveLoadEntries() { MKLINE(Actor, speedy, sleUint16, VER(8)), MKLINE(Actor, cost.animCounter, sleUint16, VER(8)), MKLINE(Actor, cost.soundCounter, sleByte, VER(8)), - MKLINE(Actor, actorDrawVirScr, sleByte, VER(32)), + MKLINE(Actor, drawToBackBuf, sleByte, VER(32)), MKLINE(Actor, flip, sleByte, VER(32)), MKLINE(Actor, skipLimb, sleByte, VER(32)), |