aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/actor.cpp
diff options
context:
space:
mode:
authorTravis Howell2006-05-29 12:45:11 +0000
committerTravis Howell2006-05-29 12:45:11 +0000
commita0d14a08320166437585548f2ddabc03e5faef7e (patch)
tree7eb7a1eb3e95da7b3675c3a287d121e468711fd1 /engines/scumm/actor.cpp
parent5fa3985bcbd96558d8adb0e306f1cfd0b10b2e03 (diff)
downloadscummvm-rg350-a0d14a08320166437585548f2ddabc03e5faef7e.tar.gz
scummvm-rg350-a0d14a08320166437585548f2ddabc03e5faef7e.tar.bz2
scummvm-rg350-a0d14a08320166437585548f2ddabc03e5faef7e.zip
Fix Commodore 64 versions
svn-id: r22732
Diffstat (limited to 'engines/scumm/actor.cpp')
-rw-r--r--engines/scumm/actor.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index 2574ab1bec..bee2d7688e 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -831,14 +831,14 @@ void Actor::showActor() {
// an internal variable. Emulate this to prevent overwriting script vars...
// Maniac NES (V1), however, DOES have a ScummVar for VAR_TALK_ACTOR
int ScummEngine::getTalkingActor() {
- if (_game.id == GID_MANIAC && _game.version == 1 && !(_game.platform == Common::kPlatformNES))
+ if (_game.id == GID_MANIAC && _game.version <= 1 && !(_game.platform == Common::kPlatformNES))
return _V1TalkingActor;
else
return VAR(VAR_TALK_ACTOR);
}
void ScummEngine::setTalkingActor(int value) {
- if (_game.id == GID_MANIAC && _game.version == 1 && !(_game.platform == Common::kPlatformNES))
+ if (_game.id == GID_MANIAC && _game.version <= 1 && !(_game.platform == Common::kPlatformNES))
_V1TalkingActor = value;
else
VAR(VAR_TALK_ACTOR) = value;
@@ -1549,7 +1549,7 @@ void Actor::setActorCostume(int c) {
// V1 zak uses palette[] as a dynamic costume color array.
- if (_vm->_game.version == 1)
+ if (_vm->_game.version <= 1)
return;
if (_vm->_game.features & GF_NEW_COSTUMES) {