diff options
author | Sven Hesse | 2015-01-18 20:32:55 +0100 |
---|---|---|
committer | Sven Hesse | 2015-01-18 20:35:51 +0100 |
commit | 3f66f28624812910834600d8a2cecb084dedea9f (patch) | |
tree | 7d38f98b9bf8d04e4e8bac6b20b6c9d3b5f5ed88 | |
parent | 7c23eae1027d242c9169b791d99d5f22e3159816 (diff) | |
download | scummvm-rg350-3f66f28624812910834600d8a2cecb084dedea9f.tar.gz scummvm-rg350-3f66f28624812910834600d8a2cecb084dedea9f.tar.bz2 scummvm-rg350-3f66f28624812910834600d8a2cecb084dedea9f.zip |
ZVISION: Remove trailing whitespace
-rw-r--r-- | engines/zvision/core/console.cpp | 2 | ||||
-rw-r--r-- | engines/zvision/core/events.cpp | 2 | ||||
-rw-r--r-- | engines/zvision/file/save_manager.cpp | 2 | ||||
-rw-r--r-- | engines/zvision/file/search_manager.cpp | 2 | ||||
-rw-r--r-- | engines/zvision/graphics/render_manager.cpp | 4 | ||||
-rw-r--r-- | engines/zvision/graphics/render_manager.h | 4 | ||||
-rw-r--r-- | engines/zvision/scripting/scripting_effect.h | 2 | ||||
-rw-r--r-- | engines/zvision/video/rlf_decoder.cpp | 2 | ||||
-rw-r--r-- | engines/zvision/video/video.cpp | 2 | ||||
-rw-r--r-- | engines/zvision/zvision.cpp | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp index f39c06b57e..e54e986bd7 100644 --- a/engines/zvision/core/console.cpp +++ b/engines/zvision/core/console.cpp @@ -204,7 +204,7 @@ bool Console::cmdLocation(int argc, const char **argv) { Common::String scrFile = Common::String::format("%c%c%c%c.scr", curLocation.world, curLocation.room, curLocation.node, curLocation.view); debugPrintf("Current location: world '%c', room '%c', node '%c', view '%c', offset %d, script %s\n", curLocation.world, curLocation.room, curLocation.node, curLocation.view, curLocation.offset, scrFile.c_str()); - + if (argc != 6) { debugPrintf("Use %s <char: world> <char: room> <char:node> <char:view> <int: x offset> to change your location\n", argv[0]); return true; diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp index 7804130e2a..4c7d395892 100644 --- a/engines/zvision/core/events.cpp +++ b/engines/zvision/core/events.cpp @@ -336,7 +336,7 @@ void ZVision::onMouseMove(const Common::Point &pos) { mspeed = 25; } _mouseVelocity = MIN(((Common::Rational(mspeed, ROTATION_SCREEN_EDGE_OFFSET) * (clippedPos.x - _workingWindow.left)) - mspeed).toInt(), -1); - + _cursorManager->changeCursor(CursorIndex_Left); cursorWasChanged = true; diff --git a/engines/zvision/file/save_manager.cpp b/engines/zvision/file/save_manager.cpp index 5e96e4ab5e..55be8d2530 100644 --- a/engines/zvision/file/save_manager.cpp +++ b/engines/zvision/file/save_manager.cpp @@ -132,7 +132,7 @@ void SaveManager::writeSaveGameHeader(Common::OutSaveFile *file, const Common::S Common::Error SaveManager::loadGame(int slot) { Common::SeekableReadStream *saveFile = NULL; - + if (slot >= 0) { saveFile = getSlotFile(slot); } else { diff --git a/engines/zvision/file/search_manager.cpp b/engines/zvision/file/search_manager.cpp index 1ae1ff71ae..821b85b053 100644 --- a/engines/zvision/file/search_manager.cpp +++ b/engines/zvision/file/search_manager.cpp @@ -183,7 +183,7 @@ bool SearchManager::loadZix(const Common::String &name) { path.deleteChar(0); if (path.size() && path.hasSuffix("/")) path.deleteLastChar(); - + // Handle paths in case-sensitive file systems (bug #6775) if (path.size()) { for (Common::List<Common::String>::iterator it = _dirList.begin(); it != _dirList.end(); ++it) { diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp index 4a43e09b07..da6655b310 100644 --- a/engines/zvision/graphics/render_manager.cpp +++ b/engines/zvision/graphics/render_manager.cpp @@ -57,7 +57,7 @@ RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowH _effectSurface.create(_workingWindow.width(), _workingWindow.height(), _pixelFormat); _warpedSceneSurface.create(_workingWindow.width(), _workingWindow.height(), _pixelFormat); _menuSurface.create(windowWidth, workingWindow.top, _pixelFormat); - + _menuArea = Common::Rect(0, 0, windowWidth, workingWindow.top); initSubArea(windowWidth, windowHeight, workingWindow); @@ -601,7 +601,7 @@ void RenderManager::prepareBackground() { _backgroundSurfaceDirtyRect = _backgroundDirtyRect; _backgroundSurfaceDirtyRect.translate(_screenCenterX - _backgroundOffset, 0); - // Panorama mode allows the user to spin in circles. Therefore, we need to render + // Panorama mode allows the user to spin in circles. Therefore, we need to render // the portion of the image that wrapped to the other side of the screen if (_backgroundOffset < _screenCenterX) { viewPort.moveTo(-(_screenCenterX - (_backgroundOffset + _backgroundWidth)), 0); diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h index e3cbbc34ce..33d8a88e78 100644 --- a/engines/zvision/graphics/render_manager.h +++ b/engines/zvision/graphics/render_manager.h @@ -84,7 +84,7 @@ private: Graphics::Surface _currentBackgroundImage; Common::Rect _backgroundDirtyRect; - /** + /** * The x1 or y1 offset of the subRectangle of the background that is currently displayed on the screen * It will be x1 if PANORAMA, or y1 if TILT */ @@ -133,7 +133,7 @@ private: EffectsList _effects; bool _doubleFPS; - + public: void initialize(); diff --git a/engines/zvision/scripting/scripting_effect.h b/engines/zvision/scripting/scripting_effect.h index 0af1d9c21c..2a2153204f 100644 --- a/engines/zvision/scripting/scripting_effect.h +++ b/engines/zvision/scripting/scripting_effect.h @@ -37,7 +37,7 @@ class ZVision; * The base class that represents effects created from Actions. * This class is virtual. * - * Detailed Description: + * Detailed Description: * A scene has Controls. By interacting with the controls, the user * causes Actions to execute. Certain Actions create 'effects', for * example, a sound or an animation. This is the base class for diff --git a/engines/zvision/video/rlf_decoder.cpp b/engines/zvision/video/rlf_decoder.cpp index db598a25b6..040582bcf8 100644 --- a/engines/zvision/video/rlf_decoder.cpp +++ b/engines/zvision/video/rlf_decoder.cpp @@ -197,7 +197,7 @@ bool RLFDecoder::RLFVideoTrack::seek(const Audio::Timestamp &time) { const Graphics::Surface *RLFDecoder::RLFVideoTrack::decodeNextFrame() { if (_displayedFrame >= (int)_frameCount) return NULL; - + _displayedFrame++; applyFrameToCurrent(_displayedFrame); diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp index d5ffbeb536..1cfd0f4197 100644 --- a/engines/zvision/video/video.cpp +++ b/engines/zvision/video/video.cpp @@ -62,7 +62,7 @@ Video::VideoDecoder *ZVision::loadAnimation(const Common::String &fileName) { bool loaded = animation->loadStream(_file); if (!loaded) error("Error loading animation %s", tmpFileName.c_str()); - + return animation; } diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index d50c7d53c4..da80ff9d02 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -251,7 +251,7 @@ Common::Error ZVision::run() { for (int i = 0; i < FONT_COUNT; i++) { FontStyle curFont = getSystemFont(i); Common::String freeFontBoldItalic = Common::String("Bold") + curFont.freeFontItalicName; - + const char *fontSuffixes[4] = { "", "bd", "i", "bi" }; const char *freeFontSuffixes[4] = { "", "Bold", curFont.freeFontItalicName, freeFontBoldItalic.c_str() }; const char *liberationFontSuffixes[4] = { "-Regular", "-Bold", "-Italic", "-BoldItalic" }; |