From 2a4a6df5f2ae89132fd93d26b03599b6cc5c5fb7 Mon Sep 17 00:00:00 2001 From: Filippos Karapetis Date: Wed, 3 Dec 2014 01:12:35 +0200 Subject: [PATCH] ZVISION: Remove superfluous spacing and reorder some includes --- engines/zvision/animation/meta_animation.cpp | 1 - engines/zvision/animation/meta_animation.h | 1 - engines/zvision/animation/rlf_animation.cpp | 1 - engines/zvision/animation/rlf_animation.h | 1 - engines/zvision/archives/zfs_archive.cpp | 2 -- engines/zvision/archives/zfs_archive.h | 1 - engines/zvision/core/console.cpp | 1 - engines/zvision/core/events.cpp | 1 - engines/zvision/core/menu.cpp | 4 ---- engines/zvision/core/menu.h | 2 -- engines/zvision/core/save_manager.cpp | 1 - engines/zvision/core/search_manager.cpp | 2 -- engines/zvision/cursors/cursor.cpp | 1 - engines/zvision/cursors/cursor.h | 1 - engines/zvision/cursors/cursor_manager.cpp | 2 -- engines/zvision/cursors/cursor_manager.h | 1 - engines/zvision/detection.cpp | 3 --- engines/zvision/detection.h | 1 - engines/zvision/fonts/truetype_font.cpp | 1 - engines/zvision/fonts/truetype_font.h | 1 - engines/zvision/graphics/effects/fog.cpp | 1 - engines/zvision/graphics/effects/light.cpp | 1 - engines/zvision/graphics/effects/wave.cpp | 1 - engines/zvision/graphics/render_manager.cpp | 4 ---- engines/zvision/graphics/render_manager.h | 3 --- engines/zvision/graphics/render_table.cpp | 4 ---- engines/zvision/graphics/render_table.h | 1 - engines/zvision/scripting/actions.cpp | 15 --------------- engines/zvision/scripting/actions.h | 1 - engines/zvision/scripting/control.cpp | 1 - engines/zvision/scripting/control.h | 1 - .../zvision/scripting/controls/fist_control.cpp | 1 - engines/zvision/scripting/controls/fist_control.h | 1 - .../zvision/scripting/controls/hotmov_control.cpp | 1 - .../zvision/scripting/controls/hotmov_control.h | 1 - .../zvision/scripting/controls/input_control.cpp | 1 - .../zvision/scripting/controls/input_control.h | 1 - .../zvision/scripting/controls/lever_control.cpp | 1 - .../zvision/scripting/controls/lever_control.h | 1 - .../zvision/scripting/controls/paint_control.cpp | 2 -- .../zvision/scripting/controls/paint_control.h | 1 - .../scripting/controls/push_toggle_control.cpp | 1 - .../scripting/controls/push_toggle_control.h | 1 - .../zvision/scripting/controls/safe_control.cpp | 1 - engines/zvision/scripting/controls/safe_control.h | 1 - .../zvision/scripting/controls/save_control.cpp | 1 - engines/zvision/scripting/controls/save_control.h | 1 - .../zvision/scripting/controls/slot_control.cpp | 1 - engines/zvision/scripting/controls/slot_control.h | 1 - .../zvision/scripting/controls/titler_control.cpp | 1 - .../zvision/scripting/controls/titler_control.h | 1 - engines/zvision/scripting/inventory.cpp | 1 - engines/zvision/scripting/puzzle.h | 1 - engines/zvision/scripting/scr_file_handling.cpp | 3 --- engines/zvision/scripting/script_manager.cpp | 1 - engines/zvision/scripting/script_manager.h | 2 -- engines/zvision/scripting/sidefx.cpp | 1 - .../zvision/scripting/sidefx/animation_node.cpp | 3 --- engines/zvision/scripting/sidefx/animation_node.h | 1 - engines/zvision/scripting/sidefx/distort_node.cpp | 4 ---- engines/zvision/scripting/sidefx/music_node.cpp | 2 -- .../zvision/scripting/sidefx/syncsound_node.cpp | 1 - engines/zvision/scripting/sidefx/timer_node.cpp | 1 - engines/zvision/scripting/sidefx/ttytext_node.cpp | 1 - engines/zvision/sound/zork_raw.cpp | 1 - engines/zvision/sound/zork_raw.h | 2 -- engines/zvision/text/string_manager.cpp | 1 - engines/zvision/text/string_manager.h | 1 - engines/zvision/text/text.cpp | 1 - engines/zvision/text/text.h | 1 - engines/zvision/utility/clock.cpp | 1 - engines/zvision/utility/lzss_read_stream.cpp | 1 - engines/zvision/utility/lzss_read_stream.h | 1 - .../zvision/utility/single_value_container.cpp | 6 +----- engines/zvision/utility/utility.cpp | 1 - engines/zvision/utility/utility.h | 1 - engines/zvision/video/video.cpp | 15 ++++----------- engines/zvision/video/zork_avi_decoder.cpp | 1 - engines/zvision/zvision.cpp | 1 - engines/zvision/zvision.h | 1 - 80 files changed, 5 insertions(+), 136 deletions(-) diff --git a/engines/zvision/animation/meta_animation.cpp b/engines/zvision/animation/meta_animation.cpp index 2e549ec8386..857a0dd688b 100644 --- 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 index 4795a388e46..93b69587c44 100644 --- 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 index 5972bdb3efe..d9b8fa3894d 100644 --- 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 index 00c2e9b3d59..c8b29306769 100644 --- 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 index ed4dcec1feb..416719b8f22 100644 --- 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 index 44e2c4b2401..571591a6d11 100644 --- 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 index aac4e7b2bcc..201d1c9360a 100644 --- 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 index 873cdb0df75..e3bcf6f09ac 100644 --- 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 index 5816b3f364a..c7898a4fbd9 100644 --- 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 index 62683de912e..73013231739 100644 --- a/engines/zvision/core/menu.h +++ b/engines/zvision/core/menu.h @@ -70,8 +70,6 @@ public: 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 index 9b36824c3b8..11d3dd391ae 100644 --- 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 index 83501895665..1e9643ddbb6 100644 --- 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 index 8c6027a1bbb..b07220df92a 100644 --- 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 index 57db5616556..0c1e99411f5 100644 --- 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 index 564ffd25c52..33fb55515b8 100644 --- 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 index a6f77cec64e..460f6fade69 100644 --- 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 index cd696557d9a..4d210abe863 100644 --- 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,7 +44,6 @@ Common::Language ZVision::getLanguage() const { } // End of namespace ZVision - static const PlainGameDescriptor zVisionGames[] = { {"zvision", "ZVision Game"}, {"znemesis", "Zork Nemesis: The Forbidden Lands"}, @@ -53,7 +51,6 @@ static const PlainGameDescriptor zVisionGames[] = { {0, 0} }; - namespace ZVision { static const ZVisionGameDescription gameDescriptions[] = { diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h index a788e710b7b..f80cac79ecf 100644 --- 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 index 638a8ed2337..a9363d8923c 100644 --- 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 index 771c02a6dcd..30ef1c73a3a 100644 --- 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 index b6c5e7b0112..f59e82a4a06 100644 --- 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 index 9bff0770517..00b3811d655 100644 --- 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 index 9f2fbb285c3..1b3aa040e81 100644 --- 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 index 05f8dec9371..97d47e39207 100644 --- 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 index 7723c3d0f32..39809c65a4a 100644 --- 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 @@ private: // 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 @@ public: // 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 index 5500b50ba8b..54faecfa8b7 100644 --- 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 index f061b3b0d62..7455d9ba398 100644 --- 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 { diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 8ff6bd0496e..c8c82063f79 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -49,7 +49,6 @@ #include "audio/decoders/wave.h" - namespace ZVision { ////////////////////////////////////////////////////////////////////////////// @@ -66,7 +65,6 @@ bool ActionAdd::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionAssign ////////////////////////////////////////////////////////////////////////////// @@ -89,7 +87,6 @@ bool ActionAssign::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionAttenuate ////////////////////////////////////////////////////////////////////////////// @@ -108,7 +105,6 @@ bool ActionAttenuate::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionChangeLocation ////////////////////////////////////////////////////////////////////////////// @@ -125,7 +121,6 @@ bool ActionChangeLocation::execute() { return false; } - ////////////////////////////////////////////////////////////////////////////// // ActionCrossfade ////////////////////////////////////////////////////////////////////////////// @@ -368,7 +363,6 @@ bool ActionInventory::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionKill ////////////////////////////////////////////////////////////////////////////// @@ -457,8 +451,6 @@ ActionMusic::ActionMusic(ZVision *engine, int32 slotkey, const Common::String &l _volume = volume * 255 / 100; } } - - } ActionMusic::~ActionMusic() { @@ -583,7 +575,6 @@ bool ActionUnloadAnimation::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionPlayAnimation ////////////////////////////////////////////////////////////////////////////// @@ -625,7 +616,6 @@ bool ActionPlayAnimation::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionPlayPreloadAnimation ////////////////////////////////////////////////////////////////////////////// @@ -646,7 +636,6 @@ bool ActionPlayPreloadAnimation::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionQuit ////////////////////////////////////////////////////////////////////////////// @@ -786,7 +775,6 @@ bool ActionRotateTo::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionSetPartialScreen ////////////////////////////////////////////////////////////////////////////// @@ -833,7 +821,6 @@ bool ActionSetPartialScreen::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionSetScreen ////////////////////////////////////////////////////////////////////////////// @@ -852,7 +839,6 @@ bool ActionSetScreen::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionSetVenus ////////////////////////////////////////////////////////////////////////////// @@ -884,7 +870,6 @@ bool ActionStop::execute() { return true; } - ////////////////////////////////////////////////////////////////////////////// // ActionStreamVideo ////////////////////////////////////////////////////////////////////////////// diff --git a/engines/zvision/scripting/actions.h b/engines/zvision/scripting/actions.h index 03a249e580d..f9e4ee8167b 100644 --- a/engines/zvision/scripting/actions.h +++ b/engines/zvision/scripting/actions.h @@ -28,7 +28,6 @@ #include "audio/mixer.h" - namespace ZVision { // Forward declaration of ZVision. This file is included before ZVision is declared diff --git a/engines/zvision/scripting/control.cpp b/engines/zvision/scripting/control.cpp index e69d57f75c8..5469106928d 100644 --- a/engines/zvision/scripting/control.cpp +++ b/engines/zvision/scripting/control.cpp @@ -31,7 +31,6 @@ #include "common/stream.h" - namespace ZVision { void Control::parseFlatControl(ZVision *engine) { diff --git a/engines/zvision/scripting/control.h b/engines/zvision/scripting/control.h index 5814c9e4197..803d0cf1ce5 100644 --- a/engines/zvision/scripting/control.h +++ b/engines/zvision/scripting/control.h @@ -26,7 +26,6 @@ #include "common/keyboard.h" #include "common/str.h" - namespace Common { class SeekableReadStream; struct Point; diff --git a/engines/zvision/scripting/controls/fist_control.cpp b/engines/zvision/scripting/controls/fist_control.cpp index 9bb03cba518..dd6a7f11a91 100644 --- a/engines/zvision/scripting/controls/fist_control.cpp +++ b/engines/zvision/scripting/controls/fist_control.cpp @@ -37,7 +37,6 @@ #include "graphics/surface.h" - namespace ZVision { FistControl::FistControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/fist_control.h b/engines/zvision/scripting/controls/fist_control.h index 33c3c7b579a..cb765c429a5 100644 --- a/engines/zvision/scripting/controls/fist_control.h +++ b/engines/zvision/scripting/controls/fist_control.h @@ -28,7 +28,6 @@ #include "common/array.h" #include "common/rect.h" - namespace ZVision { class MetaAnimation; diff --git a/engines/zvision/scripting/controls/hotmov_control.cpp b/engines/zvision/scripting/controls/hotmov_control.cpp index fd7afb92d1e..68861dc2215 100644 --- a/engines/zvision/scripting/controls/hotmov_control.cpp +++ b/engines/zvision/scripting/controls/hotmov_control.cpp @@ -37,7 +37,6 @@ #include "graphics/surface.h" - namespace ZVision { HotMovControl::HotMovControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/hotmov_control.h b/engines/zvision/scripting/controls/hotmov_control.h index 9e01b40bab5..86600d65dce 100644 --- a/engines/zvision/scripting/controls/hotmov_control.h +++ b/engines/zvision/scripting/controls/hotmov_control.h @@ -28,7 +28,6 @@ #include "common/array.h" #include "common/rect.h" - namespace ZVision { class MetaAnimation; diff --git a/engines/zvision/scripting/controls/input_control.cpp b/engines/zvision/scripting/controls/input_control.cpp index 8af436bb403..c541693ec3b 100644 --- a/engines/zvision/scripting/controls/input_control.cpp +++ b/engines/zvision/scripting/controls/input_control.cpp @@ -35,7 +35,6 @@ #include "common/stream.h" #include "common/rect.h" - namespace ZVision { InputControl::InputControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/input_control.h b/engines/zvision/scripting/controls/input_control.h index 9a829d30f6b..410caf6d49f 100644 --- a/engines/zvision/scripting/controls/input_control.h +++ b/engines/zvision/scripting/controls/input_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" - namespace ZVision { class InputControl : public Control { diff --git a/engines/zvision/scripting/controls/lever_control.cpp b/engines/zvision/scripting/controls/lever_control.cpp index 1f176ef9d09..12b07d75846 100644 --- a/engines/zvision/scripting/controls/lever_control.cpp +++ b/engines/zvision/scripting/controls/lever_control.cpp @@ -38,7 +38,6 @@ #include "graphics/surface.h" - namespace ZVision { LeverControl::LeverControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/lever_control.h b/engines/zvision/scripting/controls/lever_control.h index 8de6d1e5c98..37d4d3bd8d8 100644 --- a/engines/zvision/scripting/controls/lever_control.h +++ b/engines/zvision/scripting/controls/lever_control.h @@ -28,7 +28,6 @@ #include "common/list.h" #include "common/rect.h" - namespace ZVision { class ZorkAVIDecoder; diff --git a/engines/zvision/scripting/controls/paint_control.cpp b/engines/zvision/scripting/controls/paint_control.cpp index cb3c17e0fd7..9bad6f2c582 100644 --- a/engines/zvision/scripting/controls/paint_control.cpp +++ b/engines/zvision/scripting/controls/paint_control.cpp @@ -110,8 +110,6 @@ PaintControl::PaintControl(ZVision *engine, uint32 key, Common::SeekableReadStre delete _paint; _paint = tmp; } - - } PaintControl::~PaintControl() { diff --git a/engines/zvision/scripting/controls/paint_control.h b/engines/zvision/scripting/controls/paint_control.h index aac4755fcd6..8097290ac21 100644 --- a/engines/zvision/scripting/controls/paint_control.h +++ b/engines/zvision/scripting/controls/paint_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/list.h" - namespace ZVision { class PaintControl : public Control { diff --git a/engines/zvision/scripting/controls/push_toggle_control.cpp b/engines/zvision/scripting/controls/push_toggle_control.cpp index ea4e947abe3..c5ec0708996 100644 --- a/engines/zvision/scripting/controls/push_toggle_control.cpp +++ b/engines/zvision/scripting/controls/push_toggle_control.cpp @@ -31,7 +31,6 @@ #include "common/stream.h" - namespace ZVision { PushToggleControl::PushToggleControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/push_toggle_control.h b/engines/zvision/scripting/controls/push_toggle_control.h index 6d68b8f1629..9444c77cb64 100644 --- a/engines/zvision/scripting/controls/push_toggle_control.h +++ b/engines/zvision/scripting/controls/push_toggle_control.h @@ -29,7 +29,6 @@ #include "common/events.h" #include "common/array.h" - namespace ZVision { class PushToggleControl : public Control { diff --git a/engines/zvision/scripting/controls/safe_control.cpp b/engines/zvision/scripting/controls/safe_control.cpp index 66ab53085f7..3ad5d3a8aec 100644 --- a/engines/zvision/scripting/controls/safe_control.cpp +++ b/engines/zvision/scripting/controls/safe_control.cpp @@ -38,7 +38,6 @@ #include "graphics/surface.h" - namespace ZVision { SafeControl::SafeControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/safe_control.h b/engines/zvision/scripting/controls/safe_control.h index e682e350503..e32ca97b70d 100644 --- a/engines/zvision/scripting/controls/safe_control.h +++ b/engines/zvision/scripting/controls/safe_control.h @@ -28,7 +28,6 @@ #include "common/list.h" #include "common/rect.h" - namespace ZVision { class ZorkAVIDecoder; diff --git a/engines/zvision/scripting/controls/save_control.cpp b/engines/zvision/scripting/controls/save_control.cpp index 7e1a65a9cc1..ad01257e6b6 100644 --- a/engines/zvision/scripting/controls/save_control.cpp +++ b/engines/zvision/scripting/controls/save_control.cpp @@ -35,7 +35,6 @@ #include "common/str.h" #include "common/stream.h" - namespace ZVision { SaveControl::SaveControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/save_control.h b/engines/zvision/scripting/controls/save_control.h index fefb0e0ce2e..cdc50eb54d5 100644 --- a/engines/zvision/scripting/controls/save_control.h +++ b/engines/zvision/scripting/controls/save_control.h @@ -27,7 +27,6 @@ #include "common/list.h" - namespace ZVision { class SaveControl : public Control { diff --git a/engines/zvision/scripting/controls/slot_control.cpp b/engines/zvision/scripting/controls/slot_control.cpp index 074d1905b42..1d83b44392d 100644 --- a/engines/zvision/scripting/controls/slot_control.cpp +++ b/engines/zvision/scripting/controls/slot_control.cpp @@ -32,7 +32,6 @@ #include "common/stream.h" - namespace ZVision { SlotControl::SlotControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/slot_control.h b/engines/zvision/scripting/controls/slot_control.h index 86fd261f255..e776d993116 100644 --- a/engines/zvision/scripting/controls/slot_control.h +++ b/engines/zvision/scripting/controls/slot_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/list.h" - namespace ZVision { class SlotControl : public Control { diff --git a/engines/zvision/scripting/controls/titler_control.cpp b/engines/zvision/scripting/controls/titler_control.cpp index b803501033c..f0126bebc21 100644 --- a/engines/zvision/scripting/controls/titler_control.cpp +++ b/engines/zvision/scripting/controls/titler_control.cpp @@ -32,7 +32,6 @@ #include "common/stream.h" - namespace ZVision { TitlerControl::TitlerControl(ZVision *engine, uint32 key, Common::SeekableReadStream &stream) diff --git a/engines/zvision/scripting/controls/titler_control.h b/engines/zvision/scripting/controls/titler_control.h index ee230afa979..075e47c9e93 100644 --- a/engines/zvision/scripting/controls/titler_control.h +++ b/engines/zvision/scripting/controls/titler_control.h @@ -30,7 +30,6 @@ #include "common/rect.h" #include "common/array.h" - namespace ZVision { class TitlerControl : public Control { diff --git a/engines/zvision/scripting/inventory.cpp b/engines/zvision/scripting/inventory.cpp index 98d063395be..76d43b200b3 100644 --- a/engines/zvision/scripting/inventory.cpp +++ b/engines/zvision/scripting/inventory.cpp @@ -24,7 +24,6 @@ #include "zvision/scripting/script_manager.h" - namespace ZVision { int8 ScriptManager::inventoryGetCount() { diff --git a/engines/zvision/scripting/puzzle.h b/engines/zvision/scripting/puzzle.h index ab38c5fc5d1..41238808351 100644 --- a/engines/zvision/scripting/puzzle.h +++ b/engines/zvision/scripting/puzzle.h @@ -28,7 +28,6 @@ #include "common/list.h" #include "common/ptr.h" - namespace ZVision { struct Puzzle { diff --git a/engines/zvision/scripting/scr_file_handling.cpp b/engines/zvision/scripting/scr_file_handling.cpp index 697de58ed89..f97eed6b75b 100644 --- a/engines/zvision/scripting/scr_file_handling.cpp +++ b/engines/zvision/scripting/scr_file_handling.cpp @@ -43,7 +43,6 @@ #include "common/file.h" #include "common/tokenizer.h" - namespace ZVision { void ScriptManager::parseScrFile(const Common::String &fileName, ScriptScope &scope) { @@ -210,8 +209,6 @@ void ScriptManager::parseResults(Common::SeekableReadStream &stream, Common::Lis args = Common::String(chrs + startpos, chrs + pos); } - - // Parse for the action type if (act.matchString("add", true)) { actionList.push_back(new ActionAdd(_engine, slot, args)); diff --git a/engines/zvision/scripting/script_manager.cpp b/engines/zvision/scripting/script_manager.cpp index 2a54cc43146..79048171561 100644 --- a/engines/zvision/scripting/script_manager.cpp +++ b/engines/zvision/scripting/script_manager.cpp @@ -37,7 +37,6 @@ #include "common/debug.h" #include "common/stream.h" - namespace ZVision { ScriptManager::ScriptManager(ZVision *engine) diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h index 5701cde6d0d..89b961634bb 100644 --- a/engines/zvision/scripting/script_manager.h +++ b/engines/zvision/scripting/script_manager.h @@ -31,7 +31,6 @@ #include "common/queue.h" #include "common/events.h" - namespace Common { class String; class SeekableReadStream; @@ -340,7 +339,6 @@ private: ScriptManager *_scriptManager; }; - } // End of namespace ZVision #endif diff --git a/engines/zvision/scripting/sidefx.cpp b/engines/zvision/scripting/sidefx.cpp index c0b8a4d12fe..9a658817c9c 100644 --- a/engines/zvision/scripting/sidefx.cpp +++ b/engines/zvision/scripting/sidefx.cpp @@ -32,5 +32,4 @@ namespace ZVision { - } // End of namespace ZVision diff --git a/engines/zvision/scripting/sidefx/animation_node.cpp b/engines/zvision/scripting/sidefx/animation_node.cpp index 98ac4e3b373..549aacba7ff 100644 --- a/engines/zvision/scripting/sidefx/animation_node.cpp +++ b/engines/zvision/scripting/sidefx/animation_node.cpp @@ -31,7 +31,6 @@ #include "graphics/surface.h" - namespace ZVision { AnimationNode::AnimationNode(ZVision *engine, uint32 controlKey, const Common::String &fileName, int32 mask, int32 frate, bool DisposeAfterUse) @@ -154,8 +153,6 @@ bool AnimationNode::process(uint32 deltaTimeInMillis) { return false; } - - void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int startFrame, int endFrame, int loops) { playnode nod; nod.loop = loops; diff --git a/engines/zvision/scripting/sidefx/animation_node.h b/engines/zvision/scripting/sidefx/animation_node.h index dab3d88d802..94428d25425 100644 --- a/engines/zvision/scripting/sidefx/animation_node.h +++ b/engines/zvision/scripting/sidefx/animation_node.h @@ -27,7 +27,6 @@ #include "common/rect.h" #include "common/list.h" - namespace Common { class String; } diff --git a/engines/zvision/scripting/sidefx/distort_node.cpp b/engines/zvision/scripting/sidefx/distort_node.cpp index 9be6b29413b..0d5c8b1ed52 100644 --- a/engines/zvision/scripting/sidefx/distort_node.cpp +++ b/engines/zvision/scripting/sidefx/distort_node.cpp @@ -31,7 +31,6 @@ #include "common/stream.h" - namespace ZVision { DistortNode::DistortNode(ZVision *engine, uint32 key, int16 speed, float startAngle, float endAngle, float startLineScale, float endLineScale) @@ -83,8 +82,6 @@ bool DistortNode::process(uint32 deltaTimeInMillis) { } float diff = (1.0 / (5.0 - (_curFrame * _frmSpeed))) / (5.0 - _frmSpeed); - - setParams(_startAngle + diff * _diffAngle, _startLineScale + diff * _diffLinScale); return false; @@ -105,5 +102,4 @@ void DistortNode::setParams(float angl, float linScale) { } } - } // End of namespace ZVision diff --git a/engines/zvision/scripting/sidefx/music_node.cpp b/engines/zvision/scripting/sidefx/music_node.cpp index b1e16e71ef0..a76d3b4e8d1 100644 --- a/engines/zvision/scripting/sidefx/music_node.cpp +++ b/engines/zvision/scripting/sidefx/music_node.cpp @@ -34,7 +34,6 @@ #include "common/file.h" #include "audio/decoders/wave.h" - namespace ZVision { MusicNode::MusicNode(ZVision *engine, uint32 key, Common::String &filename, bool loop, int8 volume) @@ -188,7 +187,6 @@ PanTrackNode::~PanTrackNode() { } } - MusicMidiNode::MusicMidiNode(ZVision *engine, uint32 key, int8 program, int8 note, int8 volume) : MusicNodeBASE(engine, key, SIDEFX_AUDIO) { _volume = volume; diff --git a/engines/zvision/scripting/sidefx/syncsound_node.cpp b/engines/zvision/scripting/sidefx/syncsound_node.cpp index 39542675eb1..c1f139694bd 100644 --- a/engines/zvision/scripting/sidefx/syncsound_node.cpp +++ b/engines/zvision/scripting/sidefx/syncsound_node.cpp @@ -33,7 +33,6 @@ #include "common/file.h" #include "audio/decoders/wave.h" - namespace ZVision { SyncSoundNode::SyncSoundNode(ZVision *engine, uint32 key, Common::String &filename, int32 syncto) diff --git a/engines/zvision/scripting/sidefx/timer_node.cpp b/engines/zvision/scripting/sidefx/timer_node.cpp index 6e71101acd3..abf2c90b048 100644 --- a/engines/zvision/scripting/sidefx/timer_node.cpp +++ b/engines/zvision/scripting/sidefx/timer_node.cpp @@ -29,7 +29,6 @@ #include "common/stream.h" - namespace ZVision { TimerNode::TimerNode(ZVision *engine, uint32 key, uint timeInSeconds) diff --git a/engines/zvision/scripting/sidefx/ttytext_node.cpp b/engines/zvision/scripting/sidefx/ttytext_node.cpp index 68636eb422c..1fb7c107924 100644 --- a/engines/zvision/scripting/sidefx/ttytext_node.cpp +++ b/engines/zvision/scripting/sidefx/ttytext_node.cpp @@ -32,7 +32,6 @@ #include "common/stream.h" #include "common/file.h" - namespace ZVision { ttyTextNode::ttyTextNode(ZVision *engine, uint32 key, const Common::String &file, const Common::Rect &r, int32 delay) : diff --git a/engines/zvision/sound/zork_raw.cpp b/engines/zvision/sound/zork_raw.cpp index 1581210c86b..485e0b8a49c 100644 --- a/engines/zvision/sound/zork_raw.cpp +++ b/engines/zvision/sound/zork_raw.cpp @@ -38,7 +38,6 @@ #include "audio/audiostream.h" #include "audio/decoders/raw.h" - namespace ZVision { const int16 RawChunkStream::_stepAdjustmentTable[8] = { -1, -1, -1, 1, 4, 7, 10, 12}; diff --git a/engines/zvision/sound/zork_raw.h b/engines/zvision/sound/zork_raw.h index a5e346dfbb0..0b408d818c0 100644 --- a/engines/zvision/sound/zork_raw.h +++ b/engines/zvision/sound/zork_raw.h @@ -25,7 +25,6 @@ #include "audio/audiostream.h" - namespace Common { class SeekableReadStream; } @@ -42,7 +41,6 @@ struct SoundParams { bool bits16; }; - /** * This is a ADPCM stream-reader, this class holds context for multi-chunk reading and no buffers. */ diff --git a/engines/zvision/text/string_manager.cpp b/engines/zvision/text/string_manager.cpp index 114f2985050..f88f9eaddd0 100644 --- a/engines/zvision/text/string_manager.cpp +++ b/engines/zvision/text/string_manager.cpp @@ -35,7 +35,6 @@ #include "graphics/fontman.h" #include "graphics/colormasks.h" - namespace ZVision { StringManager::StringManager(ZVision *engine) diff --git a/engines/zvision/text/string_manager.h b/engines/zvision/text/string_manager.h index 5420e1f3ee6..61c0d95f51a 100644 --- a/engines/zvision/text/string_manager.h +++ b/engines/zvision/text/string_manager.h @@ -26,7 +26,6 @@ #include "zvision/detection.h" #include "zvision/fonts/truetype_font.h" - namespace Graphics { class FontManager; } diff --git a/engines/zvision/text/text.cpp b/engines/zvision/text/text.cpp index 3cfc5b2f893..6f41416015d 100644 --- a/engines/zvision/text/text.cpp +++ b/engines/zvision/text/text.cpp @@ -40,7 +40,6 @@ #include "zvision/graphics/render_manager.h" #include "zvision/scripting/script_manager.h" - namespace ZVision { cTxtStyle::cTxtStyle() { diff --git a/engines/zvision/text/text.h b/engines/zvision/text/text.h index c2468383d3d..6b916860f00 100644 --- a/engines/zvision/text/text.h +++ b/engines/zvision/text/text.h @@ -28,7 +28,6 @@ #include "zvision/fonts/truetype_font.h" #include "zvision/zvision.h" - namespace Graphics { class FontManager; } diff --git a/engines/zvision/utility/clock.cpp b/engines/zvision/utility/clock.cpp index 45ab23ab655..0e800a20316 100644 --- a/engines/zvision/utility/clock.cpp +++ b/engines/zvision/utility/clock.cpp @@ -26,7 +26,6 @@ #include "common/system.h" - namespace ZVision { Clock::Clock(OSystem *system) diff --git a/engines/zvision/utility/lzss_read_stream.cpp b/engines/zvision/utility/lzss_read_stream.cpp index 14613a6fb21..bbe6e35f76e 100644 --- a/engines/zvision/utility/lzss_read_stream.cpp +++ b/engines/zvision/utility/lzss_read_stream.cpp @@ -24,7 +24,6 @@ #include "zvision/utility/lzss_read_stream.h" - namespace ZVision { LzssReadStream::LzssReadStream(Common::SeekableReadStream *source) diff --git a/engines/zvision/utility/lzss_read_stream.h b/engines/zvision/utility/lzss_read_stream.h index b7ae5ac2cb0..1420621f13d 100644 --- a/engines/zvision/utility/lzss_read_stream.h +++ b/engines/zvision/utility/lzss_read_stream.h @@ -26,7 +26,6 @@ #include "common/stream.h" #include "common/array.h" - namespace Common { class SeekableReadStream; } diff --git a/engines/zvision/utility/single_value_container.cpp b/engines/zvision/utility/single_value_container.cpp index e6094742858..774f4b72ee0 100644 --- a/engines/zvision/utility/single_value_container.cpp +++ b/engines/zvision/utility/single_value_container.cpp @@ -21,12 +21,10 @@ */ #include "common/scummsys.h" - -#include "zvision/utility/single_value_container.h" - #include "common/textconsole.h" #include "common/str.h" +#include "zvision/utility/single_value_container.h" namespace ZVision { @@ -114,7 +112,6 @@ void SingleValueContainer::deleteCharPointer() { delete[] _value.stringVal; } - SingleValueContainer &SingleValueContainer::operator=(const bool &rhs) { if (_objectType == BOOL) { _value.boolVal = rhs; @@ -270,7 +267,6 @@ SingleValueContainer &SingleValueContainer::operator=(const SingleValueContainer return *this; } - bool SingleValueContainer::getBoolValue(bool *returnValue) const { if (_objectType != BOOL) { warning("'Object' is not storing a bool."); diff --git a/engines/zvision/utility/utility.cpp b/engines/zvision/utility/utility.cpp index 537f525bd4c..517c89afbd4 100644 --- a/engines/zvision/utility/utility.cpp +++ b/engines/zvision/utility/utility.cpp @@ -30,7 +30,6 @@ #include "common/tokenizer.h" #include "common/file.h" - namespace ZVision { void writeFileContentsToFile(const Common::String &sourceFile, const Common::String &destFile) { diff --git a/engines/zvision/utility/utility.h b/engines/zvision/utility/utility.h index 380034404a4..0741cc044c1 100644 --- a/engines/zvision/utility/utility.h +++ b/engines/zvision/utility/utility.h @@ -25,7 +25,6 @@ #include "common/array.h" - namespace Common { class String; } diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp index 7a120df76b5..25125ec2fb0 100644 --- a/engines/zvision/video/video.cpp +++ b/engines/zvision/video/video.cpp @@ -21,22 +21,16 @@ */ #include "common/scummsys.h" +#include "common/system.h" +#include "video/video_decoder.h" +#include "engines/util.h" +#include "graphics/surface.h" #include "zvision/zvision.h" - #include "zvision/utility/clock.h" #include "zvision/graphics/render_manager.h" #include "zvision/subtitles/subtitles.h" -#include "common/system.h" - -#include "video/video_decoder.h" - -#include "engines/util.h" - -#include "graphics/surface.h" - - namespace ZVision { void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect, bool skippable, Subtitle *sub) { @@ -52,7 +46,6 @@ void ZVision::playVideo(Video::VideoDecoder &vid, const Common::Rect &destRect, scaled->create(dst.width(), dst.height(), vid.getPixelFormat()); } - uint16 x = _workingWindow.left + dst.left; uint16 y = _workingWindow.top + dst.top; uint16 finalWidth = dst.width() < _workingWindow.width() ? dst.width() : _workingWindow.width(); diff --git a/engines/zvision/video/zork_avi_decoder.cpp b/engines/zvision/video/zork_avi_decoder.cpp index 415a20d3f24..67fab0a114a 100644 --- a/engines/zvision/video/zork_avi_decoder.cpp +++ b/engines/zvision/video/zork_avi_decoder.cpp @@ -31,7 +31,6 @@ #include "audio/audiostream.h" #include "audio/decoders/raw.h" - namespace ZVision { Video::AVIDecoder::AVIAudioTrack *ZorkAVIDecoder::createAudioTrack(Video::AVIDecoder::AVIStreamHeader sHeader, Video::AVIDecoder::PCMWaveFormat wvInfo) { diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index 62342f02b9b..7a5e50f491f 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -51,7 +51,6 @@ #include "audio/mixer.h" - namespace ZVision { #define ZVISION_SETTINGS_KEYS_COUNT 17 diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h index 8b14cfa178f..ae49f0640f5 100644 --- a/engines/zvision/zvision.h +++ b/engines/zvision/zvision.h @@ -37,7 +37,6 @@ #include "gui/debugger.h" - namespace Video { class VideoDecoder; }