From baf8011b07d70a95019e925ecff8e1979899cf5c Mon Sep 17 00:00:00 2001
From: Eric Fry
Date: Thu, 5 Jul 2018 09:56:00 +1000
Subject: ILLUSIONS: Fix merge error.

---
 engines/illusions/actor.cpp | 7 ++++---
 1 file 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);
-- 
cgit v1.2.3