From dead4aa01446da2bf711e64a4e681be460fa1202 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Sun, 9 Oct 2016 14:59:58 +0200 Subject: JANITORIAL: Remove trailing spaces --- engines/sherlock/scalpel/3do/movie_decoder.cpp | 2 +- engines/sherlock/scalpel/3do/scalpel_3do_screen.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'engines/sherlock/scalpel/3do') diff --git a/engines/sherlock/scalpel/3do/movie_decoder.cpp b/engines/sherlock/scalpel/3do/movie_decoder.cpp index da0d16c145..bd2f44209f 100644 --- a/engines/sherlock/scalpel/3do/movie_decoder.cpp +++ b/engines/sherlock/scalpel/3do/movie_decoder.cpp @@ -140,7 +140,7 @@ bool Scalpel3DOMovieDecoder::loadStream(Common::SeekableReadStream *stream) { _stream->readUint32BE(); // Unknown 0x00004000 _stream->readUint32BE(); // Unknown 0x00000000 _stream->readUint32BE(); // Unknown 0x00000010 - audioSampleRate = _stream->readUint32BE(); + audioSampleRate = _stream->readUint32BE(); audioChannels = _stream->readUint32BE(); audioCodecTag = _stream->readUint32BE(); _stream->readUint32BE(); // Unknown 0x00000004 compression ratio? diff --git a/engines/sherlock/scalpel/3do/scalpel_3do_screen.h b/engines/sherlock/scalpel/3do/scalpel_3do_screen.h index 422f588b17..71674803ba 100644 --- a/engines/sherlock/scalpel/3do/scalpel_3do_screen.h +++ b/engines/sherlock/scalpel/3do/scalpel_3do_screen.h @@ -42,7 +42,7 @@ protected: /** * Draws a surface at a given position within this surface with transparency */ - virtual void transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, bool flipped, + virtual void transBlitFromUnscaled(const Graphics::Surface &src, const Common::Point &pt, bool flipped, int overrideColor); public: Scalpel3DOScreen(SherlockEngine *vm); -- cgit v1.2.3