diff options
| author | Filippos Karapetis | 2014-10-28 16:15:43 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2014-10-28 16:15:43 +0200 |
| commit | 2cbd2402a516e852c0d04650825b8f3ce96b6a51 (patch) | |
| tree | 9e228d5b4394d29da6f31f1f8d5577396b1f618c /engines | |
| parent | e4f3f44c23c05410ddf5a1f1d387ca7d3acaef80 (diff) | |
| download | scummvm-rg350-2cbd2402a516e852c0d04650825b8f3ce96b6a51.tar.gz scummvm-rg350-2cbd2402a516e852c0d04650825b8f3ce96b6a51.tar.bz2 scummvm-rg350-2cbd2402a516e852c0d04650825b8f3ce96b6a51.zip | |
SCUMM: Remove trailing whitespace
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/scumm/cdda.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/detection.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/scumm.h | 2 | ||||
| -rw-r--r-- | engines/scumm/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/vars.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/engines/scumm/cdda.cpp b/engines/scumm/cdda.cpp index adb414ecce..d797712a31 100644 --- a/engines/scumm/cdda.cpp +++ b/engines/scumm/cdda.cpp @@ -46,7 +46,7 @@ private: public: CDDAStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse); virtual ~CDDAStream(); - + int readBuffer(int16 *buffer, const int numSamples); bool isStereo() const { return true; } int getRate() const { return 44100; } diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp index a7922b232e..10482ba1fc 100644 --- a/engines/scumm/detection.cpp +++ b/engines/scumm/detection.cpp @@ -244,7 +244,7 @@ static Common::String generateFilenameForDetection(const char *pattern, Filename case kGenRoomNum: result = Common::String::format(pattern, 0); break; - + case kGenDiskNumSteam: case kGenRoomNumSteam: { const SteamIndexFile *indexFile = lookUpSteamIndexFile(pattern, platform); diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h index af118a89a1..46512f8ce6 100644 --- a/engines/scumm/scumm.h +++ b/engines/scumm/scumm.h @@ -1362,7 +1362,7 @@ public: byte VAR_SCRIPT_CYCLE; // Used in runScript()/runObjectScript() byte VAR_NUM_SCRIPT_CYCLES; // Used in runAllScripts() - + byte VAR_QUIT_SCRIPT; // Used in confirmExitDialog() // Exists both in V7 and in V72HE: diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index cb428d1c15..84d2b37f96 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -1066,9 +1066,9 @@ void Sound::playCDTrackInternal(int track, int numLoops, int startFrame, int dur Common::File *cddaFile = new Common::File(); if (cddaFile->open("CDDA.SOU")) { Audio::Timestamp start = Audio::Timestamp(0, startFrame, 75); - Audio::Timestamp end = Audio::Timestamp(0, startFrame + duration, 75); + Audio::Timestamp end = Audio::Timestamp(0, startFrame + duration, 75); Audio::SeekableAudioStream *stream = makeCDDAStream(cddaFile, DisposeAfterUse::YES); - + _mixer->playStream(Audio::Mixer::kMusicSoundType, &_loomSteamCDAudioHandle, Audio::makeLoopingAudioStream(stream, start, end, (numLoops < 1) ? numLoops + 1 : numLoops)); } else { diff --git a/engines/scumm/vars.cpp b/engines/scumm/vars.cpp index a903ac5804..a6be5c3f3a 100644 --- a/engines/scumm/vars.cpp +++ b/engines/scumm/vars.cpp @@ -715,7 +715,7 @@ void ScummEngine_v99he::resetScummVars() { VAR(140) = 0; #endif } - + if (_game.id == GID_PUTTZOO && _game.heversion == 100 && _game.platform == Common::kPlatformWindows) { // Specific to Nimbus Games version. VAR(156) = 1; |