thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VOYEUR: Fix bitwise comparison, make more use of DISPFLAG enum

Browse source
This commit is contained in:
Strangerke 2016-01-12 12:01:01 +01:00
parent 56b273e0d2
commit eed0fe1a2d
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/voyeur/graphics.cpp
View file

@ -159,7 +159,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
destFlags = destPic->_flags;
byte *cursorData = NULL;
if (srcFlags & 1) {
if (srcFlags & DISPFLAG_1) {
if (_clipPtr) {
int xs = _clipPtr->left - destPic->_bounds.left;
int ys = _clipPtr->top - destPic->_bounds.top;
@ -433,7 +433,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
}
}
} else {
if (srcFlags & 0x100) {
if (srcFlags & DISPFLAG_100) {
// Simple run-length encoded image
srcP = srcImgData;
@ -885,13 +885,10 @@ void GraphicsManager::flipPage() {
bool flipFlag = false;
for (uint idx = 0; idx < viewPorts.size(); ++idx) {
if (viewPorts[idx]->_flags & DISPFLAG_20) {
if ((viewPorts[idx]->_flags & (DISPFLAG_8 || DISPFLAG_1))
== (DISPFLAG_8 || DISPFLAG_1)) {
if (_planeSelect == idx)
sDisplayPic(viewPorts[idx]->_currentPic);
flipFlag = true;
}
if ((viewPorts[idx]->_flags & (DISPFLAG_20 | DISPFLAG_8 | DISPFLAG_1)) == (DISPFLAG_20 | DISPFLAG_8 | DISPFLAG_1)) {
if (_planeSelect == idx)
sDisplayPic(viewPorts[idx]->_currentPic);
flipFlag = true;
}
if (flipFlag) {