VOYEUR: Merge of upstream

5 files changed, 17 insertions, 14 deletions

diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index 3bcc6cf10f..cbd7b0af18 100644
--- a/engines/voyeur/animation.cpp
+++ b/engines/voyeur/animation.cpp
@@ -230,7 +230,7 @@ void RL2Decoder::RL2VideoTrack::copyDirtyRectsToBuffer(uint8 *dst, uint pitch) {
 	for (Common::List<Common::Rect>::const_iterator it = _dirtyRects.begin(); it != _dirtyRects.end(); ++it) {
 		for (int y = (*it).top; y < (*it).bottom; ++y) {
 			const int x = (*it).left;
-			memcpy(dst + y * pitch + x, (byte *)_surface->pixels + y * getWidth() + x, (*it).right - x);
+			memcpy(dst + y * pitch + x, (byte *)_surface->getPixels() + y * getWidth() + x, (*it).right - x);
 		}
 	}
 
@@ -238,7 +238,7 @@ void RL2Decoder::RL2VideoTrack::copyDirtyRectsToBuffer(uint8 *dst, uint pitch) {
 }
 
 void RL2Decoder::RL2VideoTrack::copyFrame(uint8 *data) {
-	memcpy((byte *)_surface->pixels, data, getWidth() * getHeight());
+	memcpy((byte *)_surface->getPixels(), data, getWidth() * getHeight());
 
 	// Redraw
 	_dirtyRects.clear();
@@ -248,7 +248,7 @@ void RL2Decoder::RL2VideoTrack::copyFrame(uint8 *data) {
 void RL2Decoder::RL2VideoTrack::rl2DecodeFrameWithoutBackground(int screenOffset) {
 	if (screenOffset == -1)
 		screenOffset = _videoBase;
-	byte *destP = (byte *)_surface->pixels + screenOffset;
+	byte *destP = (byte *)_surface->getPixels() + screenOffset;
 	int frameSize = _surface->w * _surface->h - screenOffset;
 
 	while (frameSize > 0) {
@@ -280,8 +280,8 @@ void RL2Decoder::RL2VideoTrack::rl2DecodeFrameWithoutBackground(int screenOffset
 void RL2Decoder::RL2VideoTrack::rl2DecodeFrameWithBackground() {
 	int screenOffset = _videoBase;
 	int frameSize = _surface->w * _surface->h - _videoBase;
-	byte *src = (byte *)_backSurface->pixels;
-	byte *dest = (byte *)_surface->pixels;
+	byte *src = (byte *)_backSurface->getPixels();
+	byte *dest = (byte *)_surface->getPixels();
 
 	while (frameSize > 0) {
 		byte nextByte = _fileStream->readByte();
diff --git a/engines/voyeur/configure.engine b/engines/voyeur/configure.engine
new file mode 100644
index 0000000000..647e20267f
--- /dev/null
+++ b/engines/voyeur/configure.engine
@@ -0,0 +1,3 @@
+# This file is included from the main "configure" script
+# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
+add_engine voyeur "Voyeur" yes
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 6bd0012fe7..56b7afd377 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -108,7 +108,7 @@ void EventsManager::checkForNextFrameCounter() {
 		voyeurTimer();
 
 		// Display the frame
-		g_system->copyRectToScreen((byte *)_vm->_graphicsManager._screenSurface.pixels, 
+		g_system->copyRectToScreen((byte *)_vm->_graphicsManager._screenSurface.getPixels(), 
 			SCREEN_WIDTH, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 		g_system->updateScreen();
 
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index 6e3ed103ce..3a37eb9fb0 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -308,7 +308,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 						// loc_2566F
 						if (srcFlags & DISPFLAG_2) {
 							// loc_256FA
-							srcP = (byte *)_screenSurface.pixels + srcOffset;
+							srcP = (byte *)_screenSurface.getPixels() + srcOffset;
 
 							for (int yp = 0; yp < height1; ++yp) {
 								for (int xp = 0; xp < width2; ++width2, ++srcP, ++destP) {
@@ -341,7 +341,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 							}
 						} else {
 							// loc_25829
-							destP = (byte *)_screenSurface.pixels + screenOffset;
+							destP = (byte *)_screenSurface.getPixels() + screenOffset;
 
 							for (int yp = 0; yp < height1; ++yp) {
 								Common::copy(srcP, srcP + width2, destP);
@@ -356,7 +356,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 						// loc_25D4A
 					} else {
 						// loc_2606D
-						destP = (byte *)_screenSurface.pixels + screenOffset;
+						destP = (byte *)_screenSurface.getPixels() + screenOffset;
 
 						for (int yp = 0; yp < height1; ++yp) {
 							Common::copy(srcP, srcP + width2, destP);
@@ -491,7 +491,7 @@ error("TODO: var22/var24/var2C not initialised before use?");
 				// loc_27477
 				if (destFlags & DISPFLAG_8) {
 					// loc_27481
-					destP = (byte *)_screenSurface.pixels + screenOffset;
+					destP = (byte *)_screenSurface.getPixels() + screenOffset;
 					for (int yp = 0; yp < height1; ++yp) {
 						Common::fill(srcP, srcP + width2, onOff);
 						destP += width2 + widthDiff2;
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index f39d9be9d0..871fc41d25 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -502,8 +502,8 @@ void VoyeurEngine::doOpening() {
 		if (decoder.needsUpdate()) {
 			const Graphics::Surface *frame = decoder.decodeNextFrame();
 
-			Common::copy((byte *)frame->pixels, (byte *)frame->pixels + 320 * 200,
-				(byte *)_graphicsManager._screenSurface.pixels);
+			Common::copy((byte *)frame->getPixels(), (byte *)frame->getPixels() + 320 * 200,
+				(byte *)_graphicsManager._screenSurface.getPixels());
 		}
 
 		_eventsManager.pollEvents();
@@ -526,8 +526,8 @@ void VoyeurEngine::playRL2Video(const Common::String &filename) {
 		if (decoder.needsUpdate()) {
 			const Graphics::Surface *frame = decoder.decodeNextFrame();
 
-			Common::copy((byte *)frame->pixels, (byte *)frame->pixels + 320 * 200,
-				(byte *)_graphicsManager._screenSurface.pixels);
+			Common::copy((byte *)frame->getPixels(), (byte *)frame->getPixels() + 320 * 200,
+				(byte *)_graphicsManager._screenSurface.getPixels());
 		}
 
 		_eventsManager.pollEvents();