aboutsummaryrefslogtreecommitdiff
path: root/kyra/animator.cpp
diff options
context:
space:
mode:
authorJohannes Schickel2006-02-11 00:17:20 +0000
committerJohannes Schickel2006-02-11 00:17:20 +0000
commit590289d937be8104f03a22727f0796c22106ffda (patch)
treee64b21d7d98be13c921f313411972ddb0c43ad39 /kyra/animator.cpp
parent651faae2a4797627a50e99a9f182478bf1f27c1a (diff)
downloadscummvm-rg350-590289d937be8104f03a22727f0796c22106ffda.tar.gz
scummvm-rg350-590289d937be8104f03a22727f0796c22106ffda.tar.bz2
scummvm-rg350-590289d937be8104f03a22727f0796c22106ffda.zip
Fixes the bug when displaying the falling leafe scene in room 12 and text bugs which overwride the interface. (also in the scene with the ruby tree)
svn-id: r20483
Diffstat (limited to 'kyra/animator.cpp')
-rw-r--r--kyra/animator.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kyra/animator.cpp b/kyra/animator.cpp
index e6d5d09862..bc82a28aeb 100644
--- a/kyra/animator.cpp
+++ b/kyra/animator.cpp
@@ -115,7 +115,7 @@ void ScreenAnimator::preserveAllBackgrounds() {
AnimObject *curObject = _objectQueue;
while (curObject) {
- if (curObject->active && !curObject->unk1) {
+ if (curObject->active && !curObject->disable) {
preserveOrRestoreBackground(curObject, false);
curObject->bkgdChangeFlag = 0;
}
@@ -148,7 +148,7 @@ void ScreenAnimator::restoreAllObjectBackgrounds() {
_screen->_curPage = 2;
while (curObject) {
- if (curObject->active && !curObject->unk1) {
+ if (curObject->active && !curObject->disable) {
preserveOrRestoreBackground(curObject, true);
curObject->x2 = curObject->x1;
curObject->y2 = curObject->y1;
@@ -165,7 +165,7 @@ void ScreenAnimator::preserveAnyChangedBackgrounds() {
_screen->_curPage = 2;
while (curObject) {
- if (curObject->active && !curObject->unk1 && curObject->bkgdChangeFlag) {
+ if (curObject->active && !curObject->disable && curObject->bkgdChangeFlag) {
preserveOrRestoreBackground(curObject, false);
curObject->bkgdChangeFlag = 0;
}
@@ -202,7 +202,7 @@ void ScreenAnimator::preserveOrRestoreBackground(AnimObject *obj, bool restore)
if (temp >= 136) {
y = 136 - height;
}
-
+
if (restore) {
_screen->copyBlockToPage(_screen->_curPage, x, y, width, height, obj->background);
} else {
@@ -230,7 +230,7 @@ void ScreenAnimator::prepDrawAllObjects() {
int drawLayer = 0;
if (!(curObject->flags & 0x800)) {
drawLayer = 7;
- } else if (curObject->unk1) {
+ } else if (curObject->disable) {
drawLayer = 0;
} else {
drawLayer = _vm->_sprites->getDrawLayer(curObject->drawY);