From af90a11ff258461cd84dfc89ecfbe54fc720c312 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 14 Dec 2013 17:38:01 -0500
Subject: VOYEUR: Fix various warnings

---
 engines/voyeur/events.h          | 2 +-
 engines/voyeur/files_threads.cpp | 4 +---
 engines/voyeur/graphics.cpp      | 5 +----
 engines/voyeur/voyeur.cpp        | 8 +++++---
 engines/voyeur/voyeur_game.cpp   | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

(limited to 'engines/voyeur')

diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h
index 9fe3464431..decd23341e 100644
--- a/engines/voyeur/events.h
+++ b/engines/voyeur/events.h
@@ -110,7 +110,7 @@ public:
 	int _evidence[20];
 	
 	Common::Array<VoyeurEvent> _events;
-	int _field4376;
+	byte *_field4376;
 	int _field4378;
 	int _field437A;
 	int _field437C;
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index aacc619f6b..f74b7dbb38 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -798,9 +798,7 @@ void ThreadResource::parsePlayCommands() {
 }
 
 const byte *ThreadResource::cardPerform(const byte *card) {
-	int var7 = 0;
-	uint32 varC = 0;
-	const byte *p, *p2;
+	const byte *p2;
 	byte *pDest;
 
 	uint16 id = *card++;
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index c8b554c0ed..1ac7f48ea2 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -87,9 +87,6 @@ void GraphicsManager::setupMCGASaveRect(ViewPortResource *viewPort) {
 }
 
 void GraphicsManager::addRectOptSaveRect(ViewPortResource *viewPort, int idx, const Common::Rect &bounds) {
-	int count1, count2;
-	int idx1, varE, var24;
-
 	if (viewPort->_rectListCount[idx] == -1)
 		return;
 
@@ -138,7 +135,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 	bool isClipped = false;
 	int var52;
 	int var20, var22;
-	int var26, var2C;
+	int var26;
 	byte pixel;
 
 	byte *srcImgData, *destImgData;
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 84aa0c440b..6c4e841243 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -134,7 +134,7 @@ void VoyeurEngine::globalInitBolt() {
 	// Setup default flags
 	Common::fill((byte *)&_voy, (byte *)&_voy + sizeof(SVoy), 0);
 	_voy._field478 = 1;
-	_voy._field4376 = NULL; // Original set 63h:63h
+	_voy._field4376 = nullptr; // Original set 63h:63h
 	_voy._field4F2 = 9999;
 	_voy._field472 = -1;
 	_voy._field478 = 256;
@@ -473,6 +473,7 @@ void VoyeurEngine::showTitleScreen() {
 }
 
 void VoyeurEngine::doOpening() {
+/*
 	_graphicsManager.screenReset();
 
 	if (!_bVoy->getBoltGroup(0x10200))
@@ -519,13 +520,14 @@ void VoyeurEngine::doOpening() {
 		if (decoder.needsUpdate()) {
 			const Graphics::Surface *frame = decoder.decodeNextFrame();
 
-			Common::copy((byte *)frame->getPixels(), (byte *)frame->getPixels() + 320 * 200,
+			Common::copy((const byte *)frame->getPixels(), (const byte *)frame->getPixels() + 320 * 200,
 				(byte *)_graphicsManager._screenSurface.getPixels());
 		}
 
 		_eventsManager.pollEvents();
 		g_system->delayMillis(10);
 	}
+	*/
 }
 
 void VoyeurEngine::playRL2Video(const Common::String &filename) {
@@ -542,7 +544,7 @@ void VoyeurEngine::playRL2Video(const Common::String &filename) {
 		if (decoder.needsUpdate()) {
 			const Graphics::Surface *frame = decoder.decodeNextFrame();
 
-			Common::copy((byte *)frame->getPixels(), (byte *)frame->getPixels() + 320 * 200,
+			Common::copy((const byte *)frame->getPixels(), (const byte *)frame->getPixels() + 320 * 200,
 				(byte *)_graphicsManager._screenSurface.getPixels());
 		}
 
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 505f79483d..f887e73ca6 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -149,7 +149,7 @@ void VoyeurEngine::playStamp() {
 				_graphicsManager._backgroundPage = _bVoy->boltEntry(_playStamp1)._picResource;
 				_graphicsManager._backColors = _bVoy->boltEntry(_playStamp1 + 1)._cMapResource;
 
-				int buttonId = getChooseButton();
+				buttonId = getChooseButton();
 				if (_voy._fadeFunc)
 					buttonId = 4;
 
-- 
cgit v1.2.3