[Scummvm-cvs-logs] scummvm master -> 29b9bba62cf47491801c2d49e1dec581cfdec9df

[Strangerke]

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:
29b9bba62c VOYEUR: Remove useless function in SoundManager


Commit: 29b9bba62cf47491801c2d49e1dec581cfdec9df
    https://github.com/scummvm/scummvm/commit/29b9bba62cf47491801c2d49e1dec581cfdec9df
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-19T15:48:35-08:00

Commit Message:
VOYEUR: Remove useless function in SoundManager

Changed paths:
    engines/voyeur/graphics.cpp
    engines/voyeur/sound.h
    engines/voyeur/voyeur.cpp



diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index be633f5..6a979db 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 a58c6a3..d2845bb 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 09da8f1..9731968 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);
 			}