VOYEUR: Janitorial - Remove trailing whitespace

16 files changed, 205 insertions, 205 deletions

diff --git a/engines/voyeur/animation.cpp b/engines/voyeur/animation.cpp
index c1ded75f02..62b37346da 100644
--- a/engines/voyeur/animation.cpp
+++ b/engines/voyeur/animation.cpp
@@ -48,7 +48,7 @@ RL2Decoder::~RL2Decoder() {
 }
 
 bool RL2Decoder::loadVideo(int videoId) {
-	Common::String filename = Common::String::format("%s.rl2", 
+	Common::String filename = Common::String::format("%s.rl2",
 		::Voyeur::SZ_FILENAMES[videoId * 2]);
 	return loadRL2File(filename, false);
 }
@@ -121,7 +121,7 @@ void RL2Decoder::readNextPacket() {
 	if (_soundFrameNumber == -1)
 		_soundFrameNumber = (frameNumber == -1) ? 0 : frameNumber;
 
-	while (audioTrack->numQueuedStreams() < SOUND_FRAMES_READAHEAD && 
+	while (audioTrack->numQueuedStreams() < SOUND_FRAMES_READAHEAD &&
 			(_soundFrameNumber < (int)_soundFrames.size())) {
 		_fileStream->seek(_soundFrames[_soundFrameNumber]._offset);
 		audioTrack->queueSound(_fileStream, _soundFrames[_soundFrameNumber]._size);
@@ -217,13 +217,13 @@ bool RL2Decoder::RL2FileHeader::isValid() const {
 }
 
 Common::Rational RL2Decoder::RL2FileHeader::getFrameRate() const {
-	return (_soundRate > 0) ? Common::Rational(_rate, _defSoundSize) : 
+	return (_soundRate > 0) ? Common::Rational(_rate, _defSoundSize) :
 		Common::Rational(11025, 1103);
 }
 
 /*------------------------------------------------------------------------*/
 
-RL2Decoder::RL2VideoTrack::RL2VideoTrack(const RL2FileHeader &header, RL2AudioTrack *audioTrack, 
+RL2Decoder::RL2VideoTrack::RL2VideoTrack(const RL2FileHeader &header, RL2AudioTrack *audioTrack,
 		Common::SeekableReadStream *stream): _header(header), _fileStream(stream) {
 
 	_frameOffsets = nullptr;
@@ -261,7 +261,7 @@ void RL2Decoder::RL2VideoTrack::initBackSurface() {
 
 bool RL2Decoder::RL2VideoTrack::seek(const Audio::Timestamp &time) {
 	int frame = getFrameAtTime(time);
-		
+
 	if (frame < 0 || frame >= _header._numFrames)
 		return false;
 
@@ -287,7 +287,7 @@ const Graphics::Surface *RL2Decoder::RL2VideoTrack::decodeNextFrame() {
 		_fileStream->seek(0x324);
 		rl2DecodeFrameWithoutTransparency(0);
 
-		Common::copy((byte *)_surface->getPixels(), (byte *)_surface->getPixels() + (320 * 200), 
+		Common::copy((byte *)_surface->getPixels(), (byte *)_surface->getPixels() + (320 * 200),
 			(byte *)_backSurface->getPixels());
 		_dirtyRects.push_back(Common::Rect(0, 0, _surface->w, _surface->h));
 		_initialFrame = false;
@@ -433,7 +433,7 @@ Graphics::Surface *RL2Decoder::RL2VideoTrack::getBackSurface() {
 
 /*------------------------------------------------------------------------*/
 
-RL2Decoder::RL2AudioTrack::RL2AudioTrack(const RL2FileHeader &header, Common::SeekableReadStream *stream, Audio::Mixer::SoundType soundType): 
+RL2Decoder::RL2AudioTrack::RL2AudioTrack(const RL2FileHeader &header, Common::SeekableReadStream *stream, Audio::Mixer::SoundType soundType):
 		_header(header), _soundType(soundType) {
 	// Create audio straem for the audio track
 	_audStream = Audio::makeQueuingAudioStream(_header._rate, _header._channels == 2);
@@ -450,7 +450,7 @@ void RL2Decoder::RL2AudioTrack::queueSound(Common::SeekableReadStream *stream, i
 	Common::MemoryReadStream *memoryStream = new Common::MemoryReadStream(data, size,
 		DisposeAfterUse::YES);
 
-	_audStream->queueAudioStream(Audio::makeRawStream(memoryStream, _header._rate, 
+	_audStream->queueAudioStream(Audio::makeRawStream(memoryStream, _header._rate,
 		Audio::FLAG_UNSIGNED, DisposeAfterUse::YES), DisposeAfterUse::YES);
 }
 
@@ -458,7 +458,7 @@ Audio::AudioStream *RL2Decoder::RL2AudioTrack::getAudioStream() const {
 	return _audStream;
 }
 
-void RL2Decoder::play(VoyeurEngine *vm, int resourceOffset, 
+void RL2Decoder::play(VoyeurEngine *vm, int resourceOffset,
 		byte *frames, byte *imgPos) {
 	vm->flipPageAndWait();
 	int paletteStart = getPaletteStart();
@@ -472,14 +472,14 @@ void RL2Decoder::play(VoyeurEngine *vm, int resourceOffset,
 
 			vm->_graphicsManager->setPalette128(palette, paletteStart, paletteCount);
 		}
-		
+
 		if (needsUpdate()) {
 			if (frames) {
 				// If reached a point where a new background is needed, load it
 				// and copy over to the video decoder
 				if (getCurFrame() >= READ_LE_UINT16(frames + picCtr * 4)) {
 					PictureResource *newPic = vm->_bVoy->boltEntry(0x302 + picCtr)._picResource;
-					Common::Point pt(READ_LE_UINT16(imgPos + 4 * picCtr) - 32, 
+					Common::Point pt(READ_LE_UINT16(imgPos + 4 * picCtr) - 32,
 						READ_LE_UINT16(imgPos + 4 * picCtr + 2) - 20);
 
 					vm->_graphicsManager->sDrawPic(newPic, &videoFrame, pt);
@@ -492,7 +492,7 @@ void RL2Decoder::play(VoyeurEngine *vm, int resourceOffset,
 			Common::copy((const byte *)frame->getPixels(), (const byte *)frame->getPixels() + 320 * 200,
 				(byte *)vm->_graphicsManager->_screenSurface.getPixels());
 		}
-		
+
 		vm->_eventsManager->getMouseInfo();
 		g_system->delayMillis(10);
 	}
diff --git a/engines/voyeur/animation.h b/engines/voyeur/animation.h
index b17e998214..bc6d8a361a 100644
--- a/engines/voyeur/animation.h
+++ b/engines/voyeur/animation.h
@@ -105,7 +105,7 @@ private:
 
 	class RL2VideoTrack : public FixedRateVideoTrack {
 	public:
-		RL2VideoTrack(const RL2FileHeader &header, RL2AudioTrack *audioTrack, 
+		RL2VideoTrack(const RL2FileHeader &header, RL2AudioTrack *audioTrack,
 			Common::SeekableReadStream *stream);
 		~RL2VideoTrack();
 
diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp
index cc0b81a313..b8c987f18b 100644
--- a/engines/voyeur/data.cpp
+++ b/engines/voyeur/data.cpp
@@ -94,7 +94,7 @@ SVoy::SVoy(VoyeurEngine *vm):_vm(vm) {
 		_evCmPtrs[i] = nullptr;
 }
 
-void SVoy::addEvent(int hour, int minute, VoyeurEventType type, int audioVideoId, 
+void SVoy::addEvent(int hour, int minute, VoyeurEventType type, int audioVideoId,
 		int on, int off, int dead) {
 	VoyeurEvent &e = _events[_eventCount++];
 
@@ -309,7 +309,7 @@ bool SVoy::checkForKey() {
 				if (e._audioVideoId == 40 && e._computerOn < 2 && e._computerOff > 6)
 					state->_victimEvidenceIndex = 4;
 				break;
-			
+
 			default:
 				break;
 			}
@@ -321,7 +321,7 @@ bool SVoy::checkForKey() {
 				if (e._audioVideoId == 8 && e._computerOn < 2 && e._computerOff > 26)
 					state->_victimEvidenceIndex = 1;
 				break;
-	
+
 			case 3:
 				if (e._audioVideoId == 20 && e._computerOn < 2 && e._computerOff > 28)
 					state->_victimEvidenceIndex = 3;
diff --git a/engines/voyeur/data.h b/engines/voyeur/data.h
index 98c884d0c1..a18ad84f51 100644
--- a/engines/voyeur/data.h
+++ b/engines/voyeur/data.h
@@ -101,7 +101,7 @@ public:
 	 */
 	bool isInRange(int slotIndex, int hotspotIndex, int v) const {
 		return _min[slotIndex][hotspotIndex] <= v &&
-			v < _max[slotIndex][hotspotIndex];				
+			v < _max[slotIndex][hotspotIndex];
 	}
 };
 
@@ -164,7 +164,7 @@ public:
 	/**
 	 * Add an event to the list of game events that have occurred
 	 */
-	void addEvent(int hour, int minute, VoyeurEventType type, int audioVideoId, 
+	void addEvent(int hour, int minute, VoyeurEventType type, int audioVideoId,
 		int on, int off, int dead);
 
 	/**
@@ -181,7 +181,7 @@ public:
 	 * Adds the start of an audio event happening
 	 */
 	void addAudioEventStart();
-	
+
 	/**
 	 * Adsd the finish of an audio event happening
 	 */
@@ -191,17 +191,17 @@ public:
 	 * Adds the start of an evidence event happening
 	 */
 	void addEvidEventStart(int v);
-	
+
 	/**
 	 * Adds the finish of an evidence event happening
 	 */
 	void addEvidEventEnd(int totalPages);
-	
+
 	/**
 	 * Adds the start of a computer event happening
 	 */
 	void addComputerEventStart();
-	
+
 	/**
 	 * Adds the finish of a computer event happening
 	 */
diff --git a/engines/voyeur/debugger.cpp b/engines/voyeur/debugger.cpp
index bd1da3ee0a..e9a12180da 100644
--- a/engines/voyeur/debugger.cpp
+++ b/engines/voyeur/debugger.cpp
@@ -45,13 +45,13 @@ static const int TIME_STATES[] = {
 
 bool Debugger::Cmd_Time(int argc, const char **argv) {
 	if (argc < 2) {
-		// Get the current day and time of day 
+		// Get the current day and time of day
 		Common::String dtString = _vm->getDayName();
 		Common::String timeString = _vm->getTimeOfDay();
 		if (!timeString.empty())
 			dtString += " " + timeString;
 
-		debugPrintf("Time period = %d, date/time is: %s, time is %s\n", 
+		debugPrintf("Time period = %d, date/time is: %s, time is %s\n",
 			_vm->_voy->_transitionId, dtString.c_str(), _isTimeActive ? "on" : "off");
 		debugPrintf("Format: %s [on | off | 1..17 | val <amount>]\n\n", argv[0]);
 	} else {
@@ -131,14 +131,14 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) {
 
 			for (int arrIndex = 0; arrIndex < 3; ++arrIndex) {
 				if (_vm->_voy->_audioHotspotTimes._min[arrIndex][hotspotIdx] != 9999) {
-					debugPrintf("Hotspot %d %s Audio slot %d, time: %d to %d\n", 
+					debugPrintf("Hotspot %d %s Audio slot %d, time: %d to %d\n",
 						hotspotIdx, pos.c_str(), arrIndex,
 						_vm->_voy->_audioHotspotTimes._min[arrIndex][hotspotIdx],
 						_vm->_voy->_audioHotspotTimes._max[arrIndex][hotspotIdx]);
 				}
 
 				if (_vm->_voy->_evidenceHotspotTimes._min[arrIndex][hotspotIdx] != 9999) {
-					debugPrintf("Hotspot %d %s Evidence slot %d, time: %d to %d\n", 
+					debugPrintf("Hotspot %d %s Evidence slot %d, time: %d to %d\n",
 						hotspotIdx, pos.c_str(), arrIndex,
 						_vm->_voy->_evidenceHotspotTimes._min[arrIndex][hotspotIdx],
 						_vm->_voy->_evidenceHotspotTimes._max[arrIndex][hotspotIdx]);
@@ -147,7 +147,7 @@ bool Debugger::Cmd_Hotspots(int argc, const char **argv) {
 
 			for (int arrIndex = 0; arrIndex < 8; ++arrIndex) {
 				if (_vm->_voy->_videoHotspotTimes._min[arrIndex][hotspotIdx] != 9999) {
-					debugPrintf("Hotspot %d %s Video slot %d, time: %d to %d\n", 
+					debugPrintf("Hotspot %d %s Video slot %d, time: %d to %d\n",
 						hotspotIdx, pos.c_str(), arrIndex,
 						_vm->_voy->_videoHotspotTimes._min[arrIndex][hotspotIdx],
 						_vm->_voy->_videoHotspotTimes._max[arrIndex][hotspotIdx]);
diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index 9a3c6d00ff..7ce7351e65 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -73,7 +73,7 @@ EventsManager::EventsManager(VoyeurEngine *vm) : _intPtr(_gameData),
 	Common::fill(&_cycleTime[0], &_cycleTime[4], 0);
 	Common::fill(&_cycleNext[0], &_cycleNext[4], (byte *)nullptr);
 	_cyclePtr = NULL;
-	
+
 	_leftClick = _rightClick = false;
 	_mouseClicked = _newMouseClicked = false;
 	_newLeftClick = _newRightClick = false;;
@@ -158,7 +158,7 @@ void EventsManager::checkForNextFrameCounter() {
 			showMousePosition();
 
 		// Display the frame
-		g_system->copyRectToScreen((byte *)_vm->_graphicsManager->_screenSurface.getPixels(), 
+		g_system->copyRectToScreen((byte *)_vm->_graphicsManager->_screenSurface.getPixels(),
 			SCREEN_WIDTH, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 		g_system->updateScreen();
 
@@ -218,7 +218,7 @@ void EventsManager::videoTimer() {
 		_gameData._hasPalette = false;
 
 		g_system->getPaletteManager()->setPalette(_gameData._palette +
-			_gameData._palStartIndex * 3, _gameData._palStartIndex, 
+			_gameData._palStartIndex * 3, _gameData._palStartIndex,
 			_gameData._palEndIndex - _gameData._palStartIndex + 1);
 	}
 }
@@ -241,7 +241,7 @@ void EventsManager::delayClick(int cycles) {
 	do {
 		g_system->delayMillis(10);
 		getMouseInfo();
-	} while (!_vm->shouldQuit() && g_system->getMillis() < delayEnd 
+	} while (!_vm->shouldQuit() && g_system->getMillis() < delayEnd
 			&& !_vm->_eventsManager->_mouseClicked);
 }
 
@@ -315,7 +315,7 @@ void EventsManager::startFade(CMapResource *cMap) {
 			palEntry._bEntry = vgaP[2] << 8;
 			int bDiff = (cMap->_entries[mapIndex * 3 + 2] << 8) - palEntry._bEntry;
 			palEntry._bChange = bDiff / cMap->_steps;
-			
+
 			palEntry._palIndex = idx;
 			if (!(cMap->_fadeStatus & 1))
 				++mapIndex;
@@ -431,12 +431,12 @@ void EventsManager::vDoCycleInt() {
 					byte b = pPal[start * 3 + 2];
 
 					Common::copy(&pPal[start * 3 + 3], &pPal[end * 3 + 3], &pPal[start * 3]);
-					
+
 					// Place the original saved entry at the end of the range
 					pPal[end * 3] = r;
 					pPal[end * 3 + 1] = g;
 					pPal[end * 3 + 2] = b;
-					
+
 					if (_fadeStatus & 1) {
 						//dx = start, di = end
 						warning("TODO: Adjustment of ViewPortListResource");
@@ -454,12 +454,12 @@ void EventsManager::vDoCycleInt() {
 
 					// Move the remainder of the range forwards one entry
 					Common::copy_backward(&pPal[start * 3], &pPal[end * 3], &pPal[end * 3 + 3]);
-					
+
 					// Place the original saved entry at the end of the range
 					pPal[start * 3] = r;
 					pPal[start * 3 + 1] = g;
 					pPal[start * 3 + 2] = b;
-					
+
 					if (_fadeStatus & 1) {
 						//dx = start, di = end
 						warning("TODO: Adjustment of ViewPortListResource");
diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h
index 5e0bfe6404..0c1cef0955 100644
--- a/engines/voyeur/events.h
+++ b/engines/voyeur/events.h
@@ -38,7 +38,7 @@ class CMapResource;
 #define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
 
 typedef void (EventsManager::*EventMethodPtr)();
- 
+
 class IntNode {
 public:
 	EventMethodPtr _intFunc;
diff --git a/engines/voyeur/files.cpp b/engines/voyeur/files.cpp
index 7369d9280e..346fd2419e 100644
--- a/engines/voyeur/files.cpp
+++ b/engines/voyeur/files.cpp
@@ -421,8 +421,8 @@ byte *BoltFile::getBoltMember(uint32 id) {
 }
 
 void BoltFile::initDefault() {
-	_state._curMemberPtr->_data = _state.decompress(NULL, _state._curMemberPtr->_size, 
-		_state._curMemberPtr->_mode);	
+	_state._curMemberPtr->_data = _state.decompress(NULL, _state._curMemberPtr->_size,
+		_state._curMemberPtr->_mode);
 }
 
 /*------------------------------------------------------------------------*/
@@ -505,7 +505,7 @@ void BVoyBoltFile::initSoundMap() {
 }
 
 void BVoyBoltFile::sInitRect() {
-	_state._curMemberPtr->_data = _state.decompress(NULL, _state._curMemberPtr->_size, 
+	_state._curMemberPtr->_data = _state.decompress(NULL, _state._curMemberPtr->_size,
 		_state._curMemberPtr->_mode);
 
 	// Check whether the resource Id is in the list of extended rects
@@ -522,7 +522,7 @@ void BVoyBoltFile::sInitRect() {
 void BVoyBoltFile::sInitPic() {
 	// Read in the header data
 	_state._curMemberPtr->_data = _state.decompress(NULL, 24, _state._curMemberPtr->_mode);
-	_state._curMemberPtr->_picResource = new PictureResource(_state, 
+	_state._curMemberPtr->_picResource = new PictureResource(_state,
 		_state._curMemberPtr->_data);
 }
 
@@ -567,14 +567,14 @@ void StampBoltFile::initResource(int resType) {
 void StampBoltFile::initThread() {
 	initDefault();
 
-	_state._curMemberPtr->_threadResource = new ThreadResource(_state, 
+	_state._curMemberPtr->_threadResource = new ThreadResource(_state,
 		_state._curMemberPtr->_data);
 }
 
 void StampBoltFile::initPtr() {
 	initDefault();
 
-	_state._curMemberPtr->_ptrResource = new PtrResource(_state, 
+	_state._curMemberPtr->_ptrResource = new PtrResource(_state,
 		_state._curMemberPtr->_data);
 }
 
@@ -585,7 +585,7 @@ void StampBoltFile::initControl() {
 	initDefault();
 
 	ControlResource *res;
-	_state._curMemberPtr->_controlResource = res = new ControlResource(_state, 
+	_state._curMemberPtr->_controlResource = res = new ControlResource(_state,
 		_state._curMemberPtr->_data);
 
 	_state._vm->_controlGroupPtr = _state._curGroupPtr;
@@ -596,7 +596,7 @@ void StampBoltFile::initState() {
 	initDefault();
 
 	assert(_state._curMemberPtr->_size == 16);
-	_state._curMemberPtr->_stateResource = new StateResource(_state, 
+	_state._curMemberPtr->_stateResource = new StateResource(_state,
 		_state._curMemberPtr->_data);
 }
 
@@ -658,7 +658,7 @@ BoltEntry::BoltEntry(Common::SeekableReadStream *f, uint16 id): _file(f), _id(id
 	_mode = buffer[0];
 	_initMethod = buffer[3];
 	_size = READ_LE_UINT32(&buffer[4]) & 0xffffff;
-	_fileOffset = READ_LE_UINT32(&buffer[8]); 
+	_fileOffset = READ_LE_UINT32(&buffer[8]);
 }
 
 BoltEntry::~BoltEntry() {
@@ -687,7 +687,7 @@ void BoltEntry::load() {
  */
 bool BoltEntry::hasResource() const {
 	return _rectResource ||  _picResource || _viewPortResource || _viewPortListResource
-		|| _fontResource || _fontInfoResource || _cMapResource || _vInitCycleResource 
+		|| _fontResource || _fontInfoResource || _cMapResource || _vInitCycleResource
 		|| _ptrResource || _controlResource || _stateResource || _threadResource;
 }
 
@@ -719,7 +719,7 @@ RectResource::RectResource(const byte *src, int size, bool isExtendedRects) {
 
 		int x1 = READ_LE_UINT16(src);
 		int y1 = READ_LE_UINT16(src + 2);
-		int x2 = READ_LE_UINT16(src + 4); 
+		int x2 = READ_LE_UINT16(src + 4);
 		int y2 = READ_LE_UINT16(src + 6);
 
 		_entries.push_back(RectEntry(x1, y1, x2, y2, arrIndex, rectCount));
@@ -896,7 +896,7 @@ int DisplayResource::drawText(const Common::String &msg) {
 				viewPort->_fontRect.top -= fontInfo._shadow.y;
 			}
 		}
-	} 
+	}
 
 	if (gfxManager._saveBack && fontInfo._fontSaveBack && (_flags & DISPFLAG_VIEWPORT)) {
 		viewPort->addSaveRect(viewPort->_pageIndex, viewPort->_fontRect);
@@ -971,7 +971,7 @@ int DisplayResource::drawText(const Common::String &msg) {
 			fontChar._imgData = fontData._charImages + offset * 2;
 
 			gfxManager.sDrawPic(&fontChar, this, Common::Point(xp, yp));
-			
+
 			fontChar._imgData = NULL;
 			xp += charWidth + padding;
 			msgWidth += charWidth + padding;
@@ -1056,7 +1056,7 @@ PictureResource::PictureResource(BoltFilesState &state, const byte *src):
 			byte *imgData = state._curLibPtr->boltEntry(id)._picResource->_imgData;
 			_freeImgData = DisposeAfterUse::NO;
 
-			// TODO: Double check code below. Despite different coding in the 
+			// TODO: Double check code below. Despite different coding in the
 			// original, both looked like they do the same formula
 			if (_flags & PICFLAG_PIC_OFFSET) {
 				_imgData = imgData + (READ_LE_UINT32(&src[18]) & 0xffff);
@@ -1082,7 +1082,7 @@ PictureResource::PictureResource(BoltFilesState &state, const byte *src):
 
 		if (mode != state._vm->_graphicsManager->_SVGAMode) {
 			state._vm->_graphicsManager->_SVGAMode = mode;
-			state._vm->_graphicsManager->clearPalette();			
+			state._vm->_graphicsManager->clearPalette();
 		}
 
 		int screenOffset = READ_LE_UINT32(&src[18]) & 0xffff;
@@ -1118,7 +1118,7 @@ PictureResource::PictureResource(BoltFilesState &state, const byte *src):
 			_imgData = new byte[nbytes];
 			Common::fill(_imgData, _imgData + nbytes, 0);
 		} else {
-			_imgData = state.decompress(NULL, nbytes, state._curMemberPtr->_mode);			
+			_imgData = state.decompress(NULL, nbytes, state._curMemberPtr->_mode);
 		}
 	}
 }
@@ -1131,7 +1131,7 @@ PictureResource::PictureResource(Graphics::Surface *surface) {
 	_maskData = 0;
 	_planeSize = 0;
 	_keyColor = 0;
-	
+
 	_bounds = Common::Rect(0, 0, surface->w, surface->h);
 	_imgData = (byte *)surface->getPixels();
 	_freeImgData = DisposeAfterUse::NO;
@@ -1150,7 +1150,7 @@ PictureResource::PictureResource() {
 	_freeImgData = DisposeAfterUse::NO;
 }
 
-PictureResource::PictureResource(int flags, int select, int pick, int onOff, 
+PictureResource::PictureResource(int flags, int select, int pick, int onOff,
 		const Common::Rect &bounds, int maskData, byte *imgData, int planeSize) {
 	_flags = flags;
 	_select = select;
@@ -1189,7 +1189,7 @@ void PictureResource::flipVertical(const byte *data) {
 	for (int y = 0; y < _bounds.height(); ++y) {
 		Common::copy(srcP, srcP + _bounds.width(), destP);
 		srcP += _bounds.width();
-		destP -= _bounds.width();	
+		destP -= _bounds.width();
 	}
 }
 
@@ -1205,7 +1205,7 @@ ViewPortResource::ViewPortResource(BoltFilesState &state, const byte *src):
 
 	int xs = READ_LE_UINT16(src + 12);
 	int ys = READ_LE_UINT16(src + 14);
-	_bounds = Common::Rect(xs, ys, xs + READ_LE_UINT16(src + 16), 
+	_bounds = Common::Rect(xs, ys, xs + READ_LE_UINT16(src + 16),
 		ys + READ_LE_UINT16(src + 18));
 
 	_currentPic = state._curLibPtr->getPictureResource(READ_LE_UINT32(src + 0x20));
@@ -1285,7 +1285,7 @@ void ViewPortResource::setupViewPort(PictureResource *page, Common::Rect *clippi
 		yDiff = r.bottom - page->_bounds.bottom;
 
 		if (xDiff > 0)
-			r.setWidth(xDiff <= r.width() ? r.width() - xDiff : 0); 
+			r.setWidth(xDiff <= r.width() ? r.width() - xDiff : 0);
 		if (yDiff > 0)
 			r.setHeight(yDiff <= r.height() ? r.height() - yDiff : 0);
 	}
@@ -1305,7 +1305,7 @@ void ViewPortResource::setupViewPort(PictureResource *page, Common::Rect *clippi
 			r.top = clippingRect->top;
 			r.setHeight(yDiff <= height ? height - yDiff : 0);
 		}
-		
+
 		xDiff = r.right - clippingRect->right;
 		yDiff = r.bottom - clippingRect->bottom;
 
@@ -1339,7 +1339,7 @@ void ViewPortResource::setupViewPort(PictureResource *pic, Common::Rect *clippin
 
 void ViewPortResource::addSaveRect(int pageIndex, const Common::Rect &r) {
 	Common::Rect rect = r;
-	
+
 	if (clipRect(rect)) {
 		if (_addFn) {
 			(_state._vm->_graphicsManager->*_addFn)(this, pageIndex, rect);
@@ -1355,21 +1355,21 @@ void ViewPortResource::fillPic(byte onOff) {
 
 void ViewPortResource::drawIfaceTime() {
 	// Hour display
-	_state._vm->_graphicsManager->drawANumber(_state._vm->_graphicsManager->_vPort, 
+	_state._vm->_graphicsManager->drawANumber(_state._vm->_graphicsManager->_vPort,
 		(_state._vm->_gameHour / 10) == 0 ? 10 : _state._vm->_gameHour / 10,
 		Common::Point(161, 25));
-	_state._vm->_graphicsManager->drawANumber(_state._vm->_graphicsManager->_vPort, 
+	_state._vm->_graphicsManager->drawANumber(_state._vm->_graphicsManager->_vPort,
 		_state._vm->_gameHour % 10, Common::Point(172, 25));
 
 	// Minute display
-	_state._vm->_graphicsManager->drawANumber(_state._vm->_graphicsManager->_vPort, 
+	_state._vm->_graphicsManager->drawANumber(_state._vm->_graphicsManager->_vPort,
 		_state._vm->_gameMinute / 10, Common::Point(190, 25));
-	_state._vm->_graphicsManager->drawANumber(_state._vm->_graphicsManager->_vPort, 
+	_state._vm->_graphicsManager->drawANumber(_state._vm->_graphicsManager->_vPort,
 		_state._vm->_gameMinute % 10, Common::Point(201, 25));
 
 	// AM/PM indicator
 	PictureResource *pic = _state._vm->_bVoy->boltEntry(_state._vm->_voy->_isAM ? 272 : 273)._picResource;
-	_state._vm->_graphicsManager->sDrawPic(pic, _state._vm->_graphicsManager->_vPort, 
+	_state._vm->_graphicsManager->sDrawPic(pic, _state._vm->_graphicsManager->_vPort,
 		Common::Point(215, 27));
 }
 
@@ -1488,9 +1488,9 @@ FontInfoResource::FontInfoResource() {
 	_shadowColor = 0;
 }
 
-FontInfoResource::FontInfoResource(byte picFlags, byte picSelect, byte picPick, byte picOnOff, 
-		byte fontFlags, FontJustify justify, int fontSaveBack, const Common::Point &pos, 
-		int justifyWidth, int justifyHeight, const Common::Point &shadow, int foreColor, 
+FontInfoResource::FontInfoResource(byte picFlags, byte picSelect, byte picPick, byte picOnOff,
+		byte fontFlags, FontJustify justify, int fontSaveBack, const Common::Point &pos,
+		int justifyWidth, int justifyHeight, const Common::Point &shadow, int foreColor,
 		int backColor, int shadowColor) {
 	_curFont = NULL;
 	_picFlags = picFlags;
@@ -1516,7 +1516,7 @@ CMapResource::CMapResource(BoltFilesState &state, const byte *src): _vm(state._v
 	_fadeStatus = src[1];
 	_start = READ_LE_UINT16(src + 2);
 	_end = READ_LE_UINT16(src + 4);
-	
+
 	int count = _end - _start + 1;
 	_entries = new byte[count * 3];
 	Common::copy(src + 6, src + 6 + 3 * count, _entries);
@@ -1607,7 +1607,7 @@ ControlResource::ControlResource(BoltFilesState &state, const byte *src) {
 /*------------------------------------------------------------------------*/
 
 StateResource::StateResource(BoltFilesState &state, const byte *src):
-		_victimIndex(_vals[1]), _victimEvidenceIndex(_vals[2]), 
+		_victimIndex(_vals[1]), _victimEvidenceIndex(_vals[2]),
 		_victimMurderIndex(_vals[3]) {
 	for (int i = 0; i < 4; ++i)
 		_vals[i] = READ_LE_UINT32(src + i * 4);
diff --git a/engines/voyeur/files.h b/engines/voyeur/files.h
index 49c0b2c8a4..eef5df497c 100644
--- a/engines/voyeur/files.h
+++ b/engines/voyeur/files.h
@@ -114,7 +114,7 @@ public:
 	void resolveIt(uint32 id, byte **p);
 	void resolveFunction(uint32 id, GraphicMethodPtr *fn);
 
-	BoltEntry &boltEntry(uint16 id); 
+	BoltEntry &boltEntry(uint16 id);
 	BoltEntry &getBoltEntryFromLong(uint32 id);
 	PictureResource *getPictureResource(uint32 id);
 	CMapResource *getCMapResource(uint32 id);
@@ -160,7 +160,7 @@ public:
 	int _fileOffset;
 	Common::Array<BoltEntry> _entries;
 public:
-	BoltGroup(Common::SeekableReadStream *f); 
+	BoltGroup(Common::SeekableReadStream *f);
 	virtual ~BoltGroup();
 
 	void load(uint16 groupId);
@@ -234,15 +234,15 @@ public:
 /* bvoy.blt resource types */
 
 enum PictureFlag {
-	PICFLAG_2 = 2, PICFLAG_PIC_OFFSET = 8, PICFLAG_CLEAR_SCREEN = 0x10, 
+	PICFLAG_2 = 2, PICFLAG_PIC_OFFSET = 8, PICFLAG_CLEAR_SCREEN = 0x10,
 	PICFLAG_20 = 0x20, PICFLAG_HFLIP = 0x40, PICFLAG_VFLIP = 0x80, PICFLAG_100 = 0x100,
-	PICFLAG_CLEAR_SCREEN00 = 0x1000 
+	PICFLAG_CLEAR_SCREEN00 = 0x1000
 };
 
 enum DisplayFlag {
-	DISPFLAG_1 = 1, DISPFLAG_2 = 2, DISPFLAG_4 = 4, DISPFLAG_8 = 8, 
+	DISPFLAG_1 = 1, DISPFLAG_2 = 2, DISPFLAG_4 = 4, DISPFLAG_8 = 8,
 	DISPFLAG_10 = 0x10, DISPFLAG_20 = 0x20, DISPFLAG_40 = 0x40, DISPFLAG_80 = 0x80,
-	DISPFLAG_100 = 0x100, DISPFLAG_200 = 0x200, DISPFLAG_400 = 0x400, 
+	DISPFLAG_100 = 0x100, DISPFLAG_200 = 0x200, DISPFLAG_400 = 0x400,
 	DISPFLAG_800 = 0x800, DISPFLAG_1000 = 0x1000, DISPFLAG_2000 = 0x2000,
 	DISPFLAG_4000 = 0x4000, DISPFLAG_VIEWPORT = 0x8000, DISPFLAG_CURSOR = 0x10000,
 	DISPFLAG_NONE = 0};
@@ -256,7 +256,7 @@ public:
 	DisplayResource();
 	DisplayResource(VoyeurEngine *vm);
 
-	/** 
+	/**
 	 * Fill a box of the given size at the current _drawPtr location
 	 */
 	void sFillBox(int width, int height);
@@ -308,7 +308,7 @@ public:
 	DisposeAfterUse::Flag _freeImgData;
 public:
 	PictureResource(BoltFilesState &state, const byte *src);
-	PictureResource(int flags, int select, int pick, int onOff, 
+	PictureResource(int flags, int select, int pick, int onOff,
 		const Common::Rect &bounds, int maskData, byte *imgData, int planeSize);
 	PictureResource(Graphics::Surface *surface);
 	PictureResource();
@@ -334,7 +334,7 @@ public:
 	PictureResource *_pages[2];
 
 	// Rect lists and counts. Note that _rectListCount values of '-1' seem to have
-	// special significance, which is why I'm not making them redundant in favor 
+	// special significance, which is why I'm not making them redundant in favor
 	// of the arrays' .size() method
 	Common::Array<Common::Rect> *_rectListPtr[3];
 	int _rectListCount[3];
@@ -413,9 +413,9 @@ public:
 public:
 	FontInfoResource(BoltFilesState &state, const byte *src);
 	FontInfoResource();
-	FontInfoResource(byte picFlags, byte picSelect, byte picPick, byte picOnOff, byte fontFlags, 
-		FontJustify justify, int fontSaveBack, const Common::Point &pos, int justifyWidth, 
-		int justifyHeight, const Common::Point &shadow, int foreColor, int backColor, 
+	FontInfoResource(byte picFlags, byte picSelect, byte picPick, byte picOnOff, byte fontFlags,
+		FontJustify justify, int fontSaveBack, const Common::Point &pos, int justifyWidth,
+		int justifyHeight, const Common::Point &shadow, int foreColor, int backColor,
 		int shadowColor);
 };
 
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index 700944f7ef..b1960a23ac 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -97,7 +97,7 @@ void ThreadResource::unloadAStack(int stackId) {
 }
 
 bool ThreadResource::doState() {
-	if (!getStateInfo()) 
+	if (!getStateInfo())
 		return false;
 
 	getButtonsFlags();
@@ -122,7 +122,7 @@ bool ThreadResource::getStateInfo() {
 		uint32 fld = READ_LE_UINT32(_ctlPtr + 2);
 		fld += _stateId << 3;
 		_nextStateId = READ_LE_UINT32(_ctlPtr + fld + 4);
-		
+
 		fld = READ_LE_UINT32(_ctlPtr + fld);
 		byte *baseP = _ctlPtr + fld;
 		_stateCount = READ_LE_UINT16(baseP);
@@ -133,7 +133,7 @@ bool ThreadResource::getStateInfo() {
 		_playCommandsPtr += (READ_LE_UINT32(baseP + 6) / 2) << 1;
 
 		_threadInfoPtr = baseP + 10;
-		
+
 		getButtonsText();
 		return true;
 	}
@@ -146,7 +146,7 @@ byte *ThreadResource::getDataOffset() {
 
 void ThreadResource::getButtonsText() {
 	int idx = 0;
-	
+
 	for (const byte *p = _threadInfoPtr; *p != 0x49; p = getNextRecord(p)) {
 		if (*p == 0xC0) {
 			++p;
@@ -162,7 +162,7 @@ void ThreadResource::getButtonsText() {
 
 void ThreadResource::getButtonsFlags() {
 	int idx = 0;
-	
+
 	for (const byte *p = _threadInfoPtr; *p != 0x49; p = getNextRecord(p)) {
 		if (*p == 0xC0) {
 			if (*++p & 0x20)
@@ -379,9 +379,9 @@ void ThreadResource::parsePlayCommands() {
 					_vm->_eventsManager->incrementTime(1);
 					_vm->_audioVideoId = -1;
 					parseIndex = 999;
-				}				
-			} 
-			
+				}
+			}
+
 			dataP += 8;
 			break;
 
@@ -408,7 +408,7 @@ void ThreadResource::parsePlayCommands() {
 					_vm->_voy->_eventFlags |= EVTFLAG_TIME_DISABLED;
 					_vm->_voy->addVideoEventEnd();
 					_vm->_eventsManager->incrementTime(1);
-				
+
 					_vm->_audioVideoId = -1;
 					_vm->_playStampGroupId = -1;
 
@@ -494,7 +494,7 @@ void ThreadResource::parsePlayCommands() {
 				_vm->_audioVideoId = -1;
 				parseIndex = 999;
 			}
-			break;			
+			break;
 
 		case 5:
 			// Check whether transition to a given time period is allowed, and
@@ -587,8 +587,8 @@ void ThreadResource::parsePlayCommands() {
 		case 10:
 			// Pick the person who is to die, during startup
 			if (_vm->_iForceDeath == -1) {
-				// No specific person has been preset to be killed, so pick one randomly. 
-				// The loop below was used because the victim was persisted from the previous 
+				// No specific person has been preset to be killed, so pick one randomly.
+				// The loop below was used because the victim was persisted from the previous
 				// play-through, so it ensured that a different victim is picked.
 				int randomVal;
 				do {
@@ -663,7 +663,7 @@ void ThreadResource::parsePlayCommands() {
 
 			if (v2 == 0 || _vm->_controlPtr->_state->_victimIndex == v2)
 				_vm->_voy->_murderThreshold = v3;
-			
+
 			dataP += 4;
 			break;
 
@@ -819,7 +819,7 @@ const byte *ThreadResource::cardPerform(const byte *card) {
 	case 24:
 	case 27:
 	case 28:
-		subId -= 3;	
+		subId -= 3;
 		// Deliberate fall-through
 
 	case 21:
@@ -858,13 +858,13 @@ const byte *ThreadResource::cardPerform(const byte *card) {
 						++count;
 				}
 			}
-			
+
 			++card;
 		} else {
 			if (cardPerform2(card, id)) {
 				card += subId;
 				card = cardPerform(card);
-				while (*card++ != 61) ;		
+				while (*card++ != 61) ;
 			} else {
 				card += subId;
 				while (*card != 61 && *card != 29)
@@ -878,7 +878,7 @@ const byte *ThreadResource::cardPerform(const byte *card) {
 		assert(bVal < 8);
 		card += 6;
 		break;
-	
+
 	case 45:
 		_newStateId = _nextStateId;
 		_newStackId = _stackId;
@@ -929,12 +929,12 @@ bool ThreadResource::cardPerform2(const byte *pSrc, int cardCmdId) {
 		return vLong != vLong2;
 
 	case 25:
-		vLong = _vm->_controlPtr->_state->_vals[*pSrc]; 
+		vLong = _vm->_controlPtr->_state->_vals[*pSrc];
 		vLong2 = (int32)READ_LE_UINT32(pSrc + 1);
 		return vLong < vLong2;
 
 	case 26:
-		vLong = _vm->_controlPtr->_state->_vals[*pSrc]; 
+		vLong = _vm->_controlPtr->_state->_vals[*pSrc];
 		vLong2 = (int32)READ_LE_UINT32(pSrc + 1);
 		return vLong > vLong2;
 
@@ -951,13 +951,13 @@ bool ThreadResource::cardPerform2(const byte *pSrc, int cardCmdId) {
 	default:
 		return false;
 	}
-}	
+}
 
 int ThreadResource::doApt() {
 	loadTheApt();
 
 	_vm->_currentVocId = 151;
-	_vm->_voy->_viewBounds = _vm->_bVoy->boltEntry(_vm->_playStampGroupId)._rectResource; 
+	_vm->_voy->_viewBounds = _vm->_bVoy->boltEntry(_vm->_playStampGroupId)._rectResource;
 	Common::Array<RectEntry> &hotspots = _vm->_bVoy->boltEntry(
 		_vm->_playStampGroupId + 1)._rectResource->_entries;
 	_vm->_eventsManager->getMouseInfo();
@@ -1039,7 +1039,7 @@ int ThreadResource::doApt() {
 						hotspotId = 5;
 
 					// Draw the text description for the highlighted hotspot
-					pic = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + 
+					pic = _vm->_bVoy->boltEntry(_vm->_playStampGroupId +
 						hotspotId + 6)._picResource;
 					_vm->_graphicsManager->sDrawPic(pic, _vm->_graphicsManager->_vPort,
 						Common::Point(106, 200));
@@ -1101,10 +1101,10 @@ int ThreadResource::doApt() {
 void ThreadResource::doRoom() {
 	VoyeurEngine &vm = *_vm;
 	SVoy voy = *vm._voy;
-	
+
 	vm.makeViewFinderP();
 	voy._fadingType = 0;
-	
+
 	if (!vm._bVoy->getBoltGroup(vm._playStampGroupId))
 		return;
 
@@ -1116,7 +1116,7 @@ void ThreadResource::doRoom() {
 	voy._fadingStep1 = 2;
 	voy._fadingStep2 = 0;
 	voy._fadingType = 1;
-	
+
 	Common::Array<RectEntry> &hotspots = vm._bVoy->boltEntry(vm._playStampGroupId + 4)._rectResource->_entries;
 	int hotspotId = -1;
 
@@ -1214,7 +1214,7 @@ void ThreadResource::doRoom() {
 				vm._eventsManager->_mouseClicked = false;
 				vm._eventsManager->startCursorBlink();
 
-				int totalChars = vm.doComputerText(9999); 
+				int totalChars = vm.doComputerText(9999);
 				if (totalChars)
 					vm._voy->addComputerEventEnd(totalChars);
 
@@ -1345,12 +1345,12 @@ int ThreadResource::doInterface() {
 	Common::String fname = _vm->_soundManager->getVOCFileName(_vm->_currentVocId);
 	_vm->_soundManager->startVOCPlay(fname);
 	_vm->_eventsManager->getMouseInfo();
-	
+
 	_vm->_graphicsManager->setColor(240, 220, 220, 220);
 	_vm->_eventsManager->_intPtr._hasPalette = true;
 	_vm->_voy->_eventFlags &= ~EVTFLAG_TIME_DISABLED;
 
-	// Set the cusor 
+	// Set the cusor
 	PictureResource *crosshairsCursor = _vm->_bVoy->boltEntry(0x112)._picResource;
 	PictureResource *eyeCursor = _vm->_bVoy->boltEntry(0x113)._picResource;
 	PictureResource *listenCursor = _vm->_bVoy->boltEntry(0x114)._picResource;
@@ -1382,7 +1382,7 @@ int ThreadResource::doInterface() {
 		if (!mansionViewBounds.contains(pt))
 			pt = Common::Point(-1, -1);
 		else
-			pt = _vm->_mansionViewPos + 
+			pt = _vm->_mansionViewPos +
 				Common::Point(pt.x - MANSION_VIEW_X, pt.y - MANSION_VIEW_Y);
 		regionIndex = -1;
 
@@ -1420,20 +1420,20 @@ int ThreadResource::doInterface() {
 
 		// Regularly update the time display
 		if (_vm->_voy->_RTANum & 2) {
-			_vm->_graphicsManager->drawANumber(_vm->_graphicsManager->_vPort, 
+			_vm->_graphicsManager->drawANumber(_vm->_graphicsManager->_vPort,
 				_vm->_gameMinute / 10, Common::Point(190, 25));
-			_vm->_graphicsManager->drawANumber(_vm->_graphicsManager->_vPort, 
+			_vm->_graphicsManager->drawANumber(_vm->_graphicsManager->_vPort,
 				_vm->_gameMinute % 10, Common::Point(201, 25));
 
 			if (_vm->_voy->_RTANum & 4) {
 				int v = _vm->_gameHour / 10;
-				_vm->_graphicsManager->drawANumber(_vm->_graphicsManager->_vPort, 
+				_vm->_graphicsManager->drawANumber(_vm->_graphicsManager->_vPort,
 					v == 0 ? 10 : v, Common::Point(161, 25));
-				_vm->_graphicsManager->drawANumber(_vm->_graphicsManager->_vPort, 
+				_vm->_graphicsManager->drawANumber(_vm->_graphicsManager->_vPort,
 					_vm->_gameHour % 10, Common::Point(172, 25));
 
 				pic = _vm->_bVoy->boltEntry(_vm->_voy->_isAM ? 272 : 273)._picResource;
-				_vm->_graphicsManager->sDrawPic(pic, _vm->_graphicsManager->_vPort, 
+				_vm->_graphicsManager->sDrawPic(pic, _vm->_graphicsManager->_vPort,
 					Common::Point(215, 27));
 			}
 		}
@@ -1462,7 +1462,7 @@ int ThreadResource::doInterface() {
 				_vm->makeViewFinder();
 
 				_vm->initIFace();
-				
+
 				hotspots = &_vm->_bVoy->boltEntry(_vm->_playStampGroupId + 1)._rectResource->_entries;
 				_vm->_eventsManager->getMouseInfo();
 
@@ -1471,7 +1471,7 @@ int ThreadResource::doInterface() {
 				_vm->_eventsManager->_intPtr._flashTimer = 0;
 			}
 		}
-	} while (!_vm->_eventsManager->_rightClick && !_vm->shouldQuit() && 
+	} while (!_vm->_eventsManager->_rightClick && !_vm->shouldQuit() &&
 		(!_vm->_eventsManager->_leftClick || regionIndex == -1));
 
 	_vm->_eventsManager->hideCursor();
@@ -1612,7 +1612,7 @@ void ThreadResource::loadTheApt() {
 	}
 
 	CMapResource *pal = _vm->_bVoy->boltEntry(_vm->_playStampGroupId + 4)._cMapResource;
-	pal->_steps = 1; 
+	pal->_steps = 1;
 	pal->startFade();
 	_vm->flipPageAndWaitForFade();
 }
@@ -1715,7 +1715,7 @@ void ThreadResource::doAptAnim(int mode) {
 void ThreadResource::synchronize(Common::Serializer &s) {
 	s.syncAsSint16LE(_aptPos.x);
 	s.syncAsSint16LE(_aptPos.y);
-	
+
 	int stateId = _stateId;
 	int stackId = _stackId;
 	s.syncAsSint16LE(stateId);
diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp
index f756b9cc85..68a30e41f4 100644
--- a/engines/voyeur/graphics.cpp
+++ b/engines/voyeur/graphics.cpp
@@ -97,9 +97,9 @@ void GraphicsManager::restoreMCGASaveRect(ViewPortResource *viewPort) {
 
 	restoreBack(*viewPort->_rectListPtr[1], viewPort->_rectListCount[1], viewPort->_pages[0],
 		viewPort->_pages[1]);
-	
+
 	int count = viewPort->_rectListCount[0];
-	restoreBack(*viewPort->_rectListPtr[0], viewPort->_rectListCount[0], 
+	restoreBack(*viewPort->_rectListPtr[0], viewPort->_rectListCount[0],
 		viewPort->_activePage, viewPort->_currentPic);
 
 	SWAP(viewPort->_rectListPtr[0], viewPort->_rectListPtr[1]);
@@ -150,7 +150,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 		destPic = (PictureResource *)destDisplay;
 	}
 
-	Common::Point offset = Common::Point(initialOffset.x + srcPic->_bounds.left - destPic->_bounds.left, 
+	Common::Point offset = Common::Point(initialOffset.x + srcPic->_bounds.left - destPic->_bounds.left,
 		initialOffset.y + srcPic->_bounds.top - destPic->_bounds.top);
 	width1 = width2 = srcPic->_bounds.width();
 	height1 = srcPic->_bounds.height();
@@ -178,7 +178,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 			srcOffset -= tmpHeight * width2;
 			height1 += tmpHeight;
 			offset.y = newBounds.top;
-			
+
 			if (height1 <= 0)
 				return;
 
@@ -258,7 +258,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 		for (uint idx = 0; idx < srcPic->_maskData; ++idx) {
 			if (imageDataShift < 4)
 				++imageDataShift;
-		}		
+		}
 	} else {
 		srcImgData = srcPic->_imgData;
 		destImgData = destPic->_imgData;
@@ -367,7 +367,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 
 							width2 = srcPic->_bounds.width();
 							height1 = tmpHeight + height1;
-							
+
 							for (int yp = 0; yp < height1; ++yp) {
 								runLength = 0;
 
@@ -509,7 +509,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 			if (srcFlags & DISPFLAG_2) {
 				if (!(srcFlags & DISPFLAG_8)) {
 					srcP = srcImgData + srcOffset;
-					
+
 					if (destFlags & DISPFLAG_8) {
 						// loc_272C3
 						error("TODO: sDrawPic variation");
@@ -786,7 +786,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
 						} else {
 							// loc_271F0
 							srcP = srcImgData;
-							
+
 							if (isClipped) {
 								// loc_2700A
 								tmpWidth = (tmpWidth < 0) ? -tmpWidth : 0;
@@ -886,7 +886,7 @@ void GraphicsManager::flipPage() {
 
 	for (uint idx = 0; idx < viewPorts.size(); ++idx) {
 		if (viewPorts[idx]->_flags & DISPFLAG_20) {
-			if ((viewPorts[idx]->_flags & (DISPFLAG_8 || DISPFLAG_1)) 
+			if ((viewPorts[idx]->_flags & (DISPFLAG_8 || DISPFLAG_1))
 					== (DISPFLAG_8 || DISPFLAG_1)) {
 				if (_planeSelect == idx)
 					sDisplayPic(viewPorts[idx]->_currentPic);
@@ -992,7 +992,7 @@ void GraphicsManager::screenReset() {
 
 	_backgroundPage = NULL;
 	_vPort->setupViewPort(NULL);
-	fillPic(_vPort, 0);	
+	fillPic(_vPort, 0);
 
 	_vm->flipPageAndWait();
 }
diff --git a/engines/voyeur/graphics.h b/engines/voyeur/graphics.h
index 41a1bafaca..e4d0b38650 100644
--- a/engines/voyeur/graphics.h
+++ b/engines/voyeur/graphics.h
@@ -54,7 +54,7 @@ public:
 	DrawInfo(int penColor, const Common::Point &pos);
 };
 
-typedef void (GraphicsManager::*GraphicMethodPtr)(); 
+typedef void (GraphicsManager::*GraphicMethodPtr)();
 typedef void (GraphicsManager::*ViewPortSetupPtr)(ViewPortResource *);
 typedef void (GraphicsManager::*ViewPortAddPtr)(ViewPortResource *, int idx, const Common::Rect &bounds);
 typedef void (GraphicsManager::*ViewPortRestorePtr)(ViewPortResource *);
@@ -87,7 +87,7 @@ public:
 	void sInitGraphics();
 
 	void setupMCGASaveRect(ViewPortResource *viewPort);
-	void addRectOptSaveRect(ViewPortResource *viewPort, int idx, const Common::Rect &bounds);	
+	void addRectOptSaveRect(ViewPortResource *viewPort, int idx, const Common::Rect &bounds);
 	void restoreMCGASaveRect(ViewPortResource *viewPort);
 	void addRectNoSaveBack(ViewPortResource *viewPort, int idx, const Common::Rect &bounds);
 
@@ -102,7 +102,7 @@ public:
 	void resetPalette();
 	void setColor(int idx, byte r, byte g, byte b);
 	void setOneColor(int idx, byte r, byte g, byte b);
-	void setColors(int start, int count, const byte *pal);	
+	void setColors(int start, int count, const byte *pal);
 	void screenReset();
 	void fadeDownICF1(int steps);
 	void fadeUpICF1(int steps = 0);
diff --git a/engines/voyeur/sound.cpp b/engines/voyeur/sound.cpp
index 26145bd743..c0e5a043cd 100644
--- a/engines/voyeur/sound.cpp
+++ b/engines/voyeur/sound.cpp
@@ -62,7 +62,7 @@ void SoundManager::startVOCPlay(const Common::String &filename) {
 	if (!f.open(filename))
 		error("Could not find voc file - %s", filename.c_str());
 
-	Audio::SeekableAudioStream *audioStream = Audio::makeVOCStream(f.readStream(f.size()), 
+	Audio::SeekableAudioStream *audioStream = Audio::makeVOCStream(f.readStream(f.size()),
 		Audio::FLAG_UNSIGNED, DisposeAfterUse::YES);
 
 	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_soundHandle, audioStream);
diff --git a/engines/voyeur/staticres.cpp b/engines/voyeur/staticres.cpp
index 7016793ddc..372da508f1 100644
--- a/engines/voyeur/staticres.cpp
+++ b/engines/voyeur/staticres.cpp
@@ -43,7 +43,7 @@ const int RESOLVE_TABLE[] = {
 	0x7500
 };
 
-const int LEVEL_H[] = { 
+const int LEVEL_H[] = {
 	4, 7, 7, 8, 9, 10, 2, 2, 4, 8, 8, 9, 9, 10, 10, 11, 11
 };
 
@@ -58,40 +58,40 @@ const int BLIND_TABLE[] = {
 };
 
 const int COMPUTER_SCREEN_TABLE[] = {
-	269, 128, 307, 163, 
-	269, 128, 307, 163, 
-	68, 79, 98, 102, 
-	68, 79, 98, 102, 
-	68, 79, 98, 102, 
+	269, 128, 307, 163,
+	269, 128, 307, 163,
+	68, 79, 98, 102,
+	68, 79, 98, 102,
+	68, 79, 98, 102,
+	68, 79, 98, 102,
+	248, 138, 291, 163,
+	83, 132, 143, 156,
+	248, 138, 291, 163,
+	83, 132, 143, 156,
+	83, 132, 143, 156,
+	248, 138, 291, 163,
 	68, 79, 98, 102,
-	248, 138, 291, 163, 
-	83, 132, 143, 156, 
-	248, 138, 291, 163, 
-	83, 132, 143, 156, 
-	83, 132, 143, 156, 
-	248, 138, 291, 163, 
-	68, 79, 98, 102, 
 	68, 79, 98, 102
 };
 
 const char *const SZ_FILENAMES[] = {
-	"A2110100", nullptr, "A2300100", nullptr, "B1220100", nullptr, "C1220100", nullptr, 
-	"C1290100", nullptr, "D1220100", nullptr, "D1270100", nullptr, "E1210100", nullptr, 
+	"A2110100", nullptr, "A2300100", nullptr, "B1220100", nullptr, "C1220100", nullptr,
+	"C1290100", nullptr, "D1220100", nullptr, "D1270100", nullptr, "E1210100", nullptr,
 	"E1260100", nullptr, "E1280100", nullptr, "E1325100", nullptr, "F1200100", nullptr,
-	"G1250100", nullptr, "G1260100", nullptr, "H1200100", nullptr, "H1230100", nullptr, 
-	"H1310100", nullptr, "I1300100", nullptr, "J1220100", nullptr, "J1230100", nullptr, 
+	"G1250100", nullptr, "G1260100", nullptr, "H1200100", nullptr, "H1230100", nullptr,
+	"H1310100", nullptr, "I1300100", nullptr, "J1220100", nullptr, "J1230100", nullptr,
 	"J1320100", nullptr, "K1260100", nullptr, "K1280100", nullptr, "K1325100", nullptr,
-	"L1210100", nullptr, "L1280100", nullptr, "L1290100", nullptr, "L1300100", nullptr, 
-	"L1310100", nullptr, "M1260100", nullptr, "M1310100", nullptr, "N1210100", nullptr, 
+	"L1210100", nullptr, "L1280100", nullptr, "L1290100", nullptr, "L1300100", nullptr,
+	"L1310100", nullptr, "M1260100", nullptr, "M1310100", nullptr, "N1210100", nullptr,
 	"N1225100", nullptr, "N1275510", nullptr, "N1280510", nullptr, "N1325100", nullptr,
-	"O1230100", nullptr, "O1260100", nullptr, "O1260520", nullptr, "O1280100", nullptr, 
-	"O1325540", nullptr, "P1276710", nullptr, "P1280540", nullptr, "P1280740", nullptr, 
+	"O1230100", nullptr, "O1260100", nullptr, "O1260520", nullptr, "O1280100", nullptr,
+	"O1325540", nullptr, "P1276710", nullptr, "P1280540", nullptr, "P1280740", nullptr,
 	"P1290510", nullptr, "P1325100", nullptr, "P1325300", nullptr, "P1325520", nullptr,
-	"Q1230100", nullptr, "Q1240530", nullptr, "Q1240730", nullptr, "Q1260100", nullptr, 
-	"Q1260520", nullptr, "Q1260720", nullptr, "Q1325100", nullptr, "R1280540", nullptr, 
+	"Q1230100", nullptr, "Q1240530", nullptr, "Q1240730", nullptr, "Q1260100", nullptr,
+	"Q1260520", nullptr, "Q1260720", nullptr, "Q1325100", nullptr, "R1280540", nullptr,
 	"Z1110510", nullptr, "Z1110520", nullptr, "Z1110530", nullptr, "Z1110540", nullptr,
-	"Z1110545", nullptr, "Z2320100", nullptr, "Z2905300", nullptr, "Z3110100", nullptr, 
-	"Z3115510", nullptr, "Z3115520", nullptr, "Z3115530", nullptr, "Z3115540", nullptr, 
+	"Z1110545", nullptr, "Z2320100", nullptr, "Z2905300", nullptr, "Z3110100", nullptr,
+	"Z3115510", nullptr, "Z3115520", nullptr, "Z3115530", nullptr, "Z3115540", nullptr,
 	"Z4915100", nullptr, "Z4915200", nullptr, "Z4915300",
 	nullptr, nullptr, nullptr, nullptr, nullptr,
 	"MMARG", "MZACK", "MREED", "MJESSI", "MCHLOE", "MCAMERA", "MENDCRED",
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 9be1dad831..8edacc5883 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -37,7 +37,7 @@ VoyeurEngine *g_vm;
 
 VoyeurEngine::VoyeurEngine(OSystem *syst, const VoyeurGameDescription *gameDesc) : Engine(syst),
 		_gameDescription(gameDesc), _randomSource("Voyeur"),
-		_defaultFontInfo(3, 0xff, 0xff, 0, 0, ALIGN_LEFT, 0, Common::Point(), 1, 1, 
+		_defaultFontInfo(3, 0xff, 0xff, 0, 0, ALIGN_LEFT, 0, Common::Point(), 1, 1,
 			Common::Point(1, 1), 1, 0, 0) {
 	_debugger = nullptr;
 	_eventsManager = nullptr;
@@ -158,7 +158,7 @@ void VoyeurEngine::initInput() {
 
 bool VoyeurEngine::doHeadTitle() {
 //	char dest[144];
-	
+
 	_eventsManager->startMainClockInt();
 
 	if (_loadGameSlot == -1) {
@@ -205,7 +205,7 @@ bool VoyeurEngine::doHeadTitle() {
 			_voy->addEvent(18, 7, EVTYPE_VIDEO, 40, 0, 998, -1);
 			_voy->addEvent(18, 8, EVTYPE_VIDEO, 43, 0, 998, -1);
 			_voy->addEvent(19, 1, EVTYPE_AUDIO, 20, 0, 998, -1);
-		} 
+		}
 	}
 
 	_voy->_aptLoadMode = 140;
@@ -271,7 +271,7 @@ bool VoyeurEngine::doLock() {
 		_graphicsManager->setColor(2, 96, 96, 96);
 		_graphicsManager->setColor(3, 160, 160, 160);
 		_graphicsManager->setColor(4, 224, 224, 224);
-		
+
 		// Set up the cursor
 		_eventsManager->setCursor(cursorPic);
 		_eventsManager->showCursor();
@@ -464,11 +464,11 @@ void VoyeurEngine::doOpening() {
 	_eventsManager->_intPtr._hasPalette = true;
 	_graphicsManager->_vPort->setupViewPort();
 	flipPageAndWait();
-	
+
 	RL2Decoder decoder;
 	decoder.loadRL2File("a2300100.rl2", false);
 	decoder.start();
-	
+
 	while (!shouldQuit() && !decoder.endOfVideo() && !_eventsManager->_mouseClicked) {
 		if (decoder.hasDirtyPalette()) {
 			const byte *palette = decoder.getPalette();
@@ -487,7 +487,7 @@ void VoyeurEngine::doOpening() {
 					textPic = _bVoy->boltEntry(frameIndex / 2 + 0x202)._picResource;
 					textPos = Common::Point(READ_LE_UINT16(xyTable + frameIndex * 2),
 						READ_LE_UINT16(xyTable + (frameIndex + 1) * 2));
-					
+
 					creditShow = false;
 				} else {
 					textPic = nullptr;
@@ -501,7 +501,7 @@ void VoyeurEngine::doOpening() {
 			if (textPic) {
 				_graphicsManager->sDrawPic(textPic, _graphicsManager->_vPort, textPos);
 			}
-			
+
 			flipPageAndWait();
 		}
 
@@ -561,9 +561,9 @@ void VoyeurEngine::playAVideoDuration(int videoId, int duration) {
 	RL2Decoder decoder;
 	decoder.loadVideo(videoId);
 
-	decoder.seek(Audio::Timestamp(_voy->_vocSecondsOffset * 1000)); 
+	decoder.seek(Audio::Timestamp(_voy->_vocSecondsOffset * 1000));
 	decoder.start();
-	int endFrame = decoder.getCurFrame() + totalFrames; 
+	int endFrame = decoder.getCurFrame() + totalFrames;
 
 	_eventsManager->getMouseInfo();
 	_eventsManager->startCursorBlink();
@@ -604,9 +604,9 @@ void VoyeurEngine::playAVideoDuration(int videoId, int duration) {
 
 void VoyeurEngine::playAudio(int audioId) {
 	_bVoy->getBoltGroup(0x7F00);
-	_graphicsManager->_backgroundPage = _bVoy->boltEntry(0x7F00 + 
+	_graphicsManager->_backgroundPage = _bVoy->boltEntry(0x7F00 +
 		BLIND_TABLE[audioId] * 2)._picResource;
-	_graphicsManager->_backColors = _bVoy->boltEntry(0x7F01 + 
+	_graphicsManager->_backColors = _bVoy->boltEntry(0x7F01 +
 		BLIND_TABLE[audioId] * 2)._cMapResource;
 
 	_graphicsManager->_vPort->setupViewPort();
@@ -621,7 +621,7 @@ void VoyeurEngine::playAudio(int audioId) {
 	_voy->_eventFlags |= EVTFLAG_RECORDING;
 	_eventsManager->startCursorBlink();
 
-	while (!shouldQuit() && !_eventsManager->_mouseClicked && 
+	while (!shouldQuit() && !_eventsManager->_mouseClicked &&
 			_soundManager->getVOCStatus())
 		_eventsManager->delayClick(1);
 
@@ -658,7 +658,7 @@ void VoyeurEngine::doTransitionCard(const Common::String &time, const Common::St
 	fi._justifyHeight = 120;
 
 	_graphicsManager->_vPort->drawText(time);
-	
+
 	if (!location.empty()) {
 		fi._pos = Common::Point(0, 138);
 		fi._justify = ALIGN_CENTER;
@@ -724,7 +724,7 @@ void VoyeurEngine::showEndingNews() {
 		_soundManager->startVOCPlay(fname);
 
 		_eventsManager->getMouseInfo();
-		while (!shouldQuit() && !_eventsManager->_mouseClicked && 
+		while (!shouldQuit() && !_eventsManager->_mouseClicked &&
 				_soundManager->getVOCStatus()) {
 			_eventsManager->delay(1);
 			_eventsManager->getMouseInfo();
@@ -902,7 +902,7 @@ void VoyeurSavegameHeader::write(Common::OutSaveFile *f, VoyeurEngine *vm, const
 
 	// Create a thumbnail and save it
 	Graphics::Surface *thumb = new Graphics::Surface();
-	::createThumbnail(thumb, (byte *)vm->_graphicsManager->_screenSurface.getPixels(), 
+	::createThumbnail(thumb, (byte *)vm->_graphicsManager->_screenSurface.getPixels(),
 		SCREEN_WIDTH, SCREEN_HEIGHT, vm->_graphicsManager->_VGAColors);
 	Graphics::saveThumbnail(*f, *thumb);
 	thumb->free();
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index a6564c32ba..34ad62a88d 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -33,7 +33,7 @@ void VoyeurEngine::playStamp() {
 	_stampLibPtr->getBoltGroup(0);
 	_controlPtr->_state = _stampLibPtr->boltEntry(_controlPtr->_stateId >> 16)._stateResource;
 	assert(_controlPtr->_state);
-	
+
 	_resolvePtr = &RESOLVE_TABLE[0];
 	initStamp();
 
@@ -57,11 +57,11 @@ void VoyeurEngine::playStamp() {
 		_mainThread->parsePlayCommands();
 
 		bool flag = breakFlag = (_voy->_eventFlags & EVTFLAG_2) != 0;
-		 
+
 		switch (_voy->_playStampMode) {
 		case 5:
 			buttonId = _mainThread->doInterface();
-			
+
 			if (buttonId == -2) {
 				switch (_mainThread->doApt()) {
 				case 0:
@@ -110,7 +110,7 @@ void VoyeurEngine::playStamp() {
 		case 16:
 			_voy->_transitionId = 17;
 			buttonId = _mainThread->doApt();
-			
+
 			switch (buttonId) {
 			case 1:
 				_mainThread->chooseSTAMPButton(22);
@@ -234,19 +234,19 @@ void VoyeurEngine::closeStamp() {
 void VoyeurEngine::doTailTitle() {
 	_graphicsManager->_vPort->setupViewPort(NULL);
 	_graphicsManager->screenReset();
-	
+
 	if (_bVoy->getBoltGroup(0x600)) {
 		RL2Decoder decoder;
 		decoder.loadRL2File("a1100200.rl2", false);
 		decoder.start();
 		decoder.play(this);
-		
+
 		if (!shouldQuit() && !_eventsManager->_mouseClicked) {
 			doClosingCredits();
 
 			if (!shouldQuit() && !_eventsManager->_mouseClicked) {
 				_graphicsManager->screenReset();
-				
+
 				PictureResource *pic = _bVoy->boltEntry(0x602)._picResource;
 				CMapResource *pal = _bVoy->boltEntry(0x603)._cMapResource;
 
@@ -315,7 +315,7 @@ void VoyeurEngine::doClosingCredits() {
 			_graphicsManager->_vPort->drawText(msg);
 			msg += strlen(msg) + 1;
 		}
-		
+
 		if (flags & 0x40) {
 			fi._foreColor = 2;
 			fi._curFont = _bVoy->boltEntry(0x400)._fontResource;
@@ -345,7 +345,7 @@ void VoyeurEngine::doClosingCredits() {
 			fi._justifyHeight = 240;
 			fi._pos = Common::Point(198, READ_LE_UINT16(entry));
 
-			_graphicsManager->_vPort->drawText(msg);			
+			_graphicsManager->_vPort->drawText(msg);
 			msg += strlen(msg) + 1;
 		}
 
@@ -500,7 +500,7 @@ void VoyeurEngine::reviewTape() {
 
 					Common::String msg = _eventsManager->getEvidString(eventNum);
 					_graphicsManager->_backgroundPage->drawText(msg);
-					
+
 					yp += 15;
 				}
 
@@ -527,7 +527,7 @@ void VoyeurEngine::reviewTape() {
 					break;
 				}
 			}
-			
+
 			pt = _eventsManager->getMousePos();
 			if (tempPos.x >= 68 && tempPos.x <= 277 && tempPos.y >= 31 && tempPos.y <= 154) {
 				tempPos.y -= 2;
@@ -545,7 +545,7 @@ void VoyeurEngine::reviewTape() {
 					flipPageAndWait();
 
 					_graphicsManager->_drawPtr->_penColor = 0;
-					_graphicsManager->_drawPtr->_pos = Common::Point(tempRect.left, tempRect.top);				
+					_graphicsManager->_drawPtr->_pos = Common::Point(tempRect.left, tempRect.top);
 					_graphicsManager->_backgroundPage->sFillBox(tempRect.width(), tempRect.height());
 
 					int yp = 45;
@@ -642,7 +642,7 @@ void VoyeurEngine::reviewTape() {
 				foundIndex = -1;
 				_eventsManager->_rightClick = 0;
 			}
-			
+
 			if (_eventsManager->_rightClick)
 				foundIndex = 0;
 
@@ -652,7 +652,7 @@ void VoyeurEngine::reviewTape() {
 		_voy->_fadingType = 0;
 		_voy->_viewBounds = nullptr;
 		_graphicsManager->_vPort->setupViewPort(NULL);
-			
+
 		if (_currentVocId != -1) {
 			_voy->_vocSecondsOffset = _voy->_RTVNum - _voy->_musicStartTime;
 			_soundManager->stopVOCPlay();
@@ -693,7 +693,7 @@ void VoyeurEngine::reviewTape() {
 			uint32 secondsDuration = e._computerOff;
 
 			_eventsManager->getMouseInfo();
-			while (!_eventsManager->_mouseClicked && _soundManager->getVOCStatus() && 
+			while (!_eventsManager->_mouseClicked && _soundManager->getVOCStatus() &&
 					_soundManager->getVOCFrame() < secondsDuration) {
 				_eventsManager->getMouseInfo();
 				_eventsManager->delay(10);
@@ -707,7 +707,7 @@ void VoyeurEngine::reviewTape() {
 
 		case EVTYPE_EVID:
 			_voy->reviewAnEvidEvent(eventIndex);
-			
+
 			_voy->_vocSecondsOffset = _voy->_RTVNum - _voy->_musicStartTime;
 			_soundManager->stopVOCPlay();
 			_bVoy->getBoltGroup(0x900);
@@ -715,7 +715,7 @@ void VoyeurEngine::reviewTape() {
 
 		case EVTYPE_COMPUTER:
 			_voy->reviewComputerEvent(eventIndex);
-			
+
 			_voy->_vocSecondsOffset = _voy->_RTVNum - _voy->_musicStartTime;
 			_soundManager->stopVOCPlay();
 			_bVoy->getBoltGroup(0x900);
@@ -863,7 +863,7 @@ bool VoyeurEngine::checkForIncriminate() {
 
 	for (int idx = 0; idx < _voy->_eventCount; ++idx) {
 		VoyeurEvent &evt = _voy->_events[idx];
-		
+
 		if (evt._type == EVTYPE_VIDEO) {
 			if (evt._audioVideoId == 44 && evt._computerOn <= 40 &&
 					(evt._computerOff + evt._computerOn) >= 70) {
@@ -908,7 +908,7 @@ void VoyeurEngine::playAVideoEvent(int eventIndex) {
 	_voy->_vocSecondsOffset = evt._computerOn;
 	_eventsManager->_videoDead = evt._dead;
 	_voy->_eventFlags &= ~EVTFLAG_TIME_DISABLED;
-	
+
 	playAVideoDuration(_audioVideoId, evt._computerOff);
 
 	_voy->_eventFlags |= EVTFLAG_TIME_DISABLED;
@@ -929,7 +929,7 @@ void VoyeurEngine::playAVideoEvent(int eventIndex) {
 
 int VoyeurEngine::getChooseButton()  {
 	int prevIndex = -2;
-	Common::Array<RectEntry> &hotspots = _bVoy->boltEntry(_playStampGroupId 
+	Common::Array<RectEntry> &hotspots = _bVoy->boltEntry(_playStampGroupId
 		+ 6)._rectResource->_entries;
 	int selectedIndex = -1;
 
@@ -949,7 +949,7 @@ int VoyeurEngine::getChooseButton()  {
 			_eventsManager->getMouseInfo();
 			selectedIndex = -1;
 			Common::Point pt = _eventsManager->getMousePos();
-			
+
 			for (uint idx = 0; idx < hotspots.size(); ++idx) {
 				if (hotspots[idx].contains(pt)) {
 					if (!_voy->_victimMurdered || ((int)idx + 1) != _controlPtr->_state->_victimIndex) {
@@ -984,7 +984,7 @@ int VoyeurEngine::getChooseButton()  {
 
 void VoyeurEngine::makeViewFinder() {
 	_graphicsManager->_backgroundPage = _bVoy->boltEntry(0x103)._picResource;
-	_graphicsManager->sDrawPic(_graphicsManager->_backgroundPage, 
+	_graphicsManager->sDrawPic(_graphicsManager->_backgroundPage,
 		_graphicsManager->_vPort, Common::Point(0, 0));
 	CMapResource *pal = _bVoy->boltEntry(0x104)._cMapResource;
 
@@ -1067,7 +1067,7 @@ void VoyeurEngine::initIFace() {
 	_mansionViewPos = Common::Point((MANSION_MAX_X - MANSION_VIEW_WIDTH) / 2,
 		(MANSION_MAX_Y - MANSION_VIEW_HEIGHT) / 2);
 	doScroll(_mansionViewPos);
-	
+
 	_voy->_viewBounds = _bVoy->boltEntry(_playStampGroupId)._rectResource;
 
 	// Show the cursor using ScummVM functionality
@@ -1150,7 +1150,7 @@ Common::String VoyeurEngine::getDayName() {
 	case 3:
 	case 4:
 		return SATURDAY;
-	case 17: 
+	case 17:
 		return MONDAY;
 	default:
 		return SUNDAY;
@@ -1277,7 +1277,7 @@ void VoyeurEngine::doTimeBar() {
 	if (_voy->_RTVLimit > 0) {
 		if (_voy->_RTVNum > _voy->_RTVLimit || _voy->_RTVNum < 0)
 			_voy->_RTVNum = _voy->_RTVLimit - 1;
-		
+
 		_timeBarVal = _voy->_RTVNum;
 		int height = ((_voy->_RTVLimit - _voy->_RTVNum) * 59) / _voy->_RTVLimit;
 		int fullHeight = MAX(151 - height, 93);
@@ -1308,14 +1308,14 @@ void VoyeurEngine::flashTimeBar() {
 			_graphicsManager->setColor(240, 220, 20, 20);
 		else
 			_graphicsManager->setColor(240, 220, 220, 220);
-		
+
 		_eventsManager->_intPtr._hasPalette = true;
 		_flashTimeFlag = !_flashTimeFlag;
 	}
 }
 
 void VoyeurEngine::checkPhoneCall() {
-	if ((_voy->_RTVLimit - _voy->_RTVNum) >= 36 && _voy->_totalPhoneCalls < 5 && 
+	if ((_voy->_RTVLimit - _voy->_RTVNum) >= 36 && _voy->_totalPhoneCalls < 5 &&
 			_currentVocId <= 151 && _currentVocId > 146) {
 		if ((_voy->_switchBGNum < _checkPhoneVal || _checkPhoneVal > 180) &&
 				!_soundManager->getVOCStatus()) {
@@ -1361,9 +1361,9 @@ void VoyeurEngine::doEvidDisplay(int evidId, int eventId) {
 
 	if (count > 0) {
 		for (int idx = 1; idx <= count; ++idx) {
-			_voy->_evPicPtrs[idx - 1] = _bVoy->boltEntry(_voy->_boltGroupId2 + 
+			_voy->_evPicPtrs[idx - 1] = _bVoy->boltEntry(_voy->_boltGroupId2 +
 				(evidId + idx) * 2)._picResource;
-			_voy->_evCmPtrs[idx - 1] = _bVoy->boltEntry(_voy->_boltGroupId2 + 
+			_voy->_evCmPtrs[idx - 1] = _bVoy->boltEntry(_voy->_boltGroupId2 +
 				(evidId + idx) * 2 + 1)._cMapResource;
 		}
 	}
@@ -1394,7 +1394,7 @@ void VoyeurEngine::doEvidDisplay(int evidId, int eventId) {
 			break;
 		if (count == 0 || evidIdx >= eventId)
 			continue;
-		
+
 		pic = _voy->_evPicPtrs[arrIndex];
 		_graphicsManager->sDrawPic(pic, _graphicsManager->_vPort,
 			Common::Point((384 - pic->_bounds.width()) / 2,