libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-23 20:51:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

ILLUSIONS: Fix merge error.

Browse Source
This commit is contained in:
Eric Fry 2018-07-05 09:56:00 +10:00 committed by Eugene Sandulenko
parent 565de60234
commit baf8011b07
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engines/illusions/actor.cpp
View File

@ -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);