diff options
| author | Eric Fry | 2018-07-05 09:56:00 +1000 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
| commit | baf8011b07d70a95019e925ecff8e1979899cf5c (patch) | |
| tree | 9c52724f45342f0d5e305a7f9041dc54b6d0f367 /engines | |
| parent | 565de60234af381862200aef7c57ae3de94bf489 (diff) | |
| download | scummvm-rg350-baf8011b07d70a95019e925ecff8e1979899cf5c.tar.gz scummvm-rg350-baf8011b07d70a95019e925ecff8e1979899cf5c.tar.bz2 scummvm-rg350-baf8011b07d70a95019e925ecff8e1979899cf5c.zip | |
ILLUSIONS: Fix merge error.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/illusions/actor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/illusions/actor.cpp b/engines/illusions/actor.cpp index b4ea72e626..c052a275c1 100644 --- a/engines/illusions/actor.cpp +++ b/engines/illusions/actor.cpp @@ -137,7 +137,8 @@ void Actor::createSurface(SurfInfo &surfInfo) { } _flags |= Illusions::ACTOR_FLAG_4000; } - else { + } else { + if (_frameIndex) { _flags |= Illusions::ACTOR_FLAG_2000; _flags |= Illusions::ACTOR_FLAG_4000; } @@ -209,7 +210,7 @@ Control::~Control() { void Control::pause() { - if (_vm->getGameId() == kGameIdBBDOU || !(_flags & Illusions::ACTOR_FLAG_SCALED)) { + if (_vm->getGameId() == kGameIdBBDOU || !(_flags & 4)) { _vm->_dict->setObjectControl(_objectId, 0); if (_objectId == Illusions::CURSOR_OBJECT_ID) _vm->setCursorControl(0); @@ -222,7 +223,7 @@ void Control::pause() { void Control::unpause() { - if (_vm->getGameId() == kGameIdBBDOU || !(_flags & Illusions::ACTOR_FLAG_SCALED)) { + if (_vm->getGameId() == kGameIdBBDOU || !(_flags & 4)) { _vm->_dict->setObjectControl(_objectId, this); if (_objectId == Illusions::CURSOR_OBJECT_ID) _vm->setCursorControl(this); |