ZVISION: Janitorial - Remove trailing spaces

26 files changed, 84 insertions, 84 deletions

diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/animation/rlf_animation.cpp
index c7307265c0..ca7305da56 100644
--- a/engines/zvision/animation/rlf_animation.cpp
+++ b/engines/zvision/animation/rlf_animation.cpp
@@ -35,7 +35,7 @@
 
 namespace ZVision {
 
-RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream) 
+RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)
 		: _stream(stream),
 		  _lastFrameRead(0),
 		  _frameCount(0),
@@ -301,7 +301,7 @@ void RlfAnimation::decodeSimpleRunLengthEncoding(int8 *source, int8 *dest, uint3
 				numberOfSamples--;
 			}
 
-		// If numberOfSamples is >= 0, copy one sample from source to the 
+		// If numberOfSamples is >= 0, copy one sample from source to the
 		// next (numberOfSamples + 2) dest spots
 		} else {
 			if (sourceOffset + 1 >= sourceSize) {
diff --git a/engines/zvision/core/save_manager.h b/engines/zvision/core/save_manager.h
index b4770e68b2..ec80b37e20 100644
--- a/engines/zvision/core/save_manager.h
+++ b/engines/zvision/core/save_manager.h
@@ -60,7 +60,7 @@ private:
 public:
 	/**
 	 * Called every room change. Saves the state of the room just before
-	 * we switched rooms. Uses ZVision::generateAutoSaveFileName() to 
+	 * we switched rooms. Uses ZVision::generateAutoSaveFileName() to
 	 * create the save file name.
 	 */
 	void autoSave();
diff --git a/engines/zvision/cursors/cursor.cpp b/engines/zvision/cursors/cursor.cpp
index be80f6585b..d7cda34951 100644
--- a/engines/zvision/cursors/cursor.cpp
+++ b/engines/zvision/cursors/cursor.cpp
@@ -30,14 +30,14 @@
 
 namespace ZVision {
 
-ZorkCursor::ZorkCursor() 
+ZorkCursor::ZorkCursor()
 	: _width(0),
 	  _height(0),
 	  _hotspotX(0),
 	  _hotspotY(0) {
 }
 
-ZorkCursor::ZorkCursor(const Common::String &fileName) 
+ZorkCursor::ZorkCursor(const Common::String &fileName)
 		: _width(0),
 		  _height(0),
 		  _hotspotX(0),
diff --git a/engines/zvision/cursors/cursor.h b/engines/zvision/cursors/cursor.h
index 18ac28ce8b..304d8cf018 100644
--- a/engines/zvision/cursors/cursor.h
+++ b/engines/zvision/cursors/cursor.h
@@ -32,7 +32,7 @@ class String;
 
 namespace ZVision {
 
-/** 
+/**
  * Utility class to parse and hold cursor data
  * Modeled off Graphics::Cursor
  */
diff --git a/engines/zvision/cursors/cursor_manager.h b/engines/zvision/cursors/cursor_manager.h
index e982a40188..43f52abc9a 100644
--- a/engines/zvision/cursors/cursor_manager.h
+++ b/engines/zvision/cursors/cursor_manager.h
@@ -77,7 +77,7 @@ public:
 	/**
 	 * Parses a cursor name into a cursor file then creates and shows that cursor.
 	 *
-	 * @param cursorName    The name of a cursor. This *HAS* to correspond to one of the entries in _cursorNames[] 
+	 * @param cursorName    The name of a cursor. This *HAS* to correspond to one of the entries in _cursorNames[]
 	 * @param pushed        Should the cursor be pushed (true) or not pushed (false) (Another way to say it: down or up)
 	 */
 	void changeCursor(const Common::String &cursorName, bool pushed);
diff --git a/engines/zvision/fonts/truetype_font.h b/engines/zvision/fonts/truetype_font.h
index 33f016cffd..762657a5fb 100644
--- a/engines/zvision/fonts/truetype_font.h
+++ b/engines/zvision/fonts/truetype_font.h
@@ -60,10 +60,10 @@ public:
 	 *
 	 * @param filename    The file name of the .ttf file to load
 	 */
-	bool loadFile(const Common::String &filename);	
+	bool loadFile(const Common::String &filename);
 	/**
-	 * Renders the supplied text to a Surface using 0x0 as the 
-	 * background color. 
+	 * Renders the supplied text to a Surface using 0x0 as the
+	 * background color.
 	 *
 	 * @param text         The to render
 	 * @param textColor    The color to render the text with
diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
index f19df88935..df588d269f 100644
--- a/engines/zvision/graphics/render_manager.cpp
+++ b/engines/zvision/graphics/render_manager.cpp
@@ -159,7 +159,7 @@ void RenderManager::clearWorkingWindowTo555Color(uint16 color) {
 	}
 }
 
-void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap) {	
+void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 destinationX, int16 destinationY, bool wrap) {
 	int16 subRectX = 0;
 	int16 subRectY = 0;
 
@@ -184,8 +184,8 @@ void RenderManager::renderSubRectToScreen(Graphics::Surface &surface, int16 dest
 	if (wrap) {
 		_backgroundWidth = surface.w;
 		_backgroundHeight = surface.h;
-	
-		if (destinationX > 0) { 
+
+		if (destinationX > 0) {
 			// Move destinationX to 0
 			subRectX = surface.w - destinationX;
 			destinationX = 0;
@@ -373,7 +373,7 @@ Common::Rect RenderManager::renderTextToWorkingWindow(uint32 idNumber, const Com
 	entry.alphaColor = 0;
 	entry.destX = destX;
 	entry.destY = destY;
-	
+
 	// Draw the text to the working window
 	entry.data = font->drawTextToSurface(text, textColor, maxWidth, maxHeight, align, wrap);
 	entry.width = entry.data->w;
diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
index cb71308bc3..59b14b8bd2 100644
--- a/engines/zvision/graphics/render_manager.h
+++ b/engines/zvision/graphics/render_manager.h
@@ -89,7 +89,7 @@ private:
 	/** Center of the screen in the y direction */
 	const int _screenCenterY;
 
-	/** 
+	/**
 	 * A Rectangle centered inside the actual window. All in-game coordinates
 	 * are given in this coordinate space. Also, all images are clipped to the
 	 * edges of this Rectangle
@@ -106,7 +106,7 @@ private:
 	/** The height of the current background image */
 	uint16 _backgroundHeight;
 
-	/** 
+	/**
 	 * The "velocity" at which the background image is panning. We actually store the inverse of velocity (ms/pixel instead of pixels/ms)
 	 * because it allows you to accumulate whole pixels 'steps' instead of rounding pixels every frame
 	 */
@@ -224,17 +224,17 @@ public:
 	/**
 	 * Set the background position (_backgroundOffset). If the current RenderState is PANORAMA, the offset
 	 * will be in the horizontal direction. If the current RenderState is TILT, the offset will be in the
-	 * vertical direction. 
+	 * vertical direction.
 	 *
-	 * This method will not render anything on the screen. So if nothing else is called that renders the 
+	 * This method will not render anything on the screen. So if nothing else is called that renders the
 	 * background, the change won't be seen until next frame.
 	 *
 	 * @param offset The amount to offset the background
 	 */
 	void setBackgroundPosition(int offset);
-	
+
 	/**
-	 * Set the background scroll velocity. Negative velocities correspond to left / up scrolling and 
+	 * Set the background scroll velocity. Negative velocities correspond to left / up scrolling and
 	 * positive velocities correspond to right / down scrolling
 	 *
 	 * @param velocity    Velocity
@@ -249,7 +249,7 @@ public:
 	 */
 	const Common::Point screenSpaceToImageSpace(const Common::Point &point);
 	/**
-	 * Converts a point in image coordinate space to ***PRE-WARP*** 
+	 * Converts a point in image coordinate space to ***PRE-WARP***
 	 * working window coordinate space
 	 *
 	 * @param point    Point in image coordinate space
@@ -313,7 +313,7 @@ private:
 	 * Move the background image by an offset. If we are currently in Panorama mode,
 	 * the offset will correspond to a horizontal motion. If we are currently in Tilt mode,
 	 * the offset will correspond to a vertical motion. This function should not be called
-	 * if we are in Flat mode. 
+	 * if we are in Flat mode.
 	 *
 	 * The RenderManager will take care of wrapping the image.
 	 * Ex: If the image has width 1400px, it is legal to offset 1500px.
diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
index ffd42e6a60..99815c2072 100644
--- a/engines/zvision/graphics/render_table.cpp
+++ b/engines/zvision/graphics/render_table.cpp
@@ -115,7 +115,7 @@ void RenderTable::mutateImage(uint16 *sourceBuffer, uint16* destBuffer, uint32 d
 			// RenderTable only stores offsets from the original coordinates
 			uint32 sourceYIndex = y + _internalBuffer[index].y;
 			uint32 sourceXIndex = x + _internalBuffer[index].x;
-			
+
 			destBuffer[destOffset + normalizedX] = sourceBuffer[sourceYIndex * _numColumns + sourceXIndex];
 		}
 
@@ -154,11 +154,11 @@ void RenderTable::generatePanoramaLookupTable() {
 		// To get x in cylinder coordinates, we just need to calculate the arc length
 		// We also scale it by _panoramaOptions.linearScale
 		int32 xInCylinderCoords = int32(floor((cylinderRadius * _panoramaOptions.linearScale * alpha) + halfWidth));
-		
+
 		float cosAlpha = cos(alpha);
 
 		for (uint y = 0; y < _numRows; ++y) {
-			// To calculate y in cylinder coordinates, we can do similar triangles comparison, 
+			// To calculate y in cylinder coordinates, we can do similar triangles comparison,
 			// comparing the triangle from the center to the screen and from the center to the edge of the cylinder
 			int32 yInCylinderCoords = int32(floor(halfHeight + ((float)y - halfHeight) * cosAlpha));
 
@@ -179,7 +179,7 @@ void RenderTable::generateTiltLookupTable() {
 	float cylinderRadius = halfWidth / tan(fovInRadians);
 
 	for (uint y = 0; y < _numRows; ++y) {
-	
+
 		// Add an offset of 0.01 to overcome zero tan/atan issue (horizontal line on half of screen)
 		// Alpha represents the vertical angle between the viewer at the center of a cylinder and y
 		float alpha = atan(((float)y - halfHeight + 0.01f) / cylinderRadius);
@@ -192,7 +192,7 @@ void RenderTable::generateTiltLookupTable() {
 		uint32 columnIndex = y * _numColumns;
 
 		for (uint x = 0; x < _numColumns; ++x) {
-			// To calculate x in cylinder coordinates, we can do similar triangles comparison, 
+			// To calculate x in cylinder coordinates, we can do similar triangles comparison,
 			// comparing the triangle from the center to the screen and from the center to the edge of the cylinder
 			int32 xInCylinderCoords = int32(floor(halfWidth + ((float)x - halfWidth) * cosAlpha));
 
diff --git a/engines/zvision/module.mk b/engines/zvision/module.mk
index 4cf9c989cd..2e298f24c6 100644
--- a/engines/zvision/module.mk
+++ b/engines/zvision/module.mk
@@ -1,5 +1,5 @@
 MODULE := engines/zvision
- 
+
 MODULE_OBJS := \
 	animation/rlf_animation.o \
 	archives/zfs_archive.o \
@@ -30,14 +30,14 @@ MODULE_OBJS := \
 	video/video.o \
 	video/zork_avi_decoder.o \
 	zvision.o
-	
+
 MODULE_DIRS += \
 	engines/zvision
- 
+
 # This module can be built as a plugin
 ifeq ($(ENABLE_ZVISION), DYNAMIC_PLUGIN)
 PLUGIN := 1
 endif
- 
-# Include common rules 
+
+# Include common rules
 include $(srcdir)/rules.mk
diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h
index 770c540a12..096ddd9cd0 100644
--- a/engines/zvision/scripting/control.h
+++ b/engines/zvision/scripting/control.h
@@ -95,7 +95,7 @@ public:
 	 * store the amount of time left on the timer. Any Controls overriding this *MUST* write
 	 * their key as the first data outputted. The default implementation is NOP.
 	 *
-	 * NOTE: If this method is overridden, you MUST also override deserialize() 
+	 * NOTE: If this method is overridden, you MUST also override deserialize()
 	 * and needsSerialization()
 	 *
 	 * @param stream    Stream to write any needed data to
diff --git a/engines/zvision/scripting/controls/animation_control.cpp b/engines/zvision/scripting/controls/animation_control.cpp
index ec8f7a9647..061b1db487 100644
--- a/engines/zvision/scripting/controls/animation_control.cpp
+++ b/engines/zvision/scripting/controls/animation_control.cpp
@@ -38,7 +38,7 @@
 namespace ZVision {
 
 AnimationControl::AnimationControl(ZVision *engine, uint32 controlKey, const Common::String &fileName)
-		: Control(engine, controlKey), 
+		: Control(engine, controlKey),
 		  _fileType(RLF),
 		  _loopCount(1),
 		  _currentLoop(0),
diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp
index 2685b01312..aaa35f6748 100644
--- a/engines/zvision/scripting/controls/input_control.cpp
+++ b/engines/zvision/scripting/controls/input_control.cpp
@@ -37,7 +37,7 @@
 
 namespace ZVision {
 
-InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) 
+InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream)
 		: Control(engine, key),
 		  _nextTabstop(0),
 		  _focused(false),
diff --git a/engines/zvision/scripting/puzzle.h b/engines/zvision/scripting/puzzle.h
index 0d717f1fa9..5bf5314a1d 100644
--- a/engines/zvision/scripting/puzzle.h
+++ b/engines/zvision/scripting/puzzle.h
@@ -52,7 +52,7 @@ struct Puzzle {
 	struct CriteriaEntry {
 		/** The key of a global state */
 		uint32 key;
-		/**  
+		/**
 		 * What we're comparing the value of the global state against
 		 * This can either be a pure value or it can be the key of another global state
 		 */
diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h
index ab9b03ed30..29e41e1770 100644
--- a/engines/zvision/scripting/script_manager.h
+++ b/engines/zvision/scripting/script_manager.h
@@ -70,15 +70,15 @@ public:
 
 private:
 	ZVision *_engine;
-	/** 
-	 * Holds the global state variable. Do NOT directly modify this. Use the accessors and 
-	 * mutators getStateValue() and setStateValue(). This ensures that Puzzles that reference a 
+	/**
+	 * Holds the global state variable. Do NOT directly modify this. Use the accessors and
+	 * mutators getStateValue() and setStateValue(). This ensures that Puzzles that reference a
 	 * particular state key are checked after the key is modified.
 	 */
 	StateMap _globalState;
-	/** 
-	 * Holds the flags for the global states. This is used to enable/disable puzzles and/or 
-	 * controls as well as which puzzles should are allowed to be re-executed 
+	/**
+	 * Holds the flags for the global states. This is used to enable/disable puzzles and/or
+	 * controls as well as which puzzles should are allowed to be re-executed
 	 */
 	StateFlagMap _globalStateFlags;
 	/** References _globalState keys to Puzzles */
@@ -153,7 +153,7 @@ public:
 	void deserializeStateTable(Common::SeekableReadStream *stream);
 	void serializeControls(Common::WriteStream *stream);
 	void deserializeControls(Common::SeekableReadStream *stream);
-	
+
 	Location getCurrentLocation() const;
 
 private:
@@ -175,7 +175,7 @@ public:
 private:
 	/**
 	 * Parses the stream into a Puzzle object
-	 * Helper method for parseScrFile. 
+	 * Helper method for parseScrFile.
 	 *
 	 * @param puzzle    The object to store what is parsed
 	 * @param stream    Scr file stream
@@ -184,7 +184,7 @@ private:
 
 	/**
 	 * Parses the stream into a Criteria object
-	 * Helper method for parsePuzzle. 
+	 * Helper method for parsePuzzle.
 	 *
 	 * @param criteria    Pointer to the Criteria object to fill
 	 * @param stream      Scr file stream
@@ -194,7 +194,7 @@ private:
 
 	/**
 	 * Parses the stream into a ResultAction objects
-	 * Helper method for parsePuzzle. 
+	 * Helper method for parsePuzzle.
 	 *
 	 * @param stream        Scr file stream
 	 * @param actionList    The list where the results will be added
diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp
index 321ac93de2..316177fc42 100644
--- a/engines/zvision/sound/zork_raw.cpp
+++ b/engines/zvision/sound/zork_raw.cpp
@@ -47,16 +47,16 @@ const int32 RawZorkStream::_amplitudeLookupTable[89] = {0x0007, 0x0008, 0x0009,
                                                         0x0010, 0x0011, 0x0013, 0x0015, 0x0017, 0x0019, 0x001C, 0x001F,
                                                         0x0022, 0x0025, 0x0029, 0x002D, 0x0032, 0x0037, 0x003C, 0x0042,
                                                         0x0049, 0x0050, 0x0058, 0x0061, 0x006B, 0x0076, 0x0082, 0x008F,
-                                                        0x009D, 0x00AD, 0x00BE, 0x00D1, 0x00E6, 0x00FD, 0x0117, 0x0133, 
+                                                        0x009D, 0x00AD, 0x00BE, 0x00D1, 0x00E6, 0x00FD, 0x0117, 0x0133,
                                                         0x0151, 0x0173, 0x0198, 0x01C1, 0x01EE, 0x0220, 0x0256, 0x0292,
-                                                        0x02D4, 0x031C, 0x036C, 0x03C3, 0x0424, 0x048E, 0x0502, 0x0583, 
+                                                        0x02D4, 0x031C, 0x036C, 0x03C3, 0x0424, 0x048E, 0x0502, 0x0583,
                                                         0x0610, 0x06AB, 0x0756, 0x0812, 0x08E0, 0x09C3, 0x0ABD, 0x0BD0,
-                                                        0x0CFF, 0x0E4C, 0x0FBA, 0x114C, 0x1307, 0x14EE, 0x1706, 0x1954, 
+                                                        0x0CFF, 0x0E4C, 0x0FBA, 0x114C, 0x1307, 0x14EE, 0x1706, 0x1954,
                                                         0x1BDC, 0x1EA5, 0x21B6, 0x2515, 0x28CA, 0x2CDF, 0x315B, 0x364B,
                                                         0x3BB9, 0x41B2, 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF};
 
 const SoundParams RawZorkStream::_zNemSoundParamLookupTable[6] = {{'6', 0x2B11, false, false},
-                                                                  {'a', 0x5622, false,  true}, 
+                                                                  {'a', 0x5622, false,  true},
                                                                   {'b', 0x5622, true,  true},
                                                                   {'n', 0x2B11, false, true},
                                                                   {'s', 0x5622, false, true},
@@ -199,7 +199,7 @@ Audio::RewindableAudioStream *makeRawZorkStream(const Common::String &filePath,
 			}
 		}
 	}
-	
+
 	if (!foundParams)
 		error("Unable to find sound params for file '%s'. File identifier is '%c'", filePath.c_str(), fileIdentifier);
 
diff --git a/engines/zvision/sound/zork_raw.h b/engines/zvision/sound/zork_raw.h
index 481ea79f2d..6f93ecd1d4 100644
--- a/engines/zvision/sound/zork_raw.h
+++ b/engines/zvision/sound/zork_raw.h
@@ -62,7 +62,7 @@ private:
 	bool _endOfData;                                           // Whether the stream end has been reached
 	uint _stereo;
 
-	/** 
+	/**
 	 * Holds the frequency and index from the last sample
 	 * 0 holds the left channel, 1 holds the right channel
 	 */
diff --git a/engines/zvision/strings/string_manager.cpp b/engines/zvision/strings/string_manager.cpp
index 77ed501672..c0eaeea095 100644
--- a/engines/zvision/strings/string_manager.cpp
+++ b/engines/zvision/strings/string_manager.cpp
@@ -36,7 +36,7 @@
 
 namespace ZVision {
 
-StringManager::StringManager(ZVision *engine) 
+StringManager::StringManager(ZVision *engine)
 	: _engine(engine) {
 }
 
@@ -218,7 +218,7 @@ Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
 	// Don't spam the user with warnings about UTF-16 support.
 	// Just do one warning per String
 	bool charOverflowWarning = false;
-	
+
 	uint16 value = stream.readUint16LE();
 	while (!stream.eos()) {
 		// Check for CRLF
@@ -235,7 +235,7 @@ Common::String StringManager::readWideLine(Common::SeekableReadStream &stream) {
 			value = '?';
 		}
 		char charValue = (char)value;
-		
+
 		asciiString += charValue;
 
 		value = stream.readUint16LE();
diff --git a/engines/zvision/utility/clock.cpp b/engines/zvision/utility/clock.cpp
index 49e4b32054..d798184300 100644
--- a/engines/zvision/utility/clock.cpp
+++ b/engines/zvision/utility/clock.cpp
@@ -30,7 +30,7 @@
 
 namespace ZVision {
 
-Clock::Clock(OSystem *system) 
+Clock::Clock(OSystem *system)
 	: _system(system),
 	  _lastTime(0),
 	  _deltaTime(0),
diff --git a/engines/zvision/utility/clock.h b/engines/zvision/utility/clock.h
index 3939ba1612..e72ddda2a0 100644
--- a/engines/zvision/utility/clock.h
+++ b/engines/zvision/utility/clock.h
@@ -63,12 +63,12 @@ public:
 
 	/**
 	 * Pause the clock. Any future delta times will take this pause into account.
-	 * Has no effect if the clock is already paused.    
+	 * Has no effect if the clock is already paused.
 	 */
 	void start();
 	/**
 	 * Un-pause the clock.
-	 * Has no effect if the clock is already un-paused.    
+	 * Has no effect if the clock is already un-paused.
 	 */
 	void stop();
 };
diff --git a/engines/zvision/utility/lzss_read_stream.h b/engines/zvision/utility/lzss_read_stream.h
index f6b1eb1a65..8a8fe740ff 100644
--- a/engines/zvision/utility/lzss_read_stream.h
+++ b/engines/zvision/utility/lzss_read_stream.h
@@ -36,7 +36,7 @@ namespace ZVision {
 class LzssReadStream : public Common::ReadStream {
 public:
 	/**
-	 * A class that decompresses LZSS data and implements ReadStream for easy access 
+	 * A class that decompresses LZSS data and implements ReadStream for easy access
 	 * to the decompiled data.
 	 *
 	 * @param source              The source data
diff --git a/engines/zvision/utility/single_value_container.h b/engines/zvision/utility/single_value_container.h
index 45b5a89e95..87cf824917 100644
--- a/engines/zvision/utility/single_value_container.h
+++ b/engines/zvision/utility/single_value_container.h
@@ -30,7 +30,7 @@ class String;
 namespace ZVision {
 
 /**
- * A generic single value storage class. It is useful for storing different 
+ * A generic single value storage class. It is useful for storing different
  * value types in a single List, Hashmap, etc.
  */
 class SingleValueContainer {
@@ -94,7 +94,7 @@ public:
 	SingleValueContainer& operator=(const SingleValueContainer &rhs);
 
 	/**
-	 * Retrieve a bool from the container. If the container is not storing a 
+	 * Retrieve a bool from the container. If the container is not storing a
 	 * bool, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -102,7 +102,7 @@ public:
 	 */
 	bool getBoolValue(bool *returnValue) const;
 	/**
-	 * Retrieve a byte from the container. If the container is not storing a 
+	 * Retrieve a byte from the container. If the container is not storing a
 	 * byte, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -110,7 +110,7 @@ public:
 	 */
 	bool getByteValue(byte *returnValue) const;
 	/**
-	 * Retrieve an int16 from the container. If the container is not storing an 
+	 * Retrieve an int16 from the container. If the container is not storing an
 	 * int16, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -118,7 +118,7 @@ public:
 	 */
 	bool getInt16Value(int16 *returnValue) const;
 	/**
-	 * Retrieve a uint16 from the container. If the container is not storing a 
+	 * Retrieve a uint16 from the container. If the container is not storing a
 	 * uint16, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -126,7 +126,7 @@ public:
 	 */
 	bool getUInt16Value(uint16 *returnValue) const;
 	/**
-	 * Retrieve an int32 from the container. If the container is not storing an 
+	 * Retrieve an int32 from the container. If the container is not storing an
 	 * int32, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -134,7 +134,7 @@ public:
 	 */
 	bool getInt32Value(int32 *returnValue) const;
 	/**
-	 * Retrieve a uint32 from the container. If the container is not storing a 
+	 * Retrieve a uint32 from the container. If the container is not storing a
 	 * uint32, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -142,7 +142,7 @@ public:
 	 */
 	bool getUInt32Value(uint32 *returnValue) const;
 	/**
-	 * Retrieve a float from the container. If the container is not storing a 
+	 * Retrieve a float from the container. If the container is not storing a
 	 * float, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -150,7 +150,7 @@ public:
 	 */
 	bool getFloatValue(float *returnValue) const;
 	/**
-	 * Retrieve a double from the container. If the container is not storing a 
+	 * Retrieve a double from the container. If the container is not storing a
 	 * double, this will return false and display a warning().
 	 *
 	 * @param returnValue    Pointer to where you want the value stored
@@ -158,9 +158,9 @@ public:
 	 */
 	bool getDoubleValue(double *returnValue) const;
 	/**
-	 * Retrieve a String from the container. If the container is not storing a 
+	 * Retrieve a String from the container. If the container is not storing a
 	 * string, this will return false and display a warning().
-	 * 
+	 *
 	 * Caution: Strings are internally stored as char[]. getStringValue uses
 	 * Common::String::operator=(char *) to do the assigment, which uses both
 	 * strlen() AND memmove().
diff --git a/engines/zvision/utility/utility.h b/engines/zvision/utility/utility.h
index fb571f3fe8..42abd92e8e 100644
--- a/engines/zvision/utility/utility.h
+++ b/engines/zvision/utility/utility.h
@@ -93,7 +93,7 @@ void removeDuplicateEntries(Common::Array<T> &container) {
 }
 
 /**
- * Gets the name of the file (including extension). Forward or back slashes 
+ * Gets the name of the file (including extension). Forward or back slashes
  * are interpreted as directory changes
  *
  * @param fullPath    A full or partial path to the file. Ex: folderOne/folderTwo/file.txt
diff --git a/engines/zvision/video/zork_avi_decoder.h b/engines/zvision/video/zork_avi_decoder.h
index ec2be1bb13..79177a6795 100644
--- a/engines/zvision/video/zork_avi_decoder.h
+++ b/engines/zvision/video/zork_avi_decoder.h
@@ -25,7 +25,7 @@
 #define ZORK_AVI_DECODER_H
 
 #include "video/avi_decoder.h"
- 
+
 
 namespace ZVision {
 
@@ -56,5 +56,5 @@ private:
 };
 
 } // End of namespace ZVision
- 
+
 #endif
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index f57e225ac1..110b5c1625 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -47,7 +47,7 @@
 
 
 namespace ZVision {
- 
+
 ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 		: Engine(syst),
 		  _gameDescription(gameDesc),
@@ -61,13 +61,13 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc)
 		  _saveManager(nullptr),
 		  _stringManager(nullptr),
 		  _cursorManager(nullptr) {
- 
+
 	debug(1, "ZVision::ZVision");
 }
 
 ZVision::~ZVision() {
 	debug(1, "ZVision::~ZVision");
- 
+
 	// Dispose of resources
 	delete _console;
 	delete _cursorManager;
@@ -76,15 +76,15 @@ ZVision::~ZVision() {
 	delete _renderManager;
 	delete _scriptManager;
 	delete _rnd;
- 
+
 	// Remove all of our debug levels
 	DebugMan.clearAllDebugChannels();
 }
 
 void ZVision::initialize() {
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
-	// TODO: There are 10 file clashes when we flatten the directories. 
-	// From a quick look, the files are exactly the same, so it shouldn't matter. 
+	// TODO: There are 10 file clashes when we flatten the directories.
+	// From a quick look, the files are exactly the same, so it shouldn't matter.
 	// But I'm noting it here just in-case it does become a problem.
 	SearchMan.addSubDirectoryMatching(gameDataDir, "data1", 0, 4, true);
 	SearchMan.addSubDirectoryMatching(gameDataDir, "data2", 0, 4, true);
@@ -142,7 +142,7 @@ Common::Error ZVision::run() {
 
 		processEvents();
 
-		// Call _renderManager->update() first so the background renders 
+		// Call _renderManager->update() first so the background renders
 		// before anything that puzzles/controls will render
 		_renderManager->update(deltaTime);
 		_scriptManager->update(deltaTime);
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 7c130fc87f..15d9dc91d1 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -51,7 +51,7 @@ class CursorManager;
 class StringManager;
 class SaveManager;
 class RlfAnimation;
- 
+
 class ZVision : public Engine {
 public:
 	ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc);
@@ -70,11 +70,11 @@ private:
 	enum {
 		WINDOW_WIDTH = 640,
 		WINDOW_HEIGHT = 480,
-		
+
 		//Zork nemesis working window sizes
 		ZNEM_WORKING_WINDOW_WIDTH = 512,
 		ZNEM_WORKING_WINDOW_HEIGHT = 320,
-		
+
 		//ZGI(and default) working window sizes
 		ZGI_WORKING_WINDOW_WIDTH = 640,
 		ZGI_WORKING_WINDOW_HEIGHT = 344,
@@ -148,5 +148,5 @@ private:
 };
 
 } // End of namespace ZVision
- 
+
 #endif