ZVISION: Remove superfluous spacing and reorder some includes

scummvm · Dec 2, 2014 · 2a4a6df · 2a4a6df
1 parent 7976a34
commit 2a4a6df
Show file tree

Hide file tree

Showing 80 changed files with 5 additions and 136 deletions.
diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp
@@ -34,7 +34,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 MetaAnimation::MetaAnimation(const Common::String &fileName, ZVision *engine)

diff --git a/engines/zvision/animation/meta_animation.h b/engines/zvision/animation/meta_animation.h
@@ -28,7 +28,6 @@
 #include "common/rect.h"
 #include "common/list.h"
 
-
 namespace Common {
 class String;
 }

diff --git a/engines/zvision/animation/rlf_animation.cpp b/engines/zvision/animation/rlf_animation.cpp
@@ -32,7 +32,6 @@
 
 #include "graphics/colormasks.h"
 
-
 namespace ZVision {
 
 RlfAnimation::RlfAnimation(const Common::String &fileName, bool stream)

diff --git a/engines/zvision/animation/rlf_animation.h b/engines/zvision/animation/rlf_animation.h
@@ -27,7 +27,6 @@
 
 #include "graphics/surface.h"
 
-
 namespace Common {
 class String;
 }

diff --git a/engines/zvision/archives/zfs_archive.cpp b/engines/zvision/archives/zfs_archive.cpp
@@ -153,5 +153,3 @@ void ZfsArchive::unXor(byte *buffer, uint32 length, const byte *xorKey) const {
 }
 
 } // End of namespace ZVision
-
-
diff --git a/engines/zvision/archives/zfs_archive.h b/engines/zvision/archives/zfs_archive.h
@@ -27,7 +27,6 @@
 #include "common/hashmap.h"
 #include "common/hash-str.h"
 
-
 namespace Common {
 class String;
 }

diff --git a/engines/zvision/core/console.cpp b/engines/zvision/core/console.cpp
@@ -41,7 +41,6 @@
 
 #include "audio/mixer.h"
 
-
 namespace ZVision {
 
 Console::Console(ZVision *engine) : GUI::Debugger(), _engine(engine) {

diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
@@ -40,7 +40,6 @@
 
 #include "engines/util.h"
 
-
 namespace ZVision {
 
 void ZVision::shortKeys(Common::Event event) {

diff --git a/engines/zvision/core/menu.cpp b/engines/zvision/core/menu.cpp
@@ -26,7 +26,6 @@
 
 #include "zvision/graphics/render_manager.h"
 
-
 namespace ZVision {
 
 enum {
@@ -380,7 +379,6 @@ void MenuZGI::process(uint32 deltatime) {
 			else if (itemCount > 50)
 				itemCount = 50;
 
-
 			for (int i = 0; i < itemCount; i++) {
 				int itemspace = (600 - 28) / itemCount;
 
@@ -553,7 +551,6 @@ void MenuZGI::process(uint32 deltatime) {
 	}
 }
 
-
 MenuNemesis::MenuNemesis(ZVision *engine) :
 	MenuHandler(engine) {
 	inmenu = false;
@@ -761,5 +758,4 @@ void MenuNemesis::process(uint32 deltatime) {
 	}
 }
 
-
 } // End of namespace ZVision
diff --git a/engines/zvision/core/menu.h b/engines/zvision/core/menu.h
@@ -70,8 +70,6 @@ class MenuZGI: public MenuHandler {
 private:
 	Graphics::Surface menuback[3][2];
 	Graphics::Surface menubar[4][2];
-
-
 	Graphics::Surface *items[50][2];
 	uint itemId[50];
 

diff --git a/engines/zvision/core/save_manager.cpp b/engines/zvision/core/save_manager.cpp
@@ -35,7 +35,6 @@
 
 #include "gui/message.h"
 
-
 namespace ZVision {
 
 const uint32 SaveManager::SAVEGAME_ID = MKTAG('Z', 'E', 'N', 'G');

diff --git a/engines/zvision/core/search_manager.cpp b/engines/zvision/core/search_manager.cpp
@@ -27,7 +27,6 @@
 #include "common/fs.h"
 #include "common/stream.h"
 
-
 namespace ZVision {
 
 SearchManager::SearchManager(const Common::String &rootPath, int depth) {
@@ -237,7 +236,6 @@ void SearchManager::addDir(const Common::String &name) {
 	Common::ArchiveMemberList list;
 	dir->listMatchingMembers(list, "*.zfs");
 
-
 	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
 		Common::String flname = (*iter)->getName();
 

diff --git a/engines/zvision/cursors/cursor.cpp b/engines/zvision/cursors/cursor.cpp
@@ -27,7 +27,6 @@
 #include "common/str.h"
 #include "common/file.h"
 
-
 namespace ZVision {
 
 ZorkCursor::ZorkCursor()

diff --git a/engines/zvision/cursors/cursor.h b/engines/zvision/cursors/cursor.h
@@ -26,7 +26,6 @@
 #include "graphics/surface.h"
 #include "zvision/zvision.h"
 
-
 namespace Common {
 class String;
 }

diff --git a/engines/zvision/cursors/cursor_manager.cpp b/engines/zvision/cursors/cursor_manager.cpp
@@ -31,7 +31,6 @@
 #include "graphics/pixelformat.h"
 #include "graphics/cursorman.h"
 
-
 namespace ZVision {
 
 const char *CursorManager::_cursorNames[NUM_CURSORS] = { "active", "arrow", "backward", "downarrow", "forward", "handpt", "handpu", "hdown", "hleft",
@@ -46,7 +45,6 @@ const char *CursorManager::_zNemCursorFileNames[NUM_CURSORS] = { "00act", "arrow
                                                                  "hright", "hup", "00idle", "left", "right", "ssurr", "stilt", "turn", "up"
                                                                };
 
-
 CursorManager::CursorManager(ZVision *engine, const Graphics::PixelFormat *pixelFormat)
 	: _engine(engine),
 	  _pixelFormat(pixelFormat),

diff --git a/engines/zvision/cursors/cursor_manager.h b/engines/zvision/cursors/cursor_manager.h
@@ -27,7 +27,6 @@
 
 #include "common/str.h"
 
-
 namespace Graphics {
 struct PixelFormat;
 }

diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
@@ -32,7 +32,6 @@
 #include "common/str-array.h"
 #include "common/system.h"
 
-
 namespace ZVision {
 
 uint32 ZVision::getFeatures() const {
@@ -45,15 +44,13 @@ Common::Language ZVision::getLanguage() const {
 
 } // End of namespace ZVision
 
-
 static const PlainGameDescriptor zVisionGames[] = {
 	{"zvision",  "ZVision Game"},
 	{"znemesis", "Zork Nemesis: The Forbidden Lands"},
 	{"zgi",      "Zork: Grand Inquisitor"},
 	{0, 0}
 };
 
-
 namespace ZVision {
 
 static const ZVisionGameDescription gameDescriptions[] = {

diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
@@ -25,7 +25,6 @@
 
 #include "engines/advancedDetector.h"
 
-
 namespace ZVision {
 
 enum ZVisionGameId {

diff --git a/engines/zvision/fonts/truetype_font.cpp b/engines/zvision/fonts/truetype_font.cpp
@@ -37,7 +37,6 @@
 #include "graphics/fonts/ttf.h"
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 TruetypeFont::TruetypeFont(ZVision *engine, int32 fontHeight)

diff --git a/engines/zvision/fonts/truetype_font.h b/engines/zvision/fonts/truetype_font.h
@@ -28,7 +28,6 @@
 #include "graphics/font.h"
 #include "graphics/pixelformat.h"
 
-
 namespace Graphics {
 struct Surface;
 }

diff --git a/engines/zvision/graphics/effects/fog.cpp b/engines/zvision/graphics/effects/fog.cpp
@@ -28,7 +28,6 @@
 #include "zvision/graphics/render_manager.h"
 #include "zvision/scripting/script_manager.h"
 
-
 namespace ZVision {
 
 FogFx::FogFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, const Common::String &clouds):

diff --git a/engines/zvision/graphics/effects/light.cpp b/engines/zvision/graphics/effects/light.cpp
@@ -27,7 +27,6 @@
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 
-
 namespace ZVision {
 
 LightFx::LightFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, EffectMap *Map, int8 delta, int8 minD, int8 maxD):

diff --git a/engines/zvision/graphics/effects/wave.cpp b/engines/zvision/graphics/effects/wave.cpp
@@ -27,7 +27,6 @@
 #include "zvision/zvision.h"
 #include "zvision/graphics/render_manager.h"
 
-
 namespace ZVision {
 
 WaveFx::WaveFx(ZVision *engine, uint32 key, Common::Rect region, bool ported, int16 frames, int16 centerX, int16 centerY, float ampl, float waveln, float spd):

diff --git a/engines/zvision/graphics/render_manager.cpp b/engines/zvision/graphics/render_manager.cpp
@@ -37,7 +37,6 @@
 
 #include "image/tga.h"
 
-
 namespace ZVision {
 
 RenderManager::RenderManager(ZVision *engine, uint32 windowWidth, uint32 windowHeight, const Common::Rect workingWindow, const Graphics::PixelFormat pixelFormat)
@@ -122,7 +121,6 @@ void RenderManager::renderBackbufferToScreen() {
 		outWndDirtyRect = _wrkWndDirtyRect;
 	}
 
-
 	if (!outWndDirtyRect.isEmpty()) {
 		_system->copyRectToScreen(out->getBasePtr(outWndDirtyRect.left, outWndDirtyRect.top), out->pitch,
 		                          outWndDirtyRect.left + _workingWindow.left,
@@ -511,8 +509,6 @@ void RenderManager::blitSurfaceToSurface(const Graphics::Surface &src, const Com
 	if (srcRect.isEmpty() || !srcRect.isValidRect())
 		return;
 
-
-
 	uint32 _keycolor = colorkey & ((1 << (src.format.bytesPerPixel << 3)) - 1);
 
 	// Copy srcRect from src surface to dst surface

diff --git a/engines/zvision/graphics/render_manager.h b/engines/zvision/graphics/render_manager.h
@@ -33,7 +33,6 @@
 
 #include "effect.h"
 
-
 class OSystem;
 
 namespace Common {
@@ -92,7 +91,6 @@ class RenderManager {
 	// A buffer used for apply graphics effects
 	Graphics::Surface _effectWnd;
 
-
 	/** Width of the working window. Saved to prevent extraneous calls to _workingWindow.width() */
 	const int _wrkWidth;
 	/** Height of the working window. Saved to prevent extraneous calls to _workingWindow.height() */
@@ -256,7 +254,6 @@ class RenderManager {
 	// Processing subtitles
 	void processSubs(uint16 deltatime);
 
-
 	// Return background size
 	Common::Point getBkgSize();
 

diff --git a/engines/zvision/graphics/render_table.cpp b/engines/zvision/graphics/render_table.cpp
@@ -21,14 +21,10 @@
  */
 
 #include "common/scummsys.h"
-
 #include "zvision/graphics/render_table.h"
-
 #include "common/rect.h"
-
 #include "graphics/colormasks.h"
 
-
 namespace ZVision {
 
 RenderTable::RenderTable(uint numColumns, uint numRows)

diff --git a/engines/zvision/graphics/render_table.h b/engines/zvision/graphics/render_table.h
@@ -26,7 +26,6 @@
 #include "common/rect.h"
 #include "graphics/surface.h"
 
-
 namespace ZVision {
 
 class RenderTable {