aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/voyeur/graphics.cpp6
-rw-r--r--engines/voyeur/sound.h3
-rw-r--r--engines/voyeur/voyeur.cpp2
3 files changed, 2 insertions, 9 deletions
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index be633f53fa..6a979dba41 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -244,9 +244,8 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
if (srcFlags & DISPFLAG_1000) {
srcImgData = srcPic->_imgData + (var4C << 14);
for (uint idx = 0; idx < srcPic->_maskData; ++idx) {
- if (var4C < 4) {
+ if (var4C < 4)
++var4C;
- }
}
} else {
srcImgData = srcPic->_imgData;
@@ -254,9 +253,8 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
if (destFlags & DISPFLAG_1000) {
destImgData = destPic->_imgData + (var4C << 14);
for (uint idx = 0; idx < srcPic->_maskData; ++idx) {
- if (var4C < 4) {
+ if (var4C < 4)
++var4C;
- }
}
} else {
destImgData = destPic->_imgData;
diff --git a/engines/voyeur/sound.h b/engines/voyeur/sound.h
index a58c6a38ed..d2845bb69f 100644
--- a/engines/voyeur/sound.h
+++ b/engines/voyeur/sound.h
@@ -50,9 +50,6 @@ public:
void startVOCPlay(int soundId);
int getVOCStatus();
uint32 getVOCFrame();
-
- // Methods in the original that are stubbed in ScummVM
- void continueVocMap() {}
};
} // End of namespace Voyeur
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 09da8f1648..9731968aaf 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -325,8 +325,6 @@ bool VoyeurEngine::doLock() {
while (_soundManager.getVOCStatus()) {
if (shouldQuit())
break;
-
- _soundManager.continueVocMap();
_eventsManager.delay(1);
}