aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2010-06-26 21:36:25 +0000
committerWillem Jan Palenstijn2010-06-26 21:36:25 +0000
commitaf755b0b3d732a0976b4c008b849ca907421d6eb (patch)
tree79c64116f8c68d97a74b96d3909745aad5a3f9a7 /engines
parent1ca0cdc8b105d4b6f033e1c0b8b0cdee996903fd (diff)
downloadscummvm-rg350-af755b0b3d732a0976b4c008b849ca907421d6eb.tar.gz
scummvm-rg350-af755b0b3d732a0976b4c008b849ca907421d6eb.tar.bz2
scummvm-rg350-af755b0b3d732a0976b4c008b849ca907421d6eb.zip
Further improve readability
svn-id: r50345
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/graphics/animate.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp
index 2f1e1e726c..491553cebe 100644
--- a/engines/sci/graphics/animate.cpp
+++ b/engines/sci/graphics/animate.cpp
@@ -290,11 +290,11 @@ void GfxAnimate::fill(byte &old_picNotValid) {
|| (!(signal & kSignalHidden) && signal & kSignalRemoveView)
|| (signal & kSignalAlwaysUpdate))
old_picNotValid++;
- signal &= 0xFFFF ^ kSignalStopUpdate;
+ signal &= ~kSignalStopUpdate;
} else {
if (signal & kSignalStopUpdate || signal & kSignalAlwaysUpdate)
old_picNotValid++;
- signal &= 0xFFFF ^ kSignalForceUpdate;
+ signal &= ~kSignalForceUpdate;
}
listEntry->signal = signal;
@@ -330,11 +330,12 @@ void GfxAnimate::update() {
}
writeSelectorValue(_s->_segMan, curObject, SELECTOR(underBits), 0);
}
- signal &= 0xFFFF ^ kSignalForceUpdate;
+ signal &= ~kSignalForceUpdate;
if (signal & kSignalViewUpdated)
signal &= ~(kSignalViewUpdated | kSignalNoUpdate);
} else if (signal & kSignalStopUpdate) {
- signal = (signal & (0xFFFF ^ kSignalStopUpdate)) | kSignalNoUpdate;
+ signal &= ~kSignalStopUpdate;
+ signal |= kSignalNoUpdate;
}
listEntry->signal = signal;
listIterator--;
@@ -352,7 +353,7 @@ void GfxAnimate::update() {
_paint16->drawCel(listEntry->viewId, listEntry->loopNo, listEntry->celNo, listEntry->celRect, listEntry->priority, listEntry->paletteNo, listEntry->scaleX, listEntry->scaleY);
listEntry->showBitsFlag = true;
- signal &= 0xFFFF ^ (kSignalStopUpdate | kSignalViewUpdated | kSignalNoUpdate | kSignalForceUpdate);
+ signal &= ~(kSignalStopUpdate | kSignalViewUpdated | kSignalNoUpdate | kSignalForceUpdate);
if ((signal & kSignalIgnoreActor) == 0) {
rect = listEntry->celRect;
rect.top = CLIP<int16>(_ports->kernelPriorityToCoordinate(listEntry->priority) - 1, rect.top, rect.bottom - 1);
@@ -374,7 +375,7 @@ void GfxAnimate::update() {
if (signal & kSignalHidden) {
signal |= kSignalRemoveView;
} else {
- signal &= 0xFFFF ^ kSignalRemoveView;
+ signal &= ~kSignalRemoveView;
if (signal & kSignalIgnoreActor)
bitsHandle = _paint16->bitsSave(listEntry->celRect, GFX_SCREEN_MASK_VISUAL|GFX_SCREEN_MASK_PRIORITY);
else
@@ -398,7 +399,7 @@ void GfxAnimate::update() {
_paint16->drawCel(listEntry->viewId, listEntry->loopNo, listEntry->celNo, listEntry->celRect, listEntry->priority, listEntry->paletteNo, listEntry->scaleX, listEntry->scaleY);
listEntry->showBitsFlag = true;
- if ((signal & kSignalIgnoreActor) == 0) {
+ if (!(signal & kSignalIgnoreActor)) {
rect = listEntry->celRect;
rect.top = CLIP<int16>(_ports->kernelPriorityToCoordinate(listEntry->priority) - 1, rect.top, rect.bottom - 1);
_paint16->fillRect(rect, GFX_SCREEN_MASK_CONTROL, 0, 0, 15);
@@ -434,7 +435,7 @@ void GfxAnimate::drawCels() {
listEntry->showBitsFlag = true;
if (signal & kSignalRemoveView) {
- signal &= 0xFFFF ^ kSignalRemoveView;
+ signal &= ~kSignalRemoveView;
}
listEntry->signal = signal;