diff options
| author | Filippos Karapetis | 2014-12-03 01:12:35 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-12-03 01:12:35 +0200 |
| commit | 2a4a6df5f2ae89132fd93d26b03599b6cc5c5fb7 (patch) | |
| tree | 3b79568bbd20a9cc2d9e2f3c81d387b1ac541e38 /engines/zvision/video | |
| parent | 7976a34bbfbece2686712d80b1efa3612cb2b441 (diff) | |
| download | scummvm-rg350-2a4a6df5f2ae89132fd93d26b03599b6cc5c5fb7.tar.gz scummvm-rg350-2a4a6df5f2ae89132fd93d26b03599b6cc5c5fb7.tar.bz2 scummvm-rg350-2a4a6df5f2ae89132fd93d26b03599b6cc5c5fb7.zip | |
ZVISION: Remove superfluous spacing and reorder some includes
Diffstat (limited to 'engines/zvision/video')
| -rw-r--r-- | engines/zvision/video/video.cpp | 15 | ||||
| -rw-r--r-- | engines/zvision/video/zork_avi_decoder.cpp | 1 |
2 files changed, 4 insertions, 12 deletions
diff --git a/engines/zvision/video/video.cpp b/engines/zvision/video/video.cpp index 7a120df76b..25125ec2fb 100644 --- a/engines/zvision/video/video.cpp +++ b/engines/zvision/video/video.cpp @@ -21,21 +21,15 @@ */ #include "common/scummsys.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" +#include "zvision/zvision.h" +#include "zvision/utility/clock.h" +#include "zvision/graphics/render_manager.h" +#include "zvision/subtitles/subtitles.h" namespace ZVision { @@ -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 415a20d3f2..67fab0a114 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) { |