aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/video
diff options
context:
space:
mode:
authorJohannes Schickel2012-09-26 04:17:31 +0200
committerJohannes Schickel2012-09-26 04:17:55 +0200
commit89abab97e3124fa25eb4c7d3e8b38501747a8d17 (patch)
treed60a833c9ed352fbe44c0b9a6b8ff43fcbc29419 /engines/sci/video
parenta6c6c74350bb673c178d9756a1625ca128d24f21 (diff)
downloadscummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.gz
scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.tar.bz2
scummvm-rg350-89abab97e3124fa25eb4c7d3e8b38501747a8d17.zip
JANITORIAL: Remove trailing whitespaces.
Powered by: git ls-files "*.cpp" "*.h" "*.m" "*.mm" | xargs sed -i -e 's/[ \t]*$//'
Diffstat (limited to 'engines/sci/video')
-rw-r--r--engines/sci/video/robot_decoder.cpp6
-rw-r--r--engines/sci/video/robot_decoder.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/video/robot_decoder.cpp b/engines/sci/video/robot_decoder.cpp
index 608c77136f..0337a8d306 100644
--- a/engines/sci/video/robot_decoder.cpp
+++ b/engines/sci/video/robot_decoder.cpp
@@ -109,13 +109,13 @@ bool RobotDecoder::loadStream(Common::SeekableReadStream *stream) {
}
bool RobotDecoder::load(GuiResourceId id) {
- // TODO: RAMA's robot 1003 cannot be played (shown at the menu screen) -
+ // TODO: RAMA's robot 1003 cannot be played (shown at the menu screen) -
// its drawn at odd coordinates. SV can't play it either (along with some
// others), so it must be some new functionality added in RAMA's robot
// videos. Skip it for now.
if (g_sci->getGameId() == GID_RAMA && id == 1003)
return false;
-
+
// TODO: The robot video in the Lighthouse demo gets stuck
if (g_sci->getGameId() == GID_LIGHTHOUSE && id == 16)
return false;
@@ -247,7 +247,7 @@ void RobotDecoder::readNextPacket() {
audioTrack->queueBuffer(g_sci->_audio->getDecodedRobotAudioFrame(_fileStream, audioChunkSize), audioChunkSize * 2);
} else {
_fileStream->skip(audioChunkSize);
- }
+ }
}
void RobotDecoder::readHeaderChunk() {
diff --git a/engines/sci/video/robot_decoder.h b/engines/sci/video/robot_decoder.h
index ebc3262939..437954f7fb 100644
--- a/engines/sci/video/robot_decoder.h
+++ b/engines/sci/video/robot_decoder.h
@@ -45,13 +45,13 @@ public:
bool loadStream(Common::SeekableReadStream *stream);
bool load(GuiResourceId id);
void close();
-
+
void setPos(uint16 x, uint16 y) { _pos = Common::Point(x, y); }
Common::Point getPos() const { return _pos; }
protected:
void readNextPacket();
-
+
private:
class RobotVideoTrack : public FixedRateVideoTrack {
public: