[Scummvm-cvs-logs] scummvm master -> afb785e5c1d753d7f16ce110475cfd73f1019290
Strangerke
Strangerke at scummvm.org
Wed Mar 5 08:01:25 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
afb785e5c1 VOYEUR: Some cleanup related to the onOff and pick masks
Commit: afb785e5c1d753d7f16ce110475cfd73f1019290
https://github.com/scummvm/scummvm/commit/afb785e5c1d753d7f16ce110475cfd73f1019290
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-04T22:59:39-08:00
Commit Message:
VOYEUR: Some cleanup related to the onOff and pick masks
Changed paths:
engines/voyeur/graphics.cpp
engines/voyeur/graphics.h
engines/voyeur/voyeur.cpp
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index 761548f..ea34148 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -548,8 +548,8 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
} else {
// loc_26673
- int pick = srcPic->_pick;
- int onOff = srcPic->_onOff;
+ byte pick = srcPic->_pick;
+ byte onOff = srcPic->_onOff;
if (!(srcFlags & PICFLAG_PIC_OFFSET)) {
srcP = srcImgData += srcOffset;
diff --git a/engines/voyeur/graphics.h b/engines/voyeur/graphics.h
index f736c8a..e742191 100644
--- a/engines/voyeur/graphics.h
+++ b/engines/voyeur/graphics.h
@@ -91,7 +91,7 @@ public:
void addRectNoSaveBack(ViewPortResource *viewPort, int idx, const Common::Rect &bounds);
void sDrawPic(DisplayResource *srcDisplay, DisplayResource *destDisplay, const Common::Point &initialOffset);
- void fillPic(DisplayResource *display, byte onOff = 0);
+ void fillPic(DisplayResource *display, byte onOff);
void sDisplayPic(PictureResource *pic);
void drawANumber(DisplayResource *display, int num, const Common::Point &pt);
void flipPage();
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 6af57c6..b4c9fbe 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -364,7 +364,7 @@ bool VoyeurEngine::doLock() {
_soundManager->playVOCMap(wrongVoc, wrongVocSize);
}
- _graphicsManager->fillPic(*_graphicsManager->_vPort);
+ _graphicsManager->fillPic(*_graphicsManager->_vPort, 0);
flipPageAndWait();
_graphicsManager->resetPalette();
@@ -626,12 +626,12 @@ void VoyeurEngine::doTransitionCard(const Common::String &time, const Common::St
_eventsManager->_intPtr._hasPalette = true;
(*_graphicsManager->_vPort)->setupViewPort(NULL);
- (*_graphicsManager->_vPort)->fillPic(128);
+ (*_graphicsManager->_vPort)->fillPic(0x80);
_graphicsManager->flipPage();
_eventsManager->sWaitFlip();
flipPageAndWait();
- (*_graphicsManager->_vPort)->fillPic(128);
+ (*_graphicsManager->_vPort)->fillPic(0x80);
FontInfoResource &fi = *_graphicsManager->_fontPtr;
fi._curFont = _bVoy->boltEntry(257)._fontResource;
More information about the Scummvm-git-logs
mailing list