diff options
| author | Travis Howell | 2004-01-16 10:51:48 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-01-16 10:51:48 +0000 |
| commit | 9a8aac9e63144f9f2658b925c98c901ad0d842d3 (patch) | |
| tree | f1906e3c38f33e0baf69b576e7c1a30f196937ba /scumm | |
| parent | ac5b7036c28a4137d4b7af7385d97e6e485f0767 (diff) | |
| download | scummvm-rg350-9a8aac9e63144f9f2658b925c98c901ad0d842d3.tar.gz scummvm-rg350-9a8aac9e63144f9f2658b925c98c901ad0d842d3.tar.bz2 scummvm-rg350-9a8aac9e63144f9f2658b925c98c901ad0d842d3.zip | |
Only needed for V1 Maniac.
svn-id: r12431
Diffstat (limited to 'scumm')
| -rw-r--r-- | scumm/actor.cpp | 6 | ||||
| -rw-r--r-- | scumm/scumm.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scumm/actor.cpp b/scumm/actor.cpp index 7018c980b8..e4541c43fb 100644 --- a/scumm/actor.cpp +++ b/scumm/actor.cpp @@ -781,17 +781,17 @@ void Actor::showActor() { needRedraw = true; } -// Maniac doesn't have a ScummVar for VAR_TALK_ACTOR, and just uses +// V1 Maniac doesn't have a ScummVar for VAR_TALK_ACTOR, and just uses // an internal variable. Emulate this to prevent overwriting script vars... int ScummEngine::talkingActor() { - if (_gameId == GID_MANIAC) + if (_gameId == GID_MANIAC && _version == 1) return _V1_talkingActor; else return VAR(VAR_TALK_ACTOR); }; void ScummEngine::talkingActor(int value) { - if (_gameId == GID_MANIAC) + if (_gameId == GID_MANIAC && _version == 1) _V1_talkingActor = value; else VAR(VAR_TALK_ACTOR) = value; diff --git a/scumm/scumm.h b/scumm/scumm.h index af0110d60a..88863deb02 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -778,7 +778,7 @@ public: int16 _talkDelay; void actorTalk(); void stopTalk(); - int talkingActor(); // Wrapper around VAR_TALK_ACTOR for V1/V2 purposes + int talkingActor(); // Wrapper around VAR_TALK_ACTOR for V1 Maniac void talkingActor(int variable); // Costume class |